Alex Savenko / semena

Commit be8e393efa1b4e25a573326a7d2f8c511547572c

Authored by Alex Savenko
2 parents 70b58c2a 59b96728

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

Showing 2 changed files with 1 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/app/frontend/controllers/PageController.php
  Show/Hide comments   View file @be8e393
@@ -906,7 +906,6 @@ @@ -906,7 +906,6 @@
906 906
907 $discount = $this->models->getDiscount()->getActiveData(); 907 $discount = $this->models->getDiscount()->getActiveData();
908 if (!empty($discount)) { 908 if (!empty($discount)) {
909 - $discount = $discount[0];  
910 $discount['group_ids'] = str_replace('{', '', $discount['group_ids']); 909 $discount['group_ids'] = str_replace('{', '', $discount['group_ids']);
911 $discount['group_ids'] = str_replace('}', '', $discount['group_ids']); 910 $discount['group_ids'] = str_replace('}', '', $discount['group_ids']);
912 $discount['group_ids'] = explode(',', $discount['group_ids']); 911 $discount['group_ids'] = explode(',', $discount['group_ids']);
src/config/global.php
  Show/Hide comments   View file @be8e393
@@ -31,7 +31,7 @@ return @@ -31,7 +31,7 @@ return
31 31
32 32
33 'phones' => '(044)-581-67-15, (044)-451-48-59 <br /> (050)-464-48-59, (067)-464-48-59', 33 'phones' => '(044)-581-67-15, (044)-451-48-59 <br /> (050)-464-48-59, (067)-464-48-59',
34 - 'email' => 'ludmila.v@hs.kiev.ua, alla@hs.kiev.ua, lesya@hs.kiev.ua, olga@hs.kiev.ua,kristina@hs.kiev.ua', 34 + 'email' => 'ludmila.v@hs.kiev.ua, alla@hs.kiev.ua, lesya@hs.kiev.ua, olga@hs.kiev.ua, kristina@hs.kiev.ua, test@hs.kiev.ua',
35 'name' => 'Semena', 35 'name' => 'Semena',
36 36
37 'delivery' => 37 'delivery' =>