Completed
Pull Request — master (#128)
by
unknown
04:00
created
admin/jqadm/templates/common/partials/pagination-standard.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -21,8 +21,7 @@  discard block
 block discarded – undo
21 21
  */
22 22
 
23 23
 
24
-$pgroup = function( array $params, $group )
25
-{
24
+$pgroup = function( array $params, $group ) {
26 25
 	if( $group != null ) {
27 26
 		return [$group => ['page' => $params]];
28 27
 	}
@@ -56,16 +55,14 @@  discard block
 block discarded – undo
56 55
 		$controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
57 56
 		$action = $this->config( 'admin/jqadm/url/get/action', 'get' );
58 57
 		$config = $this->config( 'admin/jqadm/url/get/config', [] );
59
-	}
60
-	else
58
+	} else
61 59
 	{
62 60
 		$target = $this->config( 'admin/jqadm/url/create/target' );
63 61
 		$controller = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
64 62
 		$action = $this->config( 'admin/jqadm/url/create/action', 'create' );
65 63
 		$config = $this->config( 'admin/jqadm/url/create/config', [] );
66 64
 	}
67
-}
68
-else
65
+} else
69 66
 {
70 67
 	$target = $this->config( 'admin/jqadm/url/search/target' );
71 68
 	$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Product/Price/Property/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -291,8 +291,7 @@
 block discarded – undo
291 291
 				{
292 292
 					$propItem = $propItems[$entry['price.property.id']];
293 293
 					unset( $propItems[$entry['price.property.id']] );
294
-				}
295
-				else
294
+				} else
296 295
 				{
297 296
 					$propItem = $propManager->createItem();
298 297
 				}
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Service/Price/Property/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -291,8 +291,7 @@
 block discarded – undo
291 291
 				{
292 292
 					$propItem = $propItems[$entry['price.property.id']];
293 293
 					unset( $propItems[$entry['price.property.id']] );
294
-				}
295
-				else
294
+				} else
296 295
 				{
297 296
 					$propItem = $propManager->createItem();
298 297
 				}
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Attribute/Price/Property/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -291,8 +291,7 @@
 block discarded – undo
291 291
 				{
292 292
 					$propItem = $propItems[$entry['price.property.id']];
293 293
 					unset( $propItems[$entry['price.property.id']] );
294
-				}
295
-				else
294
+				} else
296 295
 				{
297 296
 					$propItem = $propManager->createItem();
298 297
 				}
Please login to merge, or discard this patch.
admin/jqadm/templates/common/partials/listsearch-standard.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -52,8 +52,11 @@
 block discarded – undo
52 52
 								</option>
53 53
 							<?php endforeach; ?>
54 54
 						</select>
55
-					<?php else : ?>
56
-						<input class="form-control" type="<?= $enc->attr( $type ); ?>" tabindex="<?= $this->get( 'tabindex' ); ?>"
55
+					<?php else {
56
+	: ?>
57
+						<input class="form-control" type="<?= $enc->attr( $type );
58
+}
59
+?>" tabindex="<?= $this->get( 'tabindex' ); ?>"
57 60
 							name="<?= $enc->attr( $this->formparam( array_merge( $group, ['filter', 'val', $idx] ) ) ); ?>"
58 61
 							value="<?= $enc->attr( $this->value( $filter, 'val/' . $idx, '' ) ); ?>" />
59 62
 					<?php endif; ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/common/partials/listhead-standard.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -56,16 +56,14 @@
 block discarded – undo
56 56
 		$controller = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
57 57
 		$action = $this->config( 'admin/jqadm/url/get/action', 'get' );
58 58
 		$config = $this->config( 'admin/jqadm/url/get/config', [] );
59
-	}
60
-	else
59
+	} else
61 60
 	{
62 61
 		$target = $this->config( 'admin/jqadm/url/create/target' );
63 62
 		$controller = $this->config( 'admin/jqadm/url/create/controller', 'Jqadm' );
64 63
 		$action = $this->config( 'admin/jqadm/url/create/action', 'create' );
65 64
 		$config = $this->config( 'admin/jqadm/url/create/config', [] );
66 65
 	}
