Mage_PDF_per_Product - Version 3.0.7

Version Notes

3.0.7- Contain group product support
and the new behavior if the file creation is in progress

Download this release

Release Info

Developer Magento Core Team
Extension Mage_PDF_per_Product
Version 3.0.7
Comparing to
See all releases


Code changes from version 3.0.6 to 3.0.7

Files changed (5) hide show
  1. app/code/community/Mage/Codi/Model/Codi.php +50 -10
  2. app/code/community/Mage/Codi/controllers/NsyncController.php +2 -0
  3. app/code/community/Mage/Codi/etc/config.xml +1 -1
  4. app/design/adminhtml/default/default/template/codi/index.phtml +7 -5
  5. package.xml +6 -5
app/code/community/Mage/Codi/Model/Codi.php CHANGED
@@ -7,7 +7,7 @@ class Mage_Codi_Model_Codi extends Mage_Core_Model_Abstract
7
  public $userid ;
8
  public $password ;
9
  public $disableextension ;
10
- public $version = "3.0.6";
11
 
12
  public $customerid ;
13
  public $customerdatasourceid ;
@@ -24,6 +24,7 @@ class Mage_Codi_Model_Codi extends Mage_Core_Model_Abstract
24
  parent::_construct();
25
  $this->_init('codi/codi');
26
  $this->_logFile = "Catalog-on-demand-items.log";
 
27
 
28
  $this->enablereviews = Mage::getStoreConfig('codi/codi/codenablereviews');
29
 
@@ -406,14 +407,29 @@ class Mage_Codi_Model_Codi extends Mage_Core_Model_Abstract
406
  $ProducttoString .= "\t" . $this->cleanStr( $ItemitemAttributes ) ; //ItemitemAttributes
407
  $ProducttoString .= "\t" . $this->cleanStr( $ItemImageURL ) ; //ItemitemGraphic
408
  $ProducttoString .= "\t" . $product->getId().'#$#'.$this->cleanStr( $product->getName() ); //ProductName
409
- $ProducttoString .= "\t" . "" ; //ProductMfg
410
- $ProducttoString .= "\t" . $this->cleanStr( $ProductDescription ) ; //ProductDescription
 
 
 
 
 
 
 
 
 
 
411
  $ProducttoString .= "\t" . $this->cleanStr( $ImageURL ); //ProductGraphic
412
  $ProducttoString .= "\t" . $this->cleanStr( $product->getProductUrl() ) ; //ProductLink
413
  $ProducttoString .= "\t" . $this->cleanStr( $ProductAttributes ) ; //ProductAttributes
414
  $ProducttoString .= "\t" . $this->cleanStr( $CategoriesString ); //Category
415
  $ProducttoString .= "\t" . $this->cleanStr( $Reviews ); //Reviews
416
- $ProducttoString .= "\t" . $this->cleanStr( $product->getShortDescription() ); //ShortDescription (Quick Overview)
 
 
 
 
 
417
  //************************* Concatenate Product Info End ************************* cleanStr
418
  }
419
  unset($ProductDescription);
@@ -553,14 +569,26 @@ class Mage_Codi_Model_Codi extends Mage_Core_Model_Abstract
553
  $ProducttoString .= "\t" . $this->cleanStr( $ItemitemAttributes ) ; //ItemitemAttributes
554
  $ProducttoString .= "\t" . ""; //ItemitemGraphic
555
  $ProducttoString .= "\t" . $product->getId().'#$#'.$this->cleanStr( $product->getName() ); //ProductName
556
- $ProducttoString .= "\t" . "" ; //ProductMfg
557
- $ProducttoString .= "\t" . $this->cleanStr( $ProductDescription ) ; //ProductDescription
 
 
 
 
 
 
 
558
  $ProducttoString .= "\t" . $this->cleanStr( $ImageURL ); //ProductGraphic
