From c99e7b14da846967d8d5b888015c19f13b8a9684 Mon Sep 17 00:00:00 2001
From: Alex <program.artweb@gmail.com>
Date: Thu, 12 Jan 2017 18:25:03 +0200
Subject: [PATCH] debugging

---
 src/app/frontend/controllers/MenuController.php | 30 +++++++-----------------------
 src/lib/models/basket.php                       | 40 +++++++++++++++++++++-------------------
 2 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/src/app/frontend/controllers/MenuController.php b/src/app/frontend/controllers/MenuController.php
index 287984e..2c651c4 100644
--- a/src/app/frontend/controllers/MenuController.php
+++ b/src/app/frontend/controllers/MenuController.php
@@ -476,7 +476,6 @@ class MenuController extends \controllers\ControllerBase
             if( in_array( $item_id, $item_id_in_cart ) )
             {
                 die( json_encode( 0 ) );
-                //die( json_encode( [0, 'This item already is already in basket'] ) );
             }
 
             $in_cart[]       =
@@ -489,20 +488,14 @@ class MenuController extends \controllers\ControllerBase
             $count = count($in_cart);
 
             //save basket in DB
-            $user_id = $this->session->get('id');
             if ($this->session->get('isAuth')) {
-                $data = [
-                    'user_id'   => $user_id,
-                    'letter'    => '0',
-                    'items'     => $in_cart
-                ];
-                $this->models->getBasket()->updateBasket($user_id, $data);
+                $user_id = $this->session->get('id');
+                $this->models->getBasket()->updateBasket($user_id, $in_cart, 0);
             }
 
         }
 
         die (json_encode($count));
-        //die( json_encode('Count items in basket: '.$count) );
 
     }
 
@@ -530,14 +523,9 @@ class MenuController extends \controllers\ControllerBase
             $count = count($in_cart);
 
             //save basket in DB
-            $user_id = $this->session->get('id');
             if ($this->session->get('isAuth')) {
-                $data = [
-                    'user_id'   => $user_id,
-                    'letter'    => '0',
-                    'items'     => $in_cart
-                ];
-                $this->models->getBasket()->updateBasket($user_id, $data);
+                $user_id = $this->session->get('id');
+                $this->models->getBasket()->updateBasket($user_id, $in_cart, 0);
             }
         }
 
@@ -565,15 +553,11 @@ class MenuController extends \controllers\ControllerBase
             }
 
             $this->session->set( 'in_cart', $in_cart );
+
             //save basket in DB
-            $user_id = $this->session->get('id');
             if ($this->session->get('isAuth')) {
-                $data = [
-                    'user_id'   => $user_id,
-                    'letter'    => '0',
-                    'items'     => $in_cart
-                ];
-                $this->models->getBasket()->updateBasket($user_id, $data);
+                $user_id = $this->session->get('id');
+                $this->models->getBasket()->updateBasket($user_id, $in_cart, 0);
             }
 		}
 
diff --git a/src/lib/models/basket.php b/src/lib/models/basket.php
index 135d487..df2b87a 100644
--- a/src/lib/models/basket.php
+++ b/src/lib/models/basket.php
@@ -217,15 +217,19 @@ class basket extends \db
     }
 
     /**
-     * @param   array   $data
+     * @param   int     $user_id
+     * @param   array   $items
+     * @param   bool    $letter
      * @return  string
      */
-    public function addData($data) {
+    public function addData($user_id, $items, $letter) {
 
-        $query_basket =  $this->addUser($data['user_id'], $data['letter']);
+        $query_basket =  $this->addUser($user_id, $letter);
+
+        foreach ($items as $item) {
+
+            $this->addItem($user_id, $item['item_id'], $item['count_items']);
 
-        foreach ($data['items'] as $item) {
-            $this->addItem($data['user_id'], $item['item_id'], $item['count_items']);
         }
 
         return 'User #'.$query_basket[0]['user_id'].' added';
@@ -233,40 +237,38 @@ class basket extends \db
     }
 
     /**
-     * @param $data
-     * @return string
+     * @param   int     $user_id
+     * @param   array   $items
+     * @param   bool    $letter
+     * @return  string
      */
-    public function updateData($data) {
+    public function updateData($user_id, $items, $letter) {
 
         //update user last mod
-        $query_basket =  $this->updateUser($data['user_id'], $data['letter']);
+        $query_basket =  $this->updateUser($user_id, $letter);
 
         //clear deprecated items
-        $this->deleteAllItems($data['user_id']);
+        $this->deleteAllItems($user_id);
 
-        foreach ($data['items'] as $item) {
+        foreach ($items as $item) {
 
             //add items 1 by 1
-            $this->addItem($data['user_id'], $item['item_id'], $item['count_items']);
+            $this->addItem($user_id, $item['item_id'], $item['count_items']);
 
         }
         return 'User #'.$query_basket[0]['user_id'].' updated';
     }
 
-    /**
-     * @param $user_id
-     * @param $data
-     */
-    public function updateBasket($user_id, $data) {
+    public function updateBasket($user_id, $items, $letter) {
 
         if ($this->checkUserExist($user_id)) {
 
-            $this->updateData($data);
+            $this->updateData($user_id, $items, $letter);
 
         }
         else {
 
-            $this->addData($data);
+            $this->addData($user_id, $items, $letter);
 
         }
 
--
libgit2 0.21.4