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

Alex Savenko
2 parents 7aa1294f 5c35c875
Showing 5 changed files with 29 additions and 29 deletions Show diff stats
src/app/backend/controllers/CustomersController.php
src/app/backend/views/customers/addEdit.php
src/app/frontend/controllers/PageController.php
src/app/frontend/views/basket_ua.php
src/app/frontend/views/landing_ukr.php
@@ -80,9 +80,9 @@ class CustomersController extends \Phalcon\Mvc\Controller
                 $data['password'] = $this->common->hashPasswd($data['password']);
             }
  
-            $current_email = $this->models->getCustomers()->getCustomerByEmail($data['email']);
+            $current_customer = $this->models->getCustomers()->getCustomerByEmail($data['email']);
  
-            if( !empty( $data ) && isset($current_email[0]))
+            if( !empty( $data ) && isset($current_customer[0]))
             {
                 if( $this->models->getCustomers()->UpdateData( $data, $id ) )
                 {
@@ -42,8 +42,8 @@
                                     <div class="input"><select name="special_users" id="group">
                                             <?php if(isset( $special_users ) && !empty( $special_users)) {
                                                 foreach($special_users as $group){
-                                                    if(isset( $page['0']['groups'] ) && !empty( $page['0']['groups'])):?>
-                                                        <option value="<?= $group['id']?>"<?= ($group['id']==$page['0']['groups'])?"selected":''?>><?= $group['name']?></option>
+                                                    if(isset( $page['0']['special_users_id'] ) && !empty( $page['0']['special_users_id'])):?>
+                                                        <option value="<?= $group['id']?>"<?= ($group['id']==$page['0']['special_users_id'])?"selected":''?>><?= $group['name']?></option>
                                                     <?php else: ?>
                                                         <option value="<?= $group['id']?>"><?= $group['name']?></option>
                                                     <?php endif;
@@ -1107,24 +1107,24 @@
                 ]);
             }
  
-            $discount = $this->models->getDiscount()->getActiveData();
-            if (!empty($discount)) {
-                $discount = $discount[0];
-                $discount['group_ids'] = str_replace('{', '', $discount['group_ids']);
-                $discount['group_ids'] = str_replace('}', '', $discount['group_ids']);
-                $discount['group_ids'] = explode(',', $discount['group_ids']);
-                if ($discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($item_id, $discount['group_ids'])) {
-                    $discount = $discount['discount'];
-                }
-                else {
-                    $discount = 0;
-                }
-            }
+//            $discount = $this->models->getDiscount()->getActiveData();
+//            if (!empty($discount)) {
+//                $discount = $discount[0];
+//                $discount['group_ids'] = str_replace('{', '', $discount['group_ids']);
+//                $discount['group_ids'] = str_replace('}', '', $discount['group_ids']);
+//                $discount['group_ids'] = explode(',', $discount['group_ids']);
+//                if ($discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($item_id, $discount['group_ids'])) {
+//                    $discount = $discount['discount'];
+//                }
+//                else {
+//                    $discount = 0;
+//                }
+//            }
  
             $this->view->pick('page/changeWithSize');
             $this->view->setVars([
                 'item'      => $item['0'],
-                'discount'  => $discount
+                //'discount'  => $discount
             ]);
             $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
         }
@@ -1595,4 +1595,4 @@
             header(!empty($language) ? "Location:".$language : 'Location:/');
         }
  
-    }
+    }
@@ -625,7 +625,7 @@ else
             <div class="col-sm-7 text-center">
                 <div class="h4">У «Огірковий кошик» входять:</div>
                 <p class="text-left">
-                    Огірок бджолозапильний Аккорд F1, фасовка 20 шт – 1 уп.<br>
+                    Огірок бджолозапильний Акорд F1, фасовка 20 шт – 1 уп.<br>
                     Огірок бджолозапильний Гектор F1, фасовка 20 шт – 1 уп.<br>
                     Огірок бджолозапильний Салім F1, фасовка 20 шт – 1 уп.<br>
                     Огірок самозапильний Аристократ F1, фасовка 10 шт – 1 уп.<br>
