Alex Savenko / semena

Commit bf43d26363c5f2bc81f20b30f4b6359c3496193e

Authored by Alex Savenko
2 parents 066585ea 4b1cc171

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

Showing 2 changed files with 5 additions and 12 deletions   Show diff stats
Inline Side-by-side
src/app/backend/controllers/DiscountController.php
  Show/Hide comments   View file @bf43d26
... ... @@ -170,9 +170,9 @@ class DiscountController extends Controller
170 170 $data[0]['end_date'] = $this->request->getPost('end_date');
171 171 $data[0]['description'] = $this->request->getPost('description');
172 172  
173   - $data[0]['catalog_ids'] = $this->request->getPost('catalog', 'string', NULL );
  173 + //$data[0]['catalog_ids'] = $this->request->getPost('catalog', 'string', NULL );
174 174 $data[0]['group_ids'] = $this->request->getPost('items', 'string', NULL );
175   - $data[0]['all_items'] = $this->request->getPost('all_items', 'int', NULL);
  175 + //$data[0]['all_items'] = $this->request->getPost('all_items', 'int', NULL);
176 176  
177 177 if ($data[0]['discount'] > 100) {
178 178  
... ... @@ -217,14 +217,6 @@ class DiscountController extends Controller
217 217  
218 218 }
219 219  
220   - foreach($data as $k => $i) {
221   -
222   - if(isset($i['image']) && !empty($i['image']))
223   - $data[$k]['image'] = $this->storage->getPhotoURL($i['image'], 'promo_codes', 'original');
224   -
225   - }
226   -
227   -
228 220 $this->view->pick( 'discount/addEdit' );
229 221  
230 222 $this->view->setVars([
... ...
src/lib/models/discount.php
  Show/Hide comments   View file @bf43d26
... ... @@ -164,7 +164,6 @@ class discount extends \db
164 164 'start_date' => $data['start_date'],
165 165 'end_date' => $data['end_date'],
166 166 'group_ids' => !empty($data['group_ids']) ? '{'. implode(', ', $data['group_ids']) . '}' : null,
167   - //'catalog_ids' => !empty($data['catalog_ids']) ? '{'. implode(', ', $data['catalog_ids']) . '}' : null,
168 167 'status' => $data['status']
169 168 ],
170 169 -1
... ... @@ -192,7 +191,8 @@ class discount extends \db
192 191 description = :description,
193 192 start_date = :start_date,
194 193 end_date = :end_date,
195   - status = :status
  194 + status = :status,
  195 + group_ids = :group_ids
196 196 WHERE
197 197 id = :id
198 198 ',
... ... @@ -203,6 +203,7 @@ class discount extends \db
203 203 'start_date' => $data['start_date'],
204 204 'end_date' => $data['end_date'],
205 205 'status' => $data['status'],
  206 + 'group_ids' => !empty($data['group_ids']) ? '{'. implode(', ', $data['group_ids']) . '}' : null,
206 207 'id' => $id
207 208 ]
208 209 );
... ...