@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function getName() |
| 31 | 31 | { |
| 32 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Process order delivery services' ); |
|
| 32 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Process order delivery services'); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | */ |
| 41 | 41 | public function getDescription() |
| 42 | 42 | { |
| 43 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Sends paid orders to the ERP system or logistic partner' ); |
|
| 43 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Sends paid orders to the ERP system or logistic partner'); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | |
@@ -69,8 +69,8 @@ discard block |
||
| 69 | 69 | * @see controller/jobs/order/email/delivery/standard/limit-days |
| 70 | 70 | * @see controller/jobs/order/service/delivery/batch-max |
| 71 | 71 | */ |
| 72 | - $days = $context->getConfig()->get( 'controller/jobs/order/service/delivery/limit-days', 90 ); |
|
| 73 | - $date = date( 'Y-m-d 00:00:00', time() - 86400 * $days ); |
|
| 72 | + $days = $context->getConfig()->get('controller/jobs/order/service/delivery/limit-days', 90); |
|
| 73 | + $date = date('Y-m-d 00:00:00', time() - 86400 * $days); |
|
| 74 | 74 | |
| 75 | 75 | /** controller/jobs/order/service/delivery/batch-max |
| 76 | 76 | * Maximum number of orders processed at once by the delivery service provider |
@@ -85,71 +85,71 @@ discard block |
||
| 85 | 85 | * @category Developer |
| 86 | 86 | * @see controller/jobs/order/service/delivery/limit-days |
| 87 | 87 | */ |
| 88 | - $maxItems = $context->getConfig()->get( 'controller/jobs/order/service/delivery/batch-max', 100 ); |
|
| 88 | + $maxItems = $context->getConfig()->get('controller/jobs/order/service/delivery/batch-max', 100); |
|
| 89 | 89 | |
| 90 | 90 | |
| 91 | - $serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager( $context ); |
|
| 91 | + $serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager($context); |
|
| 92 | 92 | $serviceSearch = $serviceManager->createSearch(); |
| 93 | - $serviceSearch->setConditions( $serviceSearch->compare( '==', 'service.type.code', 'delivery' ) ); |
|
| 93 | + $serviceSearch->setConditions($serviceSearch->compare('==', 'service.type.code', 'delivery')); |
|
| 94 | 94 | |
| 95 | - $orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( $context ); |
|
| 95 | + $orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager($context); |
|
| 96 | 96 | $orderSearch = $orderManager->createSearch(); |
| 97 | 97 | |
| 98 | 98 | $start = 0; |
| 99 | 99 | |
| 100 | 100 | do |
| 101 | 101 | { |
| 102 | - $serviceItems = $serviceManager->searchItems( $serviceSearch ); |
|
| 102 | + $serviceItems = $serviceManager->searchItems($serviceSearch); |
|
| 103 | 103 | |
| 104 | - foreach( $serviceItems as $serviceItem ) |
|
| 104 | + foreach ($serviceItems as $serviceItem) |
|
| 105 | 105 | { |
| 106 | 106 | try |
| 107 | 107 | { |
| 108 | - $serviceProvider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() ); |
|
| 108 | + $serviceProvider = $serviceManager->getProvider($serviceItem, $serviceItem->getType()); |
|
| 109 | 109 | |
| 110 | 110 | $expr = array( |
| 111 | - $orderSearch->compare( '>', 'order.datepayment', $date ), |
|
| 112 | - $orderSearch->compare( '>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING ), |
|
| 113 | - $orderSearch->compare( '==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED ), |
|
| 114 | - $orderSearch->compare( '==', 'order.base.service.code', $serviceItem->getCode() ), |
|
| 115 | - $orderSearch->compare( '==', 'order.base.service.type', 'delivery' ), |
|
| 111 | + $orderSearch->compare('>', 'order.datepayment', $date), |
|
| 112 | + $orderSearch->compare('>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING), |
|
| 113 | + $orderSearch->compare('==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED), |
|
| 114 | + $orderSearch->compare('==', 'order.base.service.code', $serviceItem->getCode()), |
|
| 115 | + $orderSearch->compare('==', 'order.base.service.type', 'delivery'), |
|
| 116 | 116 | ); |
| 117 | - $orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) ); |
|
| 117 | + $orderSearch->setConditions($orderSearch->combine('&&', $expr)); |
|
| 118 | 118 | |
| 119 | 119 | $orderStart = 0; |
| 120 | 120 | |
| 121 | 121 | do |
| 122 | 122 | { |
| 123 | - $orderSearch->setSlice( $orderStart, $maxItems ); |
|
| 124 | - $orderItems = $orderManager->searchItems( $orderSearch ); |
|
| 123 | + $orderSearch->setSlice($orderStart, $maxItems); |
|
| 124 | + $orderItems = $orderManager->searchItems($orderSearch); |
|
| 125 | 125 | |
| 126 | 126 | try |
| 127 | 127 | { |
| 128 | - $serviceProvider->processBatch( $orderItems ); |
|
| 129 | - $orderManager->saveItems( $orderItems ); |
|
| 128 | + $serviceProvider->processBatch($orderItems); |
|
| 129 | + $orderManager->saveItems($orderItems); |
|
| 130 | 130 | } |
| 131 | - catch( \Exception $e ) |
|
| 131 | + catch (\Exception $e) |
|
| 132 | 132 | { |
| 133 | 133 | $str = 'Error while processing orders: %2$s'; |
| 134 | - $context->getLogger()->log( sprintf( $str, $e->getMessage() ) ); |
|
| 134 | + $context->getLogger()->log(sprintf($str, $e->getMessage())); |
|
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - $orderCount = count( $orderItems ); |
|
| 137 | + $orderCount = count($orderItems); |
|
| 138 | 138 | $orderStart += $orderCount; |
| 139 | 139 | } |
| 140 | - while( $orderCount >= $orderSearch->getSliceSize() ); |
|
| 140 | + while ($orderCount >= $orderSearch->getSliceSize()); |
|
| 141 | 141 | } |
| 142 | - catch( \Exception $e ) |
|
| 142 | + catch (\Exception $e) |
|
| 143 | 143 | { |
| 144 | 144 | $str = 'Error while processing service with ID "%1$s": %2$s'; |
| 145 | - $context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) ); |
|
| 145 | + $context->getLogger()->log(sprintf($str, $serviceItem->getId(), $e->getMessage())); |
|
| 146 | 146 | } |
| 147 | 147 | } |
| 148 | 148 | |
| 149 | - $count = count( $serviceItems ); |
|
| 149 | + $count = count($serviceItems); |
|
| 150 | 150 | $start += $count; |
| 151 | - $serviceSearch->setSlice( $start ); |
|
| 151 | + $serviceSearch->setSlice($start); |
|
| 152 | 152 | } |
| 153 | - while( $count >= $serviceSearch->getSliceSize() ); |
|
| 153 | + while ($count >= $serviceSearch->getSliceSize()); |
|
| 154 | 154 | } |
| 155 | 155 | } |
@@ -127,8 +127,7 @@ discard block |
||
| 127 | 127 | { |
| 128 | 128 | $serviceProvider->processBatch( $orderItems ); |
| 129 | 129 | $orderManager->saveItems( $orderItems ); |
| 130 | - } |
|
| 131 | - catch( \Exception $e ) |
|
| 130 | + } catch( \Exception $e ) |
|
| 132 | 131 | { |
| 133 | 132 | $str = 'Error while processing orders: %2$s'; |
| 134 | 133 | $context->getLogger()->log( sprintf( $str, $e->getMessage() ) ); |
@@ -138,8 +137,7 @@ discard block |
||
| 138 | 137 | $orderStart += $orderCount; |
| 139 | 138 | } |
| 140 | 139 | while( $orderCount >= $orderSearch->getSliceSize() ); |
| 141 | - } |
|
| 142 | - catch( \Exception $e ) |
|
| 140 | + } catch( \Exception $e ) |
|
| 143 | 141 | { |
| 144 | 142 | $str = 'Error while processing service with ID "%1$s": %2$s'; |
| 145 | 143 | $context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) ); |