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

Alex Savenko
2 parents f9363db6 fa7778bd
Showing 3 changed files with 18 additions and 13 deletions Show diff stats
src/app/backend/controllers/DiscountController.php
src/app/backend/controllers/PromoCodesController.php
src/app/frontend/views/partial/item_group.php
@@ -82,7 +82,12 @@ class DiscountController extends Controller
             $data['end_date']       = $this->request->getPost('end_date');
             $data['discount']       = $this->request->getPost('discount', 'string', NULL );
-            if($this->models->getDiscount()->addData( $data )) {
+
+            $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);
+
+            if(!empty($data['group_ids']) && $this->models->getDiscount()->addData( $data )) {
                 $this->flash->success( 'Сохранение прошло успешно' );
                 return $this->response->redirect([ 'for' => 'discount_index' ]);
@@ -50,17 +50,17 @@ class PromoCodesController extends Controller
     if( $this->request->isPost() )
     {
-        $data['name']     = $this->request->getPost('name', 'string', NULL );
-        $data['code']     = $this->request->getPost('code', 'string', NULL );
-        $data['start_date'] = $this->request->getPost('start_date');
-        $data['end_date'] = $this->request->getPost('end_date');
-        $data['single_use'] = $this->request->getPost('single_use');
-        $data['discount'] = $this->request->getPost('discount', 'string', NULL );
-        $data['description'] = $this->request->getPost('description');
-        $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['image'] = $this->uploadImage();
+        $data['name']           = $this->request->getPost('name', 'string', NULL );
+        $data['code']           = $this->request->getPost('code', 'string', NULL );
+        $data['start_date']     = $this->request->getPost('start_date');
+        $data['end_date']       = $this->request->getPost('end_date');
+        $data['single_use']     = $this->request->getPost('single_use');
+        $data['discount']       = $this->request->getPost('discount', 'string', NULL );
+        $data['description']    = $this->request->getPost('description');
+        $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['image']          = $this->uploadImage();
         if( empty($this->models->getPromoCodes()->getPromoByCode( $data['code'] )[0]) )
         {
@@ -33,7 +33,7 @@
     <div class="align_bottom">
         <div class="one_item_price">
             <?= $t->_("price_from") ?>
-            <?php if (isset($discount) && $discount > 0) {
+            <?php if (isset($discount) && $discount > 0 && $discount <= 100) {
                 echo '<span style="text-decoration: line-through;"><span>'.$i['price'].'</span></span> грн<br/>';
                 echo '<span>'.round($i['price']*(1-$discount/100), 1).'</span> грн';
             }