user_group_id remove bug fix

Alex Savenko
1 parent 6b081599
Showing 2 changed files with 49 additions and 17 deletions Show diff stats
src/app/frontend/controllers/CustomerController.php
src/lib/models/customers.php
@@ -528,7 +528,8 @@ class CustomerController extends \controllers\ControllerBase
             if( $this->models->getCustomers()->editCustomer( $customer_edit ) )
             {
                 $this->flash->success( $this->languages->getTranslation()->_("successfully_changed_your_profile") );
-                $this->session->set('users_group_id', $customer_edit['users_group_id']);
+
+                if (!empty($customer_edit['users_group_id'])) $this->session->set('users_group_id', $customer_edit['users_group_id']);
                 return $this->response->redirect($_SERVER['HTTP_REFERER']);
             }
             else
@@ -634,9 +634,9 @@ class customers extends \db
     }
     public function editCustomer( $customer_edit )
     {
-
-        return $this->exec(
-            '
+        if (!empty($customer_edit['users_group_id'])) {
+            return $this->exec(
+                '
                 UPDATE
                     public.customers
                 SET
@@ -654,19 +654,50 @@ class customers extends \db
                 WHERE
                     id=:id
             ',
-            [
-                'name'          => $customer_edit['name'],
-                'passwd'		=> $customer_edit['passwd'],
-                'email'			=> $customer_edit['email'],
-                'birth_date'    => $customer_edit['birth_date'],
-                'phone'         => $customer_edit['phone'],
-                'city'          => $customer_edit['city'],
-                'address'       => !empty($customer_edit['address']) ? $customer_edit['address'] : '',
-                'subscribed'    => $customer_edit['subscribed'],
-                'id'            => $customer_edit['id'],
-                'users_group_id'=> !empty($customer_edit['users_group_id']) ? $customer_edit['users_group_id'] : null
-            ]
-        );
+                [
+                    'name'          => $customer_edit['name'],
+                    'passwd'		=> $customer_edit['passwd'],
+                    'email'			=> $customer_edit['email'],
+                    'birth_date'    => $customer_edit['birth_date'],
+                    'phone'         => $customer_edit['phone'],
+                    'city'          => $customer_edit['city'],
+                    'address'       => !empty($customer_edit['address']) ? $customer_edit['address'] : '',
+                    'subscribed'    => $customer_edit['subscribed'],
+                    'id'            => $customer_edit['id'],
+                    'users_group_id'=> !empty($customer_edit['users_group_id']) ? $customer_edit['users_group_id'] : null
+                ]
+            );
+        }
+        else {
+            return $this->exec(
+                '
+                UPDATE
+                    public.customers
+                SET
+                    name        = :name,
+					passwd		= :passwd,
+					email		= :email,
+                    birth_date  = :birth_date,
+                    phone       = :phone,
+                    city        = :city,
+                    address     = :address,
+                    subscribed  = :subscribed
+                WHERE
+                    id=:id
+            ',
+                [
+                    'name'          => $customer_edit['name'],
+                    'passwd'		=> $customer_edit['passwd'],
+                    'email'			=> $customer_edit['email'],
+                    'birth_date'    => $customer_edit['birth_date'],
+                    'phone'         => $customer_edit['phone'],
+                    'city'          => $customer_edit['city'],
+                    'address'       => !empty($customer_edit['address']) ? $customer_edit['address'] : '',
+                    'subscribed'    => $customer_edit['subscribed'],
+                    'id'            => $customer_edit['id']
+                ]
+            );
+        }
     }
  
     /////////////////////////////////////////////////////////////////////////////