Completed
Push — master ( 06a6c1...f03436 )
by Aimeos
03:56
created
admin/jqadm/templates/dashboard/item-order-servicepayment-standard.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,11 +17,11 @@
 block discarded – undo
17 17
 			<div class="btn btn-card-header act-show fa"></div>
18 18
 		</div>
19 19
 		<span class="item-label header-label">
20
-			<?= $enc->html( $this->translate( 'admin', 'Payment types' ) ); ?>
20
+			<?= $enc->html($this->translate('admin', 'Payment types')); ?>
21 21
 		</span>
22 22
 	</div>
23 23
 	<div id="order-servicepayment-data" class="card-block collapse show content loading" role="tabpanel"
24 24
 		aria-labelledby="order-servicepayment-head">
25 25
 	</div>
26 26
 </div>
27
-<?= $this->get( 'orderpaymenttypeBody' ); ?>
27
+<?= $this->get('orderpaymenttypeBody'); ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/dashboard/item-order-salesmonth-standard.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 			<div class="btn btn-card-header act-show fa"></div>
18 18
 		</div>
19 19
 		<span class="item-label header-label">
20
-			<?= $enc->html( $this->translate( 'admin', 'Sales per month' ) ); ?>
20
+			<?= $enc->html($this->translate('admin', 'Sales per month')); ?>
21 21
 		</span>
22 22
 	</div>
23 23
 	<div id="order-salesmonth-data" class="card-block collapse show content loading" role="tabpanel"
Please login to merge, or discard this patch.
admin/jqadm/templates/dashboard/list-job-standard.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -7,21 +7,21 @@  discard block
 block discarded – undo
7 7
 
8 8
 $enc = $this->encoder();
9 9
 $params = $this->param();
10
-$items = $this->get( 'jobItems', [] );
10
+$items = $this->get('jobItems', []);
11 11
 
12
-$getTarget = $this->config( 'admin/jqadm/url/get/target' );
13
-$getCntl = $this->config( 'admin/jqadm/url/get/controller', 'Jqadm' );
14
-$getAction = $this->config( 'admin/jqadm/url/get/action', 'get' );
15
-$getConfig = $this->config( 'admin/jqadm/url/get/config', [] );
12
+$getTarget = $this->config('admin/jqadm/url/get/target');
13
+$getCntl = $this->config('admin/jqadm/url/get/controller', 'Jqadm');
14
+$getAction = $this->config('admin/jqadm/url/get/action', 'get');
15
+$getConfig = $this->config('admin/jqadm/url/get/config', []);
16 16
 
17
-$delTarget = $this->config( 'admin/jqadm/url/delete/target' );
18
-$delCntl = $this->config( 'admin/jqadm/url/delete/controller', 'Jqadm' );
19
-$delAction = $this->config( 'admin/jqadm/url/delete/action', 'delete' );
20
-$delConfig = $this->config( 'admin/jqadm/url/delete/config', [] );
17
+$delTarget = $this->config('admin/jqadm/url/delete/target');
18
+$delCntl = $this->config('admin/jqadm/url/delete/controller', 'Jqadm');
19
+$delAction = $this->config('admin/jqadm/url/delete/action', 'delete');
20
+$delConfig = $this->config('admin/jqadm/url/delete/config', []);
21 21
 
22 22
 
23 23
 ?>
24
-<?php if( !empty( $items ) ) : ?>
24
+<?php if (!empty($items)) : ?>
25 25
 	<div class="dashboard-job row">
26 26
 		<div class="job-list card col-lg-12">
27 27
 			<div id="job-list-head" class="card-header header" role="tab"
@@ -31,28 +31,28 @@  discard block
 block discarded – undo
31 31
 					<div class="btn btn-card-header act-show fa"></div>
32 32
 				</div>
33 33
 				<span class="item-label header-label">
34
-					<?= $enc->html( $this->translate( 'admin', 'Import/Export jobs' ) ); ?>
34
+					<?= $enc->html($this->translate('admin', 'Import/Export jobs')); ?>
35 35
 				</span>
36 36
 			</div>
37 37
 			<div id="job-list-data" class="card-block content collapse show" role="tabpanel" aria-labelledby="job-list-head">
38 38
 				<div class="table-responsive">
39 39
 					<table class="list-items table table-hover">
