Check if customer is activated before login

tastyigniter · Dec 28, 2018 · 934b4b0 · 934b4b0
1 parent 81e18d3
commit 934b4b0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/app/admin/models/Customers_model.php b/app/admin/models/Customers_model.php
@@ -2,6 +2,7 @@
 
 use Carbon\Carbon;
 use DB;
+use Exception;
 use Igniter\Flame\ActivityLog\Traits\LogsActivity;
 use Igniter\Flame\Auth\Models\User as AuthUserModel;
 use Igniter\Flame\Database\Traits\Purgeable;
@@ -98,6 +99,19 @@ public function scopeIsEnabled($query)
     // Events
     //
 
+    public function beforeLogin()
+    {
+        if (!$this->group OR !$this->group->requiresApproval())
+            return;
+
+        if ($this->is_activated OR $this->status)
+            return;
+
+        throw new Exception(sprintf(
+            'Cannot login user "%s" until activated.', $this->email
+        ));
+    }
+
     public function afterCreate()
     {
         $this->saveCustomerGuestOrder();

diff --git a/app/main/classes/Customer.php b/app/main/classes/Customer.php
@@ -70,15 +70,20 @@ public function getGroupId()
      *
      * @param array $credentials
      *
+     * @param bool $activate
      * @return \Admin\Models\Customers_model
      * @throws \Exception
      */
-    public function register(array $credentials)
+    public function register(array $credentials, $activate = FALSE)
     {
         $model = $this->createModel();
         $model->fill($credentials);
         $model->save();
 
+        if ($activate) {
+            $model->completeActivation($model->getActivationCode());
+        }
+
         // Prevents subsequent saves to this model object
         $model->password = null;