559
  $ProducttoString .= "\t" . $this->cleanStr( $product->getProductUrl() ) ; //ProductLink
560
  $ProducttoString .= "\t" . $this->cleanStr( $ProductAttributes ) ; //ProductAttributes
561
  $ProducttoString .= "\t" . $this->cleanStr( $CategoriesString ); //Category
562
  $ProducttoString .= "\t" . $this->cleanStr( $Reviews ); //Reviews
563
- $ProducttoString .= "\t" . $this->cleanStr( $product->getShortDescription() ); //ShortDescription (Quick Overview)
 
 
 
 
 
564
  //************************* Concatenate Product Info End ************************* cleanStr
565
  }
566
  unset($ProductDescription);
@@ -646,14 +674,26 @@ class Mage_Codi_Model_Codi extends Mage_Core_Model_Abstract
646
  $ProducttoString .= "\t" . ""; //ItemitemAttributes
647
  $ProducttoString .= "\t" . ""; //ItemitemGraphic
648
  $ProducttoString .= "\t" . $product->getId().'#$#'.$this->cleanStr( $product->getName() ); //ProductName
649
- $ProducttoString .= "\t" . "" ; //ProductMfg
650
- $ProducttoString .= "\t" . $this->cleanStr( $ProductDescription ) ; //ProductDescription
 
 
 
 
 
 
 
651
  $ProducttoString .= "\t" . $this->cleanStr( $ImageURL ); //ProductGraphic
652
  $ProducttoString .= "\t" . $this->cleanStr( $product->getProductUrl() ) ; //ProductLink
653
  $ProducttoString .= "\t" . $this->cleanStr( $ItemitemAttributes ) ; //ProductAttributes
654
  $ProducttoString .= "\t" . $this->cleanStr( $CategoriesString ); //Category
655
  $ProducttoString .= "\t" . $this->cleanStr( $Reviews ); //Reviews
656
- $ProducttoString .= "\t" . $this->cleanStr( $product->getShortDescription() ); //ShortDescription (Quick Overview)
 
 
 
 
 
657
  //************************* Concatenate Product Info End ************************* cleanStr
658
 
659
  unset($ProductDescription);
7
  public $userid ;
8
  public $password ;
9
  public $disableextension ;
10
+ public $version = "3.0.7";
11
 
12
  public $customerid ;
13
  public $customerdatasourceid ;
24
  parent::_construct();
25
  $this->_init('codi/codi');
26
  $this->_logFile = "Catalog-on-demand-items.log";
27
+ Mage::app()->setCurrentStore(Mage_Core_Model_App::ADMIN_STORE_ID);
28
 
29
  $this->enablereviews = Mage::getStoreConfig('codi/codi/codenablereviews');
30
 
407
  $ProducttoString .= "\t" . $this->cleanStr( $ItemitemAttributes ) ; //ItemitemAttributes
408
  $ProducttoString .= "\t" . $this->cleanStr( $ItemImageURL ) ; //ItemitemGraphic
409
  $ProducttoString .= "\t" . $product->getId().'#$#'.$this->cleanStr( $product->getName() ); //ProductName
410
+ $ProducttoString .= "\t" . "" ;
411
+ //add paragraph tag in description
412
+ if(strpos($ProductDescription,'<p>')!==false)
413
+
414
+ {
415
+ $string= array('<p>', '</p>');
416
+ $ProductDescriptions = str_replace($string, "", $ProductDescription);
417
+ $ProducttoString .= "\t" . $this->cleanStr( "<p>".$ProductDescriptions ."</p>") ;
418
+ }
419
+
420
+ else $ProducttoString .= "\t" . $this->cleanStr( "<p>".$ProductDescription ."</p>") ;
421
+ //ProductDescription
422
  $ProducttoString .= "\t" . $this->cleanStr( $ImageURL ); //ProductGraphic
423
  $ProducttoString .= "\t" . $this->cleanStr( $product->getProductUrl() ) ; //ProductLink
