Commit d2390a3a630ab5bc0980673e26276d01a9ff9dde
1 parent
fa7778bd
products pick
Showing
3 changed files
with
44 additions
and
2 deletions
Show diff stats
src/app/backend/controllers/DiscountController.php
| @@ -95,7 +95,7 @@ class DiscountController extends Controller | @@ -95,7 +95,7 @@ class DiscountController extends Controller | ||
| 95 | } | 95 | } |
| 96 | else { | 96 | else { |
| 97 | 97 | ||
| 98 | - $this->flash->error( 'Выберите товары для промокода' ); | 98 | + $this->flash->error( 'Выберите товары на которые распространяется скидка' ); |
| 99 | 99 | ||
| 100 | } | 100 | } |
| 101 | } | 101 | } |
src/app/backend/views/discount/addEdit.php
| @@ -50,6 +50,48 @@ | @@ -50,6 +50,48 @@ | ||
| 50 | </div> | 50 | </div> |
| 51 | </div> | 51 | </div> |
| 52 | 52 | ||
| 53 | + <div class="clearfix input_wrapper"> | ||
| 54 | + <div class="label"><label for="catalog">Категории товаров</label></div> | ||
| 55 | + <div class="input"> | ||
| 56 | + <select class="catalog" id="catalog"> | ||
| 57 | + <option selected label=" "></option> | ||
| 58 | + <?php foreach($catalog_temp as $group): ?> | ||
| 59 | + <option value="<?= $group['id'] ?>"><?= $group['title'] ?></option> | ||
| 60 | + <?php endforeach; ?> | ||
| 61 | + </select> | ||
| 62 | + </div> | ||
| 63 | + <button type="button" id="apply_filter">Применить</button> | ||
| 64 | + <div class="input"> | ||
| 65 | + <div>Цена</div> | ||
| 66 | + <label for="from_price">От</label> | ||
| 67 | + <input type="text" id="from_price"> | ||
| 68 | + <label for="to_price">До</label> | ||
| 69 | + <input type="text" id="to_price"> | ||
| 70 | + </div> | ||
| 71 | + <div class="filter"> | ||
| 72 | + | ||
| 73 | + </div> | ||
| 74 | + </div> | ||
| 75 | + | ||
| 76 | + | ||
| 77 | + <div class="clearfix input_wrapper products"> | ||
| 78 | + | ||
| 79 | + </div> | ||
| 80 | + | ||
| 81 | + <div class="clearfix input_wrapper chose_items"> | ||
| 82 | + <?php if(isset($groups) && !empty($groups)): ?> | ||
| 83 | + <?php foreach($groups as $group): ?> | ||
| 84 | + <div> | ||
| 85 | + <label> | ||
| 86 | + <input disabled checked style="display:inline-block" id="items" name="items[]" class="items" type="checkbox" | ||
| 87 | + value="<?= $group['id'] ?>"> <?= $group['title'] ?> <?= $group['size'] ?> <?= $group['price2'] ?> грн. | ||
| 88 | + </label> | ||
| 89 | + <button type="button" class="delete_item">Удалить</button> | ||
| 90 | + </div> | ||
| 91 | + <?php endforeach; ?> | ||
| 92 | + <?php endif; ?> | ||
| 93 | + </div> | ||
| 94 | + | ||
| 53 | <div class="clearfix submit_wrapper"> | 95 | <div class="clearfix submit_wrapper"> |
| 54 | <a href="<?= $this->url->get([ 'for' => 'discount_index' ]) ?>" class="news_cancel float">Отмена</a> | 96 | <a href="<?= $this->url->get([ 'for' => 'discount_index' ]) ?>" class="news_cancel float">Отмена</a> |
| 55 | <input type="submit" class="news_submit float" name="save" value="Сохранить"> | 97 | <input type="submit" class="news_submit float" name="save" value="Сохранить"> |
src/app/backend/views/promo_codes/addEdit.php
| @@ -273,7 +273,7 @@ | @@ -273,7 +273,7 @@ | ||
| 273 | parent.append(items); | 273 | parent.append(items); |
| 274 | } | 274 | } |
| 275 | 275 | ||
| 276 | - /* var data = JSON.parse('<?php //echo json_encode($catalog_temp); ?>');*/ | 276 | + // var data = JSON.parse("<?php //echo json_encode($catalog_temp); ?>"); |
| 277 | 277 | ||
| 278 | /*$('#name').autocomplete({ | 278 | /*$('#name').autocomplete({ |
| 279 | minLength: 2, | 279 | minLength: 2, |