40 40
 						<tbody>
41
-							<?php foreach( $items as $id => $item ) : ?>
41
+							<?php foreach ($items as $id => $item) : ?>
42 42
 								<tr>
43
-									<td class="job-label"><?= $enc->html( $item->getLabel() ); ?></td>
44
-									<td class="job-mtime"><?= $enc->html( $item->getTimeModified() ); ?></td>
43
+									<td class="job-label"><?= $enc->html($item->getLabel()); ?></td>
44
+									<td class="job-mtime"><?= $enc->html($item->getTimeModified()); ?></td>
45 45
 									<td class="actions">
46
-										<?php if( !$this->site()->readonly( $item->getSiteId() ) ) : ?>
46
+										<?php if (!$this->site()->readonly($item->getSiteId())) : ?>
47 47
 											<a class="btn act-delete fa" tabindex="1"
48
-												href="<?= $enc->attr( $this->url( $delTarget, $delCntl, $delAction, ['resource' => 'dashboard', 'id' => $id] + $params, [], $delConfig ) ); ?>"
49
-												title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
50
-												aria-label="<?= $enc->attr( $this->translate( 'admin', 'Delete' ) ); ?>"></a>
48
+												href="<?= $enc->attr($this->url($delTarget, $delCntl, $delAction, ['resource' => 'dashboard', 'id' => $id] + $params, [], $delConfig)); ?>"
49
+												title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
50
+												aria-label="<?= $enc->attr($this->translate('admin', 'Delete')); ?>"></a>
51 51
 										<?php endif; ?>
52 52
 										<a class="btn act-download fa" tabindex="1"
53
-											href="<?= $enc->attr( $this->url( $getTarget, $getCntl, $getAction, ['resource' => 'dashboard', 'id' => $id] + $params, [], $getConfig ) ); ?>"
54
-											title="<?= $enc->attr( $this->translate( 'admin', 'Download this file') ); ?>"
55
-											aria-label="<?= $enc->attr( $this->translate( 'admin', 'Download' ) ); ?>"></a>
53
+											href="<?= $enc->attr($this->url($getTarget, $getCntl, $getAction, ['resource' => 'dashboard', 'id' => $id] + $params, [], $getConfig)); ?>"
54
+											title="<?= $enc->attr($this->translate('admin', 'Download this file')); ?>"
55
+											aria-label="<?= $enc->attr($this->translate('admin', 'Download')); ?>"></a>
56 56
 									</td>
57 57
 								</tr>
58 58
 							<?php endforeach; ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/dashboard/item-order-counthour-standard.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,11 +17,11 @@
 block discarded – undo
17 17
 			<div class="btn btn-card-header act-show fa"></div>
18 18
 		</div>
19 19
 		<span class="item-label header-label">
20
-			<?= $enc->html( $this->translate( 'admin', 'Orders by hour' ) ); ?>
20
+			<?= $enc->html($this->translate('admin', 'Orders by hour')); ?>
21 21
 		</span>
22 22
 	</div>
23 23
 	<div id="order-counthour-data" class="card-block collapse show content loading" role="tabpanel"
24 24
 		aria-labelledby="order-counthour-head">
25 25
 	</div>
26 26
 </div>
27
-<?= $this->get( 'orderhourBody' ); ?>
27
+<?= $this->get('orderhourBody'); ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/dashboard/item-order-countday-standard.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,11 +17,11 @@
 block discarded – undo
17 17
 			<div class="btn btn-card-header act-show fa"></div>
18 18
 		</div>
19 19
 		<span class="item-label header-label">
20
-			<?= $enc->html( $this->translate( 'admin', 'Orders by day' ) ); ?>
20
+			<?= $enc->html($this->translate('admin', 'Orders by day')); ?>
21 21
 		</span>
22 22
 	</div>
23 23
 	<div id="order-countday-data" class="card-block collapse show content loading" role="tabpanel"
24 24
 		aria-labelledby="order-countday-head">
25 25
 	</div>
26 26
 </div>
27
-<?= $this->get( 'orderdayBody' ); ?>
27
+<?= $this->get('orderdayBody'); ?>
Please login to merge, or discard this patch.
admin/jqadm/templates/product/item-option-standard.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,5 +9,5 @@
 block discarded – undo
9 9
 
