From 5a75045d5627cc12a15c2c6a21230d8e81dbb2c4 Mon Sep 17 00:00:00 2001
From: Renon Stewart <s.renon@gmail.com>
Date: Fri, 8 Dec 2017 13:41:27 -0500
Subject: [PATCH] Issues #3 - remove default config

---
 .../Order/Create/Shipping/Method/Form.php     |  2 +-
 .../System/Config/Form/Composer/Version.php   |  2 +-
 .../System/Config/Form/Field/Link.php         |  2 +-
 .../System/Config/Form/Field/ShippingList.php |  2 +-
 .../System/Config/Form/Module/Version.php     |  2 +-
 Model/Carrier.php                             |  2 +-
 Plugin/Quote/Address/Total/ShippingPlugin.php |  2 +-
 composer.json                                 | 19 +++++++++++++------
 etc/acl.xml                                   |  2 +-
 etc/adminhtml/di.xml                          |  2 +-
 etc/adminhtml/system.xml                      |  2 +-
 etc/config.xml                                |  3 +--
 etc/module.xml                                |  2 +-
 registration.php                              |  2 +-
 .../layout/sales_order_create_index.xml       |  2 +-
 .../sales_order_create_load_block_data.xml    |  2 +-
 ...rder_create_load_block_shipping_method.xml |  2 +-
 .../order/create/shipping/method/form.phtml   |  2 +-
 18 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/Block/Adminhtml/Order/Create/Shipping/Method/Form.php b/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
index 7ebc57a..577e892 100644
--- a/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
+++ b/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/Block/Adminhtml/System/Config/Form/Composer/Version.php b/Block/Adminhtml/System/Config/Form/Composer/Version.php
index 73d4a0f..e4dc33b 100644
--- a/Block/Adminhtml/System/Config/Form/Composer/Version.php
+++ b/Block/Adminhtml/System/Config/Form/Composer/Version.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/Block/Adminhtml/System/Config/Form/Field/Link.php b/Block/Adminhtml/System/Config/Form/Field/Link.php
index 3687e6d..e8cd47f 100644
--- a/Block/Adminhtml/System/Config/Form/Field/Link.php
+++ b/Block/Adminhtml/System/Config/Form/Field/Link.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/Block/Adminhtml/System/Config/Form/Field/ShippingList.php b/Block/Adminhtml/System/Config/Form/Field/ShippingList.php
index 2534d6a..dc533f3 100644
--- a/Block/Adminhtml/System/Config/Form/Field/ShippingList.php
+++ b/Block/Adminhtml/System/Config/Form/Field/ShippingList.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/Block/Adminhtml/System/Config/Form/Module/Version.php b/Block/Adminhtml/System/Config/Form/Module/Version.php
index e8eedfc..3b2609f 100644
--- a/Block/Adminhtml/System/Config/Form/Module/Version.php
+++ b/Block/Adminhtml/System/Config/Form/Module/Version.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/Model/Carrier.php b/Model/Carrier.php
index 27990a6..e92e557 100644
--- a/Model/Carrier.php
+++ b/Model/Carrier.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/Plugin/Quote/Address/Total/ShippingPlugin.php b/Plugin/Quote/Address/Total/ShippingPlugin.php
index 3b7447e..61bf638 100644
--- a/Plugin/Quote/Address/Total/ShippingPlugin.php
+++ b/Plugin/Quote/Address/Total/ShippingPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/composer.json b/composer.json
index a1d7f4c..3ec5f1d 100644
--- a/composer.json
+++ b/composer.json
@@ -14,17 +14,24 @@
         "shipping method",
         "custom shipping"
     ],
+    "type": "magento2-module",
+    "version": "1.3.1",
+    "license": [
+        "MagePal License"
+    ],
+    "authors": [
+        {
+            "name": "MagePal",
+            "email": "hello@magepal.com",
+            "homepage": "https://packagist.org/packages/magepal/",
+            "role": "Leader"
+        }
+    ],
     "require": {
         "php": "~5.6.0|7.0.2|7.0.4|~7.0.6|~7.1.0",
         "magento/module-backend": "100.0.*|100.1.*|100.2.*",
         "magento/framework": "100.0.*|100.1.*|101.0.*"
     },
-    "type": "magento2-module",
-    "version": "1.3.0",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
diff --git a/etc/acl.xml b/etc/acl.xml
index 742ebcd..03de7cd 100644
--- a/etc/acl.xml
+++ b/etc/acl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!--
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
index ef0ca5c..3e37038 100644
--- a/etc/adminhtml/di.xml
+++ b/etc/adminhtml/di.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 9fd37ae..6f82638 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
diff --git a/etc/config.xml b/etc/config.xml
index 2878934..1f83b6d 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
@@ -14,7 +14,6 @@
                 <show_on_frontend>0</show_on_frontend>
                 <model>MagePal\CustomShippingRate\Model\Carrier</model>
                 <title>Custom Shipping Rate</title>
-                <shipping_type>a:2:{s:18:"_1473554993884_884";a:2:{s:4:"code";s:6:"pickup";s:5:"title";s:12:"Local Pickup";}s:18:"_1473555017318_318";a:2:{s:4:"code";s:7:"dropoff";s:5:"title";s:14:"Local Drop Off";}}</shipping_type>
             </customshippingrate>
         </carriers>
     </default>
diff --git a/etc/module.xml b/etc/module.xml
index 533fa2f..0874fe7 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
  -->
diff --git a/registration.php b/registration.php
index 3977c02..fbd024d 100644
--- a/registration.php
+++ b/registration.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 
diff --git a/view/adminhtml/layout/sales_order_create_index.xml b/view/adminhtml/layout/sales_order_create_index.xml
index 59dc552..576bf92 100644
--- a/view/adminhtml/layout/sales_order_create_index.xml
+++ b/view/adminhtml/layout/sales_order_create_index.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
diff --git a/view/adminhtml/layout/sales_order_create_load_block_data.xml b/view/adminhtml/layout/sales_order_create_load_block_data.xml
index ba95d0b..4e252e1 100644
--- a/view/adminhtml/layout/sales_order_create_load_block_data.xml
+++ b/view/adminhtml/layout/sales_order_create_load_block_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
diff --git a/view/adminhtml/layout/sales_order_create_load_block_shipping_method.xml b/view/adminhtml/layout/sales_order_create_load_block_shipping_method.xml
index 8004934..3c56f9b 100644
--- a/view/adminhtml/layout/sales_order_create_load_block_shipping_method.xml
+++ b/view/adminhtml/layout/sales_order_create_load_block_shipping_method.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */
 -->
diff --git a/view/adminhtml/templates/order/create/shipping/method/form.phtml b/view/adminhtml/templates/order/create/shipping/method/form.phtml
index 1146c71..03c3de6 100644
--- a/view/adminhtml/templates/order/create/shipping/method/form.phtml
+++ b/view/adminhtml/templates/order/create/shipping/method/form.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2017 MagePal LLC. All rights reserved.
+ * Copyright © MagePal LLC. All rights reserved.
  * See COPYING.txt for license details.
  */