Merge pull request #54 from Paazl/1.5.0

1.5.0
Paazl · Mar 26, 2021 · 4237b07 · 4237b07
2 parents fd6bc8e + 1df7880
commit 4237b07
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/ViewModel/Pickup/Info.php b/ViewModel/Pickup/Info.php
@@ -212,4 +212,16 @@ public function getLocationName()
     {
         return $this->getOrderInfo()->getLocationName();
     }
+
+    /**
+     * @return string
+     */
+    public function getLocationCode()
+    {
+        try {
+            return (string)$this->getOrderInfo()->getLocationCode();
+        } catch (NoSuchEntityException $e) {
+            return '';
+        }
+    }
 }
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "paazl/magento2-checkout-widget",
   "description": "Paazl checkoutWidget for Magento 2",
   "type": "magento2-module",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "keywords": [
     "Paazl",
     "Magento 2",

diff --git a/etc/config.xml b/etc/config.xml
@@ -8,7 +8,7 @@
     <default>
         <carriers>
             <paazlshipping>
-                <version>v1.4.1</version>
+                <version>v1.5.0</version>
                 <active>0</active>
                 <sallowspecific>0</sallowspecific>
                 <price>0</price>

diff --git a/view/adminhtml/templates/order/view/pickup/info.phtml b/view/adminhtml/templates/order/view/pickup/info.phtml
@@ -16,6 +16,13 @@ $viewModel = $block->getData('pickupViewModel');
     <?= $block->escapeHtml($viewModel->getLocationName()) ?>
     <div class="pickup-info-wrapper">
         <?= /* @escapeNotVerified */ $pickupAddress ?>
+
+        <?php if ($viewModel->getLocationCode()): ?>
+            <div class="store-code-wrapper">
+                <strong><?= /* @noEscape */ __('Pick-up location ID') ?>:</strong><br/>
+                <?= $block->escapeHtml($viewModel->getLocationCode())?>
+            </div>
+        <?php endif; ?>
     </div>
 <?php endif;?>
 
diff --git a/view/adminhtml/web/css/styles.css b/view/adminhtml/web/css/styles.css
@@ -180,4 +180,9 @@ section.paazl.method-select {
 section.paazl.method-select section.paazl__body.body form.options {
     max-height: 400px;
     overflow-y: auto;
-}
+}
+
+.pickup-info-wrapper .store-code-wrapper {
+    margin-top: 1.5em;
+    margin-bottom: 1.5em;
+}