Salesoar_Feed - Version 1.2.6

Version Notes

Bug fixed

Download this release

Release Info

Developer Salesoar
Extension Salesoar_Feed
Version 1.2.6
Comparing to
See all releases


Code changes from version 1.2.5 to 1.2.6

Files changed (12) hide show
  1. app/code/community/Salesoar/Feed/Block/Abstract.php +0 -0
  2. app/code/community/Salesoar/Feed/Block/All.php +0 -0
  3. app/code/community/Salesoar/Feed/Block/Create.php +1 -1
  4. app/code/community/Salesoar/Feed/Block/Xml.php +0 -0
  5. app/code/community/Salesoar/Feed/Model/All.php +0 -0
  6. app/code/community/Salesoar/Feed/Model/Atom.php +2 -3
  7. app/code/community/Salesoar/Feed/Model/Feed.php +0 -0
  8. app/code/community/Salesoar/Feed/Model/Observer.php +1 -0
  9. app/code/community/Salesoar/Feed/Model/Session.php +0 -0
  10. app/code/community/Salesoar/Feed/Model/Xml.php +16 -11
  11. app/code/community/Salesoar/Feed/etc/config.xml +1 -1
  12. package.xml +5 -5
app/code/community/Salesoar/Feed/Block/Abstract.php CHANGED
File without changes
app/code/community/Salesoar/Feed/Block/All.php CHANGED
File without changes
app/code/community/Salesoar/Feed/Block/Create.php CHANGED
@@ -22,6 +22,6 @@ class Salesoar_Feed_Block_Create extends Salesoar_Feed_Block_Abstract
22
  {
23
  $xml = Mage::getModel('Salesoar_Feed/All');
24
  $xml->createAllXml();
25
- print 'Finish';
26
  }
27
  }
22
  {
23
  $xml = Mage::getModel('Salesoar_Feed/All');
24
  $xml->createAllXml();
25
+ print 'Finish';
26
  }
27
  }
app/code/community/Salesoar/Feed/Block/Xml.php CHANGED
File without changes
app/code/community/Salesoar/Feed/Model/All.php CHANGED
File without changes
app/code/community/Salesoar/Feed/Model/Atom.php CHANGED
@@ -82,10 +82,10 @@ EOT;
82
  <sr:landing>
83
  <sr:name><![CDATA[%s]]></sr:name>
84
  <sr:concepts>
85
- <group>\n
86
  EOT;
87
  $formatEnd = <<<EOT
88
- </group>
89
  </sr:concepts>
90
  <sr:url><![CDATA[%s]]></sr:url>
91
  </sr:landing>\n
@@ -221,4 +221,3 @@ EOT;
221
  return $this->output;
222
  }
223
  }
224
-
82
  <sr:landing>
83
  <sr:name><![CDATA[%s]]></sr:name>
84
  <sr:concepts>
85
+ <sr:group>\n
86
  EOT;
87
  $formatEnd = <<<EOT
88
+ </sr:group>
89
  </sr:concepts>
90
  <sr:url><![CDATA[%s]]></sr:url>
91
  </sr:landing>\n
221
  return $this->output;
222
  }
223
  }
 
app/code/community/Salesoar/Feed/Model/Feed.php CHANGED
File without changes
app/code/community/Salesoar/Feed/Model/Observer.php CHANGED
@@ -16,6 +16,7 @@ class Salesoar_Feed_Model_Observer
16
 
17
  public function handle_adminSystemConfigChangedSection()
