Completed
Push — master ( a1e1e6...8edf6f )
by Nazar
04:25
created
modules/Shop/Orders.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
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',
Please login to merge, or discard this patch.
modules/Shop/Shipping_types.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
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',
Please login to merge, or discard this patch.
modules/Shop/items_.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
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(
Please login to merge, or discard this patch.
modules/Shop/orders_.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 $page           = @$_GET['page'] ?: 1;
26 26
 $count          = @$_GET['count'] ?: Config::instance()->module('Shop')->items_per_page;
27 27
 if ($Session->user()) {
28
-	$orders       = $Orders->get(
28
+	$orders = $Orders->get(
29 29
 		$Orders->search(
30 30
 			[
31 31
 				'user' => $Session->get_user()
Please login to merge, or discard this patch.
modules/Shop/admin/categories.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,8 @@
 block discarded – undo
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]";
Please login to merge, or discard this patch.
modules/Shop/admin/orders.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
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,
Please login to merge, or discard this patch.
modules/Shop/admin/items.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -109,8 +109,7 @@
 block discarded – undo
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
 					},
Please login to merge, or discard this patch.
modules/Shop/categories_.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@
 block discarded – undo
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,
Please login to merge, or discard this patch.
modules/Shop/Items.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
 	const DEFAULT_IMAGE = 'components/modules/Shop/includes/img/no-image.svg';
57 57
 
58
-	protected $data_model                  = [
58
+	protected $data_model = [
59 59
 		'id'         => 'int',
60 60
 		'date'       => 'int',
61 61
 		'category'   => 'int',
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
443 443
 				'string'  => '',
444 444
 				'text'    => ''
445 445
 			];
446
-			$lang       = '';
446
+			$lang = '';
447 447
 			switch ($this->attribute_type_to_value_field($attribute_data['type'])) {
448 448
 				case 'numeric_value':
449 449
 					$value_type['numeric'] = $value;
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -286,17 +286,20 @@
 block discarded – undo
286 286
 		$where        = [];
287 287
 		$where_params = [];
288 288
 		foreach ($search_parameters as $key => $details) {
289
-			if (isset($this->data_model[$key])) { // Property
289
+			if (isset($this->data_model[$key])) {
290
+// Property
290 291
 				$where[]        = "`i`.`$key` = '%s'";
291 292
 				$where_params[] = $details;
292
-			} elseif (is_numeric($key)) { // Tag
293
+			} elseif (is_numeric($key)) {
294
+// Tag
293 295
 				$joins .=
294 296
 					"INNER JOIN `{$this->table}_tags` AS `t`
295 297
 					ON
296 298
 						`i`.`id`	= `t`.`id` AND
297 299
 						`t`.`tag`	= '%s'";
298 300
 				$where_params[] = $details;
299
-			} else { // Attribute
301
+			} else {
302
+// Attribute
300 303
 				$field = @$this->attribute_type_to_value_field($Attributes->get($key)['type']);
301 304
 				if (!$field || empty($details)) {
302 305
 					continue;
Please login to merge, or discard this patch.