@@ -192,7 +192,7 @@
                     <div id="img-pre3"><img src="/landing_semena/images2/pic-8.png" /></div>
                 </div>
                 <div class="one_item_title">
-                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/gazon_parkovyy_1c2-89/ru" title="">
+                    <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_parkoviy_1c-89" title="">
                         <h3>Газон Парковий</h3>
                     </a>
                 </div>
@@ -218,7 +218,7 @@
                     </div>
                 </div>
                 <div class="one_item_image">
-                    <a href="#" title="">
+                    <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_posukhostiykiy_1c-90" title="">
                         <img src="http://storage.semena.in.ua/avatar/6/0/3/e/603eb6277e041cd98e6f3f8525223971/200x.jpg " title="" alt="" width="126" height="200">
                     </a>
                     <div id="img-pre1"><img src="/landing_semena/images2/pic-3.png" /></div>
@@ -250,7 +250,7 @@
  
                 </div>
                 <div class="one_item_image">
-                    <a href="#" title="">
+                    <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_universalniy_1c-87" title="">
                         <img src="http://storage.semena.in.ua/avatar/4/3/7/8/43786eb20ef3e65f98c0438077ba53a9/200x.jpg" title="" width="126" height="200">
                     </a>
                     <div id="img-pre1"><img src="/landing_semena/images2/pic-3.png" /></div>
@@ -258,7 +258,7 @@
                     <div id="img-pre3"><img src="/landing_semena/images2/pic-10.png" /></div>
                 </div>
                 <div class="one_item_title">
-                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/gazon_universalnyy_1c2-87/ru" title="">
+                    <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_universalniy_1c-87" title="">
                         <h3>Газон Універсальний</h3>
                     </a>
                 </div>
@@ -284,14 +284,14 @@
                     </div>
                 </div>
                 <div class="one_item_image">
-                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/gazon_sportivnyy_1c2-91/ru" title="">
+                    <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_sportivniy_1c-91" title="">
                         <img src="http://storage.semena.in.ua/avatar/c/4/1/c/c41c6dd11fee9880588b05088bc67676/200x.jpg" title="" alt="" width="126" height="200">
                     </a>
                     <div id="img-pre1"><img src="/landing_semena/images2/pic-10.png" /></div>
                     <div id="img-pre2"><img src="/landing_semena/images2/pic-8.png" /></div>
                 </div>
                 <div class="one_item_title">
-                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/gazon_sportivnyy_1c2-91/ru" title="">
+                    <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_sportivniy_1c-91" title="">
                         <h3>Газон Спортивний</h3>
                     </a>
                 </div>
@@ -317,13 +317,13 @@
                     </div>
                 </div>
                 <div class="one_item_image">
-                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/gazon_dyuymovochka_1c2-52/ru" title="">
+                    <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_dyuymovochka_1c-52" title="">
                         <img src="http://storage.semena.in.ua/avatar/2/a/2/a/2a2a230487a81740577024decee3a276/200x.jpg" title="" alt="" width="126" height="200">
                     </a>
                     <div id="img-pre1"><img src="/landing_semena/images2/pic-5.png" /></div>
                 </div>
                 <div class="one_item_title">
-                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/gazon_dyuymovochka_1c2-52/ru" title="">
+                    <a href="http://semena.in.ua/gazonni_travi_1c0/nasinnja_gazonnikh_trav_1c1/gazon_dyuymovochka_1c-52" title="">
                         <h3>Газон Дюймовочка</h3>
                     </a>
                 </div>
@@ -934,4 +934,4 @@
 </div>
 <script src="/dist/js/cart.js"></script>
 </body>
-</html>
+</html>
 \ No newline at end of file