@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | */ |
| 29 | 29 | public function getName() |
| 30 | 30 | { |
| 31 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Subscription process start' ); |
|
| 31 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Subscription process start'); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | */ |
| 40 | 40 | public function getDescription() |
| 41 | 41 | { |
| 42 | - return $this->getContext()->getI18n()->dt( 'controller/jobs', 'Process subscriptions initially' ); |
|
| 42 | + return $this->getContext()->getI18n()->dt('controller/jobs', 'Process subscriptions initially'); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * @see controller/common/subscription/process/payment-status |
| 68 | 68 | * @see controller/common/subscription/process/payment-days |
| 69 | 69 | */ |
| 70 | - $names = (array) $config->get( 'controller/common/subscription/process/processors', [] ); |
|
| 70 | + $names = (array) $config->get('controller/common/subscription/process/processors', []); |
|
| 71 | 71 | |
| 72 | 72 | /** controller/common/subscription/process/payment-status |
| 73 | 73 | * Minimum payment status that will activate the subscription |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | * @see controller/common/subscription/process/payment-days |
| 87 | 87 | */ |
| 88 | 88 | $status = \Aimeos\MShop\Order\Item\Base::PAY_AUTHORIZED; |
| 89 | - $status = $config->get( 'controller/common/subscription/process/payment-status', $status ); |
|
| 89 | + $status = $config->get('controller/common/subscription/process/payment-status', $status); |
|
| 90 | 90 | |
| 91 | 91 | /** controller/common/subscription/process/payment-days |
| 92 | 92 | * Number of days to wait for the payment until subscription is removed |
@@ -104,74 +104,74 @@ discard block |
||
| 104 | 104 | * @see controller/common/subscription/process/processors |
| 105 | 105 | * @see controller/common/subscription/process/payment-status |
| 106 | 106 | */ |
| 107 | - $days = (float) $config->get( 'controller/common/subscription/process/payment-days', 3 ); |
|
| 107 | + $days = (float) $config->get('controller/common/subscription/process/payment-days', 3); |
|
| 108 | 108 | |
| 109 | 109 | |
| 110 | - $processors = $this->getProcessors( $names ); |
|
| 111 | - $orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
| 112 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'subscription' ); |
|
| 110 | + $processors = $this->getProcessors($names); |
|
| 111 | + $orderManager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
| 112 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'subscription'); |
|
| 113 | 113 | |
| 114 | - $search = $manager->createSearch( true ); |
|
| 114 | + $search = $manager->createSearch(true); |
|
| 115 | 115 | $expr = [ |
| 116 | - $search->compare( '==', 'subscription.datenext', null ), |
|
| 116 | + $search->compare('==', 'subscription.datenext', null), |
|
| 117 | 117 | $search->getConditions(), |
| 118 | 118 | ]; |
| 119 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 120 | - $search->setSortations( [$search->sort( '+', 'subscription.id' )] ); |
|
| 119 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 120 | + $search->setSortations([$search->sort('+', 'subscription.id')]); |
|
| 121 | 121 | |
| 122 | - $date = date( 'Y-m-d H:i:s', time() - 86400 * $days ); |
|
| 122 | + $date = date('Y-m-d H:i:s', time() - 86400 * $days); |
|
| 123 | 123 | $start = 0; |
| 124 | 124 | |
| 125 | 125 | do |
| 126 | 126 | { |
| 127 | 127 | $ordBaseIds = $payStatus = []; |
| 128 | 128 | |
| 129 | - $search->setSlice( $start, 100 ); |
|
| 130 | - $items = $manager->searchItems( $search ); |
|
| 129 | + $search->setSlice($start, 100); |
|
| 130 | + $items = $manager->searchItems($search); |
|
| 131 | 131 | |
| 132 | - foreach( $items as $item ) { |
|
| 132 | + foreach ($items as $item) { |
|
| 133 | 133 | $ordBaseIds[] = $item->getOrderBaseId(); |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - $orderSearch = $orderManager->createSearch()->setSlice( 0, $search->getSliceSize() ); |
|
| 137 | - $orderSearch->setConditions( $orderSearch->compare( '==', 'order.base.id', $ordBaseIds ) ); |
|
| 138 | - $orderSearch->setSortations( [$orderSearch->sort( '+', 'order.id' )] ); |
|
| 136 | + $orderSearch = $orderManager->createSearch()->setSlice(0, $search->getSliceSize()); |
|
| 137 | + $orderSearch->setConditions($orderSearch->compare('==', 'order.base.id', $ordBaseIds)); |
|
| 138 | + $orderSearch->setSortations([$orderSearch->sort('+', 'order.id')]); |
|
| 139 | 139 | |
| 140 | - foreach( $orderManager->searchItems( $orderSearch ) as $orderItem ) { |
|
| 140 | + foreach ($orderManager->searchItems($orderSearch) as $orderItem) { |
|
| 141 | 141 | $payStatus[$orderItem->getBaseId()] = $orderItem->getPaymentStatus(); |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - foreach( $items as $item ) |
|
| 144 | + foreach ($items as $item) |
|
| 145 | 145 | { |
| 146 | 146 | try |
| 147 | 147 | { |
| 148 | - if( isset( $payStatus[$item->getOrderBaseId()] ) && $payStatus[$item->getOrderBaseId()] >= $status ) |
|
| 148 | + if (isset($payStatus[$item->getOrderBaseId()]) && $payStatus[$item->getOrderBaseId()] >= $status) |
|
| 149 | 149 | { |
| 150 | - foreach( $processors as $processor ) { |
|
| 151 | - $processor->begin( $item ); |
|
| 150 | + foreach ($processors as $processor) { |
|
| 151 | + $processor->begin($item); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | - $interval = new \DateInterval( $item->getInterval() ); |
|
| 155 | - $item->setDateNext( date_create( $item->getTimeCreated() )->add( $interval )->format( 'Y-m-d' ) ); |
|
| 154 | + $interval = new \DateInterval($item->getInterval()); |
|
| 155 | + $item->setDateNext(date_create($item->getTimeCreated())->add($interval)->format('Y-m-d')); |
|
| 156 | 156 | } |
| 157 | - elseif( $item->getTimeCreated() < $date ) |
|
| 157 | + elseif ($item->getTimeCreated() < $date) |
|
| 158 | 158 | { |
| 159 | - $item->setStatus( 0 ); |
|
| 159 | + $item->setStatus(0); |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - $manager->saveItem( $item ); |
|
| 162 | + $manager->saveItem($item); |
|
| 163 | 163 | } |
| 164 | - catch( \Exception $e ) |
|
| 164 | + catch (\Exception $e) |
|
| 165 | 165 | { |
| 166 | 166 | $msg = 'Unable to process subscription with ID "%1$S": %2$s'; |
| 167 | - $logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) ); |
|
| 168 | - $logger->log( $e->getTraceAsString() ); |
|
| 167 | + $logger->log(sprintf($msg, $item->getId(), $e->getMessage())); |
|
| 168 | + $logger->log($e->getTraceAsString()); |
|
| 169 | 169 | } |
| 170 | 170 | } |
| 171 | 171 | |
| 172 | - $count = count( $items ); |
|
| 172 | + $count = count($items); |
|
| 173 | 173 | $start += $count; |
| 174 | 174 | } |
| 175 | - while( $count === $search->getSliceSize() ); |
|
| 175 | + while ($count === $search->getSliceSize()); |
|
| 176 | 176 | } |
| 177 | 177 | } |
@@ -153,15 +153,13 @@ |
||
| 153 | 153 | |
| 154 | 154 | $interval = new \DateInterval( $item->getInterval() ); |
| 155 | 155 | $item->setDateNext( date_create( $item->getTimeCreated() )->add( $interval )->format( 'Y-m-d' ) ); |
| 156 | - } |
|
| 157 | - elseif( $item->getTimeCreated() < $date ) |
|
| 156 | + } elseif( $item->getTimeCreated() < $date ) |
|
| 158 | 157 | { |
| 159 | 158 | $item->setStatus( 0 ); |
| 160 | 159 | } |
| 161 | 160 | |
| 162 | 161 | $manager->saveItem( $item ); |
| 163 | - } |
|
| 164 | - catch( \Exception $e ) |
|
| 162 | + } catch( \Exception $e ) |
|
| 165 | 163 | { |
| 166 | 164 | $msg = 'Unable to process subscription with ID "%1$S": %2$s'; |
| 167 | 165 | $logger->log( sprintf( $msg, $item->getId(), $e->getMessage() ) ); |