Merge pull request #11 from magmodules/1.3.2

1.3.2

.travis.yml

@@ -4,6 +4,7 @@ php:
 - 5.6
 - 7.0
 - 7.1
+- 7.2
 
 sudo: false
 

app/code/community/Magmodules/Sooqr/Model/System/Config/Backend/Design/Extra.php

@@ -60,11 +60,11 @@ public function _beforeSave()
      *
      * @return mixed
      */
-    function orderData($data, $sort)
+    public function orderData($data, $sort)
     {
-        $code = "return strnatcmp(\$a['$sort'], \$b['$sort']);";
-        usort($data, create_function('$a,$b', $code));
+        usort($data, function ($a, $b) use ($sort) {
+            return strnatcmp($a[$sort], $b[$sort]);
+        });
         return $data;
     }
-
 }

app/code/community/Magmodules/Sooqr/etc/config.xml

@@ -20,7 +20,7 @@
 <config>
     <modules>
         <Magmodules_Sooqr>
-            <version>1.3.1</version>
+            <version>1.3.2</version>
         </Magmodules_Sooqr>
     </modules>
     <global>

app/code/community/Magmodules/Sooqr/etc/system.xml

@@ -92,7 +92,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <tooltip>You can find your Sooqr Account ID in your Sooqr account, you can find the link in the information box at the top of this page.</tooltip>
-                            <comment>It should look like SQ-12345-1.</comment>
+                            <comment>It should look like SQ-123456-1.</comment>
                         </account_id>
                         <api_key translate="label">
                             <label>Sooqr API Key</label>
@@ -201,7 +201,7 @@
                     <expanded>1</expanded>
                     <fields>
                         <note translate="label">
-                            <label><![CDATA[This section lists all the available attributes for the Sooqr Product Feed. Some attributes are required for all products and some are required for certain product types such as apparel, others are recommended. To get the best results with Sooqr lease make sure that you provide most of the attributes.]]></label>
+                            <label><![CDATA[This section lists all the available attributes for the Sooqr Product Feed. Some attributes are required for all products and some are required for certain product types such as apparel, others are recommended. To get the best results with Sooqr please make sure that you provide most of the attributes.]]></label>
                             <frontend_model>sooqr/adminhtml_system_config_form_field_note</frontend_model>
                             <sort_order>1</sort_order>
                             <show_in_default>1</show_in_default>
@@ -270,7 +270,7 @@
                             <show_in_store>1</show_in_store>
                         </images_heading>
                         <note_resize translate="label">
-                            <label><![CDATA[Image resize options are only available on store level which can be selected from the scope dropdown on the left top of this page.<br>]]></label>
+                            <label><![CDATA[Image resize options are only available on store level which can be selected from the scope dropdown on the left top of this page. Please note that the Sooqr Feed needs to be regenerated if a Image Cache Flush is executed.]]></label>
                             <frontend_model>sooqr/adminhtml_system_config_form_field_note</frontend_model>
                             <sort_order>21</sort_order>
                             <show_in_default>1</show_in_default>
@@ -352,6 +352,7 @@
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
+                            <comment><![CDATA[This will not be used on the front-end but only as data to use in Sooqr Search.]]></comment>
                         </reviews_heading>
                         <reviews_note translate="label">
                             <label><![CDATA[Export the product rating score in the feed to use it in Sooqr Search. Please keep in mind that activating this option can cause a higher load on the feed generation.]]></label>
@@ -379,7 +380,7 @@
                             <show_in_store>1</show_in_store>
                         </tax_heading>
                         <tax_note translate="label">
-                            <label><![CDATA[By default prices are shown incl. Tax so only change this option if necessary.<br>If the feed export is without tax it's possible to add it with this option.<br>]]></label>
+                            <label><![CDATA[By default prices are shown incl. Tax, so only change this option if necessary.<br>If the feed export is without tax it's possible to add it with this option.<br>]]></label>
                             <frontend_model>sooqr/adminhtml_system_config_form_field_note</frontend_model>
                             <sort_order>41</sort_order>
                             <show_in_default>1</show_in_default>

app/design/frontend/base/default/template/magmodules/sooqr/form.mini.phtml

@@ -35,7 +35,6 @@ $catalogSearchHelper = $this->helper('catalogsearch');
             _wssq.push(['_load', {'suggest': <?php echo json_encode($this->getSooqrOptions()) ?>}]);
             _wssq.push(['suggest._setPosition', 'screen-middle']);
             _wssq.push(['suggest._setLocale', '<?php echo $this->getSooqrLanguage() ?>']);
-            _wssq.push(['suggest._setFixedFilters', {'magento_store': '<?php echo Mage::app()->getStore()->getCode(); ?>'}]);
             <?php if (!$this->isTrackingEnabled()) { ?>
             _wssq.push(['suggest._disableTracking']);
             <?php } ?>
@@ -45,7 +44,6 @@ $catalogSearchHelper = $this->helper('catalogsearch');
             _wssq.push(['_load', {'suggest': <?php echo json_encode($this->getSooqrOptions('second')) ?>}]);
             _wssq.push(['suggest2._setPosition', 'screen-middle']);
             _wssq.push(['suggest2._setLocale', '<?php echo $this->getSooqrLanguage() ?>']);
-            _wssq.push(['suggest2._setFixedFilters', {'magento_store': '<?php echo Mage::app()->getStore()->getCode(); ?>'}]);
             <?php if (!$this->isTrackingEnabled()): ?>
             _wssq.push(['suggest2._disableTracking']);
             <?php endif; ?>
@@ -64,7 +62,6 @@ $catalogSearchHelper = $this->helper('catalogsearch');
             _wssq.push(['_load', {'suggest': <?php echo json_encode($this->getSooqrOptions()) ?>}]);
             _wssq.push(['suggest._setPosition', 'screen-middle']);
             _wssq.push(['suggest._setLocale', '<?php echo $this->getSooqrLanguage() ?>']);
-            _wssq.push(['suggest._setFixedFilters', {'magento_store': '<?php echo Mage::app()->getStore()->getCode(); ?>'}]);
             <?php if (!$this->isTrackingEnabled()): ?>
             _wssq.push(['suggest._disableTracking']);
             <?php endif; ?>

composer.json

@@ -2,7 +2,7 @@
   "name": "magmodules/magento1-sooqr",
   "type": "magento-module",
   "description": "Magento 1 Sooqr integration",
-  "version": "v1.3.1",
+  "version": "v1.3.2",
   "keywords": [
     "magento","sooqr","search"
   ],