Magmodules_Sooqr - Version 1.1.6

Version Notes

Magmodules_Sooqr

Download this release

Release Info

Developer Magmodules
Extension Magmodules_Sooqr
Version 1.1.6
Comparing to
See all releases


Code changes from version 1.1.5 to 1.1.6

Files changed (7) hide show
  1. app/code/community/Magmodules/Sooqr/Block/Adminhtml/Widget/Info/Info.php +7 -0
  2. app/code/community/Magmodules/Sooqr/Model/Adminhtml/System/Config/Backend/Sooqr/Cron.php +2 -6
  3. app/code/community/Magmodules/Sooqr/Model/Sooqr.php +1 -9
  4. app/code/community/Magmodules/Sooqr/etc/config.xml +1 -1
  5. app/code/community/Magmodules/Sooqr/etc/system.xml +1 -0
  6. app/locale/nl_NL/Magmodules_Sooqr.csv +3 -1
  7. package.xml +4 -4
app/code/community/Magmodules/Sooqr/Block/Adminhtml/Widget/Info/Info.php CHANGED
@@ -68,6 +68,13 @@ class Magmodules_Sooqr_Block_Adminhtml_Widget_Info_Info extends Mage_Adminhtml_B
68
  </table>
69
  </div>';
70
 
 
 
 
 
 
 
 
71
  if(Mage::getStoreConfig('catalog/frontend/flat_catalog_product')) {
72
  $store_id = Mage::helper('sooqr')->getStoreIdConfig();
73
  $non_flat_attributes = Mage::helper('sooqr')->checkFlatCatalog(Mage::getModel("sooqr/sooqr")->getFeedAttributes($store_id, 'flatcheck'));
68
  </table>
69
  </div>';
70
 
71
+ $flat_product = Mage::getStoreConfig('catalog/frontend/flat_catalog_product');
72
+ $flat_category = Mage::getStoreConfig('catalog/frontend/flat_catalog_category');
73
+ if((!$flat_product) || (!$flat_category)) {
74
+ $msg = '<div id="messages"><ul class="messages"><li class="error-msg"><ul><li><span>' . Mage::helper('sooqr')->__('Please enable "Flat Catalog Category" and "Flat Catalog Product" for the extension to work properly. <a href="https://www.magmodules.eu/help/enable-flat-catalog/" target="_blank">More information.</a>') . '</span></li></ul></li></ul></div>';
75
+ $html = $html . $msg;
76
+ }
77
+
78
  if(Mage::getStoreConfig('catalog/frontend/flat_catalog_product')) {
79
  $store_id = Mage::helper('sooqr')->getStoreIdConfig();
80
  $non_flat_attributes = Mage::helper('sooqr')->checkFlatCatalog(Mage::getModel("sooqr/sooqr")->getFeedAttributes($store_id, 'flatcheck'));
app/code/community/Magmodules/Sooqr/Model/Adminhtml/System/Config/Backend/Sooqr/Cron.php CHANGED
@@ -28,17 +28,13 @@ class Magmodules_Sooqr_Model_Adminhtml_System_Config_Backend_Sooqr_Cron extends
28
  $store_ids = Mage::helper('sooqr')->getStoreIds('sooqr_connect/generate/enabled');
29
  $count = count($store_ids);
30
  if($count > 0) {
31
- $minute[0] = 0;
32
  $n = floor(60/$count);
33
  if($n == 60) { $n = 0; }
34
  for($i = 1; $i < $count; $i++) {
35
- $min = ($minute[0] + ($i * $n));
36
- if($min >= 60) {
37
- $min = ($minute[0] - ($i * $n));
38
- }
39
  $minute[] = $min;
40
  }
41
- asort($minute);
42
  $minute = implode(',', $minute);
43
  switch($frequency) {
44
  case 0:
28
  $store_ids = Mage::helper('sooqr')->getStoreIds('sooqr_connect/generate/enabled');
29
  $count = count($store_ids);
30
  if($count > 0) {
31
+ $minute[] = 1;
32
  $n = floor(60/$count);
33
  if($n == 60) { $n = 0; }
34
  for($i = 1; $i < $count; $i++) {
35
+ $min = ($i * $n);
 
 
 
36
  $minute[] = $min;
37
  }
 
38
  $minute = implode(',', $minute);
39
  switch($frequency) {
40
  case 0:
app/code/community/Magmodules/Sooqr/Model/Sooqr.php CHANGED
@@ -54,10 +54,6 @@ class Magmodules_Sooqr_Model_Sooqr extends Magmodules_Sooqr_Model_Common {
54
  $return_feed['products'] = $feed['products'];
55
  }
56
  return $return_feed;
57
- } else {
58
- $return_feed = array();
59
- $return_feed['config'] = $this->getFeedHeader($config, count($feed['products']), $time_start);
60
- return $return_feed;
61
  }
62
  }
63
 
@@ -165,11 +161,7 @@ class Magmodules_Sooqr_Model_Sooqr extends Magmodules_Sooqr_Model_Common {
165
  mkdir(Mage::getBaseDir('media') . DS . $type);
166
  }
167
 
168
- $fileName = Mage::getBaseDir() . DS . 'media' . DS . $type . DS . $fileName;
169
- if(file_exists($fileName) && ($refresh)) {
170
- unlink($fileName);
171
- }
172
- return $fileName;
173
  }
174
 
175
  public function saveFeed($feed, $config, $type, $count)
54
  $return_feed['products'] = $feed['products'];
55
  }
56
  return $return_feed;
 
 
 
 
57
  }
58
  }
