@@ -81,8 +81,7 @@ discard block |
||
| 81 | 81 | foreach( $manager->searchItems( $search ) as $item ) { |
| 82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
| 83 | 83 | } |
| 84 | - } |
|
| 85 | - else |
|
| 84 | + } else |
|
| 86 | 85 | { |
| 87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
| 88 | 87 | } |
@@ -164,8 +163,7 @@ discard block |
||
| 164 | 163 | { |
| 165 | 164 | $listItem = $listMap[$catid][$listtype]; |
| 166 | 165 | unset( $listItems[$listItem->getId()] ); |
| 167 | - } |
|
| 168 | - else |
|
| 166 | + } else |
|
| 169 | 167 | { |
| 170 | 168 | $listItem = $listManager->createItem()->setType( $listtype ); |
| 171 | 169 | } |
@@ -313,7 +313,8 @@ discard block |
||
| 313 | 313 | throw new \Aimeos\Controller\Jobs\Exception( $msg ); |
| 314 | 314 | } |
| 315 | 315 | |
| 316 | - try { |
|
| 316 | + try |
|
| 317 | + { |
|
| 317 | 318 | $procMappings = $mappings; |
| 318 | 319 | unset( $procMappings['item'] ); |
| 319 | 320 | |
@@ -350,7 +351,9 @@ discard block |
||
| 350 | 351 | } |
| 351 | 352 | |
| 352 | 353 | $container->close(); |
| 353 | - } catch ( \Exception $e ) { |
|
| 354 | + } |
|
| 355 | + catch ( \Exception $e ) |
|
| 356 | + { |
|
| 354 | 357 | $logger->log( 'Supplier import error: ' . $e->getMessage() . "\n" . $e->getTraceAsString() ); |
| 355 | 358 | $this->mail( 'Supplier CSV import error', $e->getMessage() . "\n" . $e->getTraceAsString() ); |
| 356 | 359 | throw new \Aimeos\Controller\Jobs\Exception( $e->getMessage() ); |
@@ -536,7 +539,8 @@ discard block |
||
| 536 | 539 | foreach( $data as $code => $list ) { |
| 537 | 540 | $manager->begin(); |
| 538 | 541 | |
| 539 | - try { |
|
| 542 | + try |
|
| 543 | + { |
|
| 540 | 544 | $code = trim( $code ); |
| 541 | 545 | |
| 542 | 546 | if( isset( $supplierMap[$code] ) ) { |
@@ -558,7 +562,9 @@ discard block |
||
| 558 | 562 | } |
| 559 | 563 | |
| 560 | 564 | $manager->commit(); |
| 561 | - } catch ( \Exception $e ) { |
|
| 565 | + } |
|
| 566 | + catch ( \Exception $e ) |
|
| 567 | + { |
|
| 562 | 568 | $manager->rollback(); |
| 563 | 569 | |
| 564 | 570 | $msg = sprintf( 'Unable to import supplier with code "%1$s": %2$s', $code, $e->getMessage() ); |
@@ -81,8 +81,7 @@ discard block |
||
| 81 | 81 | foreach( $manager->searchItems( $search ) as $item ) { |
| 82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
| 83 | 83 | } |
| 84 | - } |
|
| 85 | - else |
|
| 84 | + } else |
|
| 86 | 85 | { |
| 87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
| 88 | 87 | } |
@@ -143,8 +142,7 @@ discard block |
||
| 143 | 142 | $listItem = $listMap[$url][$type][$listtype]; |
| 144 | 143 | $refItem = $listItem->getRefItem(); |
| 145 | 144 | unset( $listItems[$listItem->getId()] ); |
| 146 | - } |
|
| 147 | - else |
|
| 145 | + } else |
|
| 148 | 146 | { |
| 149 | 147 | $listItem = $listManager->createItem()->setType( $listtype ); |
| 150 | 148 | $refItem = $manager->createItem()->setType( $type ); |
@@ -81,8 +81,7 @@ discard block |
||
| 81 | 81 | foreach( $manager->searchItems( $search ) as $item ) { |
| 82 | 82 | $this->listTypes[$item->getCode()] = $item->getCode(); |
| 83 | 83 | } |
| 84 | - } |
|
| 85 | - else |
|
| 84 | + } else |
|
| 86 | 85 | { |
| 87 | 86 | $this->listTypes = array_flip( $this->listTypes ); |
| 88 | 87 | } |
@@ -137,8 +136,7 @@ discard block |
||
| 137 | 136 | $listItem = $listMap[$content][$type][$listtype]; |
| 138 | 137 | $refItem = $listItem->getRefItem(); |
| 139 | 138 | unset( $listItems[$listItem->getId()] ); |
| 140 | - } |
|
| 141 | - else |
|
| 139 | + } else |
|
| 142 | 140 | { |
| 143 | 141 | $listItem = $listManager->createItem()->setType( $listtype ); |
| 144 | 142 | $refItem = $manager->createItem()->setType( $type ); |
@@ -58,7 +58,8 @@ discard block |
||
| 58 | 58 | $manager = \Aimeos\MShop::create( $this->getContext(), 'supplier/address' ); |
| 59 | 59 | $manager->begin(); |
| 60 | 60 | |
| 61 | - try { |
|
| 61 | + try |
|
| 62 | + { |
|
| 62 | 63 | $map = $this->getMappedChunk( $data, $this->getMapping() ); |
| 63 | 64 | $items = $this->getAddressItems( $supplier->getId() ); |
| 64 | 65 | |
@@ -80,7 +81,9 @@ discard block |
||
| 80 | 81 | $data = $this->getObject()->process( $supplier, $data ); |
| 81 | 82 | |
| 82 | 83 | $manager->commit(); |
| 83 | - } catch ( \Exception $e ) { |
|
| 84 | + } |
|
| 85 | + catch ( \Exception $e ) |
|
| 86 | + { |
|
| 84 | 87 | $manager->rollback(); |
| 85 | 88 | throw $e; |
| 86 | 89 | } |