424
  $ProducttoString .= "\t" . $this->cleanStr( $ProductAttributes ) ; //ProductAttributes
425
  $ProducttoString .= "\t" . $this->cleanStr( $CategoriesString ); //Category
426
  $ProducttoString .= "\t" . $this->cleanStr( $Reviews ); //Reviews
427
+ $shortdescription=$product->getShortDescription();
428
+ if(strpos($shortdescription,'<p>')!==false)
429
+
430
+ $ProducttoString .= "\t" . $this->cleanStr($shortdescription) ;
431
+
432
+ else $ProducttoString .= "\t" . $this->cleanStr( "<p>".$shortdescription ."</p>") ; //ShortDescription (Quick Overview)
433
  //************************* Concatenate Product Info End ************************* cleanStr
434
  }
435
  unset($ProductDescription);
569
  $ProducttoString .= "\t" . $this->cleanStr( $ItemitemAttributes ) ; //ItemitemAttributes
570
  $ProducttoString .= "\t" . ""; //ItemitemGraphic
571
  $ProducttoString .= "\t" . $product->getId().'#$#'.$this->cleanStr( $product->getName() ); //ProductName
572
+ $ProducttoString .= "\t" . "" ;
573
+ if(strpos($ProductDescription,'<p>')!==false)
574
+ {
575
+ $string= array('<p>', '</p>');
576
+ $ProductDescriptions = str_replace($string, "", $ProductDescription);
577
+ $ProducttoString .= "\t" . $this->cleanStr( "<p>".$ProductDescriptions ."</p>") ;
578
+ }
579
+
580
+ else $ProducttoString .= "\t" . $this->cleanStr( "<p>".$ProductDescription ."</p>") ; //ProductDescription
581
  $ProducttoString .= "\t" . $this->cleanStr( $ImageURL ); //ProductGraphic
582
  $ProducttoString .= "\t" . $this->cleanStr( $product->getProductUrl() ) ; //ProductLink
583
  $ProducttoString .= "\t" . $this->cleanStr( $ProductAttributes ) ; //ProductAttributes
584
  $ProducttoString .= "\t" . $this->cleanStr( $CategoriesString ); //Category
585
  $ProducttoString .= "\t" . $this->cleanStr( $Reviews ); //Reviews
586
+ $shortdescription=$product->getShortDescription();
587
+ if(strpos($shortdescription,'<p>')!==false)
588
+
589
+ $ProducttoString .= "\t" . $this->cleanStr($shortdescription) ;
590
+
591
+ else $ProducttoString .= "\t" . $this->cleanStr( "<p>".$shortdescription ."</p>") ; //ShortDescription (Quick Overview)
592
  //************************* Concatenate Product Info End ************************* cleanStr
593
  }
594
  unset($ProductDescription);
674
  $ProducttoString .= "\t" . ""; //ItemitemAttributes
675
  $ProducttoString .= "\t" . ""; //ItemitemGraphic
676
  $ProducttoString .= "\t" . $product->getId().'#$#'.$this->cleanStr( $product->getName() ); //ProductName
677
+ $ProducttoString .= "\t" . "" ;
678
+ if(strpos($ProductDescription,'<p>')!==false)
679
+ {
680
+ $string= array('<p>', '</p>');
681
+ $ProductDescriptions = str_replace($string, "", $ProductDescription);
682
+ $ProducttoString .= "\t" . $this->cleanStr( "<p>".$ProductDescriptions ."</p>") ;
683
+ }
684
+ //ProductMfg
685
+ else $ProducttoString .= "\t" . $this->cleanStr( "<p>".$ProductDescription ."</p>") ; //ProductDescription
686
  $ProducttoString .= "\t" . $this->cleanStr( $ImageURL ); //ProductGraphic
687
  $ProducttoString .= "\t" . $this->cleanStr( $product->getProductUrl() ) ; //ProductLink
