@@ -416,8 +416,7 @@ |
||
| 416 | 416 | */ |
| 417 | 417 | $path = 'mshop/coupon/manager/code/insert'; |
| 418 | 418 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 419 | - } |
|
| 420 | - else |
|
| 419 | + } else |
|
| 421 | 420 | { |
| 422 | 421 | /** mshop/coupon/manager/code/update/mysql |
| 423 | 422 | * Updates an existing coupon code record in the database |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | $this->removeItems( $item->getId(), 'catalog/lists', 'catalog', 'text' ); |
| 64 | 64 | $this->removeListItems( $item->getId(), 'catalog/lists', 'product' ); |
| 65 | 65 | } |
| 66 | - catch( \Exception $e ) { ; } // If no root node was already inserted into the database |
|
| 66 | + catch( \Exception $e ) {; } // If no root node was already inserted into the database |
|
| 67 | 67 | |
| 68 | 68 | $search = $manager->filter(); |
| 69 | 69 | $search->add( $search->and( [ |
@@ -63,7 +63,9 @@ |
||
| 63 | 63 | $this->removeItems( $item->getId(), 'catalog/lists', 'catalog', 'text' ); |
| 64 | 64 | $this->removeListItems( $item->getId(), 'catalog/lists', 'product' ); |
| 65 | 65 | } |
| 66 | - catch( \Exception $e ) { ; } // If no root node was already inserted into the database |
|
| 66 | + catch( \Exception $e ) |
|
| 67 | + { |
|
| 68 | +; } // If no root node was already inserted into the database |
|
| 67 | 69 | |
| 68 | 70 | $search = $manager->filter(); |
| 69 | 71 | $search->add( $search->and( [ |
@@ -269,9 +269,13 @@ discard block |
||
| 269 | 269 | */ |
| 270 | 270 | public function create( array $values = [] ) : \Aimeos\MShop\Common\Item\Iface |
| 271 | 271 | { |
| 272 | - try { |
|
| 272 | + try |
|
| 273 | + { |
|
| 273 | 274 | $values['log.siteid'] = $values['log.siteid'] ?? $this->context()->locale()->getSiteId(); |
| 274 | - } catch( \Exception $e ) {} // if no locale item is available |
|
| 275 | + } |
|
| 276 | + catch( \Exception $e ) |
|
| 277 | + { |
|
| 278 | +} // if no locale item is available |
|
| 275 | 279 | |
| 276 | 280 | return $this->createItemBase( $values ); |
| 277 | 281 | } |
@@ -293,9 +297,12 @@ discard block |
||
| 293 | 297 | $context = $this->context(); |
| 294 | 298 | $conn = $context->db( $this->getResourceName() ); |
| 295 | 299 | |
| 296 | - try { |
|
| 300 | + try |
|
| 301 | + { |
|
| 297 | 302 | $siteid = $context->locale()->getSiteId(); |
| 298 | - } catch( \Exception $e ) { |
|
| 303 | + } |
|
| 304 | + catch( \Exception $e ) |
|
| 305 | + { |
|
| 299 | 306 | $siteid = ''; |
| 300 | 307 | } |
| 301 | 308 | |
@@ -341,8 +348,7 @@ discard block |
||
| 341 | 348 | */ |
| 342 | 349 | $path = 'madmin/log/manager/insert'; |
| 343 | 350 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 344 | - } |
|
| 345 | - else |
|
| 351 | + } else |
|
| 346 | 352 | { |
| 347 | 353 | /** madmin/log/manager/update/mysql |
| 348 | 354 | * Updates an existing log record in the database |
@@ -112,9 +112,13 @@ discard block |
||
| 112 | 112 | */ |
| 113 | 113 | public function create( array $values = [] ) : \Aimeos\MShop\Common\Item\Iface |
| 114 | 114 | { |
| 115 | - try { |
|
| 115 | + try |
|
| 116 | + { |
|
| 116 | 117 | $values['locale.language.siteid'] = $values['locale.language.siteid'] ?? $this->context()->locale()->getSiteId(); |
| 117 | - } catch( \Exception $e ) {} // if no locale item is available |
|
| 118 | + } |
|
| 119 | + catch( \Exception $e ) |
|
| 120 | + { |
|
| 121 | +} // if no locale item is available |
|
| 118 | 122 | |
| 119 | 123 | return $this->createItemBase( $values ); |
| 120 | 124 | } |
@@ -174,8 +178,7 @@ discard block |
||
| 174 | 178 | */ |
| 175 | 179 | $path = 'mshop/locale/manager/language/insert'; |
| 176 | 180 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 177 | - } |
|
| 178 | - else |
|
| 181 | + } else |
|
| 179 | 182 | { |
| 180 | 183 | /** mshop/locale/manager/language/update/mysql |
| 181 | 184 | * Updates an existing language record in the database |
@@ -267,9 +267,13 @@ discard block |
||
| 267 | 267 | */ |
| 268 | 268 | public function create( array $values = [] ) : \Aimeos\MShop\Common\Item\Iface |
| 269 | 269 | { |
| 270 | - try { |
|
| 270 | + try |
|
| 271 | + { |
|
| 271 | 272 | $values['locale.siteid'] = $values['locale.siteid'] ?? $this->context()->locale()->getSiteId(); |
| 272 | - } catch( \Exception $e ) {} // if no locale item is available |
|
| 273 | + } |
|
| 274 | + catch( \Exception $e ) |
|
| 275 | + { |
|
| 276 | +} // if no locale item is available |
|
| 273 | 277 | |
| 274 | 278 | return $this->createItemBase( $values ); |
| 275 | 279 | } |
@@ -431,8 +435,7 @@ discard block |
||
| 431 | 435 | */ |
| 432 | 436 | $path = 'mshop/locale/manager/insert'; |
| 433 | 437 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 434 | - } |
|
| 435 | - else |
|
| 438 | + } else |
|
| 436 | 439 | { |
| 437 | 440 | /** mshop/locale/manager/update/mysql |
| 438 | 441 | * Updates an existing locale record in the database |
@@ -482,9 +482,13 @@ discard block |
||
| 482 | 482 | |
| 483 | 483 | if( empty( $item->getInvoiceNumber() ) && $item->getStatusPayment() >= \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ) |
| 484 | 484 | { |
| 485 | - try { |
|
| 485 | + try |
|
| 486 | + { |
|
| 486 | 487 | $item->setInvoiceNumber( $this->createInvoiceNumber( $item ) ); |
| 487 | - } catch( \Exception $e ) { // redo on transaction deadlock |
|
| 488 | + } |
|
| 489 | + catch( \Exception $e ) |
|
| 490 | + { |
|
| 491 | +// redo on transaction deadlock |
|
| 488 | 492 | $item->setInvoiceNumber( $this->createInvoiceNumber( $item ) ); |
| 489 | 493 | } |
| 490 | 494 | } |
@@ -535,8 +539,7 @@ discard block |
||
| 535 | 539 | */ |
| 536 | 540 | $path = 'mshop/order/manager/insert'; |
| 537 | 541 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 538 | - } |
|
| 539 | - else |
|
| 542 | + } else |
|
| 540 | 543 | { |
| 541 | 544 | /** mshop/order/manager/update/mysql |
| 542 | 545 | * Updates an existing order record in the database |