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

Alex Savenko
2 parents 175ce215 8b86b4cf
Showing 2 changed files with 8 additions and 4 deletions Show diff stats
src/app/backend/controllers/DiscountController.php
src/lib/models/discount.php
@@ -84,9 +84,9 @@ class DiscountController extends Controller
             $data['status']         = 1;
  
  
-            $data['catalog_ids']    = $this->request->getPost('catalog', 'string', NULL );
+            //$data['catalog_ids']    = $this->request->getPost('catalog', 'string', NULL );
             $data['group_ids']      = $this->request->getPost('items', 'string', NULL );
-            $data['all_items']      = $this->request->getPost('all_items', 'int', NULL);
+            //$data['all_items']      = $this->request->getPost('all_items', 'int', NULL);
  
             if(!empty($data['group_ids']) && $this->models->getDiscount()->addData( $data )) {
  
@@ -142,7 +142,8 @@ class discount extends \db
                           description,
                           start_date,
                           end_date,
-                          status
+                          status,
+                          group_ids
                         )
                         VALUES
                         (
@@ -152,6 +153,7 @@ class discount extends \db
                           :start_date,
                           :end_date,
                           :status
+                          :group_ids
                         )
                         RETURNING id
             ',
@@ -161,7 +163,9 @@ class discount extends \db
                 'description' => $data['description'],
                 'start_date' => $data['start_date'],
                 'end_date' => $data['end_date'],
-                'status' => $data['status']
+                'status' => $data['status'],
+                'group_ids' => !empty($data['group_ids']) ? '{'. implode(', ', $data['group_ids']) . '}' : null,
+                'catalog_ids' => !empty($data['catalog_ids']) ? '{'. implode(', ', $data['catalog_ids']) . '}' : null
             ],
             -1
         );