@@ -67,7 +67,7 @@ |
||
67 | 67 | |
68 | 68 | const PAYMENT_METHOD_CASH = 'shop:cash'; |
69 | 69 | |
70 | - protected $data_model = [ |
|
70 | + protected $data_model = [ |
|
71 | 71 | 'id' => 'int', |
72 | 72 | 'user' => 'int', |
73 | 73 | 'date' => 'int', |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @package Shop |
|
4 | - * @category modules |
|
5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
6 | - * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | - * @license MIT License, see license.txt |
|
8 | - */ |
|
3 | + * @package Shop |
|
4 | + * @category modules |
|
5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
6 | + * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | h, |
@@ -26,7 +26,7 @@ |
||
26 | 26 | $parent && |
27 | 27 | $parent != $category['id'] // infinite loop protection |
28 | 28 | ) { |
29 | - $parent = $Categories->get($category['parent']); |
|
29 | + $parent = $Categories->get($category['parent']); |
|
30 | 30 | if ($parent['parent'] == $category['id']) { // infinite loop protection |
31 | 31 | break; |
32 | 32 | } |
@@ -27,7 +27,8 @@ |
||
27 | 27 | $parent != $category['id'] // infinite loop protection |
28 | 28 | ) { |
29 | 29 | $parent = $Categories->get($category['parent']); |
30 | - if ($parent['parent'] == $category['id']) { // infinite loop protection |
|
30 | + if ($parent['parent'] == $category['id']) { |
|
31 | +// infinite loop protection |
|
31 | 32 | break; |
32 | 33 | } |
33 | 34 | $category['title'] = "$parent[title] :: $category[title]"; |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @package Shop |
|
4 | - * @category modules |
|
5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
6 | - * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | - * @license MIT License, see license.txt |
|
8 | - */ |
|
3 | + * @package Shop |
|
4 | + * @category modules |
|
5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
6 | + * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | h, |
@@ -110,8 +110,7 @@ |
||
110 | 110 | ) |
111 | 111 | ], |
112 | 112 | [ |
113 | - 'class' => $item['listed'] ? 'cs-block-success cs-text-success' : |
|
114 | - ($item['in_stock'] || $item['soon'] ? 'cs-block-warning cs-text-warning' : 'cs-block-error cs-text-error') |
|
113 | + 'class' => $item['listed'] ? 'cs-block-success cs-text-success' : ($item['in_stock'] || $item['soon'] ? 'cs-block-warning cs-text-warning' : 'cs-block-error cs-text-error') |
|
115 | 114 | ] |
116 | 115 | ]; |
117 | 116 | }, |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @package Shop |
|
4 | - * @category modules |
|
5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
6 | - * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | - * @license MIT License, see license.txt |
|
8 | - */ |
|
3 | + * @package Shop |
|
4 | + * @category modules |
|
5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
6 | + * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | h, |
@@ -58,7 +58,7 @@ |
||
58 | 58 | @$_GET['asc'] |
59 | 59 | ) |
60 | 60 | ); |
61 | -$orders_total = $Orders->search( |
|
61 | +$orders_total = $Orders->search( |
|
62 | 62 | [ |
63 | 63 | 'total_count' => 1 |
64 | 64 | ] + (array)$_GET, |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @package Shop |
|
4 | - * @category modules |
|
5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
6 | - * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | - * @license MIT License, see license.txt |
|
8 | - */ |
|
3 | + * @package Shop |
|
4 | + * @category modules |
|
5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
6 | + * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | h, |
@@ -113,7 +113,7 @@ |
||
113 | 113 | if (!$items) { |
114 | 114 | return; |
115 | 115 | } |
116 | -$items_total = $Items->search( |
|
116 | +$items_total = $Items->search( |
|
117 | 117 | [ |
118 | 118 | 'listed' => 1, |
119 | 119 | 'category' => $current_category, |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @package Shop |
|
4 | - * @category modules |
|
5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
6 | - * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | - * @license MIT License, see license.txt |
|
8 | - */ |
|
3 | + * @package Shop |
|
4 | + * @category modules |
|
5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
6 | + * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | h, |
@@ -23,7 +23,7 @@ |
||
23 | 23 | ':', |
24 | 24 | array_slice(Route::instance()->path, -1)[0] |
25 | 25 | ); |
26 | -$item = $Items->get_for_user(array_pop($item)); |
|
26 | +$item = $Items->get_for_user(array_pop($item)); |
|
27 | 27 | $Page->title($item['title']); |
28 | 28 | $Page->Description = description($item['description']); |
29 | 29 | $Page->canonical_url( |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @package Shop |
|
4 | - * @category modules |
|
5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
6 | - * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | - * @license MIT License, see license.txt |
|
8 | - */ |
|
3 | + * @package Shop |
|
4 | + * @category modules |
|
5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
6 | + * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | h, |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | $L = new Prefix('shop_'); |
19 | 19 | $Language = Language::instance(); |
20 | 20 | $Page = Page::instance(); |
21 | -$Session = Session::instance(); |
|
21 | +$Session = Session::instance(); |
|
22 | 22 | $Categories = Categories::instance(); |
23 | 23 | $Items = Items::instance(); |
24 | 24 | $Orders = Orders::instance(); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | $page = @$_GET['page'] ?: 1; |
28 | 28 | $count = @$_GET['count'] ?: Config::instance()->module('Shop')->items_per_page; |
29 | 29 | if ($Session->user()) { |
30 | - $orders = $Orders->get($Orders->search( |
|
30 | + $orders = $Orders->get($Orders->search( |
|
31 | 31 | [ |
32 | 32 | 'user' => $Session->get_user() |
33 | 33 | ] + (array)$_GET, |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @package Shop |
|
4 | - * @category modules |
|
5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
6 | - * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | - * @license MIT License, see license.txt |
|
8 | - */ |
|
3 | + * @package Shop |
|
4 | + * @category modules |
|
5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
6 | + * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | h, |
@@ -20,7 +20,7 @@ |
||
20 | 20 | use |
21 | 21 | CRUD, |
22 | 22 | Singleton; |
23 | - protected $data_model = [ |
|
23 | + protected $data_model = [ |
|
24 | 24 | 'id' => 'int', |
25 | 25 | 'title' => 'ml:text', |
26 | 26 | 'path' => 'ml:text', |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @package Static Pages |
|
4 | - * @category modules |
|
5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
6 | - * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi |
|
7 | - * @license MIT License, see license.txt |
|
8 | - */ |
|
3 | + * @package Static Pages |
|
4 | + * @category modules |
|
5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
6 | + * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Static_pages; |
10 | 10 | use |
11 | 11 | cs\CRUD, |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | use |
22 | 22 | CRUD, |
23 | 23 | Singleton; |
24 | - protected $data_model = [ |
|
24 | + protected $data_model = [ |
|
25 | 25 | 'id' => 'int', |
26 | 26 | 'category' => 'int', |
27 | 27 | 'title' => 'ml:text', |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | $Categories->get($parent) |
165 | 165 | ); |
166 | 166 | } |
167 | - $pages = $this->db()->qfas( |
|
167 | + $pages = $this->db()->qfas( |
|
168 | 168 | [ |
169 | 169 | "SELECT `id` |
170 | 170 | FROM `[prefix]static_pages` |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | $structure['pages'][$this->get($id)['path']] = $id; |
178 | 178 | } |
179 | 179 | unset($pages); |
180 | - $categories = $this->db()->qfa( |
|
180 | + $categories = $this->db()->qfa( |
|
181 | 181 | [ |
182 | 182 | "SELECT |
183 | 183 | `id`, |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @package Static Pages |
|
4 | - * @category modules |
|
5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
6 | - * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi |
|
7 | - * @license MIT License, see license.txt |
|
8 | - */ |
|
3 | + * @package Static Pages |
|
4 | + * @category modules |
|
5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
6 | + * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Static_pages; |
10 | 10 | use |
11 | 11 | cs\CRUD, |