@@ -81,8 +81,7 @@ discard block |
||
81 | 81 | foreach( $manager->search( $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 | } |
@@ -159,8 +158,7 @@ discard block |
||
159 | 158 | $listItem = $listMap[$url][$type][$listtype]; |
160 | 159 | $refItem = $listItem->getRefItem(); |
161 | 160 | unset( $listItems[$listItem->getId()] ); |
162 | - } |
|
163 | - else |
|
161 | + } else |
|
164 | 162 | { |
165 | 163 | $listItem = $listManager->create()->setType( $listtype ); |
166 | 164 | $refItem = $manager->create()->setType( $type ); |
@@ -81,8 +81,7 @@ discard block |
||
81 | 81 | foreach( $manager->search( $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->create()->setType( $listtype ); |
144 | 142 | $refItem = $manager->create()->setType( $type ); |
@@ -65,8 +65,7 @@ |
||
65 | 65 | { |
66 | 66 | $item = $propMap[$value][$type]; |
67 | 67 | $items->remove( $item->getId() ); |
68 | - } |
|
69 | - else |
|
68 | + } else |
|
70 | 69 | { |
71 | 70 | $item = $manager->create()->setType( $type ); |
72 | 71 | } |
@@ -81,8 +81,7 @@ discard block |
||
81 | 81 | foreach( $manager->search( $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 | } |
@@ -141,8 +140,7 @@ discard block |
||
141 | 140 | $listItem = $listMap[$content][$language][$type][$listtype]; |
142 | 141 | $refItem = $listItem->getRefItem(); |
143 | 142 | unset( $listItems[$listItem->getId()] ); |
144 | - } |
|
145 | - else |
|
143 | + } else |
|
146 | 144 | { |
147 | 145 | $listItem = $listManager->create()->setType( $listtype ); |
148 | 146 | $refItem = $manager->create()->setType( $type ); |
@@ -82,8 +82,7 @@ discard block |
||
82 | 82 | foreach( $manager->search( $search ) as $item ) { |
83 | 83 | $this->listTypes[$item->getCode()] = $item->getCode(); |
84 | 84 | } |
85 | - } |
|
86 | - else |
|
85 | + } else |
|
87 | 86 | { |
88 | 87 | $this->listTypes = array_flip( $this->listTypes ); |
89 | 88 | } |
@@ -147,8 +146,7 @@ discard block |
||
147 | 146 | { |
148 | 147 | $listItem = $listMap[$code][$attrType][$listtype]; |
149 | 148 | unset( $listItems[$listItem->getId()] ); |
150 | - } |
|
151 | - else |
|
149 | + } else |
|
152 | 150 | { |
153 | 151 | $listItem = $listManager->create()->setType( $listtype ); |
154 | 152 | } |
@@ -124,9 +124,11 @@ discard block |
||
124 | 124 | } |
125 | 125 | catch( \Exception $e ) |
126 | 126 | { |
127 | - if( $e->getCode() < 1 ) // not a soft error |
|
127 | + if( $e->getCode() < 1 ) { |
|
128 | + // not a soft error |
|
128 | 129 | { |
129 | 130 | $item->setReason( \Aimeos\MShop\Subscription\Item\Iface::REASON_PAYMENT ); |
131 | + } |
|
130 | 132 | |
131 | 133 | if( $end ) { |
132 | 134 | $item->setDateEnd( date_create()->format( 'Y-m-d' ) ); |
@@ -228,9 +230,12 @@ discard block |
||
228 | 230 | { |
229 | 231 | foreach( $codes as $code ) |
230 | 232 | { |
231 | - try { |
|
233 | + try |
|
234 | + { |
|
232 | 235 | $basket->addCoupon( $code ); |
233 | - } catch( \Aimeos\MShop\Plugin\Provider\Exception | \Aimeos\MShop\Coupon\Exception $e ) { |
|
236 | + } |
|
237 | + catch( \Aimeos\MShop\Plugin\Provider\Exception | \Aimeos\MShop\Coupon\Exception $e ) |
|
238 | + { |
|
234 | 239 | $basket->deleteCoupon( $code ); |
235 | 240 | } |
236 | 241 | } |
@@ -349,7 +354,9 @@ discard block |
||
349 | 354 | $context->setUserId( $baseItem->getCustomerId() ); |
350 | 355 | $context->setGroupIds( $customerItem->getGroups() ); |
351 | 356 | } |
352 | - catch( \Exception $e ) {} // Subscription without account |
|
357 | + catch( \Exception $e ) |
|
358 | + { |
|
359 | +} // Subscription without account |
|
353 | 360 | |
354 | 361 | return $context; |
355 | 362 | } |
@@ -592,8 +592,7 @@ |
||
592 | 592 | { |
593 | 593 | $manager->move( $item->getId(), $item->getParentId(), $parentid ); |
594 | 594 | $item = $manager->save( $item ); |
595 | - } |
|
596 | - else |
|
595 | + } else |
|
597 | 596 | { |
598 | 597 | $item = $manager->insert( $item, $parentid ); |
599 | 598 | } |
@@ -84,8 +84,7 @@ discard block |
||
84 | 84 | foreach( $manager->search( $search ) as $item ) { |
85 | 85 | $this->listTypes[$item->getCode()] = $item->getCode(); |
86 | 86 | } |
87 | - } |
|
88 | - else |
|
87 | + } else |
|
89 | 88 | { |
90 | 89 | $this->listTypes = array_flip( $this->listTypes ); |
91 | 90 | } |
@@ -155,8 +154,7 @@ discard block |
||
155 | 154 | $listItem = $listMap[$url][$type][$langId][$listtype]; |
156 | 155 | $refItem = $listItem->getRefItem(); |
157 | 156 | unset( $listItems[$listItem->getId()] ); |
158 | - } |
|
159 | - else |
|
157 | + } else |
|
160 | 158 | { |
161 | 159 | $listItem = $listManager->create()->setType( $listtype ); |
162 | 160 | $refItem = $manager->create()->setType( $type ); |
@@ -181,7 +181,8 @@ |
||
181 | 181 | $data = $this->object()->process( $product, $data ); |
182 | 182 | |
183 | 183 | $manager->commit(); |
184 | - } catch( \Exception $e ) |
|
184 | + } |
|
185 | + catch( \Exception $e ) |
|
185 | 186 | { |
186 | 187 | $manager->rollback(); |
187 | 188 | throw $e; |