Merge branch 'registration_fix' into 'master'

Registration fix See merge request !11

Merge branch 'registration_fix' into 'master'
Registration fix See merge request !11
Administrator
2 parents b9ae3614 b1483db5
Showing 2 changed files with 29 additions and 3 deletions Show diff stats
src/app/frontend/controllers/CustomerController.php
src/lib/models/customers.php
@@ -405,6 +405,7 @@ class CustomerController extends \controllers\ControllerBase
             if( $passwd === $confirm_passwd )
             {
                 $registration['passwd']          = $this->common->hashPasswd( $passwd );
+                $registration['user_pass']       = $passwd;
                 $registration['confirm_key']     = $confirm_key;
  
                 switch( $this->models->getCustomers()->resetPasswd( $registration ) )
@@ -413,7 +414,10 @@ class CustomerController extends \controllers\ControllerBase
                         // OK
                         // redirect
                         $this->flash->success($this->languages->getTranslation()->_("successfully_edited_your_password"));
-                        return $this->response->redirect([ 'for' => 'cabinet', 'language' => $this->lang_name ]);
+                        if($this->session->get('special_users_id') != null) {
+                            return $this->response->redirect(['for' => 'personal_data', 'language' => $this->lang_name]);
+                        }
+                        return $this->response->redirect(['for' => 'cabinet', 'language' => $this->lang_name]);
                         break;
  
                     case 0:
@@ -486,9 +486,31 @@ class customers extends \db
                     ]
                 );
  
+
+                $data =  $this->get(
+                    '
+                    SELECT
+                        id,
+                        status,
+                        users_group_id,
+                        special_users_id
+                    FROM
+                        public.customers
+                    WHERE
+                        id = :customer_id
+                    LIMIT
+                        1
+                ',
+                    [
+                        'customer_id' => $data_customer_id['0']['customer_id'],
+                    ],
+                    -1
+                );
+
                 $this->getDi()->get('session')->set( 'isAuth',          true );
                 $this->getDi()->get('session')->set( 'id',              $data_customer_id['0']['customer_id'] );
-
+                $this->getDi()->get('session')->set( 'users_group_id', $data['0']['users_group_id'] );
+                $this->getDi()->get('session')->set( 'special_users_id', $data['0']['special_users_id'] );
  
                 $result = 1;
  
@@ -500,7 +522,7 @@ class customers extends \db
  
             $connection->commit();
  
-            return true;
+            return $result;
         }
         catch(\Exception $e)
         {