@salesgenterp/ui-components 0.4.236 → 0.4.237

package/dist/index.js

@@ -2748,6 +2748,7 @@ var ModalContainer = styled__default(material.Dialog)(_templateObject$d || (_tem
 
 var _templateObject$e, _templateObject2$6, _templateObject3$4, _templateObject4$3, _templateObject5$3, _templateObject6$2;
 var StoreDetails = function StoreDetails(_ref) {
+  var _storeAddresses$filte;
   var apiEndPoint = _ref.apiEndPoint,
     token = _ref.token,
     primaryColor = _ref.primaryColor,
@@ -2911,7 +2912,9 @@ var StoreDetails = function StoreDetails(_ref) {
   }), "Add Address")), /*#__PURE__*/React__default.createElement(material.Grid, {
     container: true,
     spacing: 4
-  }, storeAddresses === null || storeAddresses === void 0 ? void 0 : storeAddresses.map(function (address, index) {
+  }, storeAddresses === null || storeAddresses === void 0 ? void 0 : (_storeAddresses$filte = storeAddresses.filter(function (address) {
+    return address === null || address === void 0 ? void 0 : address.active;
+  })) === null || _storeAddresses$filte === void 0 ? void 0 : _storeAddresses$filte.map(function (address, index) {
     return /*#__PURE__*/React__default.createElement(material.Grid, {
       item: true,
       sm: 12,
@@ -8057,7 +8060,8 @@ var Step1 = function Step1(_ref) {
     countries = _ref.countries,
     setSelectedCountry = _ref.setSelectedCountry,
     states = _ref.states,
-    styles = _ref.styles;
+    styles = _ref.styles,
+    setShippingAddressIdFromStep1 = _ref.setShippingAddressIdFromStep1;
   var _useForm = reactHookForm.useForm(),
     control = _useForm.control,
     handleSubmit = _useForm.handleSubmit;
@@ -8164,7 +8168,8 @@ var Step1 = function Step1(_ref) {
   }, /*#__PURE__*/React__default.createElement("select", {
     value: address,
     onChange: function onChange(e) {
-      return setAddress(parseInt(e.target.value));
+      setShippingAddressIdFromStep1(e.target.value);
+      setAddress(parseInt(e.target.value));
     }
   }, (_addressList2 = addressList) === null || _addressList2 === void 0 ? void 0 : _addressList2.map(function (address, i) {
     return /*#__PURE__*/React__default.createElement("option", {
@@ -8307,7 +8312,8 @@ var Step2 = function Step2(_ref) {
     showShipping = _ref.showShipping,
     selectedStore = _ref.selectedStore,
     stores = _ref.stores,
-    styles = _ref.styles;
+    styles = _ref.styles,
+    shippingAddressIdFromStep1 = _ref.shippingAddressIdFromStep1;
   var modifyOptions = [].concat(options);
   var _useForm = reactHookForm.useForm(),
     control = _useForm.control,
@@ -8337,7 +8343,7 @@ var Step2 = function Step2(_ref) {
       id: 99999999
     }];
   }
-  var _useState = React.useState((_addressList$ = addressList[0]) === null || _addressList$ === void 0 ? void 0 : _addressList$.id),
+  var _useState = React.useState(parseInt(shippingAddressIdFromStep1) || ((_addressList$ = addressList[0]) === null || _addressList$ === void 0 ? void 0 : _addressList$.id)),
     address = _useState[0],
     setAddress = _useState[1];
   var onSubmit = function onSubmit(data) {
@@ -8353,7 +8359,7 @@ var Step2 = function Step2(_ref) {
   }, [selectedCountry]);
   React.useEffect(function () {
     var _addressList$2;
-    setAddress((_addressList$2 = addressList[0]) === null || _addressList$2 === void 0 ? void 0 : _addressList$2.id);
+    setAddress(parseInt(shippingAddressIdFromStep1) || ((_addressList$2 = addressList[0]) === null || _addressList$2 === void 0 ? void 0 : _addressList$2.id));
   }, [selectedStore]);
   var deliveryOption = function deliveryOption(option, i) {
     var _styles$input, _styles$input2, _styles$button, _option$amount, _option$amount2;
@@ -9427,6 +9433,9 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
     shippingMethod = _ref.shippingMethod,
     discountCoupons = _ref.discountCoupons,
     shippingText = _ref.shippingText;
+  var _useState = React.useState(),
+    shippingAddressIdFromStep1 = _useState[0],
+    setShippingAddressIdFromStep1 = _useState[1];
   return /*#__PURE__*/React__default.createElement(CheckoutPageContainer, {
     className: "checkout",
     bg: styles === null || styles === void 0 ? void 0 : styles.bg
@@ -9527,6 +9536,7 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
       addStore: addStore,
       selectedStore: selectedStore,
       setSelectedStore: setSelectedStore,
+      setShippingAddressIdFromStep1: setShippingAddressIdFromStep1,
       countries: countries,
       states: states,
       addStoreAddress: addStoreAddress,
@@ -9550,6 +9560,7 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
       showShipping: showShipping,
       selectedStore: selectedStore,
       stores: userStores,
+      shippingAddressIdFromStep1: shippingAddressIdFromStep1,
       addShipping: addStoreAddress,
       setSelectedCountry: setSelectedCountry,
       styles: styles