@@ -9,6 +9,6 @@ |
||
9 | 9 | <a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='<?= $model::index(); ?>' data-path ='/' data-id='0'> Корень</a> |
10 | 10 | <div class="categoryTree"> |
11 | 11 | <?php |
12 | - $dataManager->drawCategorys(); |
|
13 | - ?> |
|
12 | + $dataManager->drawCategorys(); |
|
13 | + ?> |
|
14 | 14 | </div> |
15 | 15 | \ No newline at end of file |
@@ -29,11 +29,11 @@ |
||
29 | 29 | <select class ='form-control' id = 'widgetChooser' onchange="selectChange(this);"> |
30 | 30 | <option value = ''>Выберите виджет</option> |
31 | 31 | <?php |
32 | - foreach ($widgets as $code => $options) { |
|
33 | - $name = is_string($options) ? $options : $options['name']; |
|
34 | - echo "<option value = '{$code}' data-filename='{$code}'>{$name}</option>"; |
|
35 | - } |
|
36 | - ?> |
|
32 | + foreach ($widgets as $code => $options) { |
|
33 | + $name = is_string($options) ? $options : $options['name']; |
|
34 | + echo "<option value = '{$code}' data-filename='{$code}'>{$name}</option>"; |
|
35 | + } |
|
36 | + ?> |
|
37 | 37 | </select> |
38 | 38 | <?php |
39 | 39 | foreach ($widgets as $code => $options) { |
@@ -8,11 +8,11 @@ discard block |
||
8 | 8 | </tr> |
9 | 9 | </thead> |
10 | 10 | <?php |
11 | - $orderDeatilCols = [ |
|
12 | - 'id' => '№ Заказа', |
|
13 | - 'complete_data' => 'Дата заказа' |
|
14 | - ]; |
|
15 | - ?> |
|
11 | + $orderDeatilCols = [ |
|
12 | + 'id' => '№ Заказа', |
|
13 | + 'complete_data' => 'Дата заказа' |
|
14 | + ]; |
|
15 | + ?> |
|
16 | 16 | <tbody> |
17 | 17 | <tr> |
18 | 18 | <td class="text-left" style="width: 50%;"> |
@@ -65,91 +65,91 @@ discard block |
||
65 | 65 | </thead> |
66 | 66 | <tbody> |
67 | 67 | <?php |
68 | - $sums = []; |
|
69 | - foreach ($cart->cartItems as $cartItem) { |
|
70 | - $item = $cartItem->item; |
|
71 | - $itemName = $item->name(); |
|
72 | - if (!isset($sums[$cartItem->price->currency_id])) { |
|
73 | - $sums[$cartItem->price->currency_id] = $cartItem->price->price; |
|
74 | - } else { |
|
75 | - $sums[$cartItem->price->currency_id] += $cartItem->price->price; |
|
76 | - } |
|
77 | - ?> |
|
68 | + $sums = []; |
|
69 | + foreach ($cart->cartItems as $cartItem) { |
|
70 | + $item = $cartItem->item; |
|
71 | + $itemName = $item->name(); |
|
72 | + if (!isset($sums[$cartItem->price->currency_id])) { |
|
73 | + $sums[$cartItem->price->currency_id] = $cartItem->price->price; |
|
74 | + } else { |
|
75 | + $sums[$cartItem->price->currency_id] += $cartItem->price->price; |
|
76 | + } |
|
77 | + ?> |
|
78 | 78 | <tr> |
79 | 79 | <td class="text-left"><?= $itemName; ?></td> |
80 | 80 | <td class="text-right"><?= $cartItem->count; ?></td> |
81 | 81 | <td class="text-right"><?= $cartItem->price->price; ?> |
82 | 82 | <?php |
83 | - if (App::$cur->money) { |
|
84 | - $currency = Money\Currency::get($cartItem->price->currency_id); |
|
85 | - if ($currency) { |
|
86 | - echo $currency->acronym(); |
|
87 | - } else { |
|
88 | - echo 'руб.'; |
|
89 | - } |
|
90 | - } else { |
|
91 | - echo 'руб.'; |
|
92 | - } |
|
93 | - ?></td> |
|
83 | + if (App::$cur->money) { |
|
84 | + $currency = Money\Currency::get($cartItem->price->currency_id); |
|
85 | + if ($currency) { |
|
86 | + echo $currency->acronym(); |
|
87 | + } else { |
|
88 | + echo 'руб.'; |
|
89 | + } |
|
90 | + } else { |
|
91 | + echo 'руб.'; |
|
92 | + } |
|
93 | + ?></td> |
|
94 | 94 | <td class="text-right"><?= ($cartItem->price->price * $cartItem->count); ?> |
95 | 95 | <?php |
96 | - if (App::$cur->money) { |
|
97 | - $currency = Money\Currency::get($cartItem->price->currency_id); |
|
98 | - if ($currency) { |
|
99 | - echo $currency->acronym(); |
|
100 | - } else { |
|
101 | - echo 'руб.'; |
|
102 | - } |
|
103 | - } else { |
|
104 | - echo 'руб.'; |
|
105 | - } |
|
106 | - ?></td> |
|
96 | + if (App::$cur->money) { |
|
97 | + $currency = Money\Currency::get($cartItem->price->currency_id); |
|
98 | + if ($currency) { |
|
99 | + echo $currency->acronym(); |
|
100 | + } else { |
|
101 | + echo 'руб.'; |
|
102 | + } |
|
103 | + } else { |
|
104 | + echo 'руб.'; |
|
105 | + } |
|
106 | + ?></td> |
|
107 | 107 | <td class="text-right" style="white-space: nowrap;"> |
108 | 108 | <a onclick = 'inji.Ecommerce.Cart.addItem(<?= $item->getPrice()->id; ?>, 1); |
109 | 109 | return false;' data-original-title="Добавить в корзину" href="#" data-toggle="tooltip" title="" class="btn btn-primary"><i class="glyphicon glyphicon-shopping-cart"></i></a> |
110 | 110 | </tr> |
111 | 111 | <?php |
112 | - } |
|
113 | - ?> |
|
112 | + } |
|
113 | + ?> |
|
114 | 114 | </tbody> |
115 | 115 | <tfoot> |
116 | 116 | <tr> |
117 | 117 | <td colspan="2"></td> |
118 | 118 | <td class="text-right"><b>Сумма</b></td> |
119 | 119 | <td class="text-right"><?php |
120 | - foreach ($sums as $currency_id => $sum) { |
|
121 | - if (!$sum) { |
|
122 | - continue; |
|
123 | - } |
|
124 | - echo number_format($sum, 2, '.', ' '); |
|
125 | - if (App::$cur->money) { |
|
126 | - $currency = Money\Currency::get($currency_id); |
|
127 | - if ($currency) { |
|
128 | - echo ' ' . $currency->acronym(); |
|
129 | - } else { |
|
130 | - echo ' руб.'; |
|
131 | - } |
|
132 | - } else { |
|
133 | - echo ' руб.'; |
|
134 | - } |
|
135 | - echo '<br />'; |
|
136 | - } |
|
137 | - ?></td> |
|
120 | + foreach ($sums as $currency_id => $sum) { |
|
121 | + if (!$sum) { |
|
122 | + continue; |
|
123 | + } |
|
124 | + echo number_format($sum, 2, '.', ' '); |
|
125 | + if (App::$cur->money) { |
|
126 | + $currency = Money\Currency::get($currency_id); |
|
127 | + if ($currency) { |
|
128 | + echo ' ' . $currency->acronym(); |
|
129 | + } else { |
|
130 | + echo ' руб.'; |
|
131 | + } |
|
132 | + } else { |
|
133 | + echo ' руб.'; |
|
134 | + } |
|
135 | + echo '<br />'; |
|
136 | + } |
|
137 | + ?></td> |
|
138 | 138 | <td></td> |
139 | 139 | </tr> |
140 | 140 | <?php |
141 | - $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0; |
|
142 | - $deliveryPrice = $cart->delivery->price; |
|
143 | - if (!isset($sums[$deliveryCurrency])) { |
|
144 | - $sums[$deliveryCurrency] = $deliveryPrice; |
|
145 | - } else { |
|
146 | - $sums[$deliveryCurrency] += $deliveryPrice; |
|
147 | - } |
|
148 | - $delCurrency = false; |
|
149 | - if (App::$cur->money) { |
|
150 | - $delCurrency = Money\Currency::get($deliveryPrice); |
|
151 | - } |
|
152 | - ?> |
|
141 | + $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0; |
|
142 | + $deliveryPrice = $cart->delivery->price; |
|
143 | + if (!isset($sums[$deliveryCurrency])) { |
|
144 | + $sums[$deliveryCurrency] = $deliveryPrice; |
|
145 | + } else { |
|
146 | + $sums[$deliveryCurrency] += $deliveryPrice; |
|
147 | + } |
|
148 | + $delCurrency = false; |
|
149 | + if (App::$cur->money) { |
|
150 | + $delCurrency = Money\Currency::get($deliveryPrice); |
|
151 | + } |
|
152 | + ?> |
|
153 | 153 | <tr> |
154 | 154 | <td colspan="2"></td> |
155 | 155 | <td class="text-right"><b><?= $cart->delivery ? $cart->delivery->name : 'Доставка'; ?></b></td> |
@@ -160,24 +160,24 @@ discard block |
||
160 | 160 | <td colspan="2"></td> |
161 | 161 | <td class="text-right"><b>Итого</b></td> |
162 | 162 | <td class="text-right"><?php |
163 | - foreach ($sums as $currency_id => $sum) { |
|
164 | - if (!$sum) { |
|
165 | - continue; |
|
166 | - } |
|
167 | - echo number_format($sum, 2, '.', ' '); |
|
168 | - if (App::$cur->money) { |
|
169 | - $currency = Money\Currency::get($currency_id); |
|
170 | - if ($currency) { |
|
171 | - echo ' ' . $currency->acronym(); |
|
172 | - } else { |
|
173 | - echo ' руб.'; |
|
174 | - } |
|
175 | - } else { |
|
176 | - echo ' руб.'; |
|
177 | - } |
|
178 | - echo '<br />'; |
|
179 | - } |
|
180 | - ?></td> |
|
163 | + foreach ($sums as $currency_id => $sum) { |
|
164 | + if (!$sum) { |
|
165 | + continue; |
|
166 | + } |
|
167 | + echo number_format($sum, 2, '.', ' '); |
|
168 | + if (App::$cur->money) { |
|
169 | + $currency = Money\Currency::get($currency_id); |
|
170 | + if ($currency) { |
|
171 | + echo ' ' . $currency->acronym(); |
|
172 | + } else { |
|
173 | + echo ' руб.'; |
|
174 | + } |
|
175 | + } else { |
|
176 | + echo ' руб.'; |
|
177 | + } |
|
178 | + echo '<br />'; |
|
179 | + } |
|
180 | + ?></td> |
|
181 | 181 | <td></td> |
182 | 182 | </tr> |
183 | 183 | </tfoot> |
@@ -13,85 +13,85 @@ |
||
13 | 13 | |
14 | 14 | class Value extends \Migrations\Parser { |
15 | 15 | |
16 | - public function parse() { |
|
16 | + public function parse() { |
|
17 | 17 | $options = $this->param->options ? json_decode($this->param->options, true) : []; |
18 | 18 | $modelName = get_class($this->model); |
19 | 19 | $cols = $modelName::$cols; |
20 | 20 | $value = $this->data; |
21 | 21 | if (is_array($value)) { |
22 | - $value = ''; |
|
22 | + $value = ''; |
|
23 | 23 | } |
24 | 24 | if (!empty($cols[$this->param->value])) { |
25 | - $col = $cols[$this->param->value]; |
|
26 | - if ($col['type'] == 'dynamicType') { |
|
25 | + $col = $cols[$this->param->value]; |
|
26 | + if ($col['type'] == 'dynamicType') { |
|
27 | 27 | switch ($col['typeSource']) { |
28 | - case'selfMethod': |
|
28 | + case'selfMethod': |
|
29 | 29 | $type = $this->model->{$col['selfMethod']}(); |
30 | 30 | if (is_array($type)) { |
31 | - if (strpos($type['relation'], ':')) { |
|
31 | + if (strpos($type['relation'], ':')) { |
|
32 | 32 | $relationPath = explode(':', $type['relation']); |
33 | 33 | $relationName = array_pop($relationPath); |
34 | 34 | $item = $this->model; |
35 | 35 | foreach ($relationPath as $path) { |
36 | - $item = $item->$path; |
|
36 | + $item = $item->$path; |
|
37 | 37 | } |
38 | 38 | $itemModel = get_class($item); |
39 | 39 | $relation = $itemModel::getRelation($relationName); |
40 | 40 | $sourceModel = $relation['model']; |
41 | - } else { |
|
41 | + } else { |
|
42 | 42 | $relation = $modelName::getRelation($type['relation']); |
43 | 43 | $sourceModel = $relation['model']; |
44 | - } |
|
45 | - $objectId = \App::$cur->migrations->findObject((string) $value, $sourceModel); |
|
46 | - if ($objectId) { |
|
44 | + } |
|
45 | + $objectId = \App::$cur->migrations->findObject((string) $value, $sourceModel); |
|
46 | + if ($objectId) { |
|
47 | 47 | $value = $objectId->object_id; |
48 | - } |
|
48 | + } |
|
49 | 49 | } |
50 | 50 | break; |
51 | 51 | } |
52 | - } else { |
|
52 | + } else { |
|
53 | 53 | $type = $col['type']; |
54 | - } |
|
54 | + } |
|
55 | 55 | } else { |
56 | - $type = 'text'; |
|
56 | + $type = 'text'; |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | if (!empty($options['valueReplace'])) { |
60 | - $values = $this->param->values(['key' => 'original']); |
|
61 | - if (empty($values[$value])) { |
|
60 | + $values = $this->param->values(['key' => 'original']); |
|
61 | + if (empty($values[$value])) { |
|
62 | 62 | $valueObject = new \Migrations\Migration\Object\Param\Value(); |
63 | 63 | $valueObject->param_id = $this->param->id; |
64 | 64 | $valueObject->original = $value; |
65 | 65 | $valueObject->save(); |
66 | - } else { |
|
66 | + } else { |
|
67 | 67 | $valueObject = $values[$value]; |
68 | - } |
|
69 | - $value = $valueObject->replace; |
|
68 | + } |
|
69 | + $value = $valueObject->replace; |
|
70 | 70 | } |
71 | 71 | switch ($type) { |
72 | - case 'image': |
|
72 | + case 'image': |
|
73 | 73 | $notEq = true; |
74 | 74 | $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME); |
75 | 75 | if ($this->model->{$this->param->value}) { |
76 | - $file = \Files\File::get($this->model->{$this->param->value}); |
|
77 | - if ($file && $value && file_exists($dir . '/' . $value) && file_exists(\App::$primary->path . $file->path) && md5_file($dir . '/' . $value) == md5_file(\App::$primary->path . $file->path)) { |
|
76 | + $file = \Files\File::get($this->model->{$this->param->value}); |
|
77 | + if ($file && $value && file_exists($dir . '/' . $value) && file_exists(\App::$primary->path . $file->path) && md5_file($dir . '/' . $value) == md5_file(\App::$primary->path . $file->path)) { |
|
78 | 78 | $notEq = false; |
79 | - } |
|
80 | - if ($file && $notEq) { |
|
79 | + } |
|
80 | + if ($file && $notEq) { |
|
81 | 81 | $file->delete(); |
82 | 82 | $this->model->{$this->param->value} = 0; |
83 | - } |
|
83 | + } |
|
84 | 84 | } |
85 | 85 | if ($notEq) { |
86 | - $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']); |
|
86 | + $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']); |
|
87 | 87 | } |
88 | 88 | break; |
89 | - default: |
|
89 | + default: |
|
90 | 90 | if (is_array($value)) { |
91 | - $value = implode(' ', $value); |
|
91 | + $value = implode(' ', $value); |
|
92 | 92 | } |
93 | 93 | $this->model->{$this->param->value} = $value; |
94 | 94 | } |
95 | - } |
|
95 | + } |
|
96 | 96 | |
97 | 97 | } |
@@ -13,63 +13,63 @@ discard block |
||
13 | 13 | |
14 | 14 | class Option extends \Model { |
15 | 15 | |
16 | - public static $objectName = 'Свойство'; |
|
17 | - public static $cols = [ |
|
18 | - //Основные параметры |
|
19 | - 'name' => ['type' => 'text'], |
|
20 | - 'filter_name' => ['type' => 'text'], |
|
21 | - 'image_file_id' => ['type' => 'image'], |
|
22 | - 'code' => ['type' => 'text'], |
|
23 | - 'type' => ['type' => 'text'], |
|
24 | - 'postfix' => ['type' => 'text'], |
|
25 | - 'default_val' => ['type' => 'text'], |
|
26 | - 'view' => ['type' => 'bool'], |
|
27 | - 'searchable' => ['type' => 'bool'], |
|
28 | - //Системные |
|
29 | - 'weight' => ['type' => 'number'], |
|
30 | - 'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'], |
|
31 | - 'advance' => ['type' => 'text'], |
|
32 | - 'date_create' => ['type' => 'dateTime'], |
|
33 | - //Менеджеры |
|
34 | - 'item' => ['type' => 'dataManager', 'relation' => 'items'], |
|
35 | - ]; |
|
36 | - public static $labels = [ |
|
37 | - 'name' => 'Название', |
|
38 | - 'filter_name' => 'Название в фильтре', |
|
39 | - 'image_file_id' => 'Иконка', |
|
40 | - 'code' => 'Код', |
|
41 | - 'type' => 'Тип', |
|
42 | - 'postfix' => 'Постфикс', |
|
43 | - 'default_val' => 'Значение по умолчанию', |
|
44 | - 'view' => 'Отображается', |
|
45 | - 'searchable' => 'Используется при поиске', |
|
46 | - 'weight' => 'Вес сортировки', |
|
47 | - 'advance' => 'Дополнительные параметры', |
|
48 | - 'user_id' => 'Создатель', |
|
49 | - 'date_create' => 'Дата создания', |
|
50 | - 'item' => 'Значения для списка' |
|
51 | - ]; |
|
52 | - public static $dataManagers = [ |
|
53 | - 'manager' => [ |
|
54 | - 'name' => 'Свойства товаров', |
|
55 | - 'cols' => [ |
|
56 | - 'name', 'code', 'type', 'item', 'view', 'searchable', 'user_id', 'date_create' |
|
57 | - ] |
|
58 | - ] |
|
59 | - ]; |
|
60 | - public static $forms = [ |
|
61 | - 'manager' => [ |
|
62 | - 'map' => [ |
|
63 | - ['name', 'filter_name'], |
|
64 | - ['code', 'type', 'image_file_id'], |
|
65 | - ['default_val', 'postfix'], |
|
66 | - ['view', 'searchable'], |
|
67 | - ['item'] |
|
68 | - ] |
|
69 | - ] |
|
70 | - ]; |
|
16 | + public static $objectName = 'Свойство'; |
|
17 | + public static $cols = [ |
|
18 | + //Основные параметры |
|
19 | + 'name' => ['type' => 'text'], |
|
20 | + 'filter_name' => ['type' => 'text'], |
|
21 | + 'image_file_id' => ['type' => 'image'], |
|
22 | + 'code' => ['type' => 'text'], |
|
23 | + 'type' => ['type' => 'text'], |
|
24 | + 'postfix' => ['type' => 'text'], |
|
25 | + 'default_val' => ['type' => 'text'], |
|
26 | + 'view' => ['type' => 'bool'], |
|
27 | + 'searchable' => ['type' => 'bool'], |
|
28 | + //Системные |
|
29 | + 'weight' => ['type' => 'number'], |
|
30 | + 'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'], |
|
31 | + 'advance' => ['type' => 'text'], |
|
32 | + 'date_create' => ['type' => 'dateTime'], |
|
33 | + //Менеджеры |
|
34 | + 'item' => ['type' => 'dataManager', 'relation' => 'items'], |
|
35 | + ]; |
|
36 | + public static $labels = [ |
|
37 | + 'name' => 'Название', |
|
38 | + 'filter_name' => 'Название в фильтре', |
|
39 | + 'image_file_id' => 'Иконка', |
|
40 | + 'code' => 'Код', |
|
41 | + 'type' => 'Тип', |
|
42 | + 'postfix' => 'Постфикс', |
|
43 | + 'default_val' => 'Значение по умолчанию', |
|
44 | + 'view' => 'Отображается', |
|
45 | + 'searchable' => 'Используется при поиске', |
|
46 | + 'weight' => 'Вес сортировки', |
|
47 | + 'advance' => 'Дополнительные параметры', |
|
48 | + 'user_id' => 'Создатель', |
|
49 | + 'date_create' => 'Дата создания', |
|
50 | + 'item' => 'Значения для списка' |
|
51 | + ]; |
|
52 | + public static $dataManagers = [ |
|
53 | + 'manager' => [ |
|
54 | + 'name' => 'Свойства товаров', |
|
55 | + 'cols' => [ |
|
56 | + 'name', 'code', 'type', 'item', 'view', 'searchable', 'user_id', 'date_create' |
|
57 | + ] |
|
58 | + ] |
|
59 | + ]; |
|
60 | + public static $forms = [ |
|
61 | + 'manager' => [ |
|
62 | + 'map' => [ |
|
63 | + ['name', 'filter_name'], |
|
64 | + ['code', 'type', 'image_file_id'], |
|
65 | + ['default_val', 'postfix'], |
|
66 | + ['view', 'searchable'], |
|
67 | + ['item'] |
|
68 | + ] |
|
69 | + ] |
|
70 | + ]; |
|
71 | 71 | |
72 | - public static function relations() { |
|
72 | + public static function relations() { |
|
73 | 73 | return [ |
74 | 74 | 'user' => [ |
75 | 75 | 'model' => 'Users\User', |
@@ -85,15 +85,15 @@ discard block |
||
85 | 85 | 'col' => 'image_file_id' |
86 | 86 | ], |
87 | 87 | ]; |
88 | - } |
|
88 | + } |
|
89 | 89 | |
90 | - public function beforeSave() { |
|
90 | + public function beforeSave() { |
|
91 | 91 | if (!isset($this->id)) { |
92 | - $this->user_id = \Users\User::$cur->id; |
|
92 | + $this->user_id = \Users\User::$cur->id; |
|
93 | 93 | } |
94 | 94 | if ($this->advance && is_array($this->advance)) { |
95 | - $this->advance = json_encode($this->advance); |
|
95 | + $this->advance = json_encode($this->advance); |
|
96 | + } |
|
96 | 97 | } |
97 | - } |
|
98 | 98 | |
99 | 99 | } |
@@ -6,12 +6,12 @@ discard block |
||
6 | 6 | <?php |
7 | 7 | $socials = Users\Social::getList(['where' => ['active', 1]]); |
8 | 8 | if ($socials) { |
9 | - ?> |
|
9 | + ?> |
|
10 | 10 | <div class="form-group"> |
11 | 11 | <label>Регистрация через соц.сети</label><br /> |
12 | 12 | <?php |
13 | 13 | foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) { |
14 | - echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> "; |
|
14 | + echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> "; |
|
15 | 15 | } |
16 | 16 | ?> |
17 | 17 | </div> |
@@ -41,15 +41,15 @@ discard block |
||
41 | 41 | <div class ='row'> |
42 | 42 | <div class="col-sm-6"> |
43 | 43 | <?php |
44 | - if (!empty(App::$cur->users->config['invites'])) { |
|
44 | + if (!empty(App::$cur->users->config['invites'])) { |
|
45 | 45 | ?> |
46 | 46 | <div class ='form-group'> |
47 | 47 | <label><?= !empty(App::$cur->users->config['invitesName']) ? App::$cur->users->config['invitesName'] : 'Код приглашения'; ?></label> |
48 | 48 | <input type ='text' name ='invite_code' class ='form-control' value ="<?= (isset($_POST['invite_code']) ? $_POST['invite_code'] : ((!empty($_COOKIE['invite_code']) ? $_COOKIE['invite_code'] : ((!empty($_GET['invite_code']) ? $_GET['invite_code'] : ''))))); ?>" /> |
49 | 49 | </div> |
50 | 50 | <?php |
51 | - } |
|
52 | - ?> |
|
51 | + } |
|
52 | + ?> |
|
53 | 53 | </div> |
54 | 54 | </div> |
55 | 55 | <div class ='form-group'> |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | $min = App::$cur->ecommerce->getItems(['sort' => ['price' => 'asc'], 'count' => 1, 'key' => false]); |
5 | 5 | $max = App::$cur->ecommerce->getItems(['sort' => ['price' => 'desc'], 'count' => 1, 'key' => false]); |
6 | 6 | if ($min && $min[0]->getPrice() && $max && $max[0]->getPrice()) { |
7 | - ?> |
|
7 | + ?> |
|
8 | 8 | <h4>Фильтр по цене</h4> |
9 | 9 | <div class="form-group"> |
10 | 10 | <div class="row"> |
@@ -15,28 +15,28 @@ discard block |
||
15 | 15 | <?php |
16 | 16 | } |
17 | 17 | foreach ($options as $option) { |
18 | - ?> |
|
18 | + ?> |
|
19 | 19 | <div class="filter"> |
20 | 20 | |
21 | 21 | <?php |
22 | 22 | switch ($option->type) { |
23 | - case 'radio': |
|
23 | + case 'radio': |
|
24 | 24 | echo "<label>{$option->name}</label>"; |
25 | 25 | foreach ($option->items as $item) { |
26 | - $this->widget('Ui\Form/' . $option->type, [ |
|
27 | - 'label' => $item->name, |
|
28 | - 'name' => "filters[options][{$option->id}]", |
|
29 | - !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false, |
|
30 | - 'options' => [ |
|
31 | - 'value' => $item->id, |
|
32 | - ] |
|
33 | - ]); |
|
26 | + $this->widget('Ui\Form/' . $option->type, [ |
|
27 | + 'label' => $item->name, |
|
28 | + 'name' => "filters[options][{$option->id}]", |
|
29 | + !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false, |
|
30 | + 'options' => [ |
|
31 | + 'value' => $item->id, |
|
32 | + ] |
|
33 | + ]); |
|
34 | 34 | } |
35 | 35 | break; |
36 | - case 'select': |
|
36 | + case 'select': |
|
37 | 37 | echo "<label>{$option->name}</label>"; |
38 | 38 | foreach ($option->items as $item) { |
39 | - ?> |
|
39 | + ?> |
|
40 | 40 | <div class="radio"> |
41 | 41 | <label> |
42 | 42 | <input type="checkbox" name = 'filters[options][<?= $option->id; ?>][]' value ="<?= $item->id; ?>" <?= !empty($_GET['filters']['options'][$option->id]) && in_array($item->id, $_GET['filters']['options'][$option->id]) ? 'checked' : ''; ?>> |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | <?php |
47 | 47 | } |
48 | 48 | break; |
49 | - default: |
|
49 | + default: |
|
50 | 50 | $this->widget('Ui\Form/' . ($option->type ? $option->type : 'text'), [ |
51 | 51 | 'label' => $option->name, |
52 | 52 | 'name' => "filters[options][{$option->id}]", |
@@ -13,65 +13,65 @@ |
||
13 | 13 | |
14 | 14 | class Sums extends \Object { |
15 | 15 | |
16 | - public $sums = []; |
|
16 | + public $sums = []; |
|
17 | 17 | |
18 | - public function __construct($sums) { |
|
18 | + public function __construct($sums) { |
|
19 | 19 | $this->sums = $sums; |
20 | - } |
|
20 | + } |
|
21 | 21 | |
22 | - function plus(Sums $sums) { |
|
22 | + function plus(Sums $sums) { |
|
23 | 23 | $newSums = $this->sums; |
24 | 24 | foreach ($sums->sums as $currency_id => $sum) { |
25 | - $newSums[$currency_id] = isset($newSums[$currency_id]) ? $newSums[$currency_id] + $sum : $sum; |
|
25 | + $newSums[$currency_id] = isset($newSums[$currency_id]) ? $newSums[$currency_id] + $sum : $sum; |
|
26 | 26 | } |
27 | 27 | return new Sums($newSums); |
28 | - } |
|
28 | + } |
|
29 | 29 | |
30 | - function minus(Sums $sums) { |
|
30 | + function minus(Sums $sums) { |
|
31 | 31 | $newSums = $this->sums; |
32 | 32 | foreach ($sums->sums as $currency_id => $sum) { |
33 | - $newSums[$currency_id] = isset($newSums[$currency_id]) ? $newSums[$currency_id] - $sum : -$sum; |
|
33 | + $newSums[$currency_id] = isset($newSums[$currency_id]) ? $newSums[$currency_id] - $sum : -$sum; |
|
34 | 34 | } |
35 | 35 | return new Sums($newSums); |
36 | - } |
|
36 | + } |
|
37 | 37 | |
38 | 38 | //Equal, Less and Greater |
39 | - public function greater(Sums $sums) { |
|
39 | + public function greater(Sums $sums) { |
|
40 | 40 | if (count($this->sums) == count($sums->sums) && isset($sums->sums[key($this->sums)])) { |
41 | - return current($this->sums) > current($sums->sums); |
|
41 | + return current($this->sums) > current($sums->sums); |
|
42 | + } |
|
42 | 43 | } |
43 | - } |
|
44 | 44 | |
45 | - public function equal(Sums $sums) { |
|
45 | + public function equal(Sums $sums) { |
|
46 | 46 | if (count($this->sums) == count($sums->sums) && isset($sums->sums[key($this->sums)])) { |
47 | - return current($this->sums) == current($sums->sums); |
|
47 | + return current($this->sums) == current($sums->sums); |
|
48 | + } |
|
48 | 49 | } |
49 | - } |
|
50 | 50 | |
51 | - function __toString() { |
|
51 | + function __toString() { |
|
52 | 52 | $string = ''; |
53 | 53 | $first = true; |
54 | 54 | foreach ($this->sums as $currency_id => $sum) { |
55 | - if ($first) { |
|
55 | + if ($first) { |
|
56 | 56 | $first = false; |
57 | - } else { |
|
57 | + } else { |
|
58 | 58 | $string.= '<br />'; |
59 | - } |
|
60 | - $string.= '<span style="white-space:nowrap;">'; |
|
61 | - $string.= number_format($sum, 2, '.', ' '); |
|
62 | - if (\App::$cur->money) { |
|
59 | + } |
|
60 | + $string.= '<span style="white-space:nowrap;">'; |
|
61 | + $string.= number_format($sum, 2, '.', ' '); |
|
62 | + if (\App::$cur->money) { |
|
63 | 63 | $currency = \Money\Currency::get($currency_id); |
64 | 64 | if ($currency) { |
65 | - $string.= ' ' . $currency->acronym(); |
|
65 | + $string.= ' ' . $currency->acronym(); |
|
66 | 66 | } else { |
67 | - $string.= ' руб.'; |
|
67 | + $string.= ' руб.'; |
|
68 | 68 | } |
69 | - } else { |
|
69 | + } else { |
|
70 | 70 | $string.= ' руб.'; |
71 | - } |
|
72 | - $string.= '</span>'; |
|
71 | + } |
|
72 | + $string.= '</span>'; |
|
73 | 73 | } |
74 | 74 | return $string; |
75 | - } |
|
75 | + } |
|
76 | 76 | |
77 | 77 | } |
@@ -2,57 +2,57 @@ |
||
2 | 2 | <div class="col-md-4"> |
3 | 3 | <ul class="nav nav-pills nav-stacked"> |
4 | 4 | <?php |
5 | - $hiddenId = Tools::randomString(); |
|
6 | - foreach ($deliverys as $delivery) { |
|
5 | + $hiddenId = Tools::randomString(); |
|
6 | + foreach ($deliverys as $delivery) { |
|
7 | 7 | if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || ($cart->delivery && $delivery->id == $cart->delivery->id)) { |
8 | - $checked = 'checked'; |
|
8 | + $checked = 'checked'; |
|
9 | 9 | } else { |
10 | - $checked = ''; |
|
10 | + $checked = ''; |
|
11 | 11 | } |
12 | 12 | echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">'; |
13 | 13 | echo $delivery->name; |
14 | 14 | echo '</a></li>'; |
15 | - } |
|
16 | - $form->input('hidden', "delivery", '', [ |
|
17 | - 'value' => $cart->delivery_id, |
|
18 | - 'attributes' => [ |
|
19 | - 'id' => $hiddenId |
|
20 | - ], |
|
21 | - ]); |
|
22 | - ?> |
|
15 | + } |
|
16 | + $form->input('hidden', "delivery", '', [ |
|
17 | + 'value' => $cart->delivery_id, |
|
18 | + 'attributes' => [ |
|
19 | + 'id' => $hiddenId |
|
20 | + ], |
|
21 | + ]); |
|
22 | + ?> |
|
23 | 23 | </ul> |
24 | 24 | </div> |
25 | 25 | <div class="col-md-8"> |
26 | 26 | <?php |
27 | 27 | if ($cart->delivery) { |
28 | - echo "<h4>Информация о доставке</h4>"; |
|
29 | - if ($cart->delivery->price_text || $cart->delivery->price) { |
|
28 | + echo "<h4>Информация о доставке</h4>"; |
|
29 | + if ($cart->delivery->price_text || $cart->delivery->price) { |
|
30 | 30 | echo "<div>Стоимость доставки: <b>" . ($cart->delivery->price_text ? $cart->delivery->price_text : ( $cart->delivery->price . ' ' . ($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.') )) . '</b></div>'; |
31 | - } |
|
32 | - if ((float) $cart->delivery->max_cart_price) { |
|
31 | + } |
|
32 | + if ((float) $cart->delivery->max_cart_price) { |
|
33 | 33 | echo '<div>При заказе товаров на сумму от ' . $cart->delivery->max_cart_price . ' руб - бесплатно</div>'; |
34 | - } |
|
35 | - echo $cart->delivery->info; |
|
36 | - if ($cart->delivery->fields) { |
|
34 | + } |
|
35 | + echo $cart->delivery->info; |
|
36 | + if ($cart->delivery->fields) { |
|
37 | 37 | echo '<hr />'; |
38 | 38 | foreach ($cart->delivery->fields as $field) { |
39 | - $options = ['required' => $field->required]; |
|
40 | - if ($field->type == 'radio') { |
|
39 | + $options = ['required' => $field->required]; |
|
40 | + if ($field->type == 'radio') { |
|
41 | 41 | $values = $field->fieldItems(['forSelect' => true]); |
42 | 42 | foreach ($values as $key => $value) { |
43 | - $options['value'] = $key; |
|
44 | - $form->input($field->type, "deliveryFields[{$field->id}]", $value, $options); |
|
43 | + $options['value'] = $key; |
|
44 | + $form->input($field->type, "deliveryFields[{$field->id}]", $value, $options); |
|
45 | 45 | } |
46 | - } else { |
|
46 | + } else { |
|
47 | 47 | if ($field->type == 'select') { |
48 | - $options['values'] = $field->fieldItems(['forSelect' => true]); |
|
48 | + $options['values'] = $field->fieldItems(['forSelect' => true]); |
|
49 | 49 | } |
50 | 50 | $form->input($field->type, "deliveryFields[{$field->id}]", $field->name, $options); |
51 | - } |
|
51 | + } |
|
52 | + } |
|
52 | 53 | } |
53 | - } |
|
54 | 54 | } else { |
55 | - echo "<h4>Выберите способ доставки</h4>"; |
|
55 | + echo "<h4>Выберите способ доставки</h4>"; |
|
56 | 56 | } |
57 | 57 | ?> |
58 | 58 | </div> |