10 10
 ?>
11 11
 <div id="option" class="row item-option tab-pane fade" role="tabpanel" aria-labelledby="option">
12
-	<?= $this->get( 'optionBody' ); ?>
12
+	<?= $this->get('optionBody'); ?>
13 13
 </div>
Please login to merge, or discard this patch.
admin/jqadm/templates/product/item-special-standard.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,5 +9,5 @@
 block discarded – undo
9 9
 
10 10
 ?>
11 11
 <div id="special" class="row item-special tab-pane fade" role="tabpanel" aria-labelledby="special">
12
-	<?= $this->get( 'specialBody' ); ?>
12
+	<?= $this->get('specialBody'); ?>
13 13
 </div>
Please login to merge, or discard this patch.
admin/jqadm/templates/product/item-stock-standard.php 2 patches
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,9 +74,12 @@
 block discarded – undo
74 74
 							<?php endforeach; ?>
75 75
 						</select>
76 76
 					</td>
77
-				<?php else : ?>
77
+				<?php else {
78
+	: ?>
78 79
 					<input class="item-typeid" type="hidden"
79
-						name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.typeid', '' ) ) ); ?>"
80
+						name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.typeid', '' ) ) );
81
+}
82
+?>"
80 83
 						value="<?= $enc->attr( key( $stockTypes ) ); ?>" />
81 84
 				<?php endif; ?>
82 85
 				<td class="stock-stocklevel optional">
Please login to merge, or discard this patch.
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 
8 8
 
9 9
 $enc = $this->encoder();
10
-$stockTypes = $this->get( 'stockTypes', [] );
10
+$stockTypes = $this->get('stockTypes', []);
11 11
 
12 12
 $keys = ['stock.id', 'stock.siteid', 'stock.typeid', 'stock.stocklevel', 'stock.dateback'];
13 13
 
@@ -16,37 +16,37 @@  discard block
 block discarded – undo
16 16
 <div id="stock" class="item-stock content-block tab-pane fade" role="tabpanel" aria-labelledby="stock">
17 17
 
18 18
 	<table class="stock-list table table-default"
19
-		data-items="<?= $enc->attr( json_encode( $this->get( 'stockData', [] ) ) ); ?>"
20
-		data-keys="<?= $enc->attr( json_encode( $keys ) ) ?>"
19
+		data-items="<?= $enc->attr(json_encode($this->get('stockData', []))); ?>"
20
+		data-keys="<?= $enc->attr(json_encode($keys)) ?>"
21 21
 		data-prefix="stock."
22 22
 		data-siteid="<?= $this->site()->siteid() ?>"
23
-		data-numtypes="<?= count( $stockTypes ) ?>" >
23
+		data-numtypes="<?= count($stockTypes) ?>" >
24 24
 
25 25
 		<thead>
26 26
 			<tr>
27
-				<?php if( count( $stockTypes ) > 1 ) : ?>
27
+				<?php if (count($stockTypes) > 1) : ?>
28 28
 					<th class="stock-type">
29
-						<span class="help"><?= $enc->html( $this->translate( 'admin', 'Type' ) ); ?></span>
29
+						<span class="help"><?= $enc->html($this->translate('admin', 'Type')); ?></span>
30 30
 						<div class="form-text text-muted help-text">
31
-							<?= $enc->html( $this->translate( 'admin', 'Warehouse or local store if your articles are available at several locations' ) ); ?>
31
+							<?= $enc->html($this->translate('admin', 'Warehouse or local store if your articles are available at several locations')); ?>
32 32
 						</div>
33 33
 					</th>
34 34
 				<?php endif; ?>
35 35
 				<th class="stock-stocklevel">
36
-					<span class="help"><?= $enc->html( $this->translate( 'admin', 'Stock level' ) ); ?></span>
36
+					<span class="help"><?= $enc->html($this->translate('admin', 'Stock level')); ?></span>
37 37
 					<div class="form-text text-muted help-text">
38
-						<?= $enc->html( $this->translate( 'admin', 'Number of articles currently in stock, leave empty for an unlimited quantity' ) ); ?>
38
+						<?= $enc->html($this->translate('admin', 'Number of articles currently in stock, leave empty for an unlimited quantity')); ?>
39 39
 					</div>
40 40
 				</th>
