@@ -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 |
@@ -799,9 +799,12 @@ discard block |
||
| 799 | 799 | |
| 800 | 800 | foreach( $sitePath as $siteId ) |
| 801 | 801 | { |
| 802 | - try { |
|
| 802 | + try |
|
| 803 | + { |
|
| 803 | 804 | $path = $this->createTreeManager( $siteId )->getPath( $id ); |
| 804 | - } catch( \Exception $e ) { |
|
| 805 | + } |
|
| 806 | + catch( \Exception $e ) |
|
| 807 | + { |
|
| 805 | 808 | continue; |
| 806 | 809 | } |
| 807 | 810 | |
@@ -845,9 +848,12 @@ discard block |
||
| 845 | 848 | |
| 846 | 849 | foreach( $sitePath as $siteId ) |
| 847 | 850 | { |
| 848 | - try { |
|
| 851 | + try |
|
| 852 | + { |
|
| 849 | 853 | $node = $this->createTreeManager( $siteId )->getNode( $id, $level, $criteria ); |
| 850 | - } catch( \Aimeos\MW\Tree\Exception $e ) { |
|
| 854 | + } |
|
| 855 | + catch( \Aimeos\MW\Tree\Exception $e ) |
|
| 856 | + { |
|
| 851 | 857 | continue; |
| 852 | 858 | } |
| 853 | 859 | |
@@ -929,8 +935,7 @@ discard block |
||
| 929 | 935 | if( $child->getParentId() !== $item->getId() ) { |
| 930 | 936 | $this->move( $child->getId(), $item->getParentId(), $child->getParentId() ); |
| 931 | 937 | } |
| 932 | - } |
|
| 933 | - else |
|
| 938 | + } else |
|
| 934 | 939 | { |
| 935 | 940 | $this->insert( $child, $item->getId() ); |
| 936 | 941 | } |
@@ -1076,8 +1081,7 @@ discard block |
||
| 1076 | 1081 | */ |
| 1077 | 1082 | $path = 'mshop/catalog/manager/update-usage'; |
| 1078 | 1083 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ), false ); |
| 1079 | - } |
|
| 1080 | - else |
|
| 1084 | + } else |
|
| 1081 | 1085 | { |
| 1082 | 1086 | /** mshop/catalog/manager/insert-usage/mysql |
| 1083 | 1087 | * Updates the config, editor, ctime and mtime value of an inserted record |
@@ -1141,8 +1145,7 @@ discard block |
||
| 1141 | 1145 | { |
| 1142 | 1146 | $stmt->bind( $idx++, $siteid ); |
| 1143 | 1147 | $stmt->bind( $idx++, $id, \Aimeos\Base\DB\Statement\Base::PARAM_INT ); |
| 1144 | - } |
|
| 1145 | - else |
|
| 1148 | + } else |
|
| 1146 | 1149 | { |
| 1147 | 1150 | $stmt->bind( $idx++, $date ); // ctime |
| 1148 | 1151 | $stmt->bind( $idx++, $siteid ); |
@@ -60,8 +60,7 @@ |
||
| 60 | 60 | $sort = 'mindte_ft.RANK * mpro."boost"'; |
| 61 | 61 | |
| 62 | 62 | $func = $this->getFunctionRelevance(); |
| 63 | - } |
|
| 64 | - else |
|
| 63 | + } else |
|
| 65 | 64 | { |
| 66 | 65 | $search = ':site AND mindte."langid" = $1 AND CHARINDEX( $2, content )'; |
| 67 | 66 | $sort = '-CHARINDEX( $2, content ) * mpro."boost"'; |
@@ -133,9 +133,11 @@ |
||
| 133 | 133 | $code = $orderProduct->getProductCode(); |
| 134 | 134 | $prodMap[$code] = ( $prodMap[$code] ?? 0 ) + $orderProduct->getQuantity(); |
| 135 | 135 | |
| 136 | - foreach( $orderProduct->getProducts() as $prodItem ) // calculate bundled products |
|
| 136 | + foreach( $orderProduct->getProducts() as $prodItem ) { |
|
| 137 | + // calculate bundled products |
|
| 137 | 138 | { |
| 138 | 139 | $code = $prodItem->getProductCode(); |
| 140 | + } |
|
| 139 | 141 | $prodMap[$code] = ( $prodMap[$code] ?? 0 ) + $prodItem->getQuantity(); |
| 140 | 142 | } |
| 141 | 143 | } |
@@ -253,8 +253,7 @@ |
||
| 253 | 253 | */ |
| 254 | 254 | $path = 'mshop/order/manager/status/insert'; |
| 255 | 255 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 256 | - } |
|
| 257 | - else |
|
| 256 | + } else |
|
| 258 | 257 | { |
| 259 | 258 | /** mshop/order/manager/status/update/mysql |
| 260 | 259 | * Updates an existing order record in the database |
@@ -270,9 +270,13 @@ discard block |
||
| 270 | 270 | */ |
| 271 | 271 | public function create( array $values = [] ) : \Aimeos\MShop\Common\Item\Iface |
| 272 | 272 | { |
| 273 | - try { |
|
| 273 | + try |
|
| 274 | + { |
|
| 274 | 275 | $values['log.siteid'] = $values['log.siteid'] ?? $this->context()->locale()->getSiteId(); |
| 275 | - } catch( \Exception $e ) {} // if no locale item is available |
|
| 276 | + } |
|
| 277 | + catch( \Exception $e ) |
|
| 278 | + { |
|
| 279 | +} // if no locale item is available |
|
| 276 | 280 | |
| 277 | 281 | return $this->createItemBase( $values ); |
| 278 | 282 | } |
@@ -449,9 +453,12 @@ discard block |
||
| 449 | 453 | return $item; |
| 450 | 454 | } |
| 451 | 455 | |
| 452 | - try { |
|
| 456 | + try |
|
| 457 | + { |
|
| 453 | 458 | $siteid = $this->context()->locale()->getSiteId(); |
| 454 | - } catch( \Exception $e ) { |
|
| 459 | + } |
|
| 460 | + catch( \Exception $e ) |
|
| 461 | + { |
|
| 455 | 462 | $siteid = ''; |
| 456 | 463 | } |
| 457 | 464 | |
@@ -498,8 +505,7 @@ discard block |
||
| 498 | 505 | */ |
| 499 | 506 | $path = 'madmin/log/manager/insert'; |
| 500 | 507 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 501 | - } |
|
| 502 | - else |
|
| 508 | + } else |
|
| 503 | 509 | { |
| 504 | 510 | /** madmin/log/manager/update/mysql |
| 505 | 511 | * Updates an existing log record in the database |
@@ -660,8 +660,7 @@ |
||
| 660 | 660 | */ |
| 661 | 661 | $path = 'mshop/order/manager/address/insert'; |
| 662 | 662 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 663 | - } |
|
| 664 | - else |
|
| 663 | + } else |
|
| 665 | 664 | { |
| 666 | 665 | /** mshop/order/manager/address/update/mysql |
| 667 | 666 | * Updates an existing order record in the database |
@@ -302,8 +302,7 @@ discard block |
||
| 302 | 302 | $attributes[$attribute->getParentId()][] = $attribute; |
| 303 | 303 | $attribute->setParentId( null ); |
| 304 | 304 | $attribute->setId( null ); |
| 305 | - } |
|
| 306 | - else |
|
| 305 | + } else |
|
| 307 | 306 | { |
| 308 | 307 | $attributes[$attribute->getParentId()][$id] = $attribute; |
| 309 | 308 | } |
@@ -322,8 +321,7 @@ discard block |
||
| 322 | 321 | $map[$item->getParentId()][$item->getPosition()] = $item; |
| 323 | 322 | |
| 324 | 323 | $subProducts = []; |
| 325 | - } |
|
| 326 | - else |
|
| 324 | + } else |
|
| 327 | 325 | { // in case it's a sub-product |
| 328 | 326 | $subProducts[$item->getPosition()] = $item; |
| 329 | 327 | } |
@@ -535,8 +535,7 @@ |
||
| 535 | 535 | */ |
| 536 | 536 | $path = 'mshop/order/manager/service/attribute/insert'; |
| 537 | 537 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 538 | - } |
|
| 539 | - else |
|
| 538 | + } else |
|
| 540 | 539 | { |
| 541 | 540 | /** mshop/order/manager/service/attribute/update/mysql |
| 542 | 541 | * Updates an existing order record in the database |