Merge pull request #3 from mageworx/compatibility_new

Update compatibility with latest module version
mageworx · Apr 8, 2022 · f73d5af · f73d5af
2 parents 1b081f4 + 0f1e1b7
commit f73d5af
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 34 deletions.
diff --git a/Observer/CheckoutLayoutModifier.php b/Observer/CheckoutLayoutModifier.php
@@ -23,7 +23,7 @@ class CheckoutLayoutModifier implements ObserverInterface
      */
     public function execute(Observer $observer)
     {
-        /** @var \MageWorx\Checkout\Api\LayoutModifierAccess $subject */
+        /** @var \MageWorx\Checkout\Api\LayoutModifierAccessInterface $subject */
         $subject = $observer->getSubject();
         /** @var array $jsLayout */
         $jsLayout = &$subject->getJsLayout();

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
         "mageworx/module-deliverydate" : ">=1.8.6 < 1.14"
     },
     "type": "magento2-module",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
@@ -7,9 +7,6 @@ var config = {
         mixins: {
             'MageWorx_DeliveryDate/js/checkout/time_range': {
                 'MageWorx_DeliveryDateCheckout/js/mixin/time-range-mixin': true
-            },
-            'MageWorx_DeliveryDate/js/checkout/delivery_date_manager': {
-                'MageWorx_DeliveryDateCheckout/js/mixin/delivery_date_manager-mixin': true
             }
         }
     }

diff --git a/view/frontend/web/js/mixin/delivery_date_manager-mixin.js b/view/frontend/web/js/mixin/delivery_date_manager-mixin.js
diff --git a/view/frontend/web/template/form/element/date/calendar.html b/view/frontend/web/template/form/element/date/calendar.html
@@ -9,17 +9,17 @@
        autocomplete="off"
        data-bind="
     hasFocus: focused,
-    datepicker: {
-        storage: shiftedValue,
-        options: options
-    },
     valueUpdate: valueUpdate,
     attr: {
         value: shiftedValue,
         name: inputName,
-        id: 'delivery-day-' + method.method_code + '_' + method.carrier_code,
+        id: uid,
         placeholder: placeholder,
         'aria-describedby': noticeId,
         disabled: disabled,
         autocomplete: autocomplete
+    },
+    datepicker: {
+        storage: shiftedValue,
+        options: options
     }"/>