test

Alex Savenko
1 parent 1e0a25aa
Showing 3 changed files with 11 additions and 2 deletions Show diff stats
src/app/frontend/controllers/PageController.php
src/app/frontend/views/partial/item_group.php
src/lib/common.php
@@ -1352,6 +1352,16 @@
                 $groups_         = $this->common->getGroups1( $this->lang_id, $groups );
+
+                //discount
+                $discount = $this->models->getDiscount()->getActiveData();
+                $discount = $this->models->getDiscount()->explodeGroupIds($discount);
+                $discount = $discount[0];
+                foreach ($groups_ as &$item) {
+                    if ($discount['discount'] > 0 && $discount['discount'] <= 100 && in_array($item['id'], $discount['group_ids'])) {
+                        $item['discounted_price'] = round($item['price']*(1-$discount['discount']/100), 1);
+                    }
+                }
             }
             die( json_encode( $groups_ ) );
@@ -69,7 +69,7 @@
         <div class="one_item_compare">
             <input type="checkbox" id="items_compare_item_<?= $i['id'] ?>" value="<?= $i['type_id'].'-'.$i['catalog'].'-'.$i['id'] ?>" <?= ( !empty($i['checked']) ? 'checked' : '' ) ?> />
-            <label for="items_compare_item_<?= $i['id'] ?>"><span></span><?= $t->_("compared_to") ?>!><!</label>
+            <label for="items_compare_item_<?= $i['id'] ?>"><span></span><?= $t->_("compared_to") ?></label>
         </div>
     </div>
@@ -779,7 +779,6 @@ namespace
                     }
-
                     foreach( $groups as &$g )
                     {
                         $g['items']                 = $this->getDi()->get('models')->getItems()->getSizesByGroupId($lang_id, $g['group_id']);