@salesgenterp/ui-components 0.4.515 → 0.4.517

package/dist/index.js

@@ -1138,12 +1138,14 @@ var getCustomer = function getCustomer(_ref14) {
 };
 var getDeliveryOption = function getDeliveryOption(_ref15) {
   var apiEndPoint = _ref15.apiEndPoint,
-    token = _ref15.token;
+    token = _ref15.token,
+    queryParams = _ref15.queryParams;
   try {
     return Promise.resolve(API({
       apiEndPoint: apiEndPoint,
       token: token,
-      url: "/shipping/options"
+      url: "/shipping/options",
+      queryParams: queryParams
     }));
   } catch (e) {
     return Promise.reject(e);
@@ -11581,7 +11583,7 @@ var Step1 = function Step1(_ref) {
 
 var _templateObject$N;
 var Step2 = function Step2(_ref) {
-  var _filter, _customer$customerDto, _addressList$, _addressList2, _styles$button2, _JSON$parse2, _styles$button3;
+  var _filter, _customer$customerDto, _addressList$, _addressList3, _styles$button2, _JSON$parse2, _styles$button3;
   var apiEndPoint = _ref.apiEndPoint,
     token = _ref.token,
     cartData = _ref.cartData,
@@ -11591,6 +11593,8 @@ var Step2 = function Step2(_ref) {
     _ref$options = _ref.options,
     options = _ref$options === void 0 ? [] : _ref$options,
     setShipping = _ref.setShipping,
+    refetchDeliveryOptions = _ref.refetchDeliveryOptions,
+    deliveryOptionsLoading = _ref.deliveryOptionsLoading,
     countries = _ref.countries,
     states = _ref.states,
     addShipping = _ref.addShipping,
@@ -11647,6 +11651,7 @@ var Step2 = function Step2(_ref) {
   var _useState = React.useState(parseInt(shippingAddressId) || ((_addressList$ = addressList[0]) === null || _addressList$ === void 0 ? void 0 : _addressList$.id)),
     address = _useState[0],
     setAddress = _useState[1];
+  var hasFetchedInitialDeliveryOptions = React.useRef(false);
   var onSubmit = function onSubmit(data) {
     var _addressList, _addressList$2;
     var modifyData = _extends({}, data, {
@@ -11657,6 +11662,17 @@ var Step2 = function Step2(_ref) {
     setAddress(shippingAddressId || ((_addressList = addressList) === null || _addressList === void 0 ? void 0 : (_addressList$2 = _addressList[0]) === null || _addressList$2 === void 0 ? void 0 : _addressList$2.id));
     resetField('shippingAddress');
   };
+  React.useEffect(function () {
+    var _addressList2;
+    if (refetchDeliveryOptions && (_addressList2 = addressList) !== null && _addressList2 !== void 0 && _addressList2[0] && !hasFetchedInitialDeliveryOptions.current) {
+      var selectedAddr = addressList.find(function (addr) {
+        return addr.id === address;
+      }) || addressList[0];
+      setShipping(address, method, selectedAddr);
+      refetchDeliveryOptions(selectedAddr);
+      hasFetchedInitialDeliveryOptions.current = true;
+    }
+  }, []);
   React.useEffect(function () {
     setSelectedCountry(selectedCountry);
   }, [selectedCountry]);
@@ -11794,9 +11810,19 @@ var Step2 = function Step2(_ref) {
   }, /*#__PURE__*/React__default.createElement(Select, null, /*#__PURE__*/React__default.createElement("select", {
     value: address,
     onChange: function onChange(e) {
-      return setAddress(parseInt(e.target.value));
+      var newAddress = parseInt(e.target.value);
+      setAddress(newAddress);
+      if (newAddress !== 99999999) {
+        var selectedAddr = addressList.find(function (address) {
+          return address.id === newAddress;
+        });
+        setShipping(newAddress, method, selectedAddr);
+        if (refetchDeliveryOptions && selectedAddr) {
+          refetchDeliveryOptions(selectedAddr);
+        }
+      }
     }
-  }, (_addressList2 = addressList) === null || _addressList2 === void 0 ? void 0 : _addressList2.map(function (address, i) {
+  }, (_addressList3 = addressList) === null || _addressList3 === void 0 ? void 0 : _addressList3.map(function (address, i) {
     return /*#__PURE__*/React__default.createElement("option", {
       key: i,
       value: address.id
@@ -11819,7 +11845,9 @@ var Step2 = function Step2(_ref) {
     width: "100%",
     alignItems: 'flex-start',
     paddingBottom: '1rem'
-  }, modifyOptions === null || modifyOptions === void 0 ? void 0 : modifyOptions.map(function (option, i) {
+  }, deliveryOptionsLoading ? /*#__PURE__*/React__default.createElement(Loader, {
+    height: 100
+  }) : modifyOptions === null || modifyOptions === void 0 ? void 0 : modifyOptions.map(function (option, i) {
     return deliveryOption(option, i);
   })), (method === null || method === void 0 ? void 0 : method.description) && /*#__PURE__*/React__default.createElement("span", {
     style: {
@@ -13214,53 +13242,59 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
   var _useState6 = React.useState([]),
     deliveryOptions = _useState6[0],
     setDeliveryOptions = _useState6[1];
-  var _useState7 = React.useState([]),
-    paymentMethods = _useState7[0],
-    setPaymentMethods = _useState7[1];
-  var _useState8 = React.useState(),
-    billingAddressId = _useState8[0],
-    setBillingAddressId = _useState8[1];
+  var _useState7 = React.useState(false),
+    deliveryOptionsLoading = _useState7[0],
+    setDeliveryOptionsLoading = _useState7[1];
+  var _useState8 = React.useState([]),
+    paymentMethods = _useState8[0],
+    setPaymentMethods = _useState8[1];
   var _useState9 = React.useState(),
-    shippingAddressId = _useState9[0],
-    setShippingAddressId = _useState9[1];
-  var _useState10 = React.useState(false),
-    showShipping = _useState10[0],
-    setShowShipping = _useState10[1];
-  var _useState11 = React.useState(),
-    shippingMethod = _useState11[0],
-    setShippingMethod = _useState11[1];
+    billingAddressId = _useState9[0],
+    setBillingAddressId = _useState9[1];
+  var _useState10 = React.useState(),
+    shippingAddressId = _useState10[0],
+    setShippingAddressId = _useState10[1];
+  var _useState11 = React.useState(false),
+    showShipping = _useState11[0],
+    setShowShipping = _useState11[1];
   var _useState12 = React.useState(),
-    selectedPaymentMethod = _useState12[0],
-    setSelectedPaymentMethod = _useState12[1];
+    shippingMethod = _useState12[0],
+    setShippingMethod = _useState12[1];
   var _useState13 = React.useState(),
-    selectedStoreCredits = _useState13[0],
-    setStoreCredits = _useState13[1];
+    selectedPaymentMethod = _useState13[0],
+    setSelectedPaymentMethod = _useState13[1];
   var _useState14 = React.useState(),
-    selectedCountry = _useState14[0],
-    setSelectedCountry = _useState14[1];
-  var _useState15 = React.useState([]),
-    countries = _useState15[0],
-    setCountries = _useState15[1];
+    selectedStoreCredits = _useState14[0],
+    setStoreCredits = _useState14[1];
+  var _useState15 = React.useState(),
+    selectedCountry = _useState15[0],
+    setSelectedCountry = _useState15[1];
   var _useState16 = React.useState([]),
-    states = _useState16[0],
-    setStates = _useState16[1];
-  var _useState17 = React.useState(),
-    card = _useState17[0],
-    setCard = _useState17[1];
-  var _useState18 = React.useState({}),
-    orderTotal = _useState18[0],
-    setOrderTotal = _useState18[1];
-  var _useState19 = React.useState({
+    countries = _useState16[0],
+    setCountries = _useState16[1];
+  var _useState17 = React.useState([]),
+    states = _useState17[0],
+    setStates = _useState17[1];
+  var _useState18 = React.useState(),
+    card = _useState18[0],
+    setCard = _useState18[1];
+  var _useState19 = React.useState({}),
+    orderTotal = _useState19[0],
+    setOrderTotal = _useState19[1];
+  var _useState20 = React.useState({
       openDiscountModal: false,
       discountCouponsData: []
     }),
-    discountCoupons = _useState19[0],
-    setDiscountCoupons = _useState19[1];
-  var _useState20 = React.useState(null),
-    totalTaxAmount = _useState20[0],
-    setTotalTaxAmount = _useState20[1];
+    discountCoupons = _useState20[0],
+    setDiscountCoupons = _useState20[1];
+  var _useState21 = React.useState(null),
+    totalTaxAmount = _useState21[0],
+    setTotalTaxAmount = _useState21[1];
   var previousSubTotalRef = React.useRef(null);
   var previousShippingAddressIdRef = React.useRef(null);
+  var _useState22 = React.useState(),
+    selectedAddress = _useState22[0],
+    setSelectedAddress = _useState22[1];
   React.useEffect(function () {
     if (apiEndPoint && token) {
       (function () {
@@ -13290,11 +13324,40 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
       })();
     }
   }, [token]);
+  var refetchDeliveryOptions = function refetchDeliveryOptions(addressOverride) {
+    try {
+      if (!(apiEndPoint && token)) return Promise.resolve();
+      var addressToUse = addressOverride || selectedAddress;
+      var _temp2 = _finallyRethrows(function () {
+        return _catch(function () {
+          setDeliveryOptionsLoading(true);
+          return Promise.resolve(getDeliveryOption({
+            apiEndPoint: apiEndPoint,
+            token: token,
+            queryParams: {
+              toZipCode: addressToUse === null || addressToUse === void 0 ? void 0 : addressToUse.zip,
+              toCountryId: addressToUse === null || addressToUse === void 0 ? void 0 : addressToUse.countryId,
+              storeId: storeId
+            }
+          })).then(function (data) {
+            setDeliveryOptions(data);
+          });
+        }, function () {});
+      }, function (_wasThrown, _result) {
+        setDeliveryOptionsLoading(false);
+        if (_wasThrown) throw _result;
+        return _result;
+      });
+      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
   React.useEffect(function () {
     if (apiEndPoint && token) {
       (function () {
         return _catch(function () {
-          var _temp2 = function () {
+          var _temp3 = function () {
             if (selectedCountry) {
               return Promise.resolve(getStatesById({
                 id: selectedCountry,
@@ -13305,7 +13368,7 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
               });
             }
           }();
-          if (_temp2 && _temp2.then) return _temp2.then(function () {});
+          if (_temp3 && _temp3.then) return _temp3.then(function () {});
         }, function () {});
       })();
     }
@@ -13313,31 +13376,20 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
   React.useEffect(function () {
     (function () {
       try {
-        var _temp8 = function () {
+        var _temp7 = function () {
           if (apiEndPoint && token) {
-            var _temp7 = function _temp7() {
-              function _temp5() {
-                var _temp3 = _catch(function () {
-                  return Promise.resolve(getPaymentMethods({
-                    apiEndPoint: apiEndPoint,
-                    token: token
-                  })).then(function (data) {
-                    setPaymentMethods(data);
-                  });
-                }, function () {});
-                if (_temp3 && _temp3.then) return _temp3.then(function () {});
-              }
+            var _temp6 = function _temp6() {
               var _temp4 = _catch(function () {
-                return Promise.resolve(getDeliveryOption({
+                return Promise.resolve(getPaymentMethods({
                   apiEndPoint: apiEndPoint,
                   token: token
                 })).then(function (data) {
-                  setDeliveryOptions(data);
+                  setPaymentMethods(data);
                 });
               }, function () {});
-              return _temp4 && _temp4.then ? _temp4.then(_temp5) : _temp5(_temp4);
+              if (_temp4 && _temp4.then) return _temp4.then(function () {});
             };
-            var _temp6 = _catch(function () {
+            var _temp5 = _catch(function () {
               return Promise.resolve(getCustomer({
                 apiEndPoint: apiEndPoint,
                 token: token
@@ -13345,10 +13397,10 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
                 setCustomer(data);
               });
             }, function () {});
-            return _temp6 && _temp6.then ? _temp6.then(_temp7) : _temp7(_temp6);
+            return _temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5);
           }
         }();
-        return _temp8 && _temp8.then ? _temp8.then(function () {}) : void 0;
+        return _temp7 && _temp7.then ? _temp7.then(function () {}) : void 0;
       } catch (e) {
         Promise.reject(e);
       }
@@ -13372,7 +13424,7 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
           alert('Product quantity must be greater than 0');
           window.location.replace("/cart");
         }
-        var _temp9 = function () {
+        var _temp8 = function () {
           if (customer) {
             setSubmitting(function (prev) {
               return _extends({}, prev, {
@@ -13395,7 +13447,7 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
             });
           }
         }();
-        return _temp9 && _temp9.then ? _temp9.then(function () {}) : void 0;
+        return _temp8 && _temp8.then ? _temp8.then(function () {}) : void 0;
       } catch (e) {
         Promise.reject(e);
       }
@@ -13404,10 +13456,10 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
   var taxFunction = function taxFunction() {
     try {
       var taxAmount = totalTaxAmount || 0;
-      var _temp11 = function (_cartData$cartLineIte2) {
+      var _temp10 = function (_cartData$cartLineIte2) {
         if (shippingAddressId && (cartData === null || cartData === void 0 ? void 0 : (_cartData$cartLineIte2 = cartData.cartLineItemDtoList) === null || _cartData$cartLineIte2 === void 0 ? void 0 : _cartData$cartLineIte2.length) > 0 && shippingAddressId && (shippingAddressId !== previousShippingAddressIdRef.current || (cartData === null || cartData === void 0 ? void 0 : cartData.cartSubTotal) !== previousSubTotalRef.current)) {
           previousShippingAddressIdRef.current = shippingAddressId;
-          var _temp10 = _catch(function () {
+          var _temp9 = _catch(function () {
             return Promise.resolve(getTaxData({
               apiEndPoint: apiEndPoint,
               token: token,
@@ -13420,10 +13472,10 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
               setTotalTaxAmount(taxAmount);
             });
           }, function () {});
-          if (_temp10 && _temp10.then) return _temp10.then(function () {});
+          if (_temp9 && _temp9.then) return _temp9.then(function () {});
         }
       }();
-      return Promise.resolve(_temp11 && _temp11.then ? _temp11.then(function () {
+      return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(function () {
         return taxAmount;
       }) : taxAmount);
     } catch (e) {
@@ -13434,16 +13486,16 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
     try {
       var _ref2;
       var couponDiscountTotal = parseFloat((_ref2 = lodash.sumBy(discountCoupons === null || discountCoupons === void 0 ? void 0 : discountCoupons.discountCouponsData, 'amount') || 0) === null || _ref2 === void 0 ? void 0 : _ref2.toFixed(2));
-      var _temp14 = function () {
+      var _temp13 = function () {
         if (!isNullUndefined(cartData === null || cartData === void 0 ? void 0 : cartData.cartSubTotal) && (cartData === null || cartData === void 0 ? void 0 : cartData.cartSubTotal) !== previousSubTotalRef.current) {
           previousSubTotalRef.current = cartData === null || cartData === void 0 ? void 0 : cartData.cartSubTotal;
-          var _temp13 = _catch(function () {
+          var _temp12 = _catch(function () {
             return Promise.resolve(autoApplyCoupon({
               apiEndPoint: apiEndPoint,
               token: token,
               subTotal: cartData === null || cartData === void 0 ? void 0 : cartData.cartSubTotal
             })).then(function () {
-              function _temp12(_fetchCartData) {
+              function _temp11(_fetchCartData) {
                 _fetchCartData;
                 return Promise.resolve(getCartDiscountList({
                   apiEndPoint: apiEndPoint,
@@ -13459,15 +13511,15 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
                   });
                 });
               }
-              return fetchCartData ? Promise.resolve(fetchCartData()).then(_temp12) : _temp12(fetchCartData);
+              return fetchCartData ? Promise.resolve(fetchCartData()).then(_temp11) : _temp11(fetchCartData);
             });
           }, function () {
             window.location.replace("/cart");
           });
-          if (_temp13 && _temp13.then) return _temp13.then(function () {});
+          if (_temp12 && _temp12.then) return _temp12.then(function () {});
         }
       }();
-      return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(function () {
+      return Promise.resolve(_temp13 && _temp13.then ? _temp13.then(function () {
         return couponDiscountTotal;
       }) : couponDiscountTotal);
     } catch (e) {
@@ -13516,21 +13568,21 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
   };
   var onLoginCustomer = function onLoginCustomer(data) {
     try {
-      var _temp16 = function _temp16() {
+      var _temp15 = function _temp15() {
         setLoginLoading(false);
       };
       setLoginLoading(true);
-      var _temp15 = _catch(function () {
+      var _temp14 = _catch(function () {
         return Promise.resolve(handleLogin(data)).then(function () {});
       }, function () {});
-      return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(_temp16) : _temp16(_temp15));
+      return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(_temp15) : _temp15(_temp14));
     } catch (e) {
       return Promise.reject(e);
     }
   };
   var addStoreAddress = function addStoreAddress(data) {
     try {
-      var _temp18 = _catch(function () {
+      var _temp17 = _catch(function () {
         var _customer$customerDto2;
         return Promise.resolve(createStoreAddress({
           apiEndPoint: apiEndPoint,
@@ -13538,7 +13590,7 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
           data: data,
           customerId: customer === null || customer === void 0 ? void 0 : (_customer$customerDto2 = customer.customerDto) === null || _customer$customerDto2 === void 0 ? void 0 : _customer$customerDto2.id
         })).then(function (result) {
-          var _temp17 = function () {
+          var _temp16 = function () {
             if (result) {
               return Promise.resolve(getCustomer({
                 apiEndPoint: apiEndPoint,
@@ -13548,10 +13600,10 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
               });
             }
           }();
-          if (_temp17 && _temp17.then) return _temp17.then(function () {});
+          if (_temp16 && _temp16.then) return _temp16.then(function () {});
         });
       }, function () {});
-      return Promise.resolve(_temp18 && _temp18.then ? _temp18.then(function () {}) : void 0);
+      return Promise.resolve(_temp17 && _temp17.then ? _temp17.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -13569,9 +13621,10 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
   var setBilling = function setBilling(data) {
     setBillingAddressId(data);
   };
-  var setShipping = function setShipping(shippingAddressId, shippingMethod) {
+  var setShipping = function setShipping(shippingAddressId, shippingMethod, selectedAddress) {
     setShippingAddressId(shippingAddressId);
     setShippingMethod(shippingMethod);
+    setSelectedAddress(selectedAddress);
   };
   var setPaymentDetails = function setPaymentDetails(storeCr, paymentMethod, cr) {
     var _customer$customerDto3;
@@ -13632,7 +13685,7 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
   };
   var onPlaceOrder = function onPlaceOrder(note, transactionId) {
     try {
-      var _temp20 = function _temp20() {
+      var _temp19 = function _temp19() {
         setSubmitting(function (prev) {
           return _extends({}, prev, {
             loading: false
@@ -13644,7 +13697,7 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
           loading: true
         });
       });
-      var _temp19 = _catch(function () {
+      var _temp18 = _catch(function () {
         var authorizeCustomerCardData = {
           authorizeDotNetCustomerProfileId: selectedPaymentMethod === null || selectedPaymentMethod === void 0 ? void 0 : selectedPaymentMethod.authorizeDotNetCustomerProfileId,
           authorizeDotNetCustomerPaymentProfileId: selectedPaymentMethod === null || selectedPaymentMethod === void 0 ? void 0 : selectedPaymentMethod.authorizeDotNetCustomerPaymentProfileId
@@ -13731,7 +13784,7 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
         }
         return Promise.resolve(createSalesOrder(salesOrderDtoBody)).then(function () {});
       }, function () {});
-      return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(_temp20) : _temp20(_temp19));
+      return Promise.resolve(_temp18 && _temp18.then ? _temp18.then(_temp19) : _temp19(_temp18));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -13874,6 +13927,8 @@ var CheckoutPageComponentWrapper = function CheckoutPageComponentWrapper(_ref) {
       states: states,
       countries: countries,
       setShipping: setShipping,
+      refetchDeliveryOptions: refetchDeliveryOptions,
+      deliveryOptionsLoading: deliveryOptionsLoading,
       showShipping: showShipping,
       storeCredits: customer === null || customer === void 0 ? void 0 : (_customer$customerDto7 = customer.customerDto) === null || _customer$customerDto7 === void 0 ? void 0 : _customer$customerDto7.storeCredit,
       discountCoupons: discountCoupons === null || discountCoupons === void 0 ? void 0 : discountCoupons.discountCouponsData,