@@ -18,13 +18,16 @@ |
||
18 | 18 | <ul class="item-options"> |
19 | 19 | <?php |
20 | 20 | foreach ($item->options as $param) { |
21 | - if (!$param->item_option_view || !$param->value) |
|
22 | - continue; |
|
21 | + if (!$param->item_option_view || !$param->value) { |
|
22 | + continue; |
|
23 | + } |
|
23 | 24 | if ($param->item_option_type == 'select') { |
24 | - if (empty($param->option->items[$param->value])) |
|
25 | - continue; |
|
25 | + if (empty($param->option->items[$param->value])) { |
|
26 | + continue; |
|
27 | + } |
|
26 | 28 | $value = $param->option->items[$param->value]->value; |
27 | - } else { |
|
29 | + } |
|
30 | + else { |
|
28 | 31 | $value = $param->value; |
29 | 32 | } |
30 | 33 | $paramName = $param->item_option_name; |
@@ -28,7 +28,8 @@ discard block |
||
28 | 28 | if (!$user_id) { |
29 | 29 | $error = true; |
30 | 30 | $user = null; |
31 | - } else { |
|
31 | + } |
|
32 | + else { |
|
32 | 33 | $user = Users\User::get($user_id); |
33 | 34 | } |
34 | 35 | } |
@@ -107,16 +108,19 @@ discard block |
||
107 | 108 | $category_id = (int) $_GET['inCatalog']; |
108 | 109 | } |
109 | 110 | $search = $_GET['search']; |
110 | - } else { |
|
111 | + } |
|
112 | + else { |
|
111 | 113 | $search = ''; |
112 | 114 | } |
113 | 115 | |
114 | 116 | //sort |
115 | 117 | if (!empty($_GET['sort'])) { |
116 | 118 | $sort = $_GET['sort']; |
117 | - } elseif (!empty($this->ecommerce->config['defaultSort'])) { |
|
119 | + } |
|
120 | + elseif (!empty($this->ecommerce->config['defaultSort'])) { |
|
118 | 121 | $sort = $this->ecommerce->config['defaultSort']; |
119 | - } else { |
|
122 | + } |
|
123 | + else { |
|
120 | 124 | $sort = ['name' => 'asc']; |
121 | 125 | } |
122 | 126 | |
@@ -131,10 +135,12 @@ discard block |
||
131 | 135 | } |
132 | 136 | if ($category) { |
133 | 137 | $category_id = $category->id; |
134 | - } else { |
|
138 | + } |
|
139 | + else { |
|
135 | 140 | $category_id = 0; |
136 | 141 | } |
137 | - } else { |
|
142 | + } |
|
143 | + else { |
|
138 | 144 | $category_id = 0; |
139 | 145 | } |
140 | 146 | $active = $category_id; |
@@ -153,7 +159,8 @@ discard block |
||
153 | 159 | if (!$category || !$category->name) { |
154 | 160 | $bread[] = array('text' => 'Каталог'); |
155 | 161 | $this->view->setTitle('Каталог'); |
156 | - } else { |
|
162 | + } |
|
163 | + else { |
|
157 | 164 | $bread[] = array('text' => 'Каталог', 'href' => '/ecommerce'); |
158 | 165 | $categoryIds = array_values(array_filter(explode('/', $category->tree_path))); |
159 | 166 | foreach ($categoryIds as $id) { |
@@ -177,7 +184,8 @@ discard block |
||
177 | 184 | //params |
178 | 185 | if (empty(App::$cur->ecommerce->config['filtersInLast'])) { |
179 | 186 | $options = \Ecommerce\Item\Option::getList(['where' => ['item_option_searchable', 1], 'order' => ['weight', 'asc']]); |
180 | - } else { |
|
187 | + } |
|
188 | + else { |
|
181 | 189 | $params = $this->ecommerce->getItemsParams([ |
182 | 190 | 'parent' => $category_id, |
183 | 191 | 'search' => trim($search), |
@@ -189,7 +197,8 @@ discard block |
||
189 | 197 | } |
190 | 198 | if ($ids) { |
191 | 199 | $options = \Ecommerce\Item\Option::getList(['where' => ['id', $ids, 'IN'], 'order' => ['weight', 'asc']]); |
192 | - } else { |
|
200 | + } |
|
201 | + else { |
|
193 | 202 | $options = []; |
194 | 203 | } |
195 | 204 | } |
@@ -198,7 +207,8 @@ discard block |
||
198 | 207 | //child categorys |
199 | 208 | if ($category) { |
200 | 209 | $categorys = $category->catalogs; |
201 | - } else { |
|
210 | + } |
|
211 | + else { |
|
202 | 212 | $categorys = \Ecommerce\Category::getList(['where' => ['parent_id', 0]]); |
203 | 213 | } |
204 | 214 |
@@ -22,10 +22,12 @@ discard block |
||
22 | 22 | $user_id = $this->Users->registration($_POST, true); |
23 | 23 | if (!$user_id) { |
24 | 24 | $error = true; |
25 | - } else { |
|
25 | + } |
|
26 | + else { |
|
26 | 27 | $user = Users\User::get($user_id); |
27 | 28 | } |
28 | - } else { |
|
29 | + } |
|
30 | + else { |
|
29 | 31 | $user = Users\User::$cur; |
30 | 32 | } |
31 | 33 | $ids = []; |
@@ -69,7 +71,8 @@ discard block |
||
69 | 71 | if ($deliverys && empty($deliverys[$_POST['delivery']])) { |
70 | 72 | $error = 1; |
71 | 73 | Msg::add('Выберите способ доставки', 'danger'); |
72 | - } elseif ($deliverys && !empty($deliverys[$_POST['delivery']])) { |
|
74 | + } |
|
75 | + elseif ($deliverys && !empty($deliverys[$_POST['delivery']])) { |
|
73 | 76 | $cart->delivery_id = $_POST['delivery']; |
74 | 77 | foreach ($deliverys[$cart->delivery_id]->fields as $field) { |
75 | 78 | if (empty($_POST['deliveryFields'][$field->id]) && $field->required) { |
@@ -81,10 +84,12 @@ discard block |
||
81 | 84 | if ($payTypes && (empty($_POST['payType']) || empty($payTypes[$_POST['payType']]))) { |
82 | 85 | $error = 1; |
83 | 86 | Msg::add('Выберите способ оплаты', 'danger'); |
84 | - } elseif ($payTypes && !empty($payTypes[$_POST['payType']])) { |
|
87 | + } |
|
88 | + elseif ($payTypes && !empty($payTypes[$_POST['payType']])) { |
|
85 | 89 | $payType = $payTypes[$_POST['payType']]; |
86 | 90 | $cart->paytype_id = $payType->id; |
87 | - } else { |
|
91 | + } |
|
92 | + else { |
|
88 | 93 | $payType = null; |
89 | 94 | } |
90 | 95 | foreach (\Ecommerce\UserAdds\Field::getList() as $field) { |
@@ -98,10 +103,12 @@ discard block |
||
98 | 103 | if (!$userCard) { |
99 | 104 | $error = true; |
100 | 105 | Msg::add('Такой карты не существует', 'danger'); |
101 | - } elseif ($userCard->user_id != $user->id) { |
|
106 | + } |
|
107 | + elseif ($userCard->user_id != $user->id) { |
|
102 | 108 | $error = true; |
103 | 109 | Msg::add('Это не ваша карта', 'danger'); |
104 | - } else { |
|
110 | + } |
|
111 | + else { |
|
105 | 112 | $cart->card_item_id = $userCard->id; |
106 | 113 | } |
107 | 114 | } |
@@ -272,10 +279,12 @@ discard block |
||
272 | 279 | $item->sales ++; |
273 | 280 | $item->save(); |
274 | 281 | |
275 | - if (empty($_GET['count'])) |
|
276 | - $count = 1; |
|
277 | - else |
|
278 | - $count = (float) $_GET['count']; |
|
282 | + if (empty($_GET['count'])) { |
|
283 | + $count = 1; |
|
284 | + } |
|
285 | + else { |
|
286 | + $count = (float) $_GET['count']; |
|
287 | + } |
|
279 | 288 | |
280 | 289 | $cart = $this->ecommerce->getCurCart(); |
281 | 290 | $stages = Ecommerce\Cart\Stage::getList(); |
@@ -13,7 +13,8 @@ |
||
13 | 13 | function init() { |
14 | 14 | if (!empty(App::$primary->config['site']['domain'])) { |
15 | 15 | $domain = App::$primary->config['site']['domain']; |
16 | - } else { |
|
16 | + } |
|
17 | + else { |
|
17 | 18 | $domain = implode('.', array_slice(explode('.', idn_to_utf8(INJI_DOMAIN_NAME)), -2)); |
18 | 19 | } |
19 | 20 | $alias = str_replace($domain, '', idn_to_utf8(INJI_DOMAIN_NAME)); |
@@ -2,27 +2,45 @@ |
||
2 | 2 | <form action = '' method = 'POST' enctype="multipart/form-data"> |
3 | 3 | <div class ="form-group"> |
4 | 4 | <label>Название сайта</label> |
5 | - <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) echo \App::$primary->config['site']['name']; ?>' /> |
|
5 | + <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) { |
|
6 | + echo \App::$primary->config['site']['name']; |
|
7 | +} |
|
8 | +?>' /> |
|
6 | 9 | </div> |
7 | 10 | <div class ="form-group"> |
8 | 11 | <label>Название компании</label> |
9 | - <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) echo \App::$primary->config['site']['company_name']; ?>' /> |
|
12 | + <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) { |
|
13 | + echo \App::$primary->config['site']['company_name']; |
|
14 | +} |
|
15 | +?>' /> |
|
10 | 16 | </div> |
11 | 17 | <div class ="form-group"> |
12 | 18 | <label>Основной домен</label> |
13 | - <input class ="form-control" type = 'text' name = 'site_domain' value = '<?php if (!empty(\App::$primary->config['site']['domain'])) echo \App::$primary->config['site']['domain']; ?>' /> |
|
19 | + <input class ="form-control" type = 'text' name = 'site_domain' value = '<?php if (!empty(\App::$primary->config['site']['domain'])) { |
|
20 | + echo \App::$primary->config['site']['domain']; |
|
21 | +} |
|
22 | +?>' /> |
|
14 | 23 | </div> |
15 | 24 | <div class ="form-group"> |
16 | 25 | <label>Контактный email</label> |
17 | - <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) echo \App::$primary->config['site']['email']; ?>' /> |
|
26 | + <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) { |
|
27 | + echo \App::$primary->config['site']['email']; |
|
28 | +} |
|
29 | +?>' /> |
|
18 | 30 | </div> |
19 | 31 | <div class ="form-group"> |
20 | 32 | <label>Ключевые слова</label> |
21 | - <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) echo \App::$primary->config['site']['keywords']; ?>' /> |
|
33 | + <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) { |
|
34 | + echo \App::$primary->config['site']['keywords']; |
|
35 | +} |
|
36 | +?>' /> |
|
22 | 37 | </div> |
23 | 38 | <div class ="form-group"> |
24 | 39 | <label>Краткое описание сайта</label> |
25 | - <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) echo \App::$primary->config['site']['description']; ?>' /> |
|
40 | + <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) { |
|
41 | + echo \App::$primary->config['site']['description']; |
|
42 | +} |
|
43 | +?>' /> |
|
26 | 44 | </div> |
27 | 45 | <?php |
28 | 46 | $form = new Ui\Form(); |
@@ -40,7 +40,8 @@ discard block |
||
40 | 40 | echo "<div id = 'params_" . str_replace('\\', '-', $code) . "' class = 'widgetParams' style='display:none;'>"; |
41 | 41 | if (isset($options['params']) && !is_array($options['params'])) { |
42 | 42 | $options['params'](); |
43 | - } elseif (isset($options['params'])) { |
|
43 | + } |
|
44 | + elseif (isset($options['params'])) { |
|
44 | 45 | $params = $options['params']; |
45 | 46 | if ($params) { |
46 | 47 | echo "<h3>Параметры</h3>"; |
@@ -54,12 +55,14 @@ discard block |
||
54 | 55 | } |
55 | 56 | echo "</select> |
56 | 57 | </div>"; |
57 | - } elseif ($param['type'] == 'textarea') { |
|
58 | + } |
|
59 | + elseif ($param['type'] == 'textarea') { |
|
58 | 60 | echo "<div class = 'form-group'> |
59 | 61 | <label>{$param['name']}</label> |
60 | 62 | <textarea name = 'params[" . str_replace('\\', '-', $code) . "][]' class = 'form-control'></textarea> |
61 | 63 | </div>"; |
62 | - } else { |
|
64 | + } |
|
65 | + else { |
|
63 | 66 | echo "<div class = 'form-group'> |
64 | 67 | <label>{$param['name']}</label> |
65 | 68 | <input name = 'params[" . str_replace('\\', '-', $code) . "][]' class = 'form-control' /> |
@@ -34,16 +34,19 @@ discard block |
||
34 | 34 | $params = json_decode($widget->widget_params, true); |
35 | 35 | if ($params) { |
36 | 36 | foreach ($params as $param) { |
37 | - if (!isset($widgetCode[$i])) |
|
38 | - break; |
|
37 | + if (!isset($widgetCode[$i])) { |
|
38 | + break; |
|
39 | + } |
|
39 | 40 | if ($param['type'] == 'select') { |
40 | 41 | $item = $param['model']::get($widgetCode[$i++]); |
41 | 42 | if ($item) { |
42 | 43 | $text .= $param['name'] . ': ' . $item->$param['showCol'] . "\n"; |
43 | - } else { |
|
44 | + } |
|
45 | + else { |
|
44 | 46 | $text .= $widgetCode[$i - 1]; |
45 | 47 | } |
46 | - } else { |
|
48 | + } |
|
49 | + else { |
|
47 | 50 | $value = $widgetCode[$i++]; |
48 | 51 | if (mb_strlen($value, 'utf-8') > 50) { |
49 | 52 | $value = mb_substr($value, 0, 50) . '...'; |
@@ -52,18 +55,21 @@ discard block |
||
52 | 55 | } |
53 | 56 | } |
54 | 57 | } |
55 | - } else { |
|
58 | + } |
|
59 | + else { |
|
56 | 60 | unset($widgetCode[0]); |
57 | 61 | foreach ($widgetCode as $item) { |
58 | 62 | $text .= $item . "\n"; |
59 | 63 | } |
60 | 64 | } |
61 | - } else { |
|
65 | + } |
|
66 | + else { |
|
62 | 67 | foreach ($widgetCode as $item) { |
63 | 68 | $text .= $item . "\n"; |
64 | 69 | } |
65 | 70 | } |
66 | - } else { |
|
71 | + } |
|
72 | + else { |
|
67 | 73 | $text = 'text not defined'; |
68 | 74 | } |
69 | 75 |
@@ -25,7 +25,8 @@ |
||
25 | 25 | if ($this->success) { |
26 | 26 | $return['content'] = $this->content; |
27 | 27 | $return['successMsg'] = $this->successMsg; |
28 | - } else { |
|
28 | + } |
|
29 | + else { |
|
29 | 30 | $return['error'] = $this->content; |
30 | 31 | } |
31 | 32 | if (!headers_sent()) { |
@@ -96,7 +96,8 @@ |
||
96 | 96 | foreach ($tableCols as $colKey => $params) { |
97 | 97 | App::$cur->db->add_col($tableName, $colKey, $params); |
98 | 98 | } |
99 | - } else { |
|
99 | + } |
|
100 | + else { |
|
100 | 101 | App::$cur->db->createTable($tableName, $tableCols); |
101 | 102 | } |
102 | 103 | } |