@@ -76,12 +76,12 @@ discard block |
||
| 76 | 76 | h::tr( |
| 77 | 77 | array_map( |
| 78 | 78 | function ($transaction) use ($L) { |
| 79 | - $created = $transaction['created'] |
|
| 79 | + $created = $transaction['created'] |
|
| 80 | 80 | ? $L->to_locale( |
| 81 | 81 | date($L->{TIME - $transaction['created'] < 24 * 3600 ? '_time' : '_datetime_long'}, $transaction['created']) |
| 82 | 82 | ) |
| 83 | 83 | : '-'; |
| 84 | - $paid = $transaction['paid'] |
|
| 84 | + $paid = $transaction['paid'] |
|
| 85 | 85 | ? $L->to_locale( |
| 86 | 86 | date($L->{TIME - $transaction['paid'] < 24 * 3600 ? '_time' : '_datetime_long'}, $transaction['paid']) |
| 87 | 87 | ) |
@@ -93,8 +93,7 @@ discard block |
||
| 93 | 93 | : '-'; |
| 94 | 94 | $username = User::instance()->username($transaction['user']); |
| 95 | 95 | $class = |
| 96 | - $transaction['confirmed'] ? 'cs-block-success.cs-text-success' : |
|
| 97 | - ($transaction['paid'] ? 'cs-block-warning.cs-text-warning' : 'cs-block-error.cs-text-error'); |
|
| 96 | + $transaction['confirmed'] ? 'cs-block-success.cs-text-success' : ($transaction['paid'] ? 'cs-block-warning.cs-text-warning' : 'cs-block-error.cs-text-error'); |
|
| 98 | 97 | $tag = "td.$class"; |
| 99 | 98 | return [ |
| 100 | 99 | [ |
@@ -24,7 +24,8 @@ |
||
| 24 | 24 | $parent != $category['id'] // infinite loop protection |
| 25 | 25 | ) { |
| 26 | 26 | $parent = $Categories->get($category['parent']); |
| 27 | - if ($parent['parent'] == $category['id']) { // infinite loop protection |
|
| 27 | + if ($parent['parent'] == $category['id']) { |
|
| 28 | +// infinite loop protection |
|
| 28 | 29 | break; |
| 29 | 30 | } |
| 30 | 31 | $category['title'] = "$parent[title] :: $category[title]"; |
@@ -109,8 +109,7 @@ |
||
| 109 | 109 | ) |
| 110 | 110 | ], |
| 111 | 111 | [ |
| 112 | - 'class' => $item['listed'] ? 'cs-block-success cs-text-success' : |
|
| 113 | - ($item['in_stock'] || $item['soon'] ? 'cs-block-warning cs-text-warning' : 'cs-block-error cs-text-error') |
|
| 112 | + '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') |
|
| 114 | 113 | ] |
| 115 | 114 | ]; |
| 116 | 115 | }, |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | @$_GET['asc'] |
| 56 | 56 | ) |
| 57 | 57 | ); |
| 58 | -$orders_total = $Orders->search( |
|
| 58 | +$orders_total = $Orders->search( |
|
| 59 | 59 | [ |
| 60 | 60 | 'total_count' => 1 |
| 61 | 61 | ] + (array)$_GET, |
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @package CleverStyle CMS |
|
| 4 | - * @author Nazar Mokrynskyi <[email protected]> |
|
| 5 | - * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi |
|
| 6 | - * @license MIT License, see license.txt |
|
| 7 | - */ |
|
| 3 | + * @package CleverStyle CMS |
|
| 4 | + * @author Nazar Mokrynskyi <[email protected]> |
|
| 5 | + * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi |
|
| 6 | + * @license MIT License, see license.txt |
|
| 7 | + */ |
|
| 8 | 8 | namespace cs\User; |
| 9 | 9 | use |
| 10 | 10 | cs\Config, |
@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @package CleverStyle CMS |
|
| 4 | - * @author Nazar Mokrynskyi <[email protected]> |
|
| 5 | - * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi |
|
| 6 | - * @license MIT License, see license.txt |
|
| 7 | - */ |
|
| 3 | + * @package CleverStyle CMS |
|
| 4 | + * @author Nazar Mokrynskyi <[email protected]> |
|
| 5 | + * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi |
|
| 6 | + * @license MIT License, see license.txt |
|
| 7 | + */ |
|
| 8 | 8 | namespace cs; |
| 9 | 9 | use |
| 10 | 10 | ArrayAccess, |