Merge pull request #235 from Erislandio/fix/fix-address-trim-error

fix: fix orderForm address street trim error
vtex-apps · Jan 17, 2024 · 628f238 · 628f238
2 parents 6029fb5 + 4b574a5
commit 628f238
Show file tree

Hide file tree

Showing 5 changed files with 4,129 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## Fixed
+- Fix trim errors
+
 ## [0.15.4] - 2024-01-10
 
 ## [0.15.3] - 2024-01-09

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/src/_js/_v.custom.checkout.ui.js b/checkout-ui-custom/src/_js/_v.custom.checkout.ui.js
@@ -565,7 +565,7 @@ class checkoutCustom {
 
       if(typeDays === "d") {
         d.setDate(
-          d.getDate() + n 
+          d.getDate() + n
         )
       } else {
         d.setDate(
@@ -1089,7 +1089,7 @@ class checkoutCustom {
 
   appendMessageEmptyStreet(orderForm) {
     const _this = this
-    if(!(orderForm && orderForm.shippingData && orderForm.shippingData.address && orderForm.shippingData.address.street != null||undefined && orderForm.shippingData.address.street.trim()) ) {
+    if(!(orderForm && orderForm.shippingData && orderForm.shippingData.address && orderForm.shippingData.address.street != null || undefined && orderForm.shippingData.address.street.trim())) {
       if( !$('.alert-noStreet').length && $('.accordion-inner.shipping-container').length) $('.orderform-template-holder #shipping-data .accordion-inner').append(`<div class="alert-noStreet"><span class="alert">${_this.locale ? _this.locale.noStreetAddress || 'Your shipping information is missing a required field, please include a street' : 'Your shipping information is missing a required field, please include a street'}</span></div>`)
     } else {
       $('.alert-noStreet').remove()
@@ -1099,12 +1099,13 @@ class checkoutCustom {
 
   URLHasIncludePayment(orderForm) {
     const _this = this
-
+    
     if (
       window.location.hash === '#/payment' &&
       orderForm.shippingData &&
       orderForm.shippingData.address &&
       orderForm.shippingData.address.addressType !== 'search' &&
+      orderForm.shippingData.address.street &&
       !orderForm.shippingData.address.street.trim() &&
       _this.customAddressForm
     ) {

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