@@ -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 | } |
@@ -96,9 +96,11 @@ |
||
| 96 | 96 | $code = $orderProduct->getProductCode(); |
| 97 | 97 | $prodMap[$code] = ( isset( $prodMap[$code] ) ? $prodMap[$code] + $qty : $qty ); |
| 98 | 98 | |
| 99 | - foreach( $orderProduct->getProducts() as $prodItem ) // calculate bundled products |
|
| 99 | + foreach( $orderProduct->getProducts() as $prodItem ) { |
|
| 100 | + // calculate bundled products |
|
| 100 | 101 | { |
| 101 | 102 | $qty = $prodItem->getQuantity(); |
| 103 | + } |
|
| 102 | 104 | $code = $prodItem->getProductCode(); |
| 103 | 105 | $prodMap[$code] = ( isset( $prodMap[$code] ) ? $prodMap[$code] + $qty : $qty ); |
| 104 | 106 | } |
@@ -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 | } |
@@ -628,8 +628,7 @@ |
||
| 628 | 628 | */ |
| 629 | 629 | $path = 'mshop/order/manager/base/service/insert'; |
| 630 | 630 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 631 | - } |
|
| 632 | - else |
|
| 631 | + } else |
|
| 633 | 632 | { |
| 634 | 633 | /** mshop/order/manager/base/service/update/mysql |
| 635 | 634 | * Updates an existing order record in the database |
@@ -533,8 +533,7 @@ |
||
| 533 | 533 | */ |
| 534 | 534 | $path = 'mshop/order/manager/base/service/attribute/insert'; |
| 535 | 535 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 536 | - } |
|
| 537 | - else |
|
| 536 | + } else |
|
| 538 | 537 | { |
| 539 | 538 | /** mshop/order/manager/base/service/attribute/update/mysql |
| 540 | 539 | * Updates an existing order record in the database |
@@ -627,8 +627,7 @@ |
||
| 627 | 627 | */ |
| 628 | 628 | $path = 'mshop/order/manager/base/insert'; |
| 629 | 629 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 630 | - } |
|
| 631 | - else |
|
| 630 | + } else |
|
| 632 | 631 | { |
| 633 | 632 | /** mshop/order/manager/base/update/mysql |
| 634 | 633 | * Updates an existing order record in the database |