Mage_Codi - Version 4.2.7

Version Notes

Please contact our support desk if you have any problems.

Download this release

Release Info

Developer Magento Core Team
Extension Mage_Codi
Version 4.2.7
Comparing to
See all releases


Code changes from version 4.2.6 to 4.2.7

Files changed (3) hide show
  1. app/code/community/Mage/CodiScript/Model/Files.php +23 -22
  2. app/code/community/Mage/CodiScript/controllers/IndexController.php +4 -1
  3. package.xml +4 -4
app/code/community/Mage/CodiScript/Model/Files.php CHANGED
@@ -1,5 +1,5 @@
1
  <?php
2
- // 2015-05-08
3
  class ConfiguredProductLine{
4
  public $optionIds = array();
5
  public $line = NULL;
@@ -354,10 +354,10 @@ thumbnail: ".$product->getThumbnail()."
354
  $SToDate = $ProdSToDate;
355
  $RPrice = $ProdRPrice;
356
  if( !empty( $RPrice ) && $this->includetaxes )
357
- $RPrice = $this->taxhelper->getPrice( $UsedProduct, $RPrice, true );
358
  $SPrice = $ProdSPrice;
359
  if( $SPrice >= 0 && $this->includetaxes )
360
- $SPrice = $this->taxhelper->getPrice( $UsedProduct, $SPrice, true );
361
  if( $this->_DEBUG ) echo "resulting prices: Regular=".$RPrice." Special=".$SPrice." FromDate=".$SFromDate." ToDate=".$SToDate."
362
  ";
363
  if( $this->ignoreassprodimages ) $itemImages = "";
@@ -455,7 +455,7 @@ thumbnail: ".$product->getThumbnail()."
455
  foreach( $ProdSpecGroupPrices as $groupPrice ){
456
  $price = 0.0 + $groupPrice[ 'price' ];
457
  if( $price >= 0 && $this->includetaxes )
458
- $price = $this->taxhelper->getPrice( $UsedProduct, $price, true );
459
  if( !empty( $ItemAttributes ) )
460
  $ItemAttributes .= "|";
461
  $ItemAttributes .= "price_".$this->customerGroups[ $groupPrice[ 'cust_group' ] ]."=".$this->_formatPrice( $price );
@@ -818,9 +818,9 @@ thumbnail: ".$product->getThumbnail()."
818
  } // ! $this->getpricefromchild
819
  }
820
  if( !empty($RPrice) && $this->includetaxes )
821
- $RPrice = $this->taxhelper->getPrice( $UsedProduct, $RPrice, true );
822
  if( !empty($SPrice) && $this->includetaxes )
823
- $SPrice = $this->taxhelper->getPrice( $UsedProduct, $SPrice, true );
824
  if( $this->includeinvqty ){
825
  if( !empty( $ItemAttributes ) )
826
  $ItemAttributes .= "|";
@@ -854,7 +854,7 @@ thumbnail: ".$product->getThumbnail()."
854
  if( $this->getgroupprices && $SpecGroupPrices ){
855
  foreach( $SpecGroupPrices as $groupID => $price ){
856
  if( $price >= 0 && $this->includetaxes )
857
- $price = $this->taxhelper->getPrice( $UsedProduct, $price, true );
858
  if( !empty( $ItemAttributes ) )
859
  $ItemAttributes .= "|";
860
  $ItemAttributes .= "price_".$this->customerGroups[ $groupID ]."=".$this->_formatPrice( $price );
@@ -1368,9 +1368,9 @@ ProdRPrice=".$ProdRPrice." ProdSPrice=".$ProdSPrice."
1368
  continue;
1369
  }
1370
  if( !empty( $RPrice ) && $this->includetaxes )
1371
- $RPrice = $this->taxhelper->getPrice( $product, $RPrice, true );
1372
  if( $SPrice >= 0 && $this->includetaxes )
1373
- $SPrice = $this->taxhelper->getPrice( $product, $SPrice, true );
1374
  if( $this->_DEBUG ) echo "resulting prices: Regular=".$RPrice." Special=".$SPrice." FromDate=".$ProdSFromDate." ToDate=".$ProdSToDate."
1375
  ";
1376
  $RPrice = $this->_formatPrice( $RPrice );
@@ -1412,7 +1412,7 @@ ProdRPrice=".$ProdRPrice." ProdSPrice=".$ProdSPrice."
1412
  }
1413
  }
