Merge pull request #234 from vtex-apps/fix-bussines-days

Fix bussines days
vtex-apps · Jan 9, 2024 · d513d28 · d513d28
2 parents 1645cf8 + 280ac33
commit d513d28
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 837 deletions.
diff --git a/checkout-ui-custom/checkout6-custom.css b/checkout-ui-custom/checkout6-custom.css
diff --git a/checkout-ui-custom/checkout6-custom.js b/checkout-ui-custom/checkout6-custom.js
diff --git a/checkout-ui-custom/package.json b/checkout-ui-custom/package.json
@@ -23,7 +23,7 @@
     "eslint": "^8.40.0",
     "extract-loader": "^2.0.1",
     "file-loader": "^2.0.0",
-    "node-sass": "^4.9.3",
+    "sass": "^1.69.5",
     "postcss-cli": "^6.0.0",
     "postcss-loader": "^3.0.0",
     "sass-loader": "^7.1.0",

diff --git a/checkout-ui-custom/src/_js/_v.custom.checkout.ui.js b/checkout-ui-custom/src/_js/_v.custom.checkout.ui.js
@@ -551,22 +551,30 @@ class checkoutCustom {
     return holidaysCount;
   }
 
-  addBusinessDays(n, lang = window.i18n.options.lng) {
+   addBusinessDays(n, days, lang = window.i18n.options.lng) {
     const _this = this
 
+    let typeDays = days.replace(/[0-9]/g, '');
+
     try {
 
       let d = new Date()
 
       d = new Date(d.getTime())
       const day = d.getDay()
 
-      d.setDate(
-        d.getDate() +
-          n +
-          (day === 6 ? 2 : +!day) +
-          Math.floor((n - 1 + (day % 6 || 1)) / 5) * 2
-      )
+      if(typeDays === "d") {
+        d.setDate(
+          d.getDate() + n 
+        )
+      } else {
+        d.setDate(
+          d.getDate() +
+            n +
+            (day === 6 ? 2 : +!day) +
+            Math.floor((n - 1 + (day % 6 || 1)) / 5) * 2
+        )
+      }
 
       let bdHolidays = 0
       if(_this._holidays ) {
@@ -691,7 +699,7 @@ class checkoutCustom {
           $(this)
             .find(mainSTIelems.join(', '))
             .html(
-              `${_delivtext} <strong>${_this.addBusinessDays(days)}</strong>`
+              `${_delivtext} <strong>${_this.addBusinessDays(days, selectedSlaDays)}</strong>`
             )
             .addClass('v-changeShippingTimeInfo-elem-active')
         }
@@ -736,7 +744,7 @@ class checkoutCustom {
               } // check if is pickup. OBS: none of others solutions worked, needs constantly update
 
               deliveryDates.push(
-                `${_delivtext} <strong>${_this.addBusinessDays(days)}</strong>`
+                `${_delivtext} <strong>${_this.addBusinessDays(days, selectedSlaDays)}</strong>`
               )
             }
           }

diff --git a/checkout-ui-custom/yarn.lock b/checkout-ui-custom/yarn.lock
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "checkout-ui-custom",
   "vendor": "vtex",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "title": "Checkout Custom",
   "description": "Make possible to customize the checkout layout using a easy to use interface from the admin",
   "builders": {

diff --git a/node/templates/checkout6-custom.css b/node/templates/checkout6-custom.css
diff --git a/node/templates/checkout6-custom.js b/node/templates/checkout6-custom.js