59
 
161
  mkdir(Mage::getBaseDir('media') . DS . $type);
162
  }
163
 
164
+ return Mage::getBaseDir() . DS . 'media' . DS . $type . DS . $fileName;
 
 
 
 
165
  }
166
 
167
  public function saveFeed($feed, $config, $type, $count)
app/code/community/Magmodules/Sooqr/etc/config.xml CHANGED
@@ -19,7 +19,7 @@
19
  <config>
20
  <modules>
21
  <Magmodules_Sooqr>
22
- <version>1.1.5</version>
23
  </Magmodules_Sooqr>
24
  </modules>
25
  <global>
19
  <config>
20
  <modules>
21
  <Magmodules_Sooqr>
22
+ <version>1.1.6</version>
23
  </Magmodules_Sooqr>
24
  </modules>
25
  <global>
app/code/community/Magmodules/Sooqr/etc/system.xml CHANGED
@@ -607,6 +607,7 @@
607
  <show_in_website>1</show_in_website>
608
  <show_in_store>1</show_in_store>
609
  <depends><frequency>0</frequency></depends>
 
610
  </time>
611
  <feeds_heading translate="label">
612
  <label>Generated Feeds</label>
607
  <show_in_website>1</show_in_website>
608
  <show_in_store>1</show_in_store>
609
  <depends><frequency>0</frequency></depends>
610
+ <tooltip>When using multiple feeds, the cron will run several times during this hour. For example when set to 12:00 with 3 feeds it will run at 12:00, 12:20, 12:40</tooltip>
611
  </time>
612
  <feeds_heading translate="label">
613
  <label>Generated Feeds</label>
app/locale/nl_NL/Magmodules_Sooqr.csv CHANGED
@@ -139,4 +139,6 @@
139
  "This overwrites the maximum amount of memory in bytes that a script is allowed to allocate, eg: 1024M.","Dit overschrijft de maximale hoeveelheid geheugen in bytes dat het script maximaal mag gebruiken, bijvoorbeeld: 1024M."
140
  "Max Execution Time","Maximale uitvoer tijd"
141
  "Only use this option if it's necessary to overwrite this setting because of your server memory limit or execution time.","Gebruik deze optie alleen als het nodig is om de instelling van het geheugen limiet of uitvoertijd van je server te overschrijven."
142
- "This overwrites the maximum time in seconds a script is allowed to run before it is terminated by the parser, eg: 300 (for 5 minutes).","Dit overschrijft de maximale tijd in seconden dat het script mag draaien voordat het wordt beëindigd, bijvoorbeeld: 300 (5 minuten)."
 
 
139
  "This overwrites the maximum amount of memory in bytes that a script is allowed to allocate, eg: 1024M.","Dit overschrijft de maximale hoeveelheid geheugen in bytes dat het script maximaal mag gebruiken, bijvoorbeeld: 1024M."
