Bug Fix

 Fixed issue with login event

Author: objectivehtml

core/parcel_types/UserEmailParcelType.php

@@ -6,7 +6,7 @@
 use Craft\Postmaster_TransportModel;
 
 class UserEmailParcelType extends DefaultParcelType {
-	
+
     public function getName()
     {
         return Craft::t('User Email');
@@ -29,22 +29,35 @@ public function init()
             {
             	$user = $event->params['user'];
 
+                // If the user doesn't have a password yet, use a Password Reset URL
+                if (!$user->password)
+                {
+                    $activationUrl = $parcelType->craft()->users->getPasswordResetUrl($user);
+                }
+                else
+                {
+                    $activationUrl = $parcelType->craft()->users->getEmailVerifyUrl($user);
+                }
+
             	$isNewUser = isset($event->params['isNewUser']) ? $event->params['isNewUser'] : false;
 
                 $parcelType->getParcelModel()->settings->parse(array_merge($event->params, array(
                     'user' => $user,
-                    'isNewUser' => $isNewUser
+                    'isNewUser' => $isNewUser,
+                    'activationUrl' => $activationUrl,
                 )));
 
                 $parcelType->settings->parse(array_merge($event->params, array(
                     'user' => $user,
-                    'isNewUser' => $isNewUser
+                    'isNewUser' => $isNewUser,
+                    'activationUrl' => $activationUrl,
                 )));
 
                 $parcelType->getParcelModel()->service->settings->parse(array_merge($event->params, array(
                     'user' => $user,
                     'settings' => $parcelType->settings,
-                    'isNewUser' => $isNewUser
+                    'isNewUser' => $isNewUser,
+                    'activationUrl' => $activationUrl,
                 )));
 
 		        if($parcelType->validateUser($user, $isNewUser))
@@ -54,7 +67,8 @@ public function init()
                         'settings' => $parcelType->settings,
                         'data' => array_merge($event->params, array(
                             'user' => $user,
-                    		'isNewUser' => $isNewUser
+                    		'isNewUser' => $isNewUser,
+                            'activationUrl' => $activationUrl,
                         ))
                     ));
 
@@ -63,7 +77,7 @@ public function init()
             });
         }
 	}
-	
+
 	public function areTriggersValid($isNewUser)
     {
     	if($this->hasTriggers())
@@ -108,4 +122,4 @@ public function getSettingsModelClassName()
 	{
 		return '\Craft\Postmaster_UserEmailParcelTypeSettingsModel';
 	}
-}
+}

templates/parcel_types/user_email/settings.html

@@ -14,14 +14,14 @@
 	name: 'settings[parcelTypeSettings][userEmail][events]',
 	allValue: '',
 	options: [{
-		label: "users.onSaveUser",
-		value: "users.saveUser"
+		label: "userSession.onLogin",
+		value: "userSession.login"
 	},{
-		label: "users.onLogin",
-		value: "users.login"
+		label: "userSession.onLogout",
+		value: "userSession.logout"
 	},{
-		label: "users.onLogout",
-		value: "users.logout"
+		label: "users.onSaveUser",
+		value: "users.saveUser"
 	},{
 		label: "users.onActivateUser",
 		value: "users.activateUsers"
@@ -73,4 +73,4 @@
 	name: 'settings[parcelTypeSettings][userEmail][extraConditionals]',
 	value: settings.extraConditionals,
 	rows: 10
-}) }}
+}) }}