@@ -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-2015, 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-2015, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | cs\Config, |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @package Shop |
|
4 | - * @attribute modules |
|
5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
6 | - * @copyright Copyright (c) 2014-2015, Nazar Mokrynskyi |
|
7 | - * @license MIT License, see license.txt |
|
8 | - */ |
|
3 | + * @package Shop |
|
4 | + * @attribute modules |
|
5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
6 | + * @copyright Copyright (c) 2014-2015, 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-2015, 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-2015, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | cs\Config, |
@@ -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-2015, 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-2015, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | cs\Config, |
@@ -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-2015, 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-2015, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | cs\Config, |
@@ -34,7 +34,8 @@ |
||
34 | 34 | $Page->json( |
35 | 35 | $Attributes->get_type_to_name_array() |
36 | 36 | ); |
37 | -} elseif (User::instance()->admin()) { //Hack to re-use contents of this file from `api/admin/attributes.get.php` |
|
37 | +} elseif (User::instance()->admin()) { |
|
38 | +//Hack to re-use contents of this file from `api/admin/attributes.get.php` |
|
38 | 39 | $Page->json( |
39 | 40 | $Attributes->get( |
40 | 41 | $Attributes->get_all() |
@@ -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-2015, 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-2015, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | cs\Config, |
@@ -1,19 +1,19 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * @package Shop |
|
4 | - * @category modules |
|
5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
6 | - * @copyright Copyright (c) 2015, 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) 2015, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | /** |
10 | - * Provides next events: |
|
11 | - * Shop/Cart/calculate |
|
12 | - * [ |
|
13 | - * 'items' => &$items, // Array of array elements [id => item_id, units => units, price => total_price] |
|
14 | - * 'shipping' => &$shipping // Array in form [type => shipping_type_id, price => shipping_type_price] |
|
15 | - * ] |
|
16 | - */ |
|
10 | + * Provides next events: |
|
11 | + * Shop/Cart/calculate |
|
12 | + * [ |
|
13 | + * 'items' => &$items, // Array of array elements [id => item_id, units => units, price => total_price] |
|
14 | + * 'shipping' => &$shipping // Array in form [type => shipping_type_id, price => shipping_type_price] |
|
15 | + * ] |
|
16 | + */ |
|
17 | 17 | |
18 | 18 | namespace cs\modules\Shop; |
19 | 19 | use |
@@ -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) 2015, 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) 2015, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | cs\Page; |
@@ -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-2015, 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-2015, Nazar Mokrynskyi |
|
7 | + * @license MIT License, see license.txt |
|
8 | + */ |
|
9 | 9 | namespace cs\modules\Shop; |
10 | 10 | use |
11 | 11 | cs\Config, |