Merge pull request #135 from Invertus/opcps-module-fixes

onepagecheckout ps module compatibility fixes
Invertus · Jul 5, 2024 · 12311d4 · 12311d4
2 parents 4a9116d + 14def08
commit 12311d4
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 8 deletions.
diff --git a/dpdbaltics.php b/dpdbaltics.php
@@ -214,6 +214,12 @@ public function hookActionFrontControllerSetMedia()
                     'priority' => 130
                 ]
             );
+
+            Media::addJsDef([
+                'dpdbaltics' => [
+                    'isOnePageCheckout' => $opcModuleCompatibilityValidator->isOpcModuleInUse()
+                ]
+            ]);
         }
 
         /** @var \Invertus\dpdBaltics\Provider\CurrentCountryProvider $currentCountryProvider */
@@ -272,7 +278,7 @@ public function hookActionFrontControllerSetMedia()
                 'dpdLockerMarkerPath' => $this->getPathUri() . 'views/img/locker.png',
                 'dpdHookAjaxUrl' => $this->context->link->getModuleLink($this->name, 'Ajax'),
                 'pudoSelectSuccess' => $this->l('Pick-up point selected'),
-                'dpd_carrier_ids' => $carrierIds
+                'dpd_carrier_ids' => $carrierIds,
             ]);
 
             $this->context->controller->registerStylesheet(

diff --git a/views/css/front/onepagecheckout.css b/views/css/front/onepagecheckout.css
@@ -50,7 +50,8 @@
 }
 
 .chosen-container {
-    width: 100%;
+    width: 100% !important;
+    max-width: 290px;
 }
 
 .carrier-extra-content .chosen-select {
@@ -60,4 +61,9 @@
 
 .dpd-checkout-delivery-time--container {
     width: 100%;
+}
+
+.search-block-container {
+    padding-left: 15px;
+    padding-right: 15px;
 }
diff --git a/views/js/front/order-opc.js b/views/js/front/order-opc.js
@@ -17,6 +17,12 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 var isPudoPointSelected = false;
+var phoneQuerySelectors = [
+    '#checkout #delivery-address [name="phone"]',
+    '.address-fields input[name="phone"]',
+    '#checkout [name="delivery_phone_mobile"]'
+];
+
 $(document).ready(function (){
 
     $(document).on('change', '.dpd-phone-block', function() {
@@ -51,9 +57,19 @@ function handlePhoneNumber(selector)
     if (!$('.dpd-phone-block')) {
         return true;
     }
+
     var phone = selector.find('input[name="dpd-phone"]').val();
     var phoneArea = selector.find('select[name="dpd-phone-area"] option:selected').val();
 
+    // if empty then take it from opc phone field
+    if (phone === '') {
+        phoneQuerySelectors.forEach(function (phoneSelector) {
+            if ($(phoneSelector).val()) {
+                phone = $(phoneSelector).val();
+            }
+        });
+    }
+
     if (currentController === 'supercheckout') {
         saveSelectedPhoneNumberSuperCheckout(phone, phoneArea)
     } else {
@@ -95,8 +111,10 @@ function DPDdisplayMessageOpc(parent, template) {
 
 // Module "onepagecheckoutps" compatibility
 $(document).on('opc-load-review:completed', function() {
-    $('.delivery-option.selected .carrier-extra-content').show();
     handlePhoneNumber($('.dpd-phone-block'));
 });
 
-
+// Then address is being modified
+$(document).on('thecheckout_Address_Modified', function () {
+    handlePhoneNumber($('.dpd-phone-block'));
+});
diff --git a/views/js/front/pudo.js b/views/js/front/pudo.js
@@ -108,7 +108,7 @@ $(document).ready(function () {
             }
 
             //Js to open extra content failed from theme, doing it manually.
-            if (params.deliveryOption.length > 0 && !$(params.deliveryOption).next('.carrier-extra-content').is(':visible')) {
+            if (params.deliveryOption.length > 0 && !$(params.deliveryOption).next('.carrier-extra-content').is(':visible') && !dpdbaltics.isOnePageCheckout) {
                 $('.carrier-extra-content').hide();
                 $(params.deliveryOption).next('.carrier-extra-content').slideDown();
             }

diff --git a/views/templates/hook/front/partials/pudo-search-block.tpl b/views/templates/hook/front/partials/pudo-search-block.tpl
@@ -19,10 +19,10 @@
 
 <div class="search-block-container">
         {if count($city_list) > 1}
-    <div class="col-xl-6 col-lg-6 col-sm-12 dpd-city-block dpd-select-wrapper dpd-input-wrapper">
+    <div class="{if !($isOpcCheckout)}col-xl-6 col-lg-6 col-sm-12 {/if}dpd-city-block dpd-select-wrapper dpd-input-wrapper">
     <select name="dpd-city" class="form-control-chosen chosen-select">
         {else}
-        <div class="col-xl-0 col-lg-0 col-sm-12 dpd-city-block dpd-select-wrapper">
+        <div class="{if !($isOpcCheckout)}col-xl-0 col-lg-0 col-sm-12 {/if}dpd-city-block dpd-select-wrapper">
         <select name="dpd-city" style="display: none">
         {/if}
             {if !empty($city_list)}
@@ -40,7 +40,7 @@
         </div>
     </div>
 
-    <div class="col-xl-6 col-lg-6 col-sm-12 dpd-city-block dpd-input-wrapper js-pudo-search-street">
+    <div class="{if !($isOpcCheckout)}col-xl-6 col-lg-6 col-sm-12 {/if}dpd-city-block dpd-input-wrapper js-pudo-search-street">
         {include file='module:dpdbaltics/views/templates/hook/front/partials/pudo-search-street.tpl'}
     </div>
 </div>