67
-}
68
-else
66
+} else
69 67
 {
70 68
 	$target = $this->config( 'admin/jqadm/url/search/target' );
71 69
 	$controller = $this->config( 'admin/jqadm/url/search/controller', 'Jqadm' );
Please login to merge, or discard this patch.
admin/jqadm/src/Admin/JQAdm/Product/Physical/Standard.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -294,8 +294,7 @@
 block discarded – undo
294 294
 				$propItem->setValue( $value );
295 295
 
296 296
 				$item->addPropertyItem( $propItem );
297
-			}
298
-			else
297
+			} else
299 298
 			{
300 299
 				$item->deletePropertyItems( $propItems->toArray() );
301 300
 			}
Please login to merge, or discard this patch.
admin/jqadm/templates/order/item-standard.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -334,8 +334,11 @@  discard block
 block discarded – undo
334 334
 										<div class="col-sm-8"><span class="item-coupon"><?= $enc->attr( $code ); ?></span></div>
335 335
 									</div>
336 336
 								<?php endforeach; ?>
337
-							<?php else : ?>
338
-								<?= $enc->html( $this->translate( 'admin', 'No voucher' ) ); ?>
337
+							<?php else {
338
+	: ?>
339
+								<?= $enc->html( $this->translate( 'admin', 'No voucher' ) );
340
+}
341
+?>
339 342
 							<?php endif; ?>
340 343
 						</div>
341 344
 
@@ -762,8 +765,11 @@  discard block
 block discarded – undo
762 765
 									<div class="col-6 name">
763 766
 										<?php if( $basket->getPrice()->getTaxFlag() ) : ?>
764 767
 											<?= $enc->html( $this->translate( 'admin', 'Incl. tax' ) ); ?>
765
-										<?php else : ?>
766
-											<?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) ); ?>
768
+										<?php else {
769
+	: ?>
770
+											<?= $enc->html( $this->translate( 'admin', 'Excl. tax' ) );
771
+}
772
+?>
767 773
 										<?php endif; ?>
768 774
 									</div>
769 775
 									<div class="col-6 value"><?= $enc->html( sprintf( $priceFormat, $this->number( $basket->getPrice()->getTaxValue() ), $currency ) ); ?></div>
Please login to merge, or discard this patch.
admin/jqadm/templates/service/item-media-standard.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -123,9 +123,12 @@  discard block
 block discarded – undo
123 123
 										<?= $enc->html( $this->translate( 'admin', 'Types for additional images like icons' ) ); ?>
124 124
 									</div>
125 125
 								</div>
126
-							<?php else : ?>
126
+							<?php else {
127
+	: ?>
127 128
 								<input class="item-type" type="hidden"
128
-									v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'media.type'] ) ); ?>'.replace('_idx_', idx)"
129
+									v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'media.type'] ) );
130
+}
131
+?>'.replace('_idx_', idx)"
129 132
 									value="<?= $enc->attr( $mediaTypes->getCode()->first() ) ?>" />
130 133
 							<?php endif; ?>
131 134
 
@@ -188,9 +191,12 @@  discard block
 block discarded – undo
188 191
 										<?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?>
189 192
 									</div>
190 193
 								</div>
191
-							<?php else : ?>
194
+							<?php else {
195
+	: ?>
192 196
 								<input class="listitem-type" type="hidden"
193
-									v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'service.lists.type'] ) ); ?>'.replace('_idx_', idx)"
197
+									v-bind:name="'<?= $enc->attr( $this->formparam( ['media', '_idx_', 'service.lists.type'] ) );
198
+}
199
+?>'.replace('_idx_', idx)"
194 200
 									value="<?= $enc->attr( $listTypes->getCode()->first() ) ?>" />
195 201
 							<?php endif; ?>
196 202
 							<div class="form-group row optional">
Please login to merge, or discard this patch.