@@ -114,7 +114,9 @@ |
||
114 | 114 | $feconfig['time.hourminute']['default'] = $value; |
115 | 115 | } |
116 | 116 | } |
117 | - catch( \Aimeos\MShop\Service\Exception $e ) {} // If service isn't available |
|
117 | + catch( \Aimeos\MShop\Service\Exception $e ) |
|
118 | + { |
|
119 | +} // If service isn't available |
|
118 | 120 | |
119 | 121 | return array_merge( $this->getProvider()->getConfigFE( $basket ), $this->getConfigItems( $feconfig ) ); |
120 | 122 | } |
@@ -119,12 +119,13 @@ |
||
119 | 119 | return false; |
120 | 120 | } |
121 | 121 | } |
122 | - } |
|
123 | - elseif( ( $addresses = $basket->getAddress( $paymentType ) ) !== [] ) // use billing address if no delivery address is available |
|
122 | + } elseif( ( $addresses = $basket->getAddress( $paymentType ) ) !== [] ) { |
|
123 | + // use billing address if no delivery address is available |
|
124 | 124 | { |
125 | 125 | foreach( $addresses as $address ) |
126 | 126 | { |
127 | 127 | $code = $address->getPostal(); |
128 | + } |
|
128 | 129 | |
129 | 130 | if( $this->checkPostalCode( $code, 'postal.delivery-include' ) === false |
130 | 131 | || $this->checkPostalCode( $code, 'postal.delivery-exclude' ) === true |
@@ -97,7 +97,9 @@ |
||
97 | 97 | $feconfig['date.value']['default'] = $value; |
98 | 98 | } |
99 | 99 | } |
100 | - catch( \Aimeos\MShop\Service\Exception $e ) {} // If service isn't available |
|
100 | + catch( \Aimeos\MShop\Service\Exception $e ) |
|
101 | + { |
|
102 | +} // If service isn't available |
|
101 | 103 | |
102 | 104 | return array_merge( $this->getProvider()->getConfigFE( $basket ), $this->getConfigItems( $feconfig ) ); |
103 | 105 | } |
@@ -129,7 +129,9 @@ |
||
129 | 129 | $feconfig['delivery.type']['default'] = $values; |
130 | 130 | } |
131 | 131 | } |
132 | - catch( \Aimeos\MShop\Service\Exception $e ) {} // If service isn't available |
|
132 | + catch( \Aimeos\MShop\Service\Exception $e ) |
|
133 | + { |
|
134 | +} // If service isn't available |
|
133 | 135 | |
134 | 136 | return array_merge( $this->getProvider()->getConfigFE( $basket ), $this->getConfigItems( $feconfig ) ); |
135 | 137 | } |
@@ -59,8 +59,7 @@ discard block |
||
59 | 59 | foreach( $value as $key => $product ) { |
60 | 60 | $value[$key] = $this->updatePrice( $product ); |
61 | 61 | } |
62 | - } |
|
63 | - else |
|
62 | + } else |
|
64 | 63 | { |
65 | 64 | $value = $this->updatePrice( $value ); |
66 | 65 | } |
@@ -139,8 +138,7 @@ discard block |
||
139 | 138 | { |
140 | 139 | $priceManager = \Aimeos\MShop::create( $this->context(), 'price' ); |
141 | 140 | |
142 | - $sortFcn = function( $a, $b ) use( $priceManager, $attrQtys ) |
|
143 | - { |
|
141 | + $sortFcn = function( $a, $b ) use( $priceManager, $attrQtys ) { |
|
144 | 142 | if( ( $pricesA = $a->getRefItems( 'price', 'default', 'default' )->toArray() ) === [] ) { |
145 | 143 | return 1; |
146 | 144 | } |
@@ -203,8 +201,7 @@ discard block |
||
203 | 201 | { |
204 | 202 | $list = $this->sortByPrice( $list, $attrQtys ); |
205 | 203 | $priceItem = $this->addPrices( $priceItem, $list, $attrQtys, (int) $prodConf[$type] ); |
206 | - } |
|
207 | - else |
|
204 | + } else |
|
208 | 205 | { |
209 | 206 | $priceItem = $this->addPrices( $priceItem, $list, $attrQtys, 0 ); |
210 | 207 | } |
@@ -306,8 +306,7 @@ |
||
306 | 306 | if( empty( $search->getSortations() ) && ( $attribute = reset( $attributes ) ) !== false ) |
307 | 307 | { |
308 | 308 | $search = ( clone $search )->setSortations( [$search->sort( '+', $attribute->getCode() )] ); |
309 | - } |
|
310 | - elseif( !empty( $search->getSortations() ) ) |
|
309 | + } elseif( !empty( $search->getSortations() ) ) |
|
311 | 310 | { |
312 | 311 | $names = $search->translate( $search->getSortations(), [], $funcs ); |
313 | 312 | $cols = $search->translate( $search->getSortations(), $translations, $funcs ); |
@@ -305,8 +305,7 @@ |
||
305 | 305 | */ |
306 | 306 | $path = 'mshop/customer/manager/group/insert'; |
307 | 307 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
308 | - } |
|
309 | - else |
|
308 | + } else |
|
310 | 309 | { |
311 | 310 | /** mshop/customer/manager/group/update/mysql |
312 | 311 | * Updates an existing customer group record in the database |
@@ -305,8 +305,7 @@ discard block |
||
305 | 305 | foreach( $columns as $name ) { |
306 | 306 | $names .= '"' . $name . '", '; $values .= '?, '; |
307 | 307 | } |
308 | - } |
|
309 | - else |
|
308 | + } else |
|
310 | 309 | { |
311 | 310 | foreach( $columns as $name ) { |
312 | 311 | $names .= '"' . $name . '" = ?, '; |
@@ -691,11 +690,9 @@ discard block |
||
691 | 690 | |
692 | 691 | if( isset( $attributes[$prefix] ) && $attributes[$prefix] instanceof $iface ) { |
693 | 692 | return $attributes[$prefix]->getInternalDeps(); |
694 | - } |
|
695 | - elseif( isset( $attributes[$name] ) && $attributes[$name] instanceof $iface ) { |
|
693 | + } elseif( isset( $attributes[$name] ) && $attributes[$name] instanceof $iface ) { |
|
696 | 694 | return $attributes[$name]->getInternalDeps(); |
697 | - } |
|
698 | - else if( isset( $attributes['id'] ) && $attributes['id'] instanceof $iface ) { |
|
695 | + } else if( isset( $attributes['id'] ) && $attributes['id'] instanceof $iface ) { |
|
699 | 696 | return $attributes['id']->getInternalDeps(); |
700 | 697 | } |
701 | 698 |
@@ -178,8 +178,7 @@ discard block |
||
178 | 178 | $search->compare( '==', $prefix . '.lists.domain', $key ), |
179 | 179 | $search->compare( '==', $prefix . '.lists.type', $domain ), |
180 | 180 | ] ); |
181 | - } |
|
182 | - else |
|
181 | + } else |
|
183 | 182 | { |
184 | 183 | $list[] = $search->compare( '==', $prefix . '.lists.domain', $domain ); |
185 | 184 | } |
@@ -187,8 +186,7 @@ discard block |
||
187 | 186 | |
188 | 187 | $expr[] = $search->or( $list ); |
189 | 188 | $search->setConditions( $search->and( $expr ) ); |
190 | - } |
|
191 | - else |
|
189 | + } else |
|
192 | 190 | { |
193 | 191 | $search->setConditions( $search->compare( '==', $prefix . '.lists.parentid', $ids ) ); |
194 | 192 | } |