688
  $ProducttoString .= "\t" . $this->cleanStr( $ItemitemAttributes ) ; //ProductAttributes
689
  $ProducttoString .= "\t" . $this->cleanStr( $CategoriesString ); //Category
690
  $ProducttoString .= "\t" . $this->cleanStr( $Reviews ); //Reviews
691
+
692
+ if(strpos($shortdescription,'<p>')!==false)
693
+
694
+ $ProducttoString .= "\t" . $this->cleanStr($shortdescription) ;
695
+
696
+ else $ProducttoString .= "\t" . $this->cleanStr( "<p>".$shortdescription ."</p>") ; //ShortDescription (Quick Overview)
697
  //************************* Concatenate Product Info End ************************* cleanStr
698
 
699
  unset($ProductDescription);
app/code/community/Mage/Codi/controllers/NsyncController.php CHANGED
@@ -88,6 +88,7 @@ class Mage_Codi_NsyncController extends Mage_Core_Controller_Front_Action
88
 
89
  public function manualAction()
90
  {
 
91
  $products = Mage::getModel('catalog/product')->getCollection();
92
  $products->addAttributeToFilter('status', 1);//enabled
93
  $products->addAttributeToFilter('visibility', 4);//catalog, search
@@ -99,6 +100,7 @@ class Mage_Codi_NsyncController extends Mage_Core_Controller_Front_Action
99
  //create file
100
  public function updatestatusAction()
101
  {
 
102
  ini_set('memory_limit','1024M');
103
  set_time_limit(0);
104
  $this->_logFile = "Catalog-on-demand.log";
88
 
89
  public function manualAction()
90
  {
91
+ Mage::app()->setCurrentStore(Mage_Core_Model_App::ADMIN_STORE_ID);
92
  $products = Mage::getModel('catalog/product')->getCollection();
93
  $products->addAttributeToFilter('status', 1);//enabled
94
  $products->addAttributeToFilter('visibility', 4);//catalog, search
100
  //create file
101
  public function updatestatusAction()
102
  {
103
+ Mage::app()->setCurrentStore(Mage_Core_Model_App::ADMIN_STORE_ID);
104
  ini_set('memory_limit','1024M');
105
  set_time_limit(0);
106
  $this->_logFile = "Catalog-on-demand.log";
app/code/community/Mage/Codi/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Mage_Codi>
5
- <version>3.0.6</version>
6
  </Mage_Codi>
7
  </modules>
8
  <adminhtml>
2
  <config>
3
  <modules>
4
  <Mage_Codi>
5
+ <version>3.0.7</version>
6
  </Mage_Codi>
7
  </modules>
8
  <adminhtml>
app/design/adminhtml/default/default/template/codi/index.phtml CHANGED
@@ -1,16 +1,18 @@
1
  <?php
 
 
2
  $codimodel = Mage::getSingleton('codi/codi');
3
  $userid = Mage::getStoreConfig('codi/codi/codusername') ;
4
  $password = Mage::getStoreConfig('codi/codi/codpassword') ;
5
  $secretkey = Mage::getStoreConfig('codi/codi/secretkey') ;
6
 
7
- $enablefreshflyers = Mage::getStoreConfig('codi/codi/enablefreshflyers') ;
8
- $enablereviews = Mage::getStoreConfig('codi/codi/codenablereviews') ;
9
  $fromchild = Mage::getStoreConfig('codi/codi/fromchild') ;
10
 
11
- $codflyerlinkimg = Mage::getStoreConfig('codi/codi/codflyerlinkimg') ;
12
- $codflyerlinkimgurl = Mage::getStoreConfig('codi/codi/codflyerlinkimgurl') ;
13
- $codflyerlinkimgalt = Mage::getStoreConfig('codi/codi/codflyerlinkimgalt') ;
14
 
15
  $codbeforename = Mage::getStoreConfig('codi/codi/codbeforename') ;
16
  $codaftername = Mage::getStoreConfig('codi/codi/codaftername') ;
1
  <?php
2
+ error_reporting(E_WARNING);
3
+
4
  $codimodel = Mage::getSingleton('codi/codi');
5
  $userid = Mage::getStoreConfig('codi/codi/codusername') ;
6
  $password = Mage::getStoreConfig('codi/codi/codpassword') ;
7
  $secretkey = Mage::getStoreConfig('codi/codi/secretkey') ;
8
 
9
+ $enablefreshflyers = Mage::getStoreConfig('codi/codi/enablefreshflyers') ;
10
+ $enablereviews = Mage::getStoreConfig('codi/codi/codenablereviews') ;
11
  $fromchild = Mage::getStoreConfig('codi/codi/fromchild') ;
12
 
13
+ $codflyerlinkimg = Mage::getStoreConfig('codi/codi/codflyerlinkimg') ;
14
+ $codflyerlinkimgurl = Mage::getStoreConfig('codi/codi/codflyerlinkimgurl') ;
15
+ $codflyerlinkimgalt = Mage::getStoreConfig('codi/codi/codflyerlinkimgalt') ;
16
 
17
  $codbeforename = Mage::getStoreConfig('codi/codi/codbeforename') ;
18
  $codaftername = Mage::getStoreConfig('codi/codi/codaftername') ;
package.xml CHANGED
@@ -1,18 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mage_PDF_per_Product</name>
4
- <version>3.0.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>
8
  <extends/>
9
  <summary>Catalog-On-Demand</summary>
10
  <description>Catalog-On-Demand</description>
11
- <notes>3.0.6- Added Catalog Project, Sections and Data file support</notes>
 
12
  <authors><author><name>catalogondemand</name><user>auto-converted</user><email>timh@catalog-on-demand.com</email></author></authors>
13
- <date>2011-12-12</date>
14
- <time>08:04:35</time>
15
- <contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><file name="codimport_run.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/><file name="codimport_yes.gif" hash="0afb20898a704a106cb4c598868abf32"/><file name="preview_field_help.png" hash="1b1601459d25e8b1a6b1d109782078d2"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="codi"><file name="index.phtml" hash="655ebed208c9f7d106468048e4a79c49"/></dir></dir><dir name="layout"><file name="codi.xml" hash="9407985f30403744eb4e758312d62aef"/></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="catalog"><dir name="product"><file name="view.phtml" hash="86eff56921219708a31c279309b949ca"/></dir></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="jquery"><file name="jquery-1.2.6.noConflict.min.js" hash="090fdb3fbcb4727c0ca20cca87e7e12d"/><file name="jquery.tooltip.js" hash="8217c6611da6cfe45094e58485d013f0"/></dir></dir></target><target name="magecommunity"><dir name="Mage"><dir name="Codi"><dir name="Block"><dir name="Adminhtml"><file name="Menu.php" hash="ae8a9d1be49f00102911ef5fbe97c126"/><file name="Switcher.php" hash="62f36d23f039d7c21ec84b42fd0532ff"/></dir><dir name="Customer"><file name="Codi.php" hash="17c557dbcfadd336dc7ba773d6304fc0"/></dir></dir><dir name="Helper"><file name="Createzip.php" hash="03fe07641f6f3f480b1d1c47b5ab3901"/><file name="Data.php" hash="0c5442367142b7c2048ca900e1e5a8f1"/></dir><dir name="Model"><file name="Codi.php" hash="44bfe5d1b40917101298239e413d7297"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="MenuController.php" hash="0db56a3c8d2bdd2564c8231b1efa8860"/></dir><file name="DeleteController.php" hash="8030915b46c87e5369a7c34d979873b4"/><file name="NsyncController.php" hash="d7e7601f65d33c31a6801018469a1de6"/><file name="SyncController.php" hash="ce7dfa71ab6214fbb825578ea81f55d2"/></dir><dir name="etc"><file name="config.xml" hash="00b4ca52037df0406cbb50d0b355e46e"/></dir><dir name="sql"><dir name="codi_setup"><file name="mysql4-install-3.0.4.php" hash="ffa1c82119aa4a56a6123dd1c5feca8f"/><file name="mysql4-install-3.0.6.php" hash="ffa1c82119aa4a56a6123dd1c5feca8f"/></dir></dir><file name="Codi_Process.php" hash="07b09ec755a1ae56c3a9f3945aa72035"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Codi.xml" hash="5d635cd2a0d415b67f095bda0298445d"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Mage_PDF_per_Product</name>
4
+ <version>3.0.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>
8
  <extends/>
9
  <summary>Catalog-On-Demand</summary>
10
  <description>Catalog-On-Demand</description>
11
+ <notes>3.0.7- Contain group product support&#xD;
12
+ and the new behavior if the file creation is in progress</notes>
13
  <authors><author><name>catalogondemand</name><user>auto-converted</user><email>timh@catalog-on-demand.com</email></author></authors>
14
+ <date>2012-01-03</date>
15
+ <time>09:09:22</time>
16
+ <contents><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><file name="codimport_run.gif" hash="e805ea7eca1f34c75ba0f93780d32d38"/><file name="codimport_yes.gif" hash="0afb20898a704a106cb4c598868abf32"/><file name="preview_field_help.png" hash="1b1601459d25e8b1a6b1d109782078d2"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="codi"><file name="index.phtml" hash="df25f104d32ba9e1441ded87dd0516f8"/></dir></dir><dir name="layout"><file name="codi.xml" hash="9407985f30403744eb4e758312d62aef"/></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="template"><dir name="catalog"><dir name="product"><file name="view.phtml" hash="86eff56921219708a31c279309b949ca"/></dir></dir></dir></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="jquery"><file name="jquery-1.2.6.noConflict.min.js" hash="090fdb3fbcb4727c0ca20cca87e7e12d"/><file name="jquery.tooltip.js" hash="8217c6611da6cfe45094e58485d013f0"/></dir></dir></target><target name="magecommunity"><dir name="Mage"><dir name="Codi"><dir name="Block"><dir name="Adminhtml"><file name="Menu.php" hash="ae8a9d1be49f00102911ef5fbe97c126"/><file name="Switcher.php" hash="62f36d23f039d7c21ec84b42fd0532ff"/></dir><dir name="Customer"><file name="Codi.php" hash="17c557dbcfadd336dc7ba773d6304fc0"/></dir></dir><dir name="Helper"><file name="Createzip.php" hash="03fe07641f6f3f480b1d1c47b5ab3901"/><file name="Data.php" hash="0c5442367142b7c2048ca900e1e5a8f1"/></dir><dir name="Model"><file name="Codi.php" hash="86cf5814982f812e76374f5c60a2ec02"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="MenuController.php" hash="0db56a3c8d2bdd2564c8231b1efa8860"/></dir><file name="DeleteController.php" hash="8030915b46c87e5369a7c34d979873b4"/><file name="NsyncController.php" hash="d4bb9b709c9c907731d2f4e609205934"/><file name="SyncController.php" hash="ce7dfa71ab6214fbb825578ea81f55d2"/></dir><dir name="etc"><file name="config.xml" hash="c2dac3b8ca4f350ce47f04814b69b6e4"/></dir><dir name="sql"><dir name="codi_setup"><file name="mysql4-install-3.0.4.php" hash="ffa1c82119aa4a56a6123dd1c5feca8f"/><file name="mysql4-install-3.0.6.php" hash="ffa1c82119aa4a56a6123dd1c5feca8f"/></dir></dir><file name="Codi_Process.php" hash="07b09ec755a1ae56c3a9f3945aa72035"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Mage_Codi.xml" hash="5d635cd2a0d415b67f095bda0298445d"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies/>
19
  </package>