@@ -535,8 +535,7 @@ |
||
| 535 | 535 | */ |
| 536 | 536 | $path = 'mshop/order/manager/service/attribute/insert'; |
| 537 | 537 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 538 | - } |
|
| 539 | - else |
|
| 538 | + } else |
|
| 540 | 539 | { |
| 541 | 540 | /** mshop/order/manager/service/attribute/update/mysql |
| 542 | 541 | * Updates an existing order record in the database |
@@ -650,8 +650,7 @@ |
||
| 650 | 650 | */ |
| 651 | 651 | $path = 'mshop/order/manager/service/insert'; |
| 652 | 652 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 653 | - } |
|
| 654 | - else |
|
| 653 | + } else |
|
| 655 | 654 | { |
| 656 | 655 | /** mshop/order/manager/service/update/mysql |
| 657 | 656 | * Updates an existing order record in the database |
@@ -528,8 +528,7 @@ |
||
| 528 | 528 | */ |
| 529 | 529 | $path = 'mshop/order/manager/service/transaction/insert'; |
| 530 | 530 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 531 | - } |
|
| 532 | - else |
|
| 531 | + } else |
|
| 533 | 532 | { |
| 534 | 533 | /** mshop/order/manager/service/transaction/update/mysql |
| 535 | 534 | * Updates an existing order record in the database |
@@ -535,8 +535,7 @@ |
||
| 535 | 535 | */ |
| 536 | 536 | $path = 'mshop/order/manager/product/attribute/insert'; |
| 537 | 537 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 538 | - } |
|
| 539 | - else |
|
| 538 | + } else |
|
| 540 | 539 | { |
| 541 | 540 | /** mshop/order/manager/product/attribute/update/mysql |
| 542 | 541 | * Updates an existing order record in the database |
@@ -800,8 +800,7 @@ |
||
| 800 | 800 | */ |
| 801 | 801 | $path = 'mshop/order/manager/product/insert'; |
| 802 | 802 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 803 | - } |
|
| 804 | - else |
|
| 803 | + } else |
|
| 805 | 804 | { |
| 806 | 805 | /** mshop/order/manager/product/update/mysql |
| 807 | 806 | * Updates an existing order record in the database |
@@ -500,8 +500,7 @@ |
||
| 500 | 500 | */ |
| 501 | 501 | $path = 'mshop/order/manager/coupon/insert'; |
| 502 | 502 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 503 | - } |
|
| 504 | - else |
|
| 503 | + } else |
|
| 505 | 504 | { |
| 506 | 505 | /** mshop/order/manager/coupon/update/mysql |
| 507 | 506 | * Updates an existing order record in the database |
@@ -815,7 +815,7 @@ discard block |
||
| 815 | 815 | |
| 816 | 816 | foreach( $price->getTaxrates() as $name => $taxrate ) |
| 817 | 817 | { |
| 818 | - $price = (clone $price)->setTaxRate( $taxrate ); |
|
| 818 | + $price = ( clone $price )->setTaxRate( $taxrate ); |
|
| 819 | 819 | |
| 820 | 820 | if( isset( $taxes[$name][$taxrate] ) ) { |
| 821 | 821 | $taxes[$name][$taxrate]->addItem( $price, $product->getQuantity() ); |
@@ -833,7 +833,7 @@ discard block |
||
| 833 | 833 | |
| 834 | 834 | foreach( $price->getTaxrates() as $name => $taxrate ) |
| 835 | 835 | { |
| 836 | - $price = (clone $price)->setTaxRate( $taxrate ); |
|
| 836 | + $price = ( clone $price )->setTaxRate( $taxrate ); |
|
| 837 | 837 | |
| 838 | 838 | if( isset( $taxes[$name][$taxrate] ) ) { |
| 839 | 839 | $taxes[$name][$taxrate]->addItem( $price ); |
@@ -182,8 +182,7 @@ |
||
| 182 | 182 | $search->compare( '==', $prefix . '.lists.domain', $key ), |
| 183 | 183 | $search->compare( '==', $prefix . '.lists.type', $domain ), |
| 184 | 184 | ] ); |
| 185 | - } |
|
| 186 | - else |
|
| 185 | + } else |
|
| 187 | 186 | { |
| 188 | 187 | $domain = !strncmp( $domain, $prefix . '/', $len + 1 ) ? [$domain, substr( $domain, $len + 1 )] : $domain; // remove prefix |
| 189 | 188 | $list[] = $search->compare( '==', $prefix . '.lists.domain', $domain ); |
@@ -102,16 +102,19 @@ |
||
| 102 | 102 | |
| 103 | 103 | if( $siteId ) |
| 104 | 104 | { |
| 105 | - if( in_array( $siteId, $siteIds ) ) // if product is inherited, inherit price too |
|
| 105 | + if( in_array( $siteId, $siteIds ) ) { |
|
| 106 | + // if product is inherited, inherit price too |
|
| 106 | 107 | { |
| 107 | 108 | if( !in_array( $priceItem->getSiteId(), $siteIds ) ) { |
| 108 | 109 | continue; |
| 109 | - } |
|
| 110 | 110 | } |
| 111 | - elseif( $priceItem->getSiteId() !== $siteId ) // Use price from specific site originally passed as parameter |
|
| 111 | + } |
|
| 112 | + } elseif( $priceItem->getSiteId() !== $siteId ) { |
|
| 113 | + // Use price from specific site originally passed as parameter |
|
| 112 | 114 | { |
| 113 | 115 | continue; |
| 114 | 116 | } |
| 117 | + } |
|
| 115 | 118 | } |
| 116 | 119 | |
| 117 | 120 | $qty = (string) $priceItem->getQuantity(); |