Merge pull request #1 from meanbee/develop

Sync from meanbee
meanbee · Oct 4, 2018 · 18df561 · 18df561
2 parents c5e1c96 + 643989d
commit 18df561
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/app/code/community/Meanbee/Shippingrules/etc/config.xml b/app/code/community/Meanbee/Shippingrules/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Meanbee_Shippingrules>
-            <version>2.7.4</version>
+            <version>2.7.5</version>
         </Meanbee_Shippingrules>
     </modules>
     <global>
@@ -93,6 +93,7 @@
                 <condense_countries_on_grid>flag</condense_countries_on_grid>
                 <colapse_conditions_on_subcondition_on_grid>1</colapse_conditions_on_subcondition_on_grid>
                 <use_emoji_one>1</use_emoji_one>
+                <sallowspecific>0</sallowspecific>
             </meanship>
         </carriers>
     </default>

diff --git a/app/code/community/Meanbee/Shippingrules/etc/system.xml b/app/code/community/Meanbee/Shippingrules/etc/system.xml
@@ -93,6 +93,26 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </collapse_conditions_on_subcondition_on_grid>
+                        <sallowspecific translate="label">
+                            <label>Ship to Applicable Countries</label>
+                            <frontend_type>select</frontend_type>
+                            <sort_order>100</sort_order>
+                            <frontend_class>shipping-applicable-country</frontend_class>
+                            <source_model>adminhtml/system_config_source_shipping_allspecificcountries</source_model>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                        </sallowspecific>
+                        <specificcountry translate="label">
+                            <label>Ship to Specific Countries</label>
+                            <frontend_type>multiselect</frontend_type>
+                            <sort_order>101</sort_order>
+                            <source_model>adminhtml/system_config_source_country</source_model>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                            <can_be_empty>1</can_be_empty>
+                        </specificcountry>
                     </fields>
                 </meanship>
             </groups>

diff --git a/composer.json b/composer.json
@@ -0,0 +1,16 @@
+{
+	"name": "meanbee/magento-shipping-rules",
+	"description": "Magento 1 extension that uses the power of the promotion rules system to create flat rate shipping methods based on conditions",
+	"homepage": "https://www.meanbee.com/magento-extensions/meanbee-shipping-rules.html",
+	"type": "magento-module",
+	"version": "2.7.5",
+	"authors": [
+        		{
+			"name": "Meanbee",
+			"email": "[email protected]"
+			}
+		],
+	"require":{
+			"magento-hackathon/magento-composer-installer":"^3.0.0"
+		}
+}