20.20.0 SHQ18-155 support map and location details for in store pickup

shipperhq · Aug 2, 2018 · ad8cfbb · ad8cfbb
1 parent 511862a
commit ad8cfbb
Show file tree

Hide file tree

Showing 12 changed files with 84 additions and 42 deletions.
diff --git a/CHANGELOG-PUBLIC.md b/CHANGELOG-PUBLIC.md
@@ -284,3 +284,7 @@ SHQ18-438 Implement rounding for decimal quantities under 1
 SHQ18-127 Fix conflict with B2B module
 
 
+## 20.20.0 (2018-08-02)
+SHQ18-155 support map and location details for in store pickup
+
+
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -284,3 +284,7 @@ SHQ18-438 Implement rounding for decimal quantities under 1
 SHQ18-127 Fix conflict with B2B module
 
 
+## 20.20.0 (2018-08-02)
+SHQ18-155 support map and location details for in store pickup
+
+
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "shipperhq/module-shipper",
     "description": "Magento Shipping integration with ShipperHQ",
     "type": "magento2-module",
-    "version": "20.19.0",
+    "version": "20.20.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/grumphp.yml b/grumphp.yml
@@ -1,16 +1,16 @@
 parameters:
-    git_dir: .
-    bin_dir: vendor/bin
-    tasks:
-      - phplint:
-            exclude: ['vendor']
-            triggered_by: ['php', 'phtml']
-      - phpmd:
-            exclude: ['vendor']
-            ruleset: ['cleancode', 'codesize', 'naming']
-            triggered_by: ['php', 'phtml']
-      - phpcs:
-            exclude: ['vendor']
-            standard: "vendor/magento-ecg/coding-standard/Ecg/"
-            show_warnings: false
-            triggered_by: ['php', 'phtml']
+  bin_dir: vendor/bin
+  git_dir: .
+  tasks:
+    phplint:
+      exclude: [vendor]
+      triggered_by: [php, phtml]
+    phpmd:
+      exclude: [vendor]
+      ruleset: [cleancode, codesize, naming]
+      triggered_by: [php, phtml]
+    phpcs:
+      ignore_patterns: [vendor]
+      show_warnings: false
+      standard: vendor/magento-ecg/coding-standard/Ecg/
+      triggered_by: [php, phtml]
diff --git a/src/composer.json b/src/composer.json
@@ -2,7 +2,7 @@
   "name": "shipperhq/module-shipper",
   "description": "Magento Shipping integration with ShipperHQ",
   "type": "magento2-module",
-  "version": "20.19.0",
+  "version": "20.20.0",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

diff --git a/src/etc/config.xml b/src/etc/config.xml
@@ -57,7 +57,7 @@
                 <ws_timeout>30</ws_timeout>
                 <use_cache>0</use_cache>
                 <always_use_cache>1</always_use_cache>
-                <extension_version>20.19.0</extension_version>
+                <extension_version>20.20.0</extension_version>
                 <allowed_methods></allowed_methods>
                 <magento_version></magento_version>
             </shipper>

diff --git a/src/view/frontend/layout/checkout_index_index.xml b/src/view/frontend/layout/checkout_index_index.xml
@@ -8,6 +8,8 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
         <css src="ShipperHQ_Shipper::css/shipperhq-checkout.css"/>
+        <css src="ShipperHQ_Shipper::css/featherlight.min.css"/>
+        <css src="ShipperHQ_Shipper::css/featherlight.gallery.min.css"/>
     </head>
     <body>
         <referenceBlock name="checkout.root">

diff --git a/src/view/frontend/web/css/featherlight.gallery.min.css b/src/view/frontend/web/css/featherlight.gallery.min.css
diff --git a/src/view/frontend/web/css/featherlight.min.css b/src/view/frontend/web/css/featherlight.min.css
diff --git a/src/view/frontend/web/css/shipperhq-checkout.css b/src/view/frontend/web/css/shipperhq-checkout.css
@@ -7,44 +7,40 @@
 }
 
 form.methods-shipping input.shq-input {
-    width: 80% !important;
+    width: 80%;
 }
 
 .form.methods-shipping select,
 .form.methods-shipping input {
-    font-size: 12px !important;
-    height: 30px !important;
-    border: 1px solid #ddd !important;
-    max-width: 100% !important;
+    font-size: 12px;
+    height: 30px;
+    border: 1px solid #ddd;
+    max-width: 100%;
     float: left;
     line-height: 30px;
     padding-left: 5px;
     padding-right: 5px;
 }
+.form.methods-shipping input[type="radio"] {
+    height: auto;
+    margin-top: 4px;
+}
+
+.shq-optn-50l,
+.shq-optn-50r {
+    margin-bottom: 10px;
+}
 
 .shq-optn-50l,
 .shq-optn-50r,
 .shq-optn-100 {
     float: left;
-    margin-bottom: 20px;
     font-size: 12px;
 }
 
-.shq-optn-50l {
-    width: 46%;
-    padding-right: 4%;
-    box-sizing: content-box;
-}
-
-.shq-optn-50r {
-    width: 46%;
-    padding-left: 4%;
-    box-sizing: content-box;
-}
-
-.shq-optn-100 {
-    width: 100%;
-}
+.shq-optn-50l {width: 50%; padding-right: 5px; box-sizing: border-box;}
+.shq-optn-50r {width: 50%; padding-left: 5px; box-sizing: border-box;}
+.shq-optn-100 {width: 100%;}
 
 .form.methods-shipping label.shq-title,
 .form.methods-shipping input.shq-input,
@@ -53,7 +49,6 @@ form.methods-shipping input.shq-input {
 }
 
 .form.methods-shipping input.shq-input {
-    width: auto;
     float: left;
 }
 
@@ -66,7 +61,8 @@ form.methods-shipping input.shq-input {
 }
 
 .shq-input {
-    margin-top: 5px;
+    margin-bottom: 5px;
+    margin-top: 2px;
 }
 
 .shq-datepicker button {
@@ -75,6 +71,11 @@ form.methods-shipping input.shq-input {
     margin: 0 5px 0 0;
 }
 
+.shq_datepicker button.ui-datepicker-trigger {
+    margin-top: 5px;
+    margin-left: 2px;
+}
+
 @media only screen and (max-width: 480px) {
 
     .shq-optn-50l {
@@ -87,4 +88,4 @@ form.methods-shipping input.shq-input {
         padding-left: 0;
     }
 
-}
+}
diff --git a/src/view/frontend/web/js/lib/featherlight.gallery.min.js b/src/view/frontend/web/js/lib/featherlight.gallery.min.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -284,3 +284,7 @@ SHQ18-438 Implement rounding for decimal quantities under 1
		SHQ18-127 Fix conflict with B2B module


		## 20.20.0 (2018-08-02)
		SHQ18-155 support map and location details for in store pickup