@@ -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(); |
@@ -44,9 +44,12 @@ |
||
| 44 | 44 | |
| 45 | 45 | foreach( $data as $entry ) |
| 46 | 46 | { |
| 47 | - try { |
|
| 47 | + try |
|
| 48 | + { |
|
| 48 | 49 | $manager->find( $entry['catalog.code'] ); |
| 49 | - } catch( \Exception $e ) { |
|
| 50 | + } |
|
| 51 | + catch( \Exception $e ) |
|
| 52 | + { |
|
| 50 | 53 | $manager->insert( $manager->create()->fromArray( $entry ) ); |
| 51 | 54 | } |
| 52 | 55 | } |
@@ -467,7 +467,7 @@ |
||
| 467 | 467 | |
| 468 | 468 | try { |
| 469 | 469 | $stmt->execute()->finish(); |
| 470 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
| 470 | + } catch( \Aimeos\Base\DB\Exception $e ) {; } // Ignore duplicates |
|
| 471 | 471 | } |
| 472 | 472 | } |
| 473 | 473 | |
@@ -465,9 +465,13 @@ |
||
| 465 | 465 | $stmt->bind( 5, $date ); //mtime |
| 466 | 466 | $stmt->bind( 6, $siteid ); |
| 467 | 467 | |
| 468 | - try { |
|
| 468 | + try |
|
| 469 | + { |
|
| 469 | 470 | $stmt->execute()->finish(); |
| 470 | - } catch( \Aimeos\Base\DB\Exception $e ) { ; } // Ignore duplicates |
|
| 471 | + } |
|
| 472 | + catch( \Aimeos\Base\DB\Exception $e ) |
|
| 473 | + { |
|
| 474 | +; } // Ignore duplicates |
|
| 471 | 475 | } |
| 472 | 476 | } |
| 473 | 477 | |
@@ -819,9 +819,12 @@ discard block |
||
| 819 | 819 | |
| 820 | 820 | foreach( $sitePath as $siteId ) |
| 821 | 821 | { |
| 822 | - try { |
|
| 822 | + try |
|
| 823 | + { |
|
| 823 | 824 | $path = $this->createTreeManager( $siteId )->getPath( $id ); |
| 824 | - } catch( \Exception $e ) { |
|
| 825 | + } |
|
| 826 | + catch( \Exception $e ) |
|
| 827 | + { |
|
| 825 | 828 | continue; |
| 826 | 829 | } |
| 827 | 830 | |
@@ -865,9 +868,12 @@ discard block |
||
| 865 | 868 | |
| 866 | 869 | foreach( $sitePath as $siteId ) |
| 867 | 870 | { |
| 868 | - try { |
|
| 871 | + try |
|
| 872 | + { |
|
| 869 | 873 | $node = $this->createTreeManager( $siteId )->getNode( $id, $level, $criteria ); |
| 870 | - } catch( \Aimeos\MW\Tree\Exception $e ) { |
|
| 874 | + } |
|
| 875 | + catch( \Aimeos\MW\Tree\Exception $e ) |
|
| 876 | + { |
|
| 871 | 877 | continue; |
| 872 | 878 | } |
| 873 | 879 | |
@@ -949,8 +955,7 @@ discard block |
||
| 949 | 955 | if( $child->getParentId() !== $item->getId() ) { |
| 950 | 956 | $this->move( $child->getId(), $item->getParentId(), $child->getParentId() ); |
| 951 | 957 | } |
| 952 | - } |
|
| 953 | - else |
|
| 958 | + } else |
|
| 954 | 959 | { |
| 955 | 960 | $this->insert( $child, $item->getId() ); |
| 956 | 961 | } |
@@ -1095,8 +1100,7 @@ discard block |
||
| 1095 | 1100 | * @see mshop/catalog/manager/insert-usage/ansi |
| 1096 | 1101 | */ |
| 1097 | 1102 | $path = 'mshop/catalog/manager/update-usage'; |
| 1098 | - } |
|
| 1099 | - else |
|
| 1103 | + } else |
|
| 1100 | 1104 | { |
| 1101 | 1105 | /** mshop/catalog/manager/insert-usage/mysql |
| 1102 | 1106 | * Updates the config, editor, ctime and mtime value of an inserted record |
@@ -1160,8 +1164,7 @@ discard block |
||
| 1160 | 1164 | { |
| 1161 | 1165 | $stmt->bind( $idx++, $siteid ); |
| 1162 | 1166 | $stmt->bind( $idx++, $id, \Aimeos\Base\DB\Statement\Base::PARAM_INT ); |
| 1163 | - } |
|
| 1164 | - else |
|
| 1167 | + } else |
|
| 1165 | 1168 | { |
| 1166 | 1169 | $stmt->bind( $idx++, $date ); // ctime |
| 1167 | 1170 | $stmt->bind( $idx++, $siteid ); |
@@ -294,8 +294,7 @@ |
||
| 294 | 294 | $map[$item->getParentId()][$item->getPosition()] = $item; |
| 295 | 295 | |
| 296 | 296 | $subProducts = []; |
| 297 | - } |
|
| 298 | - else |
|
| 297 | + } else |
|
| 299 | 298 | { // in case it's a sub-product |
| 300 | 299 | $subProducts[$item->getPosition()] = $item; |
| 301 | 300 | } |
@@ -296,8 +296,7 @@ |
||
| 296 | 296 | } ); |
| 297 | 297 | |
| 298 | 298 | $service->setId( null )->setAttributeItems( $attrItems->setId( null ) ); |
| 299 | - } |
|
| 300 | - else |
|
| 299 | + } else |
|
| 301 | 300 | { |
| 302 | 301 | unset( $map[$type][$key] ); |
| 303 | 302 | } |