Merge branch 'discount' of gitlab.artweb.com.ua:Alex/semena

Alex Savenko
2 parents 066585ea 4b1cc171
Showing 2 changed files with 5 additions and 12 deletions Show diff stats
src/app/backend/controllers/DiscountController.php
src/lib/models/discount.php
@@ -170,9 +170,9 @@ class DiscountController extends Controller
             $data[0]['end_date']    = $this->request->getPost('end_date');
             $data[0]['description'] = $this->request->getPost('description');
-            $data[0]['catalog_ids']    = $this->request->getPost('catalog', 'string', NULL );
+            //$data[0]['catalog_ids']    = $this->request->getPost('catalog', 'string', NULL );
             $data[0]['group_ids']      = $this->request->getPost('items', 'string', NULL );
-            $data[0]['all_items']      = $this->request->getPost('all_items', 'int', NULL);
+            //$data[0]['all_items']      = $this->request->getPost('all_items', 'int', NULL);
             if ($data[0]['discount'] > 100) {
@@ -217,14 +217,6 @@ class DiscountController extends Controller
         }
-        foreach($data as $k => $i) {
-
-            if(isset($i['image']) && !empty($i['image']))
-                $data[$k]['image'] = $this->storage->getPhotoURL($i['image'], 'promo_codes', 'original');
-
-        }
-
-
         $this->view->pick( 'discount/addEdit' );
         $this->view->setVars([
@@ -164,7 +164,6 @@ class discount extends \db
                 'start_date' => $data['start_date'],
                 'end_date' => $data['end_date'],
                 'group_ids' => !empty($data['group_ids']) ? '{'. implode(', ', $data['group_ids']) . '}' : null,
-                //'catalog_ids' => !empty($data['catalog_ids']) ? '{'. implode(', ', $data['catalog_ids']) . '}' : null,
                 'status' => $data['status']
             ],
             -1
@@ -192,7 +191,8 @@ class discount extends \db
                     description = :description,
                     start_date = :start_date,
                     end_date = :end_date,
-                    status = :status
+                    status = :status,
+                    group_ids = :group_ids
                 WHERE
                     id  = :id
             ',
@@ -203,6 +203,7 @@ class discount extends \db
                 'start_date' => $data['start_date'],
                 'end_date' => $data['end_date'],
                 'status' => $data['status'],
+                'group_ids' => !empty($data['group_ids']) ? '{'. implode(', ', $data['group_ids']) . '}' : null,
                 'id' => $id
             ]
         );