41 41
 				<th class="stock-databack">
42
-					<span class="help"><?= $enc->html( $this->translate( 'admin', 'Back in stock' ) ); ?></span>
42
+					<span class="help"><?= $enc->html($this->translate('admin', 'Back in stock')); ?></span>
43 43
 					<div class="form-text text-muted help-text">
44
-						<?= $enc->html( $this->translate( 'admin', 'Shown if the article reached a stock level of zero' ) ); ?>
44
+						<?= $enc->html($this->translate('admin', 'Shown if the article reached a stock level of zero')); ?>
45 45
 					</div>
46 46
 				</th>
47 47
 				<th class="actions">
48
-					<div v-if="(items['stock.id'] || []).length < numtypes" class="btn act-add fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
49
-						title="<?= $enc->attr( $this->translate( 'admin', 'Insert new entry (Ctrl+I)') ); ?>"
48
+					<div v-if="(items['stock.id'] || []).length < numtypes" class="btn act-add fa" tabindex="<?= $this->get('tabindex'); ?>"
49
+						title="<?= $enc->attr($this->translate('admin', 'Insert new entry (Ctrl+I)')); ?>"
50 50
 						v-on:click="addItem()">
51 51
 					</div>
52 52
 				</th>
@@ -55,48 +55,48 @@  discard block
 block discarded – undo
55 55
 		<tbody>
56 56
 
57 57
 			<tr v-for="(id, idx) in items['stock.id']" v-bind:key="idx" class="stock-row">
58
-				<?php if( count( $stockTypes ) > 1 ) : ?>
58
+				<?php if (count($stockTypes) > 1) : ?>
59 59
 					<td class="stock-type mandatory">
60
-						<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get( 'tabindex' ); ?>"
61
-							name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.typeid', '' ) ) ); ?>"
60
+						<select class="form-control custom-select item-typeid" required="required" tabindex="<?= $this->get('tabindex'); ?>"
61
+							name="<?= $enc->attr($this->formparam(array('stock', 'stock.typeid', ''))); ?>"
62 62
 							v-bind:readonly="checkSite('stock.siteid', idx)"
63 63
 							v-model="items['stock.typeid'][idx]" >
64 64
 
65 65
 							<option value="" disable>
66
-								<?= $enc->html( $this->translate( 'admin', 'Please select' ) ); ?>
66
+								<?= $enc->html($this->translate('admin', 'Please select')); ?>
67 67
 							</option>
68 68
 
69
-							<?php foreach( $stockTypes as $typeId => $typeItem ) : ?>
70
-								<option value="<?= $enc->attr( $typeId ); ?>" v-bind:selected="items['stock.typeid'][idx] == '<?= $enc->attr( $typeId ) ?>'">
71
-									<?= $enc->html( $typeItem->getLabel() ) ?>
69
+							<?php foreach ($stockTypes as $typeId => $typeItem) : ?>
70
+								<option value="<?= $enc->attr($typeId); ?>" v-bind:selected="items['stock.typeid'][idx] == '<?= $enc->attr($typeId) ?>'">
71
+									<?= $enc->html($typeItem->getLabel()) ?>
72 72
 								</option>
73 73
 							<?php endforeach; ?>
74 74
 						</select>
75 75
 					</td>
76 76
 				<?php else : ?>
77 77
 					<input class="item-typeid" type="hidden"
78
-						name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.typeid', '' ) ) ); ?>"
79
-						value="<?= $enc->attr( key( $stockTypes ) ); ?>" />
78
+						name="<?= $enc->attr($this->formparam(array('stock', 'stock.typeid', ''))); ?>"
79
+						value="<?= $enc->attr(key($stockTypes)); ?>" />
80 80
 				<?php endif; ?>
81 81
 				<td class="stock-stocklevel optional">
82
-					<input class="form-control item-stocklevel" type="number" step="1" min="0" tabindex="<?= $this->get( 'tabindex' ); ?>"
83
-						name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.stocklevel', '' ) ) ); ?>"
82
+					<input class="form-control item-stocklevel" type="number" step="1" min="0" tabindex="<?= $this->get('tabindex'); ?>"
83
+						name="<?= $enc->attr($this->formparam(array('stock', 'stock.stocklevel', ''))); ?>"
84 84
 						v-bind:readonly="checkSite('stock.siteid', idx)"
