From b3a8655627a9e21710960c637e639adbba873707 Mon Sep 17 00:00:00 2001
From: Chris Nolan <chris@leytech.co.uk>
Date: Mon, 3 Jul 2017 12:54:24 +0100
Subject: [PATCH 1/5] Admin options to set applicable countries

---
 .../Meanbee/Shippingrules/etc/config.xml      |  1 +
 .../Meanbee/Shippingrules/etc/system.xml      | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/app/code/community/Meanbee/Shippingrules/etc/config.xml b/app/code/community/Meanbee/Shippingrules/etc/config.xml
index abb3ad4..078b623 100644
--- a/app/code/community/Meanbee/Shippingrules/etc/config.xml
+++ b/app/code/community/Meanbee/Shippingrules/etc/config.xml
@@ -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
index e8816d4..15b95e5 100644
--- 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>

From 42fcb7ec30caf61a53378f5860e73effd328f8fd Mon Sep 17 00:00:00 2001
From: Craig Fleming <craigfleming@users.noreply.github.com>
Date: Tue, 22 Aug 2017 21:41:41 +0100
Subject: [PATCH 2/5] Create composer.json

Add composer.json to the root of the extension to allow the extension to be installed via Composer Package Manager directly from GitHub.
---
 composer.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 composer.json

diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..63fd528
--- /dev/null
+++ 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.4",
+    "authors": [
+        {
+            "name": "Meanbee",
+            "email": "hello@meanbee.com"
+        }
+    ],
+	"require":{
+			"magento-hackathon/magento-composer-installer":"^3.0.0"
+		}
+}

From b4d691329b09f617c715415a8c95ba9d0a6d4348 Mon Sep 17 00:00:00 2001
From: Craig Fleming <craigfleming@users.noreply.github.com>
Date: Thu, 24 Aug 2017 22:42:28 +0100
Subject: [PATCH 3/5] Update composer.json

Fixed indentation issues.
---
 composer.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 63fd528..a0dcf56 100644
--- a/composer.json
+++ b/composer.json
@@ -1,15 +1,15 @@
 {
-    "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.4",
-    "authors": [
-        {
-            "name": "Meanbee",
-            "email": "hello@meanbee.com"
-        }
-    ],
+	"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.4",
+	"authors": [
+        		{
+			"name": "Meanbee",
+			"email": "hello@meanbee.com"
+			}
+		],
 	"require":{
 			"magento-hackathon/magento-composer-installer":"^3.0.0"
 		}

From b9a19ef2f7b28212c8f91475452000a544bf4b53 Mon Sep 17 00:00:00 2001
From: Tom Robertshaw <me@tomrobertshaw.net>
Date: Wed, 30 Aug 2017 09:13:53 -0500
Subject: [PATCH 4/5] Bump version to 2.7.5

---
 app/code/community/Meanbee/Shippingrules/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/community/Meanbee/Shippingrules/etc/config.xml b/app/code/community/Meanbee/Shippingrules/etc/config.xml
index 078b623..e6cb145 100644
--- 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>

From 643989dc51bc89a995d7ffc0cda4cdd9a9aed3cf Mon Sep 17 00:00:00 2001
From: Tom Robertshaw <me@tomrobertshaw.net>
Date: Wed, 30 Aug 2017 09:14:12 -0500
Subject: [PATCH 5/5] Bump version to 2.7.5

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a0dcf56..6adb648 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
 	"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.4",
+	"version": "2.7.5",
 	"authors": [
         		{
 			"name": "Meanbee",