140
  "Max Execution Time","Maximale uitvoer tijd"
141
  "Only use this option if it's necessary to overwrite this setting because of your server memory limit or execution time.","Gebruik deze optie alleen als het nodig is om de instelling van het geheugen limiet of uitvoertijd van je server te overschrijven."
142
+ "This overwrites the maximum time in seconds a script is allowed to run before it is terminated by the parser, eg: 300 (for 5 minutes).","Dit overschrijft de maximale tijd in seconden dat het script mag draaien voordat het wordt beëindigd, bijvoorbeeld: 300 (5 minuten)."
143
+ "Please enable ""Flat Catalog Category"" and ""Flat Catalog Product"" for the extension to work properly. <a href=""https://www.magmodules.eu/help/enable-flat-catalog/v" target=""_blank"">More information.</a>","Activeer de ""Platte catalogus voor producten"" en de ""Platte catalogus voor categorieën"" om de extensie juist te laten functioneren. <a href=""https://www.magmodules.eu/help/enable-flat-catalog/"" target=""_blank""> Meer informatie.</a>"
144
+ "When using multiple feeds, the cron will run several times during this hour. For example when set to 12:00 with 3 feeds it will run at 12:00, 12:20, 12:40","Indien er meerdere feeds gebruikt worden zal de cronjob meerdere keren in dat uur draaien. Als voorbeeld, wanneer de starttijd 12:00 is zal de eerste cronjob gedraaid worden om 12:00 uur, met 3 feeds zal dit dan uitgevoerd worden om 12:00, 12:20 en 12:40"
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magmodules_Sooqr</name>
4
- <version>1.1.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Magmodules_Sooqr</description>
11
  <notes>Magmodules_Sooqr</notes>
12
  <authors><author><name>Magmodules</name><user>magmodules</user><email>info@magmodules.nl</email></author></authors>