85 85
 						v-model="items['stock.stocklevel'][idx]" />
86 86
 				</td>
87 87
 				<td class="stock-databack optional">
88
-					<input class="form-control item-dateback" type="datetime-local" tabindex="<?= $this->get( 'tabindex' ); ?>"
89
-						name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.dateback', '' ) ) ); ?>"
90
-						placeholder="<?= $enc->attr( $this->translate( 'admin', 'YYYY-MM-DD hh:mm:ss (optional)' ) ); ?>"
88
+					<input class="form-control item-dateback" type="datetime-local" tabindex="<?= $this->get('tabindex'); ?>"
89
+						name="<?= $enc->attr($this->formparam(array('stock', 'stock.dateback', ''))); ?>"
90
+						placeholder="<?= $enc->attr($this->translate('admin', 'YYYY-MM-DD hh:mm:ss (optional)')); ?>"
91 91
 						v-bind:readonly="checkSite('stock.siteid', idx)"
92 92
 						v-model="items['stock.dateback'][idx]" />
93 93
 				</td>
94 94
 				<td class="actions">
95 95
 					<input class="item-id" type="hidden" v-model="items['stock.id'][idx]"
96
-						name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.id', '' ) ) ); ?>" />
96
+						name="<?= $enc->attr($this->formparam(array('stock', 'stock.id', ''))); ?>" />
97 97
 
98
-					<div v-if="!checkSite('stock.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get( 'tabindex' ); ?>"
99
-						title="<?= $enc->attr( $this->translate( 'admin', 'Delete this entry') ); ?>"
98
+					<div v-if="!checkSite('stock.siteid', idx)" class="btn act-delete fa" tabindex="<?= $this->get('tabindex'); ?>"
99
+						title="<?= $enc->attr($this->translate('admin', 'Delete this entry')); ?>"
100 100
 						v-on:click.stop="removeItem(idx)">
101 101
 					</div>
102 102
 				</td>
@@ -105,6 +105,6 @@  discard block
 block discarded – undo
105 105
 		</tbody>
106 106
 	</table>
107 107
 
108
-	<?= $this->get( 'stockBody' ); ?>
108
+	<?= $this->get('stockBody'); ?>
109 109
 
110 110
 </div>
Please login to merge, or discard this patch.
admin/jqadm/templates/product/item-special-price-standard.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -12,17 +12,17 @@
 block discarded – undo
12 12
 <div id="special-price" class="col-xl-6 content-block item-special-price">
13 13
 
14 14
 	<div class="form-group row optional warning">
15
-		<label class="col-sm-4 form-control-label help"><?= $enc->html( $this->translate( 'admin', 'Allow custom price' ) ); ?></label>
15
+		<label class="col-sm-4 form-control-label help"><?= $enc->html($this->translate('admin', 'Allow custom price')); ?></label>
16 16
 		<div class="col-sm-8">
17
-			<input class="form-control item-special-price-custom" type="checkbox" value="1" tabindex="<?= $this->get( 'tabindex' ); ?>"
18
-				name="<?= $enc->attr( $this->formparam( array( 'specialprice', 'custom' ) ) ); ?>"
19
-				<?= $this->get( 'specialpriceData/custom', 0 ) ? 'checked="checked"' : ''; ?>
17
+			<input class="form-control item-special-price-custom" type="checkbox" value="1" tabindex="<?= $this->get('tabindex'); ?>"
18
+				name="<?= $enc->attr($this->formparam(array('specialprice', 'custom'))); ?>"
19
+				<?= $this->get('specialpriceData/custom', 0) ? 'checked="checked"' : ''; ?>
20 20
 			/>
21 21
 		</div>
22 22
 		<div class="col-sm-12 form-text text-muted help-text">
23
-			<?= $enc->html( $this->translate( 'admin', 'Allow customers to choose themselves how much they want to pay' ) ); ?>
23
+			<?= $enc->html($this->translate('admin', 'Allow customers to choose themselves how much they want to pay')); ?>
24 24
 		</div>
25 25
 	</div>
26 26
 
27
-	<?= $this->get( 'specialpriceBody' ); ?>
27
+	<?= $this->get('specialpriceBody'); ?>
28 28
 </div>
Please login to merge, or discard this patch.