@salesgenterp/ui-components 0.4.50 → 0.4.52

package/dist/index.js

@@ -2357,6 +2357,7 @@ var StoreForm = function StoreForm(_ref) {
 var AddressForm = function AddressForm(_ref) {
   var control = _ref.control,
       countries = _ref.countries,
+      states = _ref.states,
       _onSubmit = _ref.onSubmit,
       handleSubmit = _ref.handleSubmit;
   return /*#__PURE__*/React__default.createElement(material.Grid, {
@@ -2378,8 +2379,18 @@ var AddressForm = function AddressForm(_ref) {
     sm: 10
   }, /*#__PURE__*/React__default.createElement(CheckoutInput, {
     controlls: {
-      name: 'fullAddress',
-      placeholder: 'Full Address*',
+      name: 'address1',
+      placeholder: 'Address 1*',
+      control: control
+    }
+  })), /*#__PURE__*/React__default.createElement(material.Grid, {
+    item: true,
+    xs: 6,
+    sm: 3.34
+  }, /*#__PURE__*/React__default.createElement(CheckoutInput, {
+    controlls: {
+      name: 'address2',
+      placeholder: 'Address 2*',
       control: control
     }
   })), /*#__PURE__*/React__default.createElement(material.Grid, {
@@ -2397,12 +2408,14 @@ var AddressForm = function AddressForm(_ref) {
   })), /*#__PURE__*/React__default.createElement(material.Grid, {
     item: true,
     xs: 6,
-    sm: 3.33
-  }, /*#__PURE__*/React__default.createElement(CheckoutInput, {
+    sm: 3.34
+  }, /*#__PURE__*/React__default.createElement(CheckoutSelect, {
     controlls: {
       name: 'state',
-      placeholder: 'State/Province*',
-      control: control
+      placeholder: 'State',
+      control: control,
+      List: states,
+      key: 'name'
     }
   })), /*#__PURE__*/React__default.createElement(material.Grid, {
     item: true,
@@ -2422,7 +2435,8 @@ var AddressForm = function AddressForm(_ref) {
     controlls: {
       name: 'zip',
       placeholder: 'Zip/Postal Code*',
-      control: control
+      control: control,
+      type: 'number'
     }
   })), /*#__PURE__*/React__default.createElement(material.Grid, {
     item: true,
@@ -2455,7 +2469,9 @@ var Step1 = function Step1(_ref) {
       stores = _ref.stores,
       selectedStore = _ref.selectedStore,
       setSelectedStore = _ref.setSelectedStore,
-      countries = _ref.countries;
+      countries = _ref.countries,
+      setSelectedCountry = _ref.setSelectedCountry,
+      states = _ref.states;
 
   var _useForm = reactHookForm.useForm(),
       control = _useForm.control,
@@ -2467,14 +2483,14 @@ var Step1 = function Step1(_ref) {
 
   var _useForm2 = reactHookForm.useForm(),
       addressControl = _useForm2.control,
-      watchAddress = _useForm2.watch,
+      watch = _useForm2.watch,
       handleSubmitAddress = _useForm2.handleSubmit;
 
   var StoresList = [].concat(stores, [{
-    storeName: 'add Store',
+    storeName: 'Add Store',
     id: 99999999
   }]);
-  var selectedAddress = watchAddress('billingAddress');
+  var selectedCountry = watch('country');
   var selectedStores = stores === null || stores === void 0 ? void 0 : stores.find(function (store) {
     return (store === null || store === void 0 ? void 0 : store.id) === selectedStore;
   });
@@ -2482,7 +2498,7 @@ var Step1 = function Step1(_ref) {
 
   if (selectedStores !== null && selectedStores !== void 0 && selectedStores.customerStoreAddressList) {
     addressList = [].concat(selectedStores === null || selectedStores === void 0 ? void 0 : selectedStores.customerStoreAddressList, [{
-      name: 'add billing Address',
+      name: 'Add billing Address',
       id: 99999999
     }]);
   }
@@ -2511,7 +2527,9 @@ var Step1 = function Step1(_ref) {
     handleNext();
   };
 
-  console.log(address);
+  React.useEffect(function () {
+    setSelectedCountry(selectedCountry);
+  }, [selectedCountry]);
   return /*#__PURE__*/React__default.createElement(StepContainer, null, /*#__PURE__*/React__default.createElement(StepsHeaderComponent, {
     text: 'billing information',
     icon: 2
@@ -2560,7 +2578,8 @@ var Step1 = function Step1(_ref) {
     control: addressControl,
     handleSubmit: handleSubmitAddress,
     onSubmit: addAddress,
-    countries: countries
+    countries: countries,
+    states: states
   }), /*#__PURE__*/React__default.createElement(material.Grid, {
     item: true,
     xs: 12
@@ -2586,20 +2605,24 @@ var Step1 = function Step1(_ref) {
     handleNext: function handleNext() {
       next();
     },
-    nextDisabled: !selectedStore || !selectedAddress || selectedStore === 99999999 || selectedAddress === 99999999
+    nextDisabled: !selectedStore || !address || selectedStore === 99999999 || address === 99999999
   })));
 };
 
 var Step2 = function Step2(_ref) {
-  var _selectedStoreAddrese;
+  var _addressList$, _addressList;
 
   var handleBack = _ref.handleBack,
       _handleNext = _ref.handleNext,
       options = _ref.options,
       setShipping = _ref.setShipping,
       countries = _ref.countries,
+      states = _ref.states,
       addShipping = _ref.addShipping,
-      showShipping = _ref.showShipping;
+      setSelectedCountry = _ref.setSelectedCountry,
+      showShipping = _ref.showShipping,
+      selectedStore = _ref.selectedStore,
+      stores = _ref.stores;
 
   var _useForm = reactHookForm.useForm(),
       control = _useForm.control,
@@ -2611,18 +2634,22 @@ var Step2 = function Step2(_ref) {
       method = _React$useState[0],
       setmethod = _React$useState[1];
 
+  var selectedCountry = watch('country');
+  var selectedStores = stores === null || stores === void 0 ? void 0 : stores.find(function (store) {
+    return (store === null || store === void 0 ? void 0 : store.id) === selectedStore;
+  });
   var addressList = [];
 
-  if ((_selectedStoreAddrese = selectedStoreAddreses) !== null && _selectedStoreAddrese !== void 0 && _selectedStoreAddrese.customerStoreAddressList) {
-    var _selectedStoreAddrese2;
-
-    addressList = [].concat((_selectedStoreAddrese2 = selectedStoreAddreses) === null || _selectedStoreAddrese2 === void 0 ? void 0 : _selectedStoreAddrese2.customerStoreAddressList, [{
-      name: 'add billing Address',
+  if (selectedStores !== null && selectedStores !== void 0 && selectedStores.customerStoreAddressList) {
+    addressList = [].concat(selectedStores === null || selectedStores === void 0 ? void 0 : selectedStores.customerStoreAddressList, [{
+      name: 'Add billing Address',
       id: 99999999
     }]);
   }
 
-  var selectedAddress = watch('shippingAddress');
+  var _useState = React.useState((_addressList$ = addressList[0]) === null || _addressList$ === void 0 ? void 0 : _addressList$.id),
+      address = _useState[0],
+      setAddress = _useState[1];
 
   var onSubmit = function onSubmit(data) {
     console.log(data);
@@ -2630,6 +2657,9 @@ var Step2 = function Step2(_ref) {
     resetField('shippingAddress');
   };
 
+  useEffect(function () {
+    setSelectedCountry(selectedCountry);
+  }, [selectedCountry]);
   return /*#__PURE__*/React__default.createElement(StepContainer, null, /*#__PURE__*/React__default.createElement(StepsHeaderComponent, {
     text: showShipping ? 'shipping information' : 'shipping method',
     icon: 3
@@ -2642,19 +2672,22 @@ var Step2 = function Step2(_ref) {
     sx: {
       padding: '1em 0'
     }
-  }, /*#__PURE__*/React__default.createElement(CheckoutSelect, {
-    controlls: {
-      name: 'shippingAddress',
-      placeholder: 'Select shipping Address ',
-      control: control,
-      List: addressList,
-      key: 'name'
+  }, /*#__PURE__*/React__default.createElement("select", {
+    value: address,
+    onChange: function onChange(e) {
+      return setAddress(parseInt(e.target.value));
     }
-  }))), selectedAddress === 99999999 && /*#__PURE__*/React__default.createElement(AddressForm, {
+  }, (_addressList = addressList) === null || _addressList === void 0 ? void 0 : _addressList.map(function (address, i) {
+    return /*#__PURE__*/React__default.createElement("option", {
+      key: i,
+      value: address === null || address === void 0 ? void 0 : address.id
+    }, address === null || address === void 0 ? void 0 : address.name);
+  })))), address === 99999999 && /*#__PURE__*/React__default.createElement(AddressForm, {
     control: control,
     onSubmit: onSubmit,
     handleSubmit: handleSubmit,
-    countries: countries
+    countries: countries,
+    states: states
   }), /*#__PURE__*/React__default.createElement(StepsHeaderComponent, {
     text: 'shipping method',
     icon: 3,
@@ -2685,11 +2718,11 @@ var Step2 = function Step2(_ref) {
   })), /*#__PURE__*/React__default.createElement(ButtonRow, {
     handleBack: handleBack,
     handleNext: function handleNext() {
-      setShipping(selectedAddress, method);
+      setShipping(address, method);
 
       _handleNext();
     },
-    nextDisabled: showShipping && !selectedAddress || (selectedAddress === null || selectedAddress === void 0 ? void 0 : selectedAddress.id) === 99999999
+    nextDisabled: showShipping && !address || (address === null || address === void 0 ? void 0 : address.id) === 99999999
   })));
 };
 
@@ -3091,7 +3124,6 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
       handleBack = _ref.handleBack,
       loading = _ref.loading,
       handleLogin = _ref.handleLogin,
-      setShipping = _ref.setShipping,
       userName = _ref.userName,
       addStore = _ref.addStore,
       setBilling = _ref.setBilling,
@@ -3100,20 +3132,23 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
       selectedStore = _ref.selectedStore,
       setSelectedStore = _ref.setSelectedStore,
       addStoreAddress = _ref.addStoreAddress,
+      setSelectedCountry = _ref.setSelectedCountry,
+      countries = _ref.countries,
+      states = _ref.states,
+      setShipping = _ref.setShipping,
       showShipping = _ref.showShipping,
       deliveryOptions = _ref.deliveryOptions,
-      countries = _ref.countries,
       setPaymentDetails = _ref.setPaymentDetails,
       paymentMethods = _ref.paymentMethods,
       cartData = _ref.cartData,
       vat = _ref.vat,
-      shippingAddress = _ref.shippingAddress,
-      billingAddress = _ref.billingAddress,
-      selectedPaymentMethod = _ref.selectedPaymentMethod,
       clickRedirect = _ref.clickRedirect,
       ordering = _ref.ordering,
       deliveryCharges = _ref.deliveryCharges,
-      placeOrder = _ref.placeOrder;
+      placeOrder = _ref.placeOrder,
+      shippingAddress = _ref.shippingAddress,
+      billingAddress = _ref.billingAddress,
+      selectedPaymentMethod = _ref.selectedPaymentMethod;
   return /*#__PURE__*/React__default.createElement(CheckoutPageContainer, {
     className: "checkout"
   }, /*#__PURE__*/React__default.createElement(material.Stack, {
@@ -3205,7 +3240,9 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
       selectedStore: selectedStore,
       setSelectedStore: setSelectedStore,
       countries: countries,
-      addStoreAddress: addStoreAddress
+      states: states,
+      addStoreAddress: addStoreAddress,
+      setSelectedCountry: setSelectedCountry
     })), index === 2 && /*#__PURE__*/React__default.createElement(material.StepContent, {
       sx: {
         padding: 0
@@ -3215,11 +3252,14 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
       handleBack: handleBack,
       handleNext: handleNext,
       options: deliveryOptions,
+      states: states,
       countries: countries,
       setShipping: setShipping,
       showShipping: showShipping,
       selectedStore: selectedStore,
-      addShipping: addStoreAddress
+      stores: userStores,
+      addShipping: addStoreAddress,
+      setSelectedCountry: setSelectedCountry
     })), index === 3 && /*#__PURE__*/React__default.createElement(material.StepContent, {
       sx: {
         padding: 0