| @@ -120,8 +120,7 @@ discard block | ||
| 120 | 120 |  					{ | 
| 121 | 121 | $capdate = date( 'Y-m-d 00:00:00', time() - 86400 * $capDays ); | 
| 122 | 122 | $expr[] = $orderSearch->compare( '<=', 'order.datepayment', $capdate ); | 
| 123 | - } | |
| 124 | - else | |
| 123 | + } else | |
| 125 | 124 |  					{ | 
| 126 | 125 | $expr[] = $orderSearch->compare( '==', 'order.statusdelivery', $status ); | 
| 127 | 126 | } | 
| @@ -144,8 +143,7 @@ discard block | ||
| 144 | 143 | try | 
| 145 | 144 |  							{ | 
| 146 | 145 | $serviceProvider->capture( $orderItem ); | 
| 147 | - } | |
| 148 | - catch( \Exception $e ) | |
| 146 | + } catch( \Exception $e ) | |
| 149 | 147 |  							{ | 
| 150 | 148 | $str = 'Error while capturing payment for order with ID "%1$s": %2$s'; | 
| 151 | 149 | $context->getLogger()->log( sprintf( $str, $orderItem->getId(), $e->getMessage() ) ); | 
| @@ -157,8 +155,7 @@ discard block | ||
| 157 | 155 | $orderSearch->setSlice( $orderStart ); | 
| 158 | 156 | } | 
| 159 | 157 | while( $orderCount >= $orderSearch->getSliceSize() ); | 
| 160 | - } | |
| 161 | - catch( \Exception $e ) | |
| 158 | + } catch( \Exception $e ) | |
| 162 | 159 |  				{ | 
| 163 | 160 | $str = 'Error while capturing payments for service with ID "%1$s": %2$s'; | 
| 164 | 161 | $context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) ); | 
| @@ -351,8 +351,7 @@ discard block | ||
| 351 | 351 | } | 
| 352 | 352 | |
| 353 | 353 | $container->close(); | 
| 354 | - } | |
| 355 | - catch( \Exception $e ) | |
| 354 | + } catch( \Exception $e ) | |
| 356 | 355 |  		{ | 
| 357 | 356 | $logger->log( 'Product import error: ' . $e->getMessage() ); | 
| 358 | 357 | $logger->log( $e->getTraceAsString() ); | 
| @@ -540,8 +539,7 @@ discard block | ||
| 540 | 539 | } | 
| 541 | 540 | |
| 542 | 541 | $manager->commit(); | 
| 543 | - } | |
| 544 | - catch( \Exception $e ) | |
| 542 | + } catch( \Exception $e ) | |
| 545 | 543 |  			{ | 
| 546 | 544 | $manager->rollback(); | 
| 547 | 545 | |
| @@ -131,8 +131,7 @@ | ||
| 131 | 131 | $data = $this->getObject()->process( $product, $data ); | 
| 132 | 132 | |
| 133 | 133 | $manager->commit(); | 
| 134 | - } | |
| 135 | - catch( \Exception $e ) | |
| 134 | + } catch( \Exception $e ) | |
| 136 | 135 |  		{ | 
| 137 | 136 | $manager->rollback(); | 
| 138 | 137 | throw $e; | 
| @@ -121,8 +121,7 @@ | ||
| 121 | 121 | } | 
| 122 | 122 | |
| 123 | 123 | $this->export( $processors, $data, $maxcnt ); | 
| 124 | - } | |
| 125 | - catch( \Exception $e ) | |
| 124 | + } catch( \Exception $e ) | |
| 126 | 125 |  			{ | 
| 127 | 126 | $logger->log( 'Order export error: ' . $e->getMessage() ); | 
| 128 | 127 | $logger->log( $e->getTraceAsString() ); | 
| @@ -160,8 +160,7 @@ discard block | ||
| 160 | 160 | $msg = 'Finished coupon import: %1$d successful, %2$s errors, %3$s total (%4$s)'; | 
| 161 | 161 | $logger->log( sprintf( $msg, $total - $errors, $errors, $total, __CLASS__ ), \Aimeos\MW\Logger\Base::NOTICE ); | 
| 162 | 162 | } | 
| 163 | - } | |
| 164 | - catch( \Exception $e ) | |
| 163 | + } catch( \Exception $e ) | |
| 165 | 164 |  		{ | 
| 166 | 165 | $logger->log( 'Coupon import error: ' . $e->getMessage() ); | 
| 167 | 166 | $logger->log( $e->getTraceAsString() ); | 
| @@ -309,8 +308,7 @@ discard block | ||
| 309 | 308 | $list = $processor->process( $item, $list ); | 
| 310 | 309 | |
| 311 | 310 | $manager->commit(); | 
| 312 | - } | |
| 313 | - catch( \Exception $e ) | |
| 311 | + } catch( \Exception $e ) | |
| 314 | 312 |  			{ | 
| 315 | 313 | $manager->rollback(); | 
| 316 | 314 | |
| @@ -66,8 +66,7 @@ | ||
| 66 | 66 | try | 
| 67 | 67 |  				{ | 
| 68 | 68 | $serviceManager->getProvider( $serviceItem, $serviceItem->getType() )->updateAsync(); | 
| 69 | - } | |
| 70 | - catch( \Exception $e ) | |
| 69 | + } catch( \Exception $e ) | |
| 71 | 70 |  				{ | 
| 72 | 71 | $msg = 'Executing updateAsyc() of "%1$s" failed: %2$s'; | 
| 73 | 72 | $context->getLogger()->log( sprintf( $msg, $serviceItem->getProvider(), $e->getMessage() ) ); | 
| @@ -352,8 +352,7 @@ discard block | ||
| 352 | 352 | } | 
| 353 | 353 | |
| 354 | 354 | $container->close(); | 
| 355 | - } | |
| 356 | - catch( \Exception $e ) | |
| 355 | + } catch( \Exception $e ) | |
| 357 | 356 |  		{ | 
| 358 | 357 | $logger->log( 'Catalog import error: ' . $e->getMessage() ); | 
| 359 | 358 | $logger->log( $e->getTraceAsString() ); | 
| @@ -583,8 +582,7 @@ discard block | ||
| 583 | 582 |  					{ | 
| 584 | 583 | $manager->moveItem( $catalogItem->getId(), $catalogItem->getParentId(), $parentid ); | 
| 585 | 584 | $catalogItem = $manager->saveItem( $catalogItem ); | 
| 586 | - } | |
| 587 | - else | |
| 585 | + } else | |
| 588 | 586 |  					{ | 
| 589 | 587 | $catalogItem = $manager->insertItem( $catalogItem, $parentid ); | 
| 590 | 588 | } | 
| @@ -594,8 +592,7 @@ discard block | ||
| 594 | 592 | } | 
| 595 | 593 | |
| 596 | 594 | $manager->commit(); | 
| 597 | - } | |
| 598 | - catch( \Exception $e ) | |
| 595 | + } catch( \Exception $e ) | |
| 599 | 596 |  			{ | 
| 600 | 597 | $manager->rollback(); | 
| 601 | 598 | |
| @@ -121,8 +121,7 @@ | ||
| 121 | 121 | } | 
| 122 | 122 | |
| 123 | 123 | $this->export( $processors, $data, $maxcnt ); | 
| 124 | - } | |
| 125 | - catch( \Exception $e ) | |
| 124 | + } catch( \Exception $e ) | |
| 126 | 125 |  			{ | 
| 127 | 126 | $logger->log( 'Subscription export error: ' . $e->getMessage() ); | 
| 128 | 127 | $logger->log( $e->getTraceAsString() ); | 
| @@ -75,8 +75,7 @@ | ||
| 75 | 75 |  				{ | 
| 76 | 76 | $cntl->scale( $item, 'fs-media' ); | 
| 77 | 77 | $manager->saveItem( $item ); | 
| 78 | - } | |
| 79 | - catch( \Exception $e ) | |
| 78 | + } catch( \Exception $e ) | |
| 80 | 79 |  				{ | 
| 81 | 80 | $msg = sprintf( 'Scaling media item "%1$s" failed: %2$s', $item->getId(), $e->getMessage() ); | 
| 82 | 81 | $context->getLogger()->log( $msg ); |