@@ -154,9 +154,12 @@ discard block |
||
154 | 154 | </select> |
155 | 155 | </div> |
156 | 156 | </div> |
157 | - <?php else : ?> |
|
157 | + <?php else { |
|
158 | + : ?> |
|
158 | 159 | <input class="item-currencyid" type="hidden" |
159 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) ); ?>'.replace('idx', idx)" |
|
160 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) ); |
|
161 | +} |
|
162 | +?>'.replace('idx', idx)" |
|
160 | 163 | value="<?= $enc->attr( key( $currencies ) ); ?>" /> |
161 | 164 | <?php endif; ?> |
162 | 165 | |
@@ -184,9 +187,12 @@ discard block |
||
184 | 187 | <?= $enc->html( $this->translate( 'admin', 'Types for additional prices like per one lb/kg or per month' ) ); ?> |
185 | 188 | </div> |
186 | 189 | </div> |
187 | - <?php else : ?> |
|
190 | + <?php else { |
|
191 | + : ?> |
|
188 | 192 | <input class="item-type" type="hidden" |
189 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) ); ?>'.replace('idx', idx)" |
|
193 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) ); |
|
194 | +} |
|
195 | +?>'.replace('idx', idx)" |
|
190 | 196 | value="<?= $enc->attr( key( $priceTypes ) ); ?>" /> |
191 | 197 | <?php endif; ?> |
192 | 198 | |
@@ -242,9 +248,12 @@ discard block |
||
242 | 248 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
243 | 249 | </div> |
244 | 250 | </div> |
245 | - <?php else : ?> |
|
251 | + <?php else { |
|
252 | + : ?> |
|
246 | 253 | <input class="listitem-type" type="hidden" |
247 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'attribute.lists.type' ) ) ); ?>'.replace('idx', idx)" |
|
254 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'attribute.lists.type' ) ) ); |
|
255 | +} |
|
256 | +?>'.replace('idx', idx)" |
|
248 | 257 | value="<?= $enc->attr( key( $listTypes ) ); ?>" |
249 | 258 | v-model="items[idx]['attribute.lists.type']" /> |
250 | 259 | <?php endif; ?> |
@@ -73,9 +73,12 @@ |
||
73 | 73 | <?php endforeach; ?> |
74 | 74 | </select> |
75 | 75 | </td> |
76 | - <?php else : ?> |
|
76 | + <?php else { |
|
77 | + : ?> |
|
77 | 78 | <input class="item-type" type="hidden" |
78 | - name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.type', '' ) ) ); ?>" |
|
79 | + name="<?= $enc->attr( $this->formparam( array( 'stock', 'stock.type', '' ) ) ); |
|
80 | +} |
|
81 | +?>" |
|
79 | 82 | value="<?= $enc->attr( key( $stockTypes ) ); ?>" /> |
80 | 83 | <?php endif; ?> |
81 | 84 | <td class="stock-stocklevel optional"> |
@@ -115,9 +115,12 @@ discard block |
||
115 | 115 | <?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?> |
116 | 116 | </div> |
117 | 117 | </div> |
118 | - <?php else : ?> |
|
118 | + <?php else { |
|
119 | + : ?> |
|
119 | 120 | <input class="text-langid" type="hidden" |
120 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)" |
|
121 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); |
|
122 | +} |
|
123 | +?>'.replace('idx', idx)" |
|
121 | 124 | value="<?= $enc->attr( key( $languages ) ); ?>" /> |
122 | 125 | <?php endif; ?> |
123 | 126 | |
@@ -146,9 +149,12 @@ discard block |
||
146 | 149 | <?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?> |
147 | 150 | </div> |
148 | 151 | </div> |
149 | - <?php else : ?> |
|
152 | + <?php else { |
|
153 | + : ?> |
|
150 | 154 | <input class="item-type" type="hidden" |
151 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) ); ?>'.replace('idx', idx)" |
|
155 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) ); |
|
156 | +} |
|
157 | +?>'.replace('idx', idx)" |
|
152 | 158 | value="<?= $enc->attr( key( $textTypes ) ); ?>" /> |
153 | 159 | <?php endif; ?> |
154 | 160 | |
@@ -204,9 +210,12 @@ discard block |
||
204 | 210 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
205 | 211 | </div> |
206 | 212 | </div> |
207 | - <?php else : ?> |
|
213 | + <?php else { |
|
214 | + : ?> |
|
208 | 215 | <input class="listitem-type" type="hidden" |
209 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'product.lists.type' ) ) ); ?>'.replace('idx', idx)" |
|
216 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'product.lists.type' ) ) ); |
|
217 | +} |
|
218 | +?>'.replace('idx', idx)" |
|
210 | 219 | value="<?= $enc->attr( key( $listTypes ) ); ?>" |
211 | 220 | v-model="items[idx]['product.lists.type']" /> |
212 | 221 | <?php endif; ?> |
@@ -154,9 +154,12 @@ discard block |
||
154 | 154 | </select> |
155 | 155 | </div> |
156 | 156 | </div> |
157 | - <?php else : ?> |
|
157 | + <?php else { |
|
158 | + : ?> |
|
158 | 159 | <input class="item-currencyid" type="hidden" |
159 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) ); ?>'.replace('idx', idx)" |
|
160 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) ); |
|
161 | +} |
|
162 | +?>'.replace('idx', idx)" |
|
160 | 163 | value="<?= $enc->attr( key( $currencies ) ); ?>" /> |
161 | 164 | <?php endif; ?> |
162 | 165 | |
@@ -184,9 +187,12 @@ discard block |
||
184 | 187 | <?= $enc->html( $this->translate( 'admin', 'Types for additional prices like per one lb/kg or per month' ) ); ?> |
185 | 188 | </div> |
186 | 189 | </div> |
187 | - <?php else : ?> |
|
190 | + <?php else { |
|
191 | + : ?> |
|
188 | 192 | <input class="item-type" type="hidden" |
189 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) ); ?>'.replace('idx', idx)" |
|
193 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) ); |
|
194 | +} |
|
195 | +?>'.replace('idx', idx)" |
|
190 | 196 | value="<?= $enc->attr( key( $priceTypes ) ); ?>" /> |
191 | 197 | <?php endif; ?> |
192 | 198 | |
@@ -242,9 +248,12 @@ discard block |
||
242 | 248 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
243 | 249 | </div> |
244 | 250 | </div> |
245 | - <?php else : ?> |
|
251 | + <?php else { |
|
252 | + : ?> |
|
246 | 253 | <input class="listitem-type" type="hidden" |
247 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'product.lists.type' ) ) ); ?>'.replace('idx', idx)" |
|
254 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'product.lists.type' ) ) ); |
|
255 | +} |
|
256 | +?>'.replace('idx', idx)" |
|
248 | 257 | value="<?= $enc->attr( key( $listTypes ) ); ?>" |
249 | 258 | v-model="items[idx]['product.lists.type']" /> |
250 | 259 | <?php endif; ?> |
@@ -115,9 +115,12 @@ discard block |
||
115 | 115 | <?= $enc->html( $this->translate( 'admin', 'Language of the entered text' ) ); ?> |
116 | 116 | </div> |
117 | 117 | </div> |
118 | - <?php else : ?> |
|
118 | + <?php else { |
|
119 | + : ?> |
|
119 | 120 | <input class="text-langid" type="hidden" |
120 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); ?>'.replace('idx', idx)" |
|
121 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.languageid' ) ) ); |
|
122 | +} |
|
123 | +?>'.replace('idx', idx)" |
|
121 | 124 | value="<?= $enc->attr( key( $languages ) ); ?>" /> |
122 | 125 | <?php endif; ?> |
123 | 126 | |
@@ -146,9 +149,12 @@ discard block |
||
146 | 149 | <?= $enc->html( $this->translate( 'admin', 'Types for additional texts like per one lb/kg or per month' ) ); ?> |
147 | 150 | </div> |
148 | 151 | </div> |
149 | - <?php else : ?> |
|
152 | + <?php else { |
|
153 | + : ?> |
|
150 | 154 | <input class="item-type" type="hidden" |
151 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) ); ?>'.replace('idx', idx)" |
|
155 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'text.type' ) ) ); |
|
156 | +} |
|
157 | +?>'.replace('idx', idx)" |
|
152 | 158 | value="<?= $enc->attr( key( $textTypes ) ); ?>" /> |
153 | 159 | <?php endif; ?> |
154 | 160 | |
@@ -204,9 +210,12 @@ discard block |
||
204 | 210 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
205 | 211 | </div> |
206 | 212 | </div> |
207 | - <?php else : ?> |
|
213 | + <?php else { |
|
214 | + : ?> |
|
208 | 215 | <input class="listitem-type" type="hidden" |
209 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'service.lists.type' ) ) ); ?>'.replace('idx', idx)" |
|
216 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'text', 'idx', 'service.lists.type' ) ) ); |
|
217 | +} |
|
218 | +?>'.replace('idx', idx)" |
|
210 | 219 | value="<?= $enc->attr( key( $listTypes ) ); ?>" |
211 | 220 | v-model="items[idx]['service.lists.type']" /> |
212 | 221 | <?php endif; ?> |
@@ -154,9 +154,12 @@ discard block |
||
154 | 154 | </select> |
155 | 155 | </div> |
156 | 156 | </div> |
157 | - <?php else : ?> |
|
157 | + <?php else { |
|
158 | + : ?> |
|
158 | 159 | <input class="item-currencyid" type="hidden" |
159 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) ); ?>'.replace('idx', idx)" |
|
160 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.currencyid' ) ) ); |
|
161 | +} |
|
162 | +?>'.replace('idx', idx)" |
|
160 | 163 | value="<?= $enc->attr( key( $currencies ) ); ?>" /> |
161 | 164 | <?php endif; ?> |
162 | 165 | |
@@ -184,9 +187,12 @@ discard block |
||
184 | 187 | <?= $enc->html( $this->translate( 'admin', 'Types for additional prices like per one lb/kg or per month' ) ); ?> |
185 | 188 | </div> |
186 | 189 | </div> |
187 | - <?php else : ?> |
|
190 | + <?php else { |
|
191 | + : ?> |
|
188 | 192 | <input class="item-type" type="hidden" |
189 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) ); ?>'.replace('idx', idx)" |
|
193 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'price.type' ) ) ); |
|
194 | +} |
|
195 | +?>'.replace('idx', idx)" |
|
190 | 196 | value="<?= $enc->attr( key( $priceTypes ) ); ?>" /> |
191 | 197 | <?php endif; ?> |
192 | 198 | |
@@ -242,9 +248,12 @@ discard block |
||
242 | 248 | <?= $enc->html( $this->translate( 'admin', 'Second level type for grouping items' ) ); ?> |
243 | 249 | </div> |
244 | 250 | </div> |
245 | - <?php else : ?> |
|
251 | + <?php else { |
|
252 | + : ?> |
|
246 | 253 | <input class="listitem-type" type="hidden" |
247 | - v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'service.lists.type' ) ) ); ?>'.replace('idx', idx)" |
|
254 | + v-bind:name="'<?= $enc->attr( $this->formparam( array( 'price', 'idx', 'service.lists.type' ) ) ); |
|
255 | +} |
|
256 | +?>'.replace('idx', idx)" |
|
248 | 257 | value="<?= $enc->attr( key( $listTypes ) ); ?>" |
249 | 258 | v-model="items[idx]['service.lists.type']" /> |
250 | 259 | <?php endif; ?> |
@@ -140,14 +140,12 @@ discard block |
||
140 | 140 | |
141 | 141 | $manager->commit(); |
142 | 142 | return; |
143 | - } |
|
144 | - catch( \Aimeos\MShop\Exception $e ) |
|
143 | + } catch( \Aimeos\MShop\Exception $e ) |
|
145 | 144 | { |
146 | 145 | $error = array( 'product-item-stock' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
147 | 146 | $view->errors = $view->get( 'errors', [] ) + $error; |
148 | 147 | $this->logException( $e ); |
149 | - } |
|
150 | - catch( \Exception $e ) |
|
148 | + } catch( \Exception $e ) |
|
151 | 149 | { |
152 | 150 | $error = array( 'product-item-stock' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
153 | 151 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -330,8 +328,7 @@ discard block |
||
330 | 328 | { |
331 | 329 | $stockItem = $stockItems[$id]; |
332 | 330 | unset( $stockItems[$id] ); |
333 | - } |
|
334 | - else |
|
331 | + } else |
|
335 | 332 | { |
336 | 333 | $stockItem = $manager->createItem()->setType( $type ); |
337 | 334 | } |
@@ -270,8 +270,7 @@ |
||
270 | 270 | $listItem = $listManager->createItem()->setType( 'custom' )->setRefId( $attrId ); |
271 | 271 | $item->addListItem( 'attribute', $listItem, $listItem->getRefItem() ); |
272 | 272 | } |
273 | - } |
|
274 | - else |
|
273 | + } else |
|
275 | 274 | { |
276 | 275 | if( ( $litem = $item->getListItem( 'attribute', 'custom', $attrId, false ) ) !== null ) { |
277 | 276 | $item->deleteListItem( 'attribute', $litem ); |
@@ -52,14 +52,12 @@ discard block |
||
52 | 52 | $view->tabindex = ++$idx + 1; |
53 | 53 | $view->itemBody .= $client->copy(); |
54 | 54 | } |
55 | - } |
|
56 | - catch( \Aimeos\MShop\Exception $e ) |
|
55 | + } catch( \Aimeos\MShop\Exception $e ) |
|
57 | 56 | { |
58 | 57 | $error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
59 | 58 | $view->errors = $view->get( 'errors', [] ) + $error; |
60 | 59 | $this->logException( $e ); |
61 | - } |
|
62 | - catch( \Exception $e ) |
|
60 | + } catch( \Exception $e ) |
|
63 | 61 | { |
64 | 62 | $error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
65 | 63 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -101,14 +99,12 @@ discard block |
||
101 | 99 | $view->tabindex = ++$idx + 1; |
102 | 100 | $view->itemBody .= $client->create(); |
103 | 101 | } |
104 | - } |
|
105 | - catch( \Aimeos\MShop\Exception $e ) |
|
102 | + } catch( \Aimeos\MShop\Exception $e ) |
|
106 | 103 | { |
107 | 104 | $error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
108 | 105 | $view->errors = $view->get( 'errors', [] ) + $error; |
109 | 106 | $this->logException( $e ); |
110 | - } |
|
111 | - catch( \Exception $e ) |
|
107 | + } catch( \Exception $e ) |
|
112 | 108 | { |
113 | 109 | $error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
114 | 110 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -150,14 +146,12 @@ discard block |
||
150 | 146 | |
151 | 147 | $this->nextAction( $view, 'search', 'catalog', null, 'delete' ); |
152 | 148 | return; |
153 | - } |
|
154 | - catch( \Aimeos\MShop\Exception $e ) |
|
149 | + } catch( \Aimeos\MShop\Exception $e ) |
|
155 | 150 | { |
156 | 151 | $error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
157 | 152 | $view->errors = $view->get( 'errors', [] ) + $error; |
158 | 153 | $this->logException( $e ); |
159 | - } |
|
160 | - catch( \Exception $e ) |
|
154 | + } catch( \Exception $e ) |
|
161 | 155 | { |
162 | 156 | $error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
163 | 157 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -199,14 +193,12 @@ discard block |
||
199 | 193 | $view->tabindex = ++$idx + 1; |
200 | 194 | $view->itemBody .= $client->get(); |
201 | 195 | } |
202 | - } |
|
203 | - catch( \Aimeos\MShop\Exception $e ) |
|
196 | + } catch( \Aimeos\MShop\Exception $e ) |
|
204 | 197 | { |
205 | 198 | $error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
206 | 199 | $view->errors = $view->get( 'errors', [] ) + $error; |
207 | 200 | $this->logException( $e ); |
208 | - } |
|
209 | - catch( \Exception $e ) |
|
201 | + } catch( \Exception $e ) |
|
210 | 202 | { |
211 | 203 | $error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
212 | 204 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -245,18 +237,15 @@ discard block |
||
245 | 237 | |
246 | 238 | $this->nextAction( $view, $view->param( 'next' ), 'catalog', $view->item->getId(), 'save' ); |
247 | 239 | return; |
248 | - } |
|
249 | - catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
240 | + } catch( \Aimeos\Admin\JQAdm\Exception $e ) |
|
250 | 241 | { |
251 | 242 | // fall through to create |
252 | - } |
|
253 | - catch( \Aimeos\MShop\Exception $e ) |
|
243 | + } catch( \Aimeos\MShop\Exception $e ) |
|
254 | 244 | { |
255 | 245 | $error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
256 | 246 | $view->errors = $view->get( 'errors', [] ) + $error; |
257 | 247 | $this->logException( $e ); |
258 | - } |
|
259 | - catch( \Exception $e ) |
|
248 | + } catch( \Exception $e ) |
|
260 | 249 | { |
261 | 250 | $error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
262 | 251 | $view->errors = $view->get( 'errors', [] ) + $error; |
@@ -284,14 +273,12 @@ discard block |
||
284 | 273 | $view->item = \Aimeos\MShop::create( $context, 'catalog' )->createItem(); |
285 | 274 | $view->itemRootId = $this->getRootId(); |
286 | 275 | $view->itemBody = ''; |
287 | - } |
|
288 | - catch( \Aimeos\MShop\Exception $e ) |
|
276 | + } catch( \Aimeos\MShop\Exception $e ) |
|
289 | 277 | { |
290 | 278 | $error = array( 'catalog-item' => $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
291 | 279 | $view->errors = $view->get( 'errors', [] ) + $error; |
292 | 280 | $this->logException( $e ); |
293 | - } |
|
294 | - catch( \Exception $e ) |
|
281 | + } catch( \Exception $e ) |
|
295 | 282 | { |
296 | 283 | $error = array( 'catalog-item' => $e->getMessage() . ', ' . $e->getFile() . ':' . $e->getLine() ); |
297 | 284 | $view->errors = $view->get( 'errors', [] ) + $error; |