18
  {
 
19
  $googleSalesoar = $_POST['googleSalesoar'];
20
  $sql = '';
21
  foreach($googleSalesoar as $idCat => $string ){
16
 
17
  public function handle_adminSystemConfigChangedSection()
18
  {
19
+ $prefix = Mage::getConfig()->getTablePrefix();
20
  $googleSalesoar = $_POST['googleSalesoar'];
21
  $sql = '';
22
  foreach($googleSalesoar as $idCat => $string ){
app/code/community/Salesoar/Feed/Model/Session.php CHANGED
File without changes
app/code/community/Salesoar/Feed/Model/Xml.php CHANGED
@@ -277,7 +277,7 @@ class Salesoar_Feed_Model_Xml
277
  ->addAttributeToFilter('is_active', 1)
278
  ->setPageSize(false);
279
 
280
- $googleProductCategory= '';
281
  foreach ($cats as $_c) {
282
  $product_type = ($_c->getId());
283
  $_cat = $this->all_categories[$_c->getId()];
@@ -340,15 +340,20 @@ class Salesoar_Feed_Model_Xml
340
  }
341
  }
342
 
343
- $rty = $this->all_categories[$product_type];
344
- $product_type = '';
345
- $path = explode('/', $rty->getPath());
346
- for ($i = 2; $i < count($path); $i++) {
347
- $cat = $this->all_categories[$path[$i]];
348
- if ($i != count($path) - 1)
349
- $product_type .= ($label = $cat->getName()) . ' &amp; ';
350
- else
351
- $product_type .= ($label = $cat->getName()) ;
 
 
 
 
 
352
  }
353
 
354
  $data = array(
@@ -362,7 +367,7 @@ class Salesoar_Feed_Model_Xml
362
  Salesoar_Feed_Model_Atom::NAMESPACE_TAG_GMERCHANT_FEED . ':product_category'
363
  => $googleProductCategory,
364
  Salesoar_Feed_Model_Atom::NAMESPACE_TAG_GMERCHANT_FEED . ':product_type'
365
- => $product_type,
366
  Salesoar_Feed_Model_Atom::NAMESPACE_TAG_GMERCHANT_FEED . ':price'
367
  => Mage::helper('core')
368
  ->currency($_priceInclTax + $_weeeTaxAmount, false, false)
277
  ->addAttributeToFilter('is_active', 1)
278
  ->setPageSize(false);
279
 
280
+ $googleProductCategory= ''; $product_type = '';
281
  foreach ($cats as $_c) {
282
  $product_type = ($_c->getId());
283
  $_cat = $this->all_categories[$_c->getId()];
340
  }
341
  }
342
 
343
+ if ($product_type != '' && array_key_exists($product_type, $this->all_categories)) {
344
+ $rty = $this->all_categories[$product_type];
345
+ $product_type_print = '';
346
+ $path = explode('/', $rty->getPath());
347
+ for ($i = 2; $i < count($path); $i++) {
348
+ $cat = $this->all_categories[$path[$i]];
349
+ if ($i != count($path) - 1)
350
+ $product_type_print .= ($label = $cat->getName()) . ' &amp; ';
351
+ else
352
+ $product_type_print .= ($label = $cat->getName());
353
+ }
354
+ }
355
+ else {
356
+ $product_type_print = '';
357
  }
358
 
359
  $data = array(
367
  Salesoar_Feed_Model_Atom::NAMESPACE_TAG_GMERCHANT_FEED . ':product_category'
368
  => $googleProductCategory,
369
  Salesoar_Feed_Model_Atom::NAMESPACE_TAG_GMERCHANT_FEED . ':product_type'
370
+ => $product_type_print,
371
  Salesoar_Feed_Model_Atom::NAMESPACE_TAG_GMERCHANT_FEED . ':price'
372
  => Mage::helper('core')
373
  ->currency($_priceInclTax + $_weeeTaxAmount, false, false)
app/code/community/Salesoar/Feed/etc/config.xml CHANGED
@@ -12,7 +12,7 @@
12
  <config>
13
  <modules>
14
  <Salesoar_Feed>
15
- <version>1.2.5</version>
16
  </Salesoar_Feed>
17
  </modules>
18
  <default>
12
  <config>
13
  <modules>
14
  <Salesoar_Feed>
15
+ <version>1.2.6</version>
16
  </Salesoar_Feed>
17
  </modules>
18
  <default>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Salesoar_Feed</name>
4
- <version>1.2.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Salesoar is the perfect marketing assistant for your ecommerce. Simply connect your ecommerce with Salesoar and you can easily create, monitor and manage your campaigns. Create your account on https://salesoar.com and start promoting your products</description>
11
  <notes>Bug fixed</notes>
12
  <authors><author><name>Salesoar</name><user>MAG003095121</user><email>hello@salesoar.com</email></author></authors>
13
- <date>2016-05-02</date>
14
- <time>09:22:01</time>
15
- <contents><target name="magecommunity"><dir name="Salesoar"><dir name="Feed"><dir name="Block"><file name="Abstract.php" hash="6fda60e05280624dec374de5f3c64037"/><dir name="Adminhtml"><dir name="Frontend"><file name="Create.php" hash="81fabd5aa53a2fce34b8a7ab9d7b3bda"/><file name="Links.php" hash="63c49a5db2ddb48863ad266e011d66a1"/></dir></dir><file name="All.php" hash="d87af68ee29734d2c95385fb9358ac8c"/><dir name="Config"><dir name="Adminhtml"><dir name="Form"><dir name="Field"><file name="Category.php" hash="bcdde546cb8af3872caeb14013784441"/><file name="GoogleCategory.php" hash="19c1e94bea04fd18dbd8b4ae9a6c3df4"/></dir></dir></dir><file name="Advertise.php" hash="42965df1c1f77fa13687c612230a4395"/><file name="TableMapping.php" hash="2819596b25566b2028f3a01da1922a5d"/></dir><file name="Create.php" hash="9e4b0843838ce5891d145bf931358c06"/><file name="Xml.php" hash="26f8a9a9e17d94405f1e640b01987cf6"/></dir><dir name="Helper"><file name="Data.php" hash="452fdf447086d40354753b37b8cf2702"/></dir><dir name="Model"><file name="All.php" hash="0c72ab1b243919fc90c3971e7a4ebd6e"/><file name="Atom.php" hash="316a200c36f8d053f8489278504a6d2f"/><file name="Feed.php" hash="0a9593319f5f5335aaf1d29e7af33d4a"/><file name="Observer.php" hash="bdadc319680152c3bfcffa178b19e77f"/><file name="Session.php" hash="cc6f2ec572d56eb882d0269b55f4f796"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="Attributes.php" hash="9d1264a5207425f0b0154966ffdc2ee2"/><file name="Categories.php" hash="888d4035a1f0eefe7fe73ccf465d2ef7"/><file name="Create.php" hash="5441649de14854fcbfedceb87aebc688"/><file name="CurrencyMap.php" hash="4485a6403b4c5cddfe6ac4f9cd9e4c9c"/><file name="Links.php" hash="3a7c2cfef5e92ba736ddbf8af06ba2e4"/><file name="SelectCategory.php" hash="37ff5211b10ae7e143fa78bfb0bd66ff"/><file name="SelectGoogleCategory.php" hash="15ca98755661d24ae0eac911b956bb89"/><dir name="Taxonomy"><file name="taxonomy_br.txt" hash="399d492d03c2c35ad1e174edf0d1f4a0"/><file name="taxonomy_de.txt" hash="6b1fc333d89fa26ba431e1658ac9364e"/><file name="taxonomy_dk.txt" hash="402a30fe21119c18af0ccd6ecbf99474"/><file name="taxonomy_en_US.txt" hash="5bc8bc4863a7d7bf1c8a68ccc54a731c"/><file name="taxonomy_es.txt" hash="57c9dad37ea984adcfd280550c338382"/><file name="taxonomy_fr.txt" hash="eb00ab5d99e1d0fdd64b2eccbd1a3700"/><file name="taxonomy_it.txt" hash="c2e5c5fcdff87033826ef908165ad48c"/><file name="taxonomy_nl.txt" hash="cd3bf4c7e879fee47f3d8f5fa0ee6477"/><file name="taxonomy_pl.txt" hash="711372a31920120e8d11d971ad186e5e"/><file name="taxonomy_se.txt" hash="fe03b123ab99796ccd24f2cbec07818e"/></dir></dir></dir></dir><file name="Xml.php" hash="80d804e3954140d1ef806258c2c7f093"/></dir><dir name="controllers"><file name="FeedController.php" hash="2d568887a82d5f8424f8b379271914f4"/><file name="IndexController.php" hash="2975c0be5a94694435771defc7c48835"/></dir><dir name="etc"><file name="adminhtml.xml" hash="a84e1e3df9ee1808ea254bcedc424a41"/><file name="config.xml" hash="9cb9952c6d94b4bb9d07fd9c1354af6d"/><file name="system.xml" hash="5e6552778998c9a2e63bef954e214f06"/></dir><dir name="sql"><dir name="Salesoar_Feed_setup"><file name="mysql4-install-1.2.0.php" hash="f5d29abb803035586af7f11a39f85e92"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Salesoar_Feed.xml" hash="06e2e706952847a75cc1045a61067755"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Salesoar_Feed.csv" hash="f99bd663f6b7becac87c8be1720f14b3"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="salesoar_feed.xml" hash="2aef7579109252e53f6653a2f337b8c1"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
- <dependencies><required><php><min>5.4.0</min><max>6.0.0</max></php><package><name>Mage_Catalog</name><channel>community</channel><min>1.6.0.0</min><max>1.9.2.4</max></package><package><name>Mage_CatalogInventory</name><channel>community</channel><min>1.6.0.0</min><max>1.9.2.4</max></package><package><name>Mage_Core_Modules</name><channel>community</channel><min>1.6.0.0</min><max>1.9.2.4</max></package><extension><name>Core</name><min>1.6.0.0</min><max>1.9.2.4</max></extension><extension><name>PDO</name><min>1.6.0.0</min><max>1.9.2.4</max></extension></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Salesoar_Feed</name>
4
+ <version>1.2.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
10
  <description>Salesoar is the perfect marketing assistant for your ecommerce. Simply connect your ecommerce with Salesoar and you can easily create, monitor and manage your campaigns. Create your account on https://salesoar.com and start promoting your products</description>
11
  <notes>Bug fixed</notes>
12
  <authors><author><name>Salesoar</name><user>MAG003095121</user><email>hello@salesoar.com</email></author></authors>
13
+ <date>2016-11-23</date>
14
+ <time>14:41:54</time>
15
+ <contents><target name="magecommunity"><dir name="Salesoar"><dir name="Feed"><dir name="Block"><file name="Abstract.php" hash="6fda60e05280624dec374de5f3c64037"/><dir name="Adminhtml"><dir name="Frontend"><file name="Create.php" hash="81fabd5aa53a2fce34b8a7ab9d7b3bda"/><file name="Links.php" hash="63c49a5db2ddb48863ad266e011d66a1"/></dir></dir><file name="All.php" hash="d2bd66cdf271831bcdeaaa19c1b1e5b4"/><dir name="Config"><dir name="Adminhtml"><dir name="Form"><dir name="Field"><file name="Category.php" hash="bcdde546cb8af3872caeb14013784441"/><file name="GoogleCategory.php" hash="19c1e94bea04fd18dbd8b4ae9a6c3df4"/></dir></dir></dir><file name="Advertise.php" hash="42965df1c1f77fa13687c612230a4395"/><file name="TableMapping.php" hash="2819596b25566b2028f3a01da1922a5d"/></dir><file name="Create.php" hash="6aff617ab94eb0af390c8b5d9d3841e2"/><file name="Xml.php" hash="d604971f2d6f55905b1cad3835d2fb81"/></dir><dir name="Helper"><file name="Data.php" hash="452fdf447086d40354753b37b8cf2702"/></dir><dir name="Model"><file name="All.php" hash="0c72ab1b243919fc90c3971e7a4ebd6e"/><file name="Atom.php" hash="80d92927d60bf2aead1e21b6327b0536"/><file name="Feed.php" hash="0a9593319f5f5335aaf1d29e7af33d4a"/><file name="Observer.php" hash="079b5607bff314004a511732053655fa"/><file name="Session.php" hash="cc6f2ec572d56eb882d0269b55f4f796"/><dir name="System"><dir name="Config"><dir name="Backend"><file name="Attributes.php" hash="9d1264a5207425f0b0154966ffdc2ee2"/><file name="Categories.php" hash="888d4035a1f0eefe7fe73ccf465d2ef7"/><file name="Create.php" hash="5441649de14854fcbfedceb87aebc688"/><file name="CurrencyMap.php" hash="4485a6403b4c5cddfe6ac4f9cd9e4c9c"/><file name="Links.php" hash="3a7c2cfef5e92ba736ddbf8af06ba2e4"/><file name="SelectCategory.php" hash="37ff5211b10ae7e143fa78bfb0bd66ff"/><file name="SelectGoogleCategory.php" hash="15ca98755661d24ae0eac911b956bb89"/><dir name="Taxonomy"><file name="taxonomy_br.txt" hash="399d492d03c2c35ad1e174edf0d1f4a0"/><file name="taxonomy_de.txt" hash="6b1fc333d89fa26ba431e1658ac9364e"/><file name="taxonomy_dk.txt" hash="402a30fe21119c18af0ccd6ecbf99474"/><file name="taxonomy_en_US.txt" hash="5bc8bc4863a7d7bf1c8a68ccc54a731c"/><file name="taxonomy_es.txt" hash="57c9dad37ea984adcfd280550c338382"/><file name="taxonomy_fr.txt" hash="eb00ab5d99e1d0fdd64b2eccbd1a3700"/><file name="taxonomy_it.txt" hash="c2e5c5fcdff87033826ef908165ad48c"/><file name="taxonomy_nl.txt" hash="cd3bf4c7e879fee47f3d8f5fa0ee6477"/><file name="taxonomy_pl.txt" hash="711372a31920120e8d11d971ad186e5e"/><file name="taxonomy_se.txt" hash="fe03b123ab99796ccd24f2cbec07818e"/></dir></dir></dir></dir><file name="Xml.php" hash="4e500fb89393d67cd4fdd41f197ec687"/></dir><dir name="controllers"><file name="FeedController.php" hash="2d568887a82d5f8424f8b379271914f4"/><file name="IndexController.php" hash="2975c0be5a94694435771defc7c48835"/></dir><dir name="etc"><file name="adminhtml.xml" hash="a84e1e3df9ee1808ea254bcedc424a41"/><file name="config.xml" hash="f131f58c8243d2a156973ff6bd0d05f6"/><file name="system.xml" hash="5e6552778998c9a2e63bef954e214f06"/></dir><dir name="sql"><dir name="Salesoar_Feed_setup"><file name="mysql4-install-1.2.0.php" hash="f5d29abb803035586af7f11a39f85e92"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Salesoar_Feed.csv" hash="f99bd663f6b7becac87c8be1720f14b3"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="salesoar_feed.xml" hash="2aef7579109252e53f6653a2f337b8c1"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Salesoar_Feed.xml" hash="06e2e706952847a75cc1045a61067755"/></dir></target></contents>
16
  <compatible/>
17
+ <dependencies><required><php><min>5.4.0</min><max>6.0.0</max></php><package><name>Mage_Catalog</name><channel>community</channel><min>1.6.0.0</min><max>1.9.2.4</max></package><package><name>Mage_CatalogInverntory</name><channel>community</channel><min>1.6.0.0</min><max>1.9.2.4</max></package><package><name>Mage_Core_Modues</name><channel>community</channel><min>1.6.0.0</min><max>1.9.2.4</max></package><extension><name>Core</name><min>1.6.0.0</min><max>1.9.2.4</max></extension><extension><name>PDO</name><min>1.6.0.0</min><max>1.9.2.4</max></extension></required></dependencies>
18
  </package>