13
- <date>2016-07-14</date>
14
- <time>11:36:42</time>
15
- <contents><target name="magecommunity"><dir name="Magmodules"><dir name="Sooqr"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Extra.php" hash="e583284820c631015ed78c131bf3cfa8"/><file name="Filter.php" hash="e21c1f53da21d4f3afbfe7691efce06e"/></dir><dir name="Renderer"><file name="Select.php" hash="69d71d66aaf7b842ef482affd484ec48"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feeds.php" hash="29007ed679b14e737b5dd784fc0eb668"/><file name="Heading.php" hash="a89db4f294f9c9e6785745163b1aed5f"/><file name="Note.php" hash="f131e40d8a0f4ed2e444d9e692a91ed5"/><file name="Version.php" hash="5832a42f30122977420d722683211f66"/></dir></dir></dir></dir><dir name="Widget"><dir name="Info"><file name="Info.php" hash="e8504af6f540c446f46603644cbe0e25"/></dir></dir></dir><file name="Search.php" hash="2acb516fec2f419e260240e8647c5999"/></dir><dir name="Helper"><file name="Data.php" hash="647b5e642566af455a3afcd312be1701"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Extra.php" hash="3e262b80ccc673e415bf51bf172c72d4"/><file name="Filter.php" hash="e6fac56290f6d0d7be78553e75cb18a3"/></dir><dir name="Sooqr"><file name="Cron.php" hash="905e30c03db2952d66c00eebc8b77477"/></dir></dir><dir name="Source"><file name="Action.php" hash="ef9830d9c1a98c94991626c4cc4909c9"/><file name="Attribute.php" hash="6f3736cd2f7de23b9d74356d7c1c557f"/><file name="Cacheresize.php" hash="86a916189abef3a670e58f3a8298f894"/><file name="Category.php" hash="92b245d0758fbe075b79c397a96d8567"/><file name="Categorytype.php" hash="8bc5f054db86f543019a6762a6a98562"/><file name="Condition.php" hash="bd66be4fe74f549d5fa6c213bd9b64f6"/><file name="Conditions.php" hash="502fe20b60e397240b8d552fd5ea4d81"/><file name="Configurable.php" hash="34a165474618953e44fd1de305371907"/><file name="Frequency.php" hash="f03bd90b098412026b21884e72c89aaf"/><file name="Identifier.php" hash="cdf5bd32696cb92a6f3be396ce5b3a6d"/><file name="Image.php" hash="610936b70a0cf63a3497a912bf885e06"/><file name="Images.php" hash="08658a5e913e334959ec476a61e2891f"/><file name="Pricemodel.php" hash="dbbeabc2853a7caecab3fc42a557766b"/><file name="Productid.php" hash="e4b431e0183d91bdd4f186f001119e77"/><file name="Producttype.php" hash="88d0e8386f59d7c0ea62a19cbf800fa4"/><file name="Resize.php" hash="1a0824757d8c87f85225f063de3a025b"/><file name="Selectattribute.php" hash="bcae6eff0788821f7d3dbf7d224b59e4"/><file name="Status.php" hash="2f474fe7188e3b1cf1d1714ffebcd9e8"/><file name="Tax.php" hash="c6e19d702751bc0c616768fceaf53855"/><file name="Textattribute.php" hash="9645d5652679a972a280cf337ab8662b"/><file name="Varcharattribute.php" hash="37a9253e8ea806f3402052a0b0744707"/><file name="Version.php" hash="906736f8f04f03421ab56a0c042639aa"/><file name="Visibility.php" hash="67f20c3b4581144b11ca8696c885b97d"/><file name="Weight.php" hash="fbc88d0b6bd073d00dc6e4a05ce1b4df"/></dir></dir></dir></dir><file name="Common.php" hash="b93ebcb4666437da90a125b99f0c5c5c"/><file name="Observer.php" hash="3aaaef864111e5d83f0b4d55c7618967"/><file name="Sooqr.php" hash="3a92a0a2eb471bf5a1f15a2bbc91f4ed"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="SooqrController.php" hash="13d562363e6e665825fed5b86f9d470f"/></dir><file name="InstallationController.php" hash="a96e58cbab2c7b6a3a4c9b42de62a59f"/></dir><dir name="etc"><file name="adminhtml.xml" hash="cf4313a4daa72837c48e137b51b11eba"/><file name="config.xml" hash="1dae2016da9d401cd0f906af68d42742"/><file name="system.xml" hash="cdd85d70d0ac8a467621e9a04ab24b03"/></dir></dir></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Magmodules_Sooqr.csv" hash="38992a5f4cf87eeee3d06ab38ead900b"/></dir><dir name="nl_NL"><file name="Magmodules_Sooqr.csv" hash="2fe3afa7c7597cf53c985aef2388ae24"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Sooqr.xml" hash="eeec89a005c4ccb1ed86bf90c446e3ef"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="magmodules"><dir name="sooqr"><file name="form.mini.phtml" hash="dfb86fc52128baeef3c81f1f1eb6cc1c"/></dir></dir></dir><dir name="layout"><file name="magmodules_sooqr.xml" hash="62a14cd61d3d74653b8d883d4d6b9d8d"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magmodules_Sooqr</name>
4
+ <version>1.1.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
7
  <channel>community</channel>
10
  <description>Magmodules_Sooqr</description>
11
  <notes>Magmodules_Sooqr</notes>
12
  <authors><author><name>Magmodules</name><user>magmodules</user><email>info@magmodules.nl</email></author></authors>