1414
  if( $price >= 0 && $this->includetaxes )
1415
- $price = $this->taxhelper->getPrice( $product, $price, true );
1416
  if( !empty( $ItemAttributes ) )
1417
  $ItemAttributes .= "|";
1418
  $ItemAttributes .= "price_".$this->customerGroups[ $groupPrice[ 'cust_group' ] ]."=".$this->_formatPrice( $price );
@@ -1454,10 +1454,10 @@ ProdRPrice=".$ProdRPrice." ProdSPrice=".$ProdSPrice."
1454
  if( !$skusAdded ){
1455
  $RPrice = $ProdRPrice;
1456
  if( !empty( $RPrice ) && $this->includetaxes )
1457
- $RPrice = $this->taxhelper->getPrice( $product, $RPrice, true );
1458
  $SPrice = $ProdSPrice;
1459
  if( $SPrice >= 0 && $this->includetaxes )
1460
- $SPrice = $this->taxhelper->getPrice( $product, $SPrice, true );
1461
  if( $this->_DEBUG ) echo "resulting prices: Regular=".$RPrice." Special=".$SPrice." FromDate=".$ProdSFromDate." ToDate=".$ProdSToDate."
1462
  ";
1463
  $ItemAttributes = "";
@@ -1490,7 +1490,7 @@ ProdRPrice=".$ProdRPrice." ProdSPrice=".$ProdSPrice."
1490
  foreach( $ProdSpecGroupPrices as $groupPrice ){
1491
  $price = 0.0 + $groupPrice[ 'price' ];
1492
  if( $price >= 0 && $this->includetaxes )
1493
- $price = $this->taxhelper->getPrice( $product, $price, true );
1494
  if( !empty( $ItemAttributes ) )
1495
  $ItemAttributes .= "|";
1496
  $ItemAttributes .= "price_".$this->customerGroups[ $groupPrice[ 'cust_group' ] ]."=".$this->_formatPrice( $price );
@@ -1708,15 +1708,16 @@ ProdRPrice=".$ProdRPrice." ProdSPrice=".$ProdSPrice."
1708
  $pos = strpos( $str, "?" );
1709
  if( $pos === false )
1710
  return $str;
1711
- else
1712
  return substr( $str, 0, $pos );
 
1713
  }
1714
 
1715
  private function _getReviews( $productid ){
1716
  $reviewsCollection = $this->reviewsModel->getCollection()
1717
- ->addStoreFilter($this->StoreId)
1718
- ->addStatusFilter('approved')
1719
- ->addEntityFilter('product', $productid)
1720
  ->setDateOrder();
1721
  $Reviews = "";
1722
  foreach( $reviewsCollection as $review )
@@ -1774,7 +1775,7 @@ ProdRPrice=".$ProdRPrice." ProdSPrice=".$ProdSPrice."
1774
  $count = count( $prices );
1775
  if( $count > 0 ){
1776
  $prodFinalPrice = $this->includetaxes ?
1777
- $this->taxhelper->getPrice($product,$product->getData('price'),true) :
1778
  $product->getData('price');
1779
  if( $this->_DEBUG ) echo "prodFinalPrice: ".$prodFinalPrice."
1780
  ";
@@ -1783,8 +1784,8 @@ ProdRPrice=".$ProdRPrice." ProdSPrice=".$ProdSPrice."
1783
  foreach( $prices as $price ){
1784
  $price['price_qty'] = $price['price_qty'] * 1;
1785
  $tierPrice = $this->includetaxes ?
1786
- $this->taxhelper->getPrice($product,$price['price'],true) :
1787
- $price['price'];
1788
  if( $tierPrice < $prodFinalPrice ){
1789
  $tierPrice = $this->_formatPrice( "".$tierPrice );
1790
  $rightstr .= $price['price_qty'].'#$#';
@@ -1828,7 +1829,7 @@ ProdRPrice=".$ProdRPrice." ProdSPrice=".$ProdSPrice."
1828
  if( $count > 0 ){
1829
  if( !isset( $prodFinalPrice ) ){
1830
  $prodFinalPrice = $this->includetaxes ?
1831
- $this->taxhelper->getPrice($product,$product->getData('price'),true) :
1832
  $product->getData('price');
1833
  if( $this->_DEBUG ) echo "prodFinalPrice: ".$prodFinalPrice."
1834
  ";
@@ -1838,7 +1839,7 @@ ProdRPrice=".$ProdRPrice." ProdSPrice=".$ProdSPrice."
1838
  foreach( $gprices as $price ){
1839
  $price['price_qty'] = $price['price_qty'] * 1;
1840
  $tierPrice = $this->includetaxes ?
1841
- $this->taxhelper->getPrice($product,$price['price'],true) :
1842
  $price['price'];
1843
  if( $tierPrice < $prodFinalPrice ){
1844
  $tierPrice = $this->_formatPrice( "".$tierPrice );
1
  <?php
2
+ // 2015-05-11
3
  class ConfiguredProductLine{
4
  public $optionIds = array();
5
  public $line = NULL;
354
  $SToDate = $ProdSToDate;
355
  $RPrice = $ProdRPrice;
356
  if( !empty( $RPrice ) && $this->includetaxes )
357
+ $RPrice = $this->taxhelper->getPrice( $UsedProduct, $RPrice, true, null, null, null, $this->StoreId );
358
  $SPrice = $ProdSPrice;
359
  if( $SPrice >= 0 && $this->includetaxes )
360
+ $SPrice = $this->taxhelper->getPrice( $UsedProduct, $SPrice, true, null, null, null, $this->StoreId );
361
  if( $this->_DEBUG ) echo "resulting prices: Regular=".$RPrice." Special=".$SPrice." FromDate=".$SFromDate." ToDate=".$SToDate."
362
  ";
363
  if( $this->ignoreassprodimages ) $itemImages = "";
455
  foreach( $ProdSpecGroupPrices as $groupPrice ){
456
  $price = 0.0 + $groupPrice[ 'price' ];
457
  if( $price >= 0 && $this->includetaxes )
458
+ $price = $this->taxhelper->getPrice( $UsedProduct, $price, true, null, null, null, $this->StoreId );
459
  if( !empty( $ItemAttributes ) )
460
  $ItemAttributes .= "|";
461
  $ItemAttributes .= "price_".$this->customerGroups[ $groupPrice[ 'cust_group' ] ]."=".$this->_formatPrice( $price );
818
  } // ! $this->getpricefromchild
819
  }
820
  if( !empty($RPrice) && $this->includetaxes )
821
+ $RPrice = $this->taxhelper->getPrice( $UsedProduct, $RPrice, true, null, null, null, $this->StoreId );
822
  if( !empty($SPrice) && $this->includetaxes )
823
+ $SPrice = $this->taxhelper->getPrice( $UsedProduct, $SPrice, true, null, null, null, $this->StoreId );
824
  if( $this->includeinvqty ){
825
  if( !empty( $ItemAttributes ) )
826
  $ItemAttributes .= "|";
854
  if( $this->getgroupprices && $SpecGroupPrices ){
855
  foreach( $SpecGroupPrices as $groupID => $price ){
856
  if( $price >= 0 && $this->includetaxes )
857
+ $price = $this->taxhelper->getPrice( $UsedProduct, $price, true, null, null, null, $this->StoreId );
858
  if( !empty( $ItemAttributes ) )
859
  $ItemAttributes .= "|";
860
  $ItemAttributes .= "price_".$this->customerGroups[ $groupID ]."=".$this->_formatPrice( $price );
1368
  continue;
1369
  }
1370
  if( !empty( $RPrice ) && $this->includetaxes )
1371
+ $RPrice = $this->taxhelper->getPrice( $product, $RPrice, true, null, null, null, $this->StoreId );
1372
  if( $SPrice >= 0 && $this->includetaxes )
1373
+ $SPrice = $this->taxhelper->getPrice( $product, $SPrice, true, null, null, null, $this->StoreId );
1374
  if( $this->_DEBUG ) echo "resulting prices: Regular=".$RPrice." Special=".$SPrice." FromDate=".$ProdSFromDate." ToDate=".$ProdSToDate."
1375
  ";
1376
  $RPrice = $this->_formatPrice( $RPrice );
1412
  }
1413
  }
1414
  if( $price >= 0 && $this->includetaxes )
1415
+ $price = $this->taxhelper->getPrice( $product, $price, true, null, null, null, $this->StoreId );
1416
  if( !empty( $ItemAttributes ) )
1417
  $ItemAttributes .= "|";
1418
  $ItemAttributes .= "price_".$this->customerGroups[ $groupPrice[ 'cust_group' ] ]."=".$this->_formatPrice( $price );
1454
  if( !$skusAdded ){
1455
  $RPrice = $ProdRPrice;
1456
  if( !empty( $RPrice ) && $this->includetaxes )
1457
+ $RPrice = $this->taxhelper->getPrice( $product, $RPrice, true, null, null, null, $this->StoreId );
1458
  $SPrice = $ProdSPrice;
1459
  if( $SPrice >= 0 && $this->includetaxes )
1460
+ $SPrice = $this->taxhelper->getPrice( $product, $SPrice, true, null, null, null, $this->StoreId );
1461
  if( $this->_DEBUG ) echo "resulting prices: Regular=".$RPrice." Special=".$SPrice." FromDate=".$ProdSFromDate." ToDate=".$ProdSToDate."
1462
  ";
1463
  $ItemAttributes = "";
1490
  foreach( $ProdSpecGroupPrices as $groupPrice ){
1491
  $price = 0.0 + $groupPrice[ 'price' ];
1492
  if( $price >= 0 && $this->includetaxes )
1493
+ $price = $this->taxhelper->getPrice( $product, $price, true, null, null, null, $this->StoreId );
1494
  if( !empty( $ItemAttributes ) )
1495
  $ItemAttributes .= "|";
1496
  $ItemAttributes .= "price_".$this->customerGroups[ $groupPrice[ 'cust_group' ] ]."=".$this->_formatPrice( $price );
1708
  $pos = strpos( $str, "?" );
1709
  if( $pos === false )
1710
  return $str;
1711
+ else if( substr( $str, $pos ) == "?___store=default" )
1712
  return substr( $str, 0, $pos );
1713
+ else return $str;
1714
  }
1715
 
1716
  private function _getReviews( $productid ){
1717
  $reviewsCollection = $this->reviewsModel->getCollection()
1718
+ ->addStoreFilter( $this->StoreId )
1719
+ ->addStatusFilter( 'approved' )
1720
+ ->addEntityFilter( 'product', $productid )
1721
  ->setDateOrder();
1722
  $Reviews = "";
1723
  foreach( $reviewsCollection as $review )
1775
  $count = count( $prices );
1776
  if( $count > 0 ){
1777
  $prodFinalPrice = $this->includetaxes ?
1778
+ $this->taxhelper->getPrice( $product, $product->getData('price'), true, null, null, null, $this->StoreId ) :
1779
  $product->getData('price');
1780
  if( $this->_DEBUG ) echo "prodFinalPrice: ".$prodFinalPrice."
1781
  ";
1784
  foreach( $prices as $price ){
1785
  $price['price_qty'] = $price['price_qty'] * 1;
1786
  $tierPrice = $this->includetaxes ?
1787
+ $this->taxhelper->getPrice( $product, $price['price'], true, null, null, null, $this->StoreId ) :
1788
+ $price['price'];
1789
  if( $tierPrice < $prodFinalPrice ){
1790
  $tierPrice = $this->_formatPrice( "".$tierPrice );
1791
  $rightstr .= $price['price_qty'].'#$#';
1829
  if( $count > 0 ){
1830
  if( !isset( $prodFinalPrice ) ){
1831
  $prodFinalPrice = $this->includetaxes ?
1832
+ $this->taxhelper->getPrice( $product, $product->getData('price'), true, null, null, null, $this->StoreId ) :
1833
  $product->getData('price');
1834
  if( $this->_DEBUG ) echo "prodFinalPrice: ".$prodFinalPrice."
1835
  ";
1839
  foreach( $gprices as $price ){
1840
  $price['price_qty'] = $price['price_qty'] * 1;
1841
  $tierPrice = $this->includetaxes ?
1842
+ $this->taxhelper->getPrice( $product, $price['price'], true, null, null, null, $this->StoreId ) :
1843
  $price['price'];
1844
  if( $tierPrice < $prodFinalPrice ){
1845
  $tierPrice = $this->_formatPrice( "".$tierPrice );
app/code/community/Mage/CodiScript/controllers/IndexController.php CHANGED
@@ -1,5 +1,5 @@
1
  <?php
2
- define("__VERSION__","2015-05-08");
3
  define("__SCRIPTNAME__",basename(__FILE__));
4
 
5
  class Mage_CodiScript_IndexController extends Mage_Core_Controller_Front_Action{
@@ -241,6 +241,9 @@ executed in ".( time() - $started_time )." sec.
241
  ";
242
  die();
243
  /* RELEASE NOTES
 
 
 
244
  * 2015-05-08
245
  * Added rendering of products associated with grouped prodict as separate products
246
  *
1
  <?php
2
+ define("__VERSION__","2015-05-11");
3
  define("__SCRIPTNAME__",basename(__FILE__));
4
 
5
  class Mage_CodiScript_IndexController extends Mage_Core_Controller_Front_Action{
241
  ";
242
  die();
243
  /* RELEASE NOTES
244
+ * 2015-05-11
245
+ * Improved rendering of prices with store-dependent taxes
246
+ *
247
  * 2015-05-08
248
  * Added rendering of products associated with grouped prodict as separate products
249
  *
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mage_Codi</name>
4
- <version>4.2.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Extension to connect to the Catalog-on-Demand service for making print catalogs, brochures, and flyers.</description>
11
  <notes>Please contact our support desk if you have any problems.</notes>
12
  <authors><author><name>catalogondemand</name><user>auto-converted</user><email>timh@catalog-on-demand.com</email></author></authors>
13
- <date>2015-05-08</date>
14
- <time>12:35:04</time>
15
- <contents><target name="magecommunity"><dir name="Mage"><dir name="CodiScript"><dir name="Helper"><file name="Data.php" hash="3f99660cb06a9dc09f024b9993d43a3f"/></dir><dir name="Model"><file name="Files.php" hash="94ff1a30086e35ce29631092de844b07"/></dir><dir name="controllers"><file name="IndexController.php" hash="7ca7661ffe4eb29095f827dc9b66dd07"/></dir><dir name="etc"><file name="adminhtml.xml" hash="40ab0bd86928c5ba175988926a9f6aee"/><file name="config.xml" hash="b960e9bd106f0c94559baa2bc5761e18"/><file name="system.xml" hash="1b5e5b18bfdce6b85e304fb4ef877274"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_CodiScript.xml" hash="f0502cac7918fc798b3b02d3d4b7e7fd"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="codiscript.xml" hash="066f99333a6054e11943a75413f65ff0"/></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="codi"><file name="password_validation.js" hash="7223aeed118bb5774c73f951460ae0b0"/></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_CodiScript.csv" hash="183fc591065ced83f878a4c3e23f854c"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mage_Codi</name>
4
+ <version>4.2.7</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
10
  <description>Extension to connect to the Catalog-on-Demand service for making print catalogs, brochures, and flyers.</description>
11
  <notes>Please contact our support desk if you have any problems.</notes>
12
  <authors><author><name>catalogondemand</name><user>auto-converted</user><email>timh@catalog-on-demand.com</email></author></authors>
13
+ <date>2015-05-12</date>
14
+ <time>16:52:20</time>
15
+ <contents><target name="magecommunity"><dir name="Mage"><dir name="CodiScript"><dir name="Helper"><file name="Data.php" hash="3f99660cb06a9dc09f024b9993d43a3f"/></dir><dir name="Model"><file name="Files.php" hash="7c362bdc29aceb997dec9833a58a7642"/></dir><dir name="controllers"><file name="IndexController.php" hash="9d059f9970fb22d36f4c1964fc699c45"/></dir><dir name="etc"><file name="adminhtml.xml" hash="40ab0bd86928c5ba175988926a9f6aee"/><file name="config.xml" hash="b960e9bd106f0c94559baa2bc5761e18"/><file name="system.xml" hash="1b5e5b18bfdce6b85e304fb4ef877274"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_CodiScript.xml" hash="f0502cac7918fc798b3b02d3d4b7e7fd"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="codiscript.xml" hash="066f99333a6054e11943a75413f65ff0"/></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="codi"><file name="password_validation.js" hash="7223aeed118bb5774c73f951460ae0b0"/></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Mage_CodiScript.csv" hash="183fc591065ced83f878a4c3e23f854c"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>