@@ -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 |
@@ -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 |
@@ -650,8 +650,7 @@ |
||
| 650 | 650 | */ |
| 651 | 651 | $path = 'mshop/order/manager/service/insert'; |
| 652 | 652 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 653 | - } |
|
| 654 | - else |
|
| 653 | + } else |
|
| 655 | 654 | { |
| 656 | 655 | /** mshop/order/manager/service/update/mysql |
| 657 | 656 | * Updates an existing order record in the database |
@@ -528,8 +528,7 @@ |
||
| 528 | 528 | */ |
| 529 | 529 | $path = 'mshop/order/manager/service/transaction/insert'; |
| 530 | 530 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 531 | - } |
|
| 532 | - else |
|
| 531 | + } else |
|
| 533 | 532 | { |
| 534 | 533 | /** mshop/order/manager/service/transaction/update/mysql |
| 535 | 534 | * Updates an existing order record in the database |
@@ -535,8 +535,7 @@ |
||
| 535 | 535 | */ |
| 536 | 536 | $path = 'mshop/order/manager/product/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/product/attribute/update/mysql |
| 542 | 541 | * Updates an existing order record in the database |
@@ -800,8 +800,7 @@ |
||
| 800 | 800 | */ |
| 801 | 801 | $path = 'mshop/order/manager/product/insert'; |
| 802 | 802 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 803 | - } |
|
| 804 | - else |
|
| 803 | + } else |
|
| 805 | 804 | { |
| 806 | 805 | /** mshop/order/manager/product/update/mysql |
| 807 | 806 | * Updates an existing order record in the database |