13
+ <date>2016-07-24</date>
14
+ <time>10:52:09</time>
15
+ <contents><target name="magecommunity"><dir name="Magmodules"><dir name="Sooqr"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Extra.php" hash="e583284820c631015ed78c131bf3cfa8"/><file name="Filter.php" hash="e21c1f53da21d4f3afbfe7691efce06e"/></dir><dir name="Renderer"><file name="Select.php" hash="69d71d66aaf7b842ef482affd484ec48"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feeds.php" hash="29007ed679b14e737b5dd784fc0eb668"/><file name="Heading.php" hash="a89db4f294f9c9e6785745163b1aed5f"/><file name="Note.php" hash="f131e40d8a0f4ed2e444d9e692a91ed5"/><file name="Version.php" hash="5832a42f30122977420d722683211f66"/></dir></dir></dir></dir><dir name="Widget"><dir name="Info"><file name="Info.php" hash="83ff73b2a4354af8a6c89c600ac86ed6"/></dir></dir></dir><file name="Search.php" hash="2acb516fec2f419e260240e8647c5999"/></dir><dir name="Helper"><file name="Data.php" hash="647b5e642566af455a3afcd312be1701"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Extra.php" hash="3e262b80ccc673e415bf51bf172c72d4"/><file name="Filter.php" hash="e6fac56290f6d0d7be78553e75cb18a3"/></dir><dir name="Sooqr"><file name="Cron.php" hash="cbc4182eca99a768636f52e2122e8c32"/></dir></dir><dir name="Source"><file name="Action.php" hash="ef9830d9c1a98c94991626c4cc4909c9"/><file name="Attribute.php" hash="6f3736cd2f7de23b9d74356d7c1c557f"/><file name="Cacheresize.php" hash="86a916189abef3a670e58f3a8298f894"/><file name="Category.php" hash="92b245d0758fbe075b79c397a96d8567"/><file name="Categorytype.php" hash="8bc5f054db86f543019a6762a6a98562"/><file name="Condition.php" hash="bd66be4fe74f549d5fa6c213bd9b64f6"/><file name="Conditions.php" hash="502fe20b60e397240b8d552fd5ea4d81"/><file name="Configurable.php" hash="34a165474618953e44fd1de305371907"/><file name="Frequency.php" hash="f03bd90b098412026b21884e72c89aaf"/><file name="Identifier.php" hash="cdf5bd32696cb92a6f3be396ce5b3a6d"/><file name="Image.php" hash="610936b70a0cf63a3497a912bf885e06"/><file name="Images.php" hash="08658a5e913e334959ec476a61e2891f"/><file name="Pricemodel.php" hash="dbbeabc2853a7caecab3fc42a557766b"/><file name="Productid.php" hash="e4b431e0183d91bdd4f186f001119e77"/><file name="Producttype.php" hash="88d0e8386f59d7c0ea62a19cbf800fa4"/><file name="Resize.php" hash="1a0824757d8c87f85225f063de3a025b"/><file name="Selectattribute.php" hash="bcae6eff0788821f7d3dbf7d224b59e4"/><file name="Status.php" hash="2f474fe7188e3b1cf1d1714ffebcd9e8"/><file name="Tax.php" hash="c6e19d702751bc0c616768fceaf53855"/><file name="Textattribute.php" hash="9645d5652679a972a280cf337ab8662b"/><file name="Varcharattribute.php" hash="37a9253e8ea806f3402052a0b0744707"/><file name="Version.php" hash="906736f8f04f03421ab56a0c042639aa"/><file name="Visibility.php" hash="67f20c3b4581144b11ca8696c885b97d"/><file name="Weight.php" hash="fbc88d0b6bd073d00dc6e4a05ce1b4df"/></dir></dir></dir></dir><file name="Common.php" hash="b93ebcb4666437da90a125b99f0c5c5c"/><file name="Observer.php" hash="3aaaef864111e5d83f0b4d55c7618967"/><file name="Sooqr.php" hash="5b7a44571d667e95133fb47e258cc999"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="SooqrController.php" hash="13d562363e6e665825fed5b86f9d470f"/></dir><file name="InstallationController.php" hash="a96e58cbab2c7b6a3a4c9b42de62a59f"/></dir><dir name="etc"><file name="adminhtml.xml" hash="cf4313a4daa72837c48e137b51b11eba"/><file name="config.xml" hash="fe748a3e5505bf759e03db7de3277ea3"/><file name="system.xml" hash="6924cf675f3807fa7190f0455390fe41"/></dir></dir></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Magmodules_Sooqr.csv" hash="38992a5f4cf87eeee3d06ab38ead900b"/></dir><dir name="nl_NL"><file name="Magmodules_Sooqr.csv" hash="7f45989fad8c6e6ad552a827757d5161"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Sooqr.xml" hash="eeec89a005c4ccb1ed86bf90c446e3ef"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="magmodules"><dir name="sooqr"><file name="form.mini.phtml" hash="dfb86fc52128baeef3c81f1f1eb6cc1c"/></dir></dir></dir><dir name="layout"><file name="magmodules_sooqr.xml" hash="62a14cd61d3d74653b8d883d4d6b9d8d"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>