@@ -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 | |
@@ -68,74 +68,74 @@ discard block |
||
| 68 | 68 | * @see controller/jobs/order/email/payment/standard/limit-days |
| 69 | 69 | * @see controller/jobs/order/email/delivery/standard/limit-days |
| 70 | 70 | */ |
| 71 | - $days = $context->getConfig()->get( 'controller/jobs/order/service/delivery/limit-days', 90 ); |
|
| 72 | - $date = date( 'Y-m-d 00:00:00', time() - 86400 * $days ); |
|
| 71 | + $days = $context->getConfig()->get('controller/jobs/order/service/delivery/limit-days', 90); |
|
| 72 | + $date = date('Y-m-d 00:00:00', time() - 86400 * $days); |
|
| 73 | 73 | |
| 74 | - $serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager( $context ); |
|
| 74 | + $serviceManager = \Aimeos\MShop\Service\Manager\Factory::createManager($context); |
|
| 75 | 75 | $serviceSearch = $serviceManager->createSearch(); |
| 76 | - $serviceSearch->setConditions( $serviceSearch->compare( '==', 'service.type.code', 'delivery' ) ); |
|
| 76 | + $serviceSearch->setConditions($serviceSearch->compare('==', 'service.type.code', 'delivery')); |
|
| 77 | 77 | |
| 78 | - $orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager( $context ); |
|
| 78 | + $orderManager = \Aimeos\MShop\Order\Manager\Factory::createManager($context); |
|
| 79 | 79 | $orderSearch = $orderManager->createSearch(); |
| 80 | 80 | |
| 81 | 81 | $start = 0; |
| 82 | 82 | |
| 83 | 83 | do |
| 84 | 84 | { |
| 85 | - $serviceItems = $serviceManager->searchItems( $serviceSearch ); |
|
| 85 | + $serviceItems = $serviceManager->searchItems($serviceSearch); |
|
| 86 | 86 | |
| 87 | - foreach( $serviceItems as $serviceItem ) |
|
| 87 | + foreach ($serviceItems as $serviceItem) |
|
| 88 | 88 | { |
| 89 | 89 | try |
| 90 | 90 | { |
| 91 | - $serviceProvider = $serviceManager->getProvider( $serviceItem, $serviceItem->getType() ); |
|
| 91 | + $serviceProvider = $serviceManager->getProvider($serviceItem, $serviceItem->getType()); |
|
| 92 | 92 | |
| 93 | 93 | $expr = array( |
| 94 | - $orderSearch->compare( '>', 'order.datepayment', $date ), |
|
| 95 | - $orderSearch->compare( '>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING ), |
|
| 96 | - $orderSearch->compare( '==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED ), |
|
| 97 | - $orderSearch->compare( '==', 'order.base.service.code', $serviceItem->getCode() ), |
|
| 98 | - $orderSearch->compare( '==', 'order.base.service.type', 'delivery' ), |
|
| 94 | + $orderSearch->compare('>', 'order.datepayment', $date), |
|
| 95 | + $orderSearch->compare('>', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_PENDING), |
|
| 96 | + $orderSearch->compare('==', 'order.statusdelivery', \Aimeos\MShop\Order\Item\Base::STAT_UNFINISHED), |
|
| 97 | + $orderSearch->compare('==', 'order.base.service.code', $serviceItem->getCode()), |
|
| 98 | + $orderSearch->compare('==', 'order.base.service.type', 'delivery'), |
|
| 99 | 99 | ); |
| 100 | - $orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) ); |
|
| 100 | + $orderSearch->setConditions($orderSearch->combine('&&', $expr)); |
|
| 101 | 101 | |
| 102 | 102 | $orderStart = 0; |
| 103 | 103 | |
| 104 | 104 | do |
| 105 | 105 | { |
| 106 | - $orderItems = $orderManager->searchItems( $orderSearch ); |
|
| 106 | + $orderItems = $orderManager->searchItems($orderSearch); |
|
| 107 | 107 | |
| 108 | - foreach( $orderItems as $orderItem ) |
|
| 108 | + foreach ($orderItems as $orderItem) |
|
| 109 | 109 | { |
| 110 | 110 | try |
| 111 | 111 | { |
| 112 | - $serviceProvider->process( $orderItem ); |
|
| 113 | - $orderManager->saveItem( $orderItem ); |
|
| 112 | + $serviceProvider->process($orderItem); |
|
| 113 | + $orderManager->saveItem($orderItem); |
|
| 114 | 114 | } |
| 115 | - catch( \Exception $e ) |
|
| 115 | + catch (\Exception $e) |
|
| 116 | 116 | { |
| 117 | 117 | $str = 'Error while processing order with ID "%1$s": %2$s'; |
| 118 | - $context->getLogger()->log( sprintf( $str, $orderItem->getId(), $e->getMessage() ) ); |
|
| 118 | + $context->getLogger()->log(sprintf($str, $orderItem->getId(), $e->getMessage())); |
|
| 119 | 119 | } |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | - $orderCount = count( $orderItems ); |
|
| 122 | + $orderCount = count($orderItems); |
|
| 123 | 123 | $orderStart += $orderCount; |
| 124 | - $orderSearch->setSlice( $orderStart ); |
|
| 124 | + $orderSearch->setSlice($orderStart); |
|
| 125 | 125 | } |
| 126 | - while( $orderCount >= $orderSearch->getSliceSize() ); |
|
| 126 | + while ($orderCount >= $orderSearch->getSliceSize()); |
|
| 127 | 127 | } |
| 128 | - catch( \Exception $e ) |
|
| 128 | + catch (\Exception $e) |
|
| 129 | 129 | { |
| 130 | 130 | $str = 'Error while processing service with ID "%1$s": %2$s'; |
| 131 | - $context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) ); |
|
| 131 | + $context->getLogger()->log(sprintf($str, $serviceItem->getId(), $e->getMessage())); |
|
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - $count = count( $serviceItems ); |
|
| 135 | + $count = count($serviceItems); |
|
| 136 | 136 | $start += $count; |
| 137 | - $serviceSearch->setSlice( $start ); |
|
| 137 | + $serviceSearch->setSlice($start); |
|
| 138 | 138 | } |
| 139 | - while( $count >= $serviceSearch->getSliceSize() ); |
|
| 139 | + while ($count >= $serviceSearch->getSliceSize()); |
|
| 140 | 140 | } |
| 141 | 141 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function getName() |
| 31 | 31 | { |
| 32 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Batch update of payment/delivery status' ); |
|
| 32 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Batch update of payment/delivery status'); |
|
| 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', 'Executes payment or delivery service providers that uses batch updates' ); |
|
| 43 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Executes payment or delivery service providers that uses batch updates'); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | |
@@ -52,32 +52,32 @@ discard block |
||
| 52 | 52 | public function run() |
| 53 | 53 | { |
| 54 | 54 | $context = $this->getContext(); |
| 55 | - $serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' ); |
|
| 55 | + $serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service'); |
|
| 56 | 56 | |
| 57 | 57 | $search = $serviceManager->createSearch(); |
| 58 | 58 | $start = 0; |
| 59 | 59 | |
| 60 | 60 | do |
| 61 | 61 | { |
| 62 | - $serviceItems = $serviceManager->searchItems( $search ); |
|
| 62 | + $serviceItems = $serviceManager->searchItems($search); |
|
| 63 | 63 | |
| 64 | - foreach( $serviceItems as $serviceItem ) |
|
| 64 | + foreach ($serviceItems as $serviceItem) |
|
| 65 | 65 | { |
| 66 | 66 | try |
| 67 | 67 | { |
| 68 | - $serviceManager->getProvider( $serviceItem, $serviceItem->getType() )->updateAsync(); |
|
| 68 | + $serviceManager->getProvider($serviceItem, $serviceItem->getType())->updateAsync(); |
|
| 69 | 69 | } |
| 70 | - catch( \Exception $e ) |
|
| 70 | + catch (\Exception $e) |
|
| 71 | 71 | { |
| 72 | 72 | $msg = 'Executing updateAsyc() of "%1$s" failed: %2$s'; |
| 73 | - $context->getLogger()->log( sprintf( $msg, $serviceItem->getProvider(), $e->getMessage() ) ); |
|
| 73 | + $context->getLogger()->log(sprintf($msg, $serviceItem->getProvider(), $e->getMessage())); |
|
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - $count = count( $serviceItems ); |
|
| 77 | + $count = count($serviceItems); |
|
| 78 | 78 | $start += $count; |
| 79 | - $search->setSlice( $start ); |
|
| 79 | + $search->setSlice($start); |
|
| 80 | 80 | } |
| 81 | - while( $count >= $search->getSliceSize() ); |
|
| 81 | + while ($count >= $search->getSliceSize()); |
|
| 82 | 82 | } |
| 83 | 83 | } |
@@ -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() ) ); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | public function getName() |
| 31 | 31 | { |
| 32 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Capture authorized payments' ); |
|
| 32 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Capture authorized payments'); |
|
| 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', 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time' ); |
|
| 43 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Authorized payments of orders will be captured after dispatching or after a configurable amount of time'); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | |
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | * @category User |
| 69 | 69 | * @category Developer |
| 70 | 70 | */ |
| 71 | - $days = $config->get( 'controller/jobs/order/service/payment/limit-days', 90 ); |
|
| 72 | - $date = date( 'Y-m-d 00:00:00', time() - 86400 * $days ); |
|
| 71 | + $days = $config->get('controller/jobs/order/service/payment/limit-days', 90); |
|
| 72 | + $date = date('Y-m-d 00:00:00', time() - 86400 * $days); |
|
| 73 | 73 | |
| 74 | 74 | /** controller/jobs/order/service/payment/capture-days |
| 75 | 75 | * Automatically capture payments after the configured amount of days |
@@ -84,90 +84,90 @@ discard block |
||
| 84 | 84 | * @category User |
| 85 | 85 | * @category Developer |
| 86 | 86 | */ |
| 87 | - $capDays = $config->get( 'controller/jobs/order/service/payment/capture-days', null ); |
|
| 87 | + $capDays = $config->get('controller/jobs/order/service/payment/capture-days', null); |
|
| 88 | 88 | |
| 89 | 89 | |
| 90 | - $serviceManager = \Aimeos\MShop\Factory::createManager( $context, 'service' ); |
|
| 90 | + $serviceManager = \Aimeos\MShop\Factory::createManager($context, 'service'); |
|
| 91 | 91 | $serviceSearch = $serviceManager->createSearch(); |
| 92 | - $serviceSearch->setConditions( $serviceSearch->compare( '==', 'service.type.code', 'payment' ) ); |
|
| 92 | + $serviceSearch->setConditions($serviceSearch->compare('==', 'service.type.code', 'payment')); |
|
| 93 | 93 | |
| 94 | - $orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
| 94 | + $orderManager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
| 95 | 95 | $orderSearch = $orderManager->createSearch(); |
| 96 | 96 | |
| 97 | - $status = array( \Aimeos\MShop\Order\Item\Base::STAT_DISPATCHED, \Aimeos\MShop\Order\Item\Base::STAT_DELIVERED ); |
|
| 97 | + $status = array(\Aimeos\MShop\Order\Item\Base::STAT_DISPATCHED, \Aimeos\MShop\Order\Item\Base::STAT_DELIVERED); |
|
| 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 | - if( !$serviceProvider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_CAPTURE ) ) { |
|
| 110 | + if (!$serviceProvider->isImplemented(\Aimeos\MShop\Service\Provider\Payment\Base::FEAT_CAPTURE)) { |
|
| 111 | 111 | continue; |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | |
| 115 | 115 | $expr = []; |
| 116 | - $expr[] = $orderSearch->compare( '>', 'order.datepayment', $date ); |
|
| 116 | + $expr[] = $orderSearch->compare('>', 'order.datepayment', $date); |
|
| 117 | 117 | |
| 118 | - if( $capDays !== null ) |
|
| 118 | + if ($capDays !== null) |
|
| 119 | 119 | { |
| 120 | - $capdate = date( 'Y-m-d 00:00:00', time() - 86400 * $capDays ); |
|
| 121 | - $expr[] = $orderSearch->compare( '<=', 'order.datepayment', $capdate ); |
|
| 120 | + $capdate = date('Y-m-d 00:00:00', time() - 86400 * $capDays); |
|
| 121 | + $expr[] = $orderSearch->compare('<=', 'order.datepayment', $capdate); |
|
| 122 | 122 | } |
| 123 | 123 | else |
| 124 | 124 | { |
| 125 | - $expr[] = $orderSearch->compare( '==', 'order.statusdelivery', $status ); |
|
| 125 | + $expr[] = $orderSearch->compare('==', 'order.statusdelivery', $status); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - $expr[] = $orderSearch->compare( '==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED ); |
|
| 129 | - $expr[] = $orderSearch->compare( '==', 'order.base.service.code', $serviceItem->getCode() ); |
|
| 130 | - $expr[] = $orderSearch->compare( '==', 'order.base.service.type', 'payment' ); |
|
| 128 | + $expr[] = $orderSearch->compare('==', 'order.statuspayment', \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED); |
|
| 129 | + $expr[] = $orderSearch->compare('==', 'order.base.service.code', $serviceItem->getCode()); |
|
| 130 | + $expr[] = $orderSearch->compare('==', 'order.base.service.type', 'payment'); |
|
| 131 | 131 | |
| 132 | - $orderSearch->setConditions( $orderSearch->combine( '&&', $expr ) ); |
|
| 132 | + $orderSearch->setConditions($orderSearch->combine('&&', $expr)); |
|
| 133 | 133 | |
| 134 | 134 | |
| 135 | 135 | $orderStart = 0; |
| 136 | 136 | |
| 137 | 137 | do |
| 138 | 138 | { |
| 139 | - $orderItems = $orderManager->searchItems( $orderSearch ); |
|
| 139 | + $orderItems = $orderManager->searchItems($orderSearch); |
|
| 140 | 140 | |
| 141 | - foreach( $orderItems as $orderItem ) |
|
| 141 | + foreach ($orderItems as $orderItem) |
|
| 142 | 142 | { |
| 143 | 143 | try |
| 144 | 144 | { |
| 145 | - $serviceProvider->capture( $orderItem ); |
|
| 145 | + $serviceProvider->capture($orderItem); |
|
| 146 | 146 | } |
| 147 | - catch( \Exception $e ) |
|
| 147 | + catch (\Exception $e) |
|
| 148 | 148 | { |
| 149 | 149 | $str = 'Error while capturing payment for order with ID "%1$s": %2$s'; |
| 150 | - $context->getLogger()->log( sprintf( $str, $orderItem->getId(), $e->getMessage() ) ); |
|
| 150 | + $context->getLogger()->log(sprintf($str, $orderItem->getId(), $e->getMessage())); |
|
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | - $orderCount = count( $orderItems ); |
|
| 154 | + $orderCount = count($orderItems); |
|
| 155 | 155 | $orderStart += $orderCount; |
| 156 | - $orderSearch->setSlice( $orderStart ); |
|
| 156 | + $orderSearch->setSlice($orderStart); |
|
| 157 | 157 | } |
| 158 | - while( $orderCount >= $orderSearch->getSliceSize() ); |
|
| 158 | + while ($orderCount >= $orderSearch->getSliceSize()); |
|
| 159 | 159 | } |
| 160 | - catch( \Exception $e ) |
|
| 160 | + catch (\Exception $e) |
|
| 161 | 161 | { |
| 162 | 162 | $str = 'Error while capturing payments for service with ID "%1$s": %2$s'; |
| 163 | - $context->getLogger()->log( sprintf( $str, $serviceItem->getId(), $e->getMessage() ) ); |
|
| 163 | + $context->getLogger()->log(sprintf($str, $serviceItem->getId(), $e->getMessage())); |
|
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | - $count = count( $serviceItems ); |
|
| 167 | + $count = count($serviceItems); |
|
| 168 | 168 | $start += $count; |
| 169 | - $serviceSearch->setSlice( $start ); |
|
| 169 | + $serviceSearch->setSlice($start); |
|
| 170 | 170 | } |
| 171 | - while( $count >= $serviceSearch->getSliceSize() ); |
|
| 171 | + while ($count >= $serviceSearch->getSliceSize()); |
|
| 172 | 172 | } |
| 173 | 173 | } |