@@ -55,9 +55,12 @@ |
||
| 55 | 55 | |
| 56 | 56 | foreach( $testdata['group'] as $entry ) |
| 57 | 57 | { |
| 58 | - try { |
|
| 58 | + try |
|
| 59 | + { |
|
| 59 | 60 | $manager->save( $manager->find( $entry['group.code'] )->fromArray( $entry ) ); |
| 60 | - } catch( \Exception $e ) { |
|
| 61 | + } |
|
| 62 | + catch( \Exception $e ) |
|
| 63 | + { |
|
| 61 | 64 | $manager->save( $manager->create()->fromArray( $entry ), false ); |
| 62 | 65 | } |
| 63 | 66 | } |
@@ -620,9 +620,13 @@ discard block |
||
| 620 | 620 | |
| 621 | 621 | if( empty( $item->getInvoiceNumber() ) && $item->getStatusPayment() >= \Aimeos\MShop\Order\Item\Base::PAY_PENDING ) |
| 622 | 622 | { |
| 623 | - try { |
|
| 623 | + try |
|
| 624 | + { |
|
| 624 | 625 | $item->setInvoiceNumber( $this->createInvoiceNumber( $item ) ); |
| 625 | - } catch( \Exception $e ) { // redo on transaction deadlock |
|
| 626 | + } |
|
| 627 | + catch( \Exception $e ) |
|
| 628 | + { |
|
| 629 | +// redo on transaction deadlock |
|
| 626 | 630 | $item->setInvoiceNumber( $this->createInvoiceNumber( $item ) ); |
| 627 | 631 | } |
| 628 | 632 | } |
@@ -673,8 +677,7 @@ discard block |
||
| 673 | 677 | */ |
| 674 | 678 | $path = 'mshop/order/manager/insert'; |
| 675 | 679 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 676 | - } |
|
| 677 | - else |
|
| 680 | + } else |
|
| 678 | 681 | { |
| 679 | 682 | /** mshop/order/manager/update/mysql |
| 680 | 683 | * Updates an existing order record in the database |
@@ -344,7 +344,8 @@ |
||
| 344 | 344 | { |
| 345 | 345 | $stockManager->decrease( [$item->getProductId() => -1 * $how * $item->getQuantity()], $item->getStockType() ); |
| 346 | 346 | |
| 347 | - switch( $item->getType() ) { |
|
| 347 | + switch( $item->getType() ) |
|
| 348 | + { |
|
| 348 | 349 | case 'default': |
| 349 | 350 | $this->updateStockBundle( $item->getParentProductId(), $item->getStockType() ); break; |
| 350 | 351 | case 'select': |
@@ -139,8 +139,7 @@ discard block |
||
| 139 | 139 | foreach( $columns as $name ) { |
| 140 | 140 | $names .= '"' . $name . '", '; $values .= '?, '; |
| 141 | 141 | } |
| 142 | - } |
|
| 143 | - else |
|
| 142 | + } else |
|
| 144 | 143 | { |
| 145 | 144 | foreach( $columns as $name ) { |
| 146 | 145 | $names .= '"' . $name . '" = ?, '; |
@@ -921,8 +920,7 @@ discard block |
||
| 921 | 920 | */ |
| 922 | 921 | $path = $this->getConfigKey( 'insert' ); |
| 923 | 922 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 924 | - } |
|
| 925 | - else |
|
| 923 | + } else |
|
| 926 | 924 | { |
| 927 | 925 | /** mshop/common/manager/update/mysql |
| 928 | 926 | * Updates an existing record in the database |
@@ -137,8 +137,7 @@ |
||
| 137 | 137 | $msg = $this->context()->translate( 'mshop', 'Unable to open file "%1$s"' ); |
| 138 | 138 | throw new \RuntimeException( sprintf( $msg, $file ) ); |
| 139 | 139 | } |
| 140 | - } |
|
| 141 | - else |
|
| 140 | + } else |
|
| 142 | 141 | { |
| 143 | 142 | $fh = $this->context()->fs( $fsname )->reads( $file ); |
| 144 | 143 | } |