Merge pull request #219 from vtex-apps/fix/indexedItems

- match of shipping step as indexOf

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- match of shipping step as indexOf
+- indexedItems when having gift
+
 ## [0.13.2] - 2023-08-04
 
 ### Fixed

checkout-ui-custom/src/_js/_customAddressForm.js

@@ -997,7 +997,6 @@ class fnsCustomAddressForm {
     $(window).on('orderFormUpdated.vtex', function (evt, orderForm) {
       _this.orderForm = orderForm
       _this.checkFirstLogin(orderForm)
-
     })
 
   }
@@ -1023,9 +1022,7 @@ class fnsCustomAddressForm {
         .getCountryRule(_this.orderForm.storePreferencesData.countryCode)
         .then(rules => {
           _this.addressrules = rules
-          _this.checkFirstLogin(orderForm)
           _this.bind()
-          _this.events()
           _this.deliveryCountries = window.checkout.deliveryCountries()
           _this.mainCountry = window.checkout.countryCode()
           _this.lang = _this.orderForm.clientPreferencesData.locale

checkout-ui-custom/src/_js/_v.custom.checkout.ui.js

@@ -479,7 +479,7 @@ class checkoutCustom {
       if (_orderForm.length) {
         const indexedInItems = _orderForm.reduce((c, v) => {
           if (v.parentItemIndex !== null) {
-            const index = v.parentItemIndex - giftDifference < 0 ? v.parentItemIndex : v.parentItemIndex - giftDifference
+            const index = v.parentItemIndex
             c[index] = c[index] || []
             c[index].push(v)
           }
@@ -838,12 +838,11 @@ class checkoutCustom {
     if (window.location.hash) {
       const [, hashstep] = window.location.hash.split('/')
 
+      const classStep = bClassStep.filter( st => { return ~hashstep.indexOf(st) })
       if (
-        bClassStep.findIndex(st => {
-          return st === hashstep
-        }) !== -1
+        classStep.length
       ) {
-        $('body').addClass(prefixClass + hashstep)
+        $('body').addClass(prefixClass + classStep[0])
       }
     }
   }
@@ -1000,22 +999,14 @@ class checkoutCustom {
 
     if (_this.customAddressForm) {
       _this.customAddressForm = new FnsCustomAddressForm({})
+      _this.customAddressForm.events()
     }
   }
 
   goToShippingStep() {
     window.location.hash = '#/shipping'
   }
 
-  activateCustomForm() {
-    const _this = this
-
-    if (_this.customAddressForm) {
-      $('body').addClass('v-custom-addressForm-on')
-      _this.customAddressForm.validateAllFields()
-    }
-  }
-
   appendMessageEmptyStreet(orderForm) {
     const _this = this
     if(!(orderForm && orderForm.shippingData && orderForm.shippingData.address && orderForm.shippingData.address.street && orderForm.shippingData.address.street.trim()) ) {