@@ -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 | } |
@@ -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 |
@@ -26,7 +26,8 @@ discard block |
||
26 | 26 | |
27 | 27 | public function test() |
28 | 28 | { |
29 | - try { |
|
29 | + try |
|
30 | + { |
|
30 | 31 | throw new \Aimeos\MShop\Plugin\Provider\Exception( 'msg', 13, null, $this->codes ); |
31 | 32 | } |
32 | 33 | catch( \Aimeos\MShop\Plugin\Provider\Exception $mppe ) |
@@ -36,7 +37,8 @@ discard block |
||
36 | 37 | $this->assertEquals( $this->codes, $mppe->getErrorCodes() ); |
37 | 38 | } |
38 | 39 | |
39 | - try { |
|
40 | + try |
|
41 | + { |
|
40 | 42 | throw new \Aimeos\MShop\Plugin\Provider\Exception( 'msg2', 11 ); |
41 | 43 | } |
42 | 44 | catch( \Aimeos\MShop\Plugin\Provider\Exception $e ) |
@@ -672,7 +672,7 @@ |
||
672 | 672 | |
673 | 673 | try { |
674 | 674 | $stmt->execute()->finish(); |
675 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
675 | + } catch( \Aimeos\MW\DB\Exception $e ) {; } // Ignore duplicates |
|
676 | 676 | } |
677 | 677 | } |
678 | 678 | } |
@@ -682,9 +682,13 @@ |
||
682 | 682 | $stmt->bind( 4, $date ); // mtime |
683 | 683 | $stmt->bind( 5, $siteid ); |
684 | 684 | |
685 | - try { |
|
685 | + try |
|
686 | + { |
|
686 | 687 | $stmt->execute()->finish(); |
687 | - } catch( \Aimeos\MW\DB\Exception $e ) { ; } // Ignore duplicates |
|
688 | + } |
|
689 | + catch( \Aimeos\MW\DB\Exception $e ) |
|
690 | + { |
|
691 | +; } // Ignore duplicates |
|
688 | 692 | } |
689 | 693 | } |
690 | 694 | } |
@@ -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 | } |
@@ -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 | } |
@@ -172,7 +172,9 @@ |
||
172 | 172 | $feconfig['supplier.code']['default'] = [$value => $address] + $feconfig['supplier.code']['default']; |
173 | 173 | } |
174 | 174 | } |
175 | - catch( \Aimeos\MShop\Service\Exception $e ) {} // If service isn't available |
|
175 | + catch( \Aimeos\MShop\Service\Exception $e ) |
|
176 | + { |
|
177 | +} // If service isn't available |
|
176 | 178 | |
177 | 179 | return array_merge( $this->getProvider()->getConfigFE( $basket ), $this->getConfigItems( $feconfig ) ); |
178 | 180 | } |
@@ -725,7 +725,9 @@ |
||
725 | 725 | $lastPos++; |
726 | 726 | } |
727 | 727 | } |
728 | - catch( \Exception $e ) { ; } // If no delivery service is available |
|
728 | + catch( \Exception $e ) |
|
729 | + { |
|
730 | +; } // If no delivery service is available |
|
729 | 731 | } |
730 | 732 | |
731 | 733 |
@@ -720,7 +720,7 @@ |
||
720 | 720 | $lastPos++; |
721 | 721 | } |
722 | 722 | } |
723 | - catch( \Exception $e ) { ; } // If no delivery service is available |
|
723 | + catch( \Exception $e ) {; } // If no delivery service is available |
|
724 | 724 | } |
725 | 725 | |
726 | 726 |
@@ -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 | } |