@salesgenterp/ui-components 0.4.37 → 0.4.39

package/dist/index.modern.js

@@ -13,13 +13,13 @@ import TableBody from '@mui/material/TableBody';
 import TableHead from '@mui/material/TableHead';
 import TableRow$1 from '@mui/material/TableRow';
 import TableSortLabel from '@mui/material/TableSortLabel';
-import { BiArrowBack, BiLockAlt, BiWallet, BiNotepad } from 'react-icons/bi';
+import { BiArrowBack, BiLockAlt, BiNotepad, BiWallet } from 'react-icons/bi';
 import { CgProfile } from 'react-icons/cg';
 import { MdOutlineDateRange, MdOutlineStickyNote2 } from 'react-icons/md';
 import { Controller, useForm } from 'react-hook-form';
 import { HiOutlineChevronDown } from 'react-icons/hi';
-import { FiTruck } from 'react-icons/fi';
 import { IoPersonOutline } from 'react-icons/io5';
+import { FiTruck } from 'react-icons/fi';
 
 function _extends() {
   _extends = Object.assign ? Object.assign.bind() : function (target) {
@@ -2017,7 +2017,7 @@ var CheckoutSummary = function CheckoutSummary(_ref) {
   }))));
 };
 
-var _templateObject$8, _templateObject2$8, _templateObject3$8, _templateObject4$6, _templateObject5$6, _templateObject6$5, _templateObject7$3, _templateObject8$1, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13;
+var _templateObject$8, _templateObject2$8, _templateObject3$8, _templateObject4$6, _templateObject5$6, _templateObject6$5, _templateObject7$3, _templateObject8$1, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14;
 var StepContainer = styled.div(_templateObject$8 || (_templateObject$8 = _taggedTemplateLiteralLoose(["\n  width: 100%;\n  min-width: 57.43em;\n  max-width: 57.43em;\n  background: white;\n  padding: 1em 2em;\n  background: #ffffff;\n  border-radius: 20px;\n  margin-left: 2em;\n  margin-top: -2em;\n  margin-bottom: 1em;\n  @media screen and (max-width: 1305px) {\n    width: 80vw;\n    min-width: 0;\n  }\n  @media screen and (max-width: 768px) {\n    width: 96%;\n    margin-left: 1em;\n    padding: 0.8em;\n  }\n"])));
 var StepsContent = styled.div(_templateObject2$8 || (_templateObject2$8 = _taggedTemplateLiteralLoose(["\n  padding-left: 1.565em;\n  min-height: max-content;\n  p {\n    font-size: 0.75em;\n  }\n  .bold {\n    text-transform: uppercase;\n    word-spacing: 5px;\n    margin-top: 0.95em;\n    span {\n      font-weight: 600;\n      cursor: pointer;\n      font-size: 0.94rem;\n    }\n    .red {\n      color: red;\n    }\n  }\n  @media screen and (max-width: 768px) {\n    padding: 0;\n    width: 100%;\n  }\n"])));
 var StepsHeaderContainer = styled.div(_templateObject3$8 || (_templateObject3$8 = _taggedTemplateLiteralLoose(["\n  width: 100%;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  justify-content: flex-start;\n  font-family: 'karla-fonts';\n  color: #323232;\n  /* padding: ", "; */\n  margin-bottom: ", ";\n  margin-top: ", ";\n  margin-left: ", ";\n  /* color: grey; */\n  border-bottom: 1px solid #fff0ec;\n  background: #ffffff;\n  border-radius: 20px;\n  max-width: 919px;\n  min-height: 4.35em;\n  max-height: 4.35em;\n  padding: ", ";\n  h5 {\n    font-size: 16px;\n    font-weight: 600;\n    text-transform: capitalize;\n    margin-left: 0.6em;\n  }\n  .icon {\n    font-size: 1.3em;\n    margin-right: 8px;\n  }\n  .dropIcon {\n    font-size: 1.4em;\n    cursor: pointer;\n    transform: rotate(-90deg);\n    transition: 0.3s;\n    color: rgba(50, 50, 50, 0.75);\n  }\n  @media screen and (max-width: 768px) {\n    max-width: 97%;\n    margin-left: 1em;\n    padding-right: 1em;\n    h5 {\n      font-size: 12px;\n    }\n  }\n"])), function (props) {
@@ -2054,15 +2054,22 @@ var ButtonRowContainer = styled.div(_templateObject7$3 || (_templateObject7$3 =
 var CheckBoxRow = styled.div(_templateObject8$1 || (_templateObject8$1 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: row;\n  justify-content: flex-start;\n  align-items: center;\n  cursor: pointer;\n  padding: ", ";\n  p {\n    font-size: 0.85em;\n  }\n  button {\n    border: none;\n    padding: 0.8em 3em;\n    background: rgba(253, 0, 21, 1);\n    color: white;\n    text-transform: uppercase;\n    font-weight: 600;\n    margin: 1em;\n    margin-top: 2em;\n    transition: 0.4s;\n    cursor: pointer;\n    font-family: 'karla-fonts';\n    &:hover {\n      padding: 0.7em 2.7em;\n    }\n  }\n  .back {\n    background-color: rgba(107, 106, 106, 1);\n    padding: 0.8em 2em;\n    &:hover {\n      padding: 0.8em 2.4em;\n    }\n  }\n"])), function (props) {
   return props.padding;
 });
-var DeliveryCard = styled.div(_templateObject9 || (_templateObject9 = _taggedTemplateLiteralLoose(["\n  width: 100%;\n  background: #fd0015;\n  color: white;\n  height: 34px;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  justify-content: center;\n  padding: 0.5em 1em;\n  margin-right: 1em;\n  margin-bottom: 1em;\n  /* padding: 1em 0.4em; */\n  cursor: pointer;\n  img {\n    width: 38px;\n    height: 17px;\n    margin-bottom: -5px;\n    margin-right: 4px;\n  }\n  p {\n    font-size: 10px;\n  }\n  .circle {\n    width: 10px;\n    height: 10px;\n    border-radius: 1px solid black;\n    background-color: white;\n    display: grid;\n    place-items: center;\n    border-radius: 50%;\n    margin-left: auto;\n    margin-left: 5px;\n    .smallCircle {\n      width: 4px;\n      height: 4px;\n      background: black;\n      border-radius: 50%;\n    }\n  }\n"])));
-var CreditCard = styled.div(_templateObject10 || (_templateObject10 = _taggedTemplateLiteralLoose(["\n  width: 70px;\n  min-height: 48px;\n  max-height: 50px;\n  background-color: white;\n  border: 3px solid rgba(217, 217, 217, 0.1);\n  display: grid;\n  place-items: center;\n  margin: auto;\n  cursor: pointer;\n  overflow: hidden;\n  border-radius: 5px;\n  transition: 0.1s;\n  border: 1px solid transparent;\n  text-align: center;\n  p {\n    font-size: 10px;\n  }\n  &:hover,\n  &:focus {\n    border: 1px solid black;\n  }\n"])));
-var StyledTableRow = styled(TableRow)(_templateObject11 || (_templateObject11 = _taggedTemplateLiteralLoose(["\n  && {\n    box-shadow: none;\n    border: none;\n    background-color: ", ";\n    p {\n      font-size: 0.9em;\n      font-family: 'karla-fonts';\n    }\n    .max {\n      min-width: max-content;\n    }\n    .red {\n      color: red;\n      font-weight: inherit;\n    }\n    .price {\n      font-weight: 600;\n    }\n    @media only screen and (max-width: 640px) {\n      p {\n        font-size: 12px;\n      }\n      .sm {\n        font-size: 8px;\n      }\n      .price,\n      .red {\n        font-size: 10px;\n      }\n      .total {\n        font-size: 14px;\n      }\n    }\n  }\n"])), function (props) {
+var DeliveryOption = styled.div(_templateObject9 || (_templateObject9 = _taggedTemplateLiteralLoose(["\n  width: 100%;\n  display: flex;\n  flex-direction: row;\n  align-items: center;\n  justify-content: flex-start;\n  max-width: 705px;\n  height: 40px;\n  padding: 0 1em;\n  border: 1px solid transparent;\n  transition: 0.3s;\n  background-color: ", ";\n  border: ", ";\n  border-radius: ", ";\n  &:hover {\n    background-color: #fff0ec;\n    border: 1px solid #fce1d9;\n    border-radius: 5px;\n  }\n  p {\n    font-weight: 500;\n    color: black;\n    font-size: 0.95em;\n    text-transform: capitalize;\n  }\n  .circle {\n    border-radius: 50%;\n    display: grid;\n    place-items: center;\n    background: linear-gradient(345.48deg, #3c332a -131.29%, #ffffff 124.82%);\n    margin-right: 1em;\n    width: 14px;\n    cursor: pointer;\n    height: 14px;\n    .inner {\n      width: 10px;\n      height: 10px;\n      border-radius: 50%;\n      display: grid;\n      place-items: center;\n      background: linear-gradient(\n        326.37deg,\n        rgba(67, 58, 42, 0.9) -219.66%,\n        rgba(255, 255, 255, 0.9) 90.45%\n      );\n      box-shadow: inset -1px -1px 1px rgba(255, 255, 255, 0.45),\n        inset 0px 0px 10px rgba(0, 0, 0, 0.2);\n    }\n    .fill {\n      width: 6px;\n      height: 6px;\n      background: radial-gradient(\n            15.79% 15.79% at 36.84% 31.58%,\n            #ffffff 0%,\n            rgba(255, 255, 255, 0) 100%\n          )\n          /* warning: gradient uses a rotation that is not supported by CSS and may not behave as expected */,\n        linear-gradient(\n          358.85deg,\n          rgba(157, 18, 30, 0.2) -19.81%,\n          rgba(12, 96, 157, 0) 64.74%\n        ),\n        radial-gradient(50% 50% at 50% 50%, #fab0b6 0%, #fd0015 100%), #fd0015;\n      background-blend-mode: normal, multiply, normal, normal;\n      box-shadow: 0px 0.5px 0px rgba(253, 0, 21, 0.25),\n        0px 1px 1px rgba(253, 0, 21, 0.2);\n      border-radius: 50%;\n      background: #fd0015;\n    }\n  }\n  .amount {\n    margin-left: auto;\n    color: #fd0015;\n    font-weight: 700;\n    font-size: 0.95em;\n  }\n"])), function (props) {
+  return props.hovered ? '#fff0ec' : '';
+}, function (props) {
+  return props.hovered ? '1px solid #fce1d9' : '';
+}, function (props) {
+  return props.hovered ? '5px' : '0';
+});
+var CreditCard = styled.div(_templateObject10 || (_templateObject10 = _taggedTemplateLiteralLoose(["\n  width: 70px;\n  min-height: 48px;\n  max-height: 50px;\n  background-color: white;\n  border: 3px solid rgba(217, 217, 217, 0.1);\n  display: grid;\n  place-items: center;\n  margin: auto;\n  cursor: pointer;\n  overflow: hidden;\n  border-radius: 5px;\n  transition: 0.1s;\n  border: 1px solid transparent;\n  text-align: center;\n  p {\n    font-size: 10px;\n  }\n"])));
+var PaymentLi = styled.div(_templateObject11 || (_templateObject11 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: row;\n  justify-content: flex-start;\n  align-items: center;\n  margin-bottom: 1.5em;\n  cursor: pointer;\n  .circle {\n    /* background: #323232; */\n    width: 16px;\n    height: 16px;\n    display: grid;\n    place-items: center;\n    border-radius: 50%;\n    border: 1px solid #323232;\n    margin-right: 1em;\n  }\n  .innerCircle {\n    background: #323232;\n    border-radius: 50%;\n    width: 6px;\n    height: 6px;\n  }\n  p {\n    font-size: 1em;\n    color: black;\n    text-transform: capitalize;\n    font-weight: 500;\n  }\n"])));
+var StyledTableRow = styled(TableRow)(_templateObject12 || (_templateObject12 = _taggedTemplateLiteralLoose(["\n  && {\n    box-shadow: none;\n    border: none;\n    background-color: ", ";\n    p {\n      font-size: 0.9em;\n      font-family: 'karla-fonts';\n    }\n    .max {\n      min-width: max-content;\n    }\n    .red {\n      color: red;\n      font-weight: inherit;\n    }\n    .price {\n      font-weight: 600;\n    }\n    @media only screen and (max-width: 640px) {\n      p {\n        font-size: 12px;\n      }\n      .sm {\n        font-size: 8px;\n      }\n      .price,\n      .red {\n        font-size: 10px;\n      }\n      .total {\n        font-size: 14px;\n      }\n    }\n  }\n"])), function (props) {
   return props.colored ? 'rgba(255, 240, 236, 1)' : 'white';
 });
-var StyledTableCell = styled(TableCell)(_templateObject12 || (_templateObject12 = _taggedTemplateLiteralLoose(["\n  && {\n    border: none;\n    font-size: 1em;\n    .noAboveSm {\n      display: none;\n    }\n    @media only screen and (max-width: 748px) {\n      display: ", ";\n      padding: 0.5em 0.3em;\n      .noAboveSm {\n        display: inline-block;\n        margin-right: 6px;\n      }\n    }\n  }\n"])), function (props) {
+var StyledTableCell = styled(TableCell)(_templateObject13 || (_templateObject13 = _taggedTemplateLiteralLoose(["\n  && {\n    border: none;\n    font-size: 1em;\n    .noAboveSm {\n      display: none;\n    }\n    @media only screen and (max-width: 748px) {\n      display: ", ";\n      padding: 0.5em 0.3em;\n      .noAboveSm {\n        display: inline-block;\n        margin-right: 6px;\n      }\n    }\n  }\n"])), function (props) {
   return props.noSmall ? 'none' : '';
 });
-var BottomGrid = styled(Grid)(_templateObject13 || (_templateObject13 = _taggedTemplateLiteralLoose(["\n  .bold {\n    font-weight: 600;\n    text-transform: capitalize;\n    margin: 1em 0;\n    font-size: 1em;\n  }\n  .icon {\n    font-size: 1.6em;\n    color: rgba(253, 0, 21, 1);\n  }\n  textarea {\n    width: 100%;\n    resize: none;\n    background: #fff8f6;\n    border: 1px solid rgba(253, 0, 21, 0.5);\n    border-radius: 4px;\n    margin-bottom: 2em;\n    padding: 1em;\n  }\n  p {\n    font-size: 12px;\n    .ul {\n      text-decoration: underline;\n      font-size: inherit;\n    }\n  }\n  .bottom {\n    margin-left: 3em;\n    font-style: italic;\n    span {\n      font-weight: 600;\n      color: rgba(253, 0, 21, 1);\n\n      cursor: pointer;\n      &:hover {\n        text-decoration: underline;\n      }\n    }\n  }\n"])));
+var BottomGrid = styled(Grid)(_templateObject14 || (_templateObject14 = _taggedTemplateLiteralLoose(["\n  .bold {\n    font-weight: 600;\n    text-transform: capitalize;\n    margin: 1em 0;\n    font-size: 1em;\n  }\n  .icon {\n    font-size: 1.6em;\n    color: rgba(253, 0, 21, 1);\n  }\n  textarea {\n    width: 100%;\n    resize: none;\n    background: #fff8f6;\n    border: 1px solid rgba(253, 0, 21, 0.5);\n    border-radius: 4px;\n    margin-bottom: 2em;\n    padding: 1em;\n  }\n  p {\n    font-size: 12px;\n    .ul {\n      text-decoration: underline;\n      font-size: inherit;\n    }\n  }\n  .bottom {\n    margin-left: 3em;\n    font-style: italic;\n    span {\n      font-weight: 600;\n      color: rgba(253, 0, 21, 1);\n\n      cursor: pointer;\n      &:hover {\n        text-decoration: underline;\n      }\n    }\n  }\n"])));
 
 var CheckoutInput = function CheckoutInput(_ref) {
   var controlls = _ref.controlls;
@@ -2135,7 +2142,8 @@ var StepsHeaderComponent = function StepsHeaderComponent(_ref) {
       icon = _ref.icon,
       single = _ref.single,
       closed = _ref.closed,
-      handleClick = _ref.handleClick;
+      handleClick = _ref.handleClick,
+      withoutIcon = _ref.withoutIcon;
   console.log("/images/checkout/vector-" + icon + ".svg");
   return /*#__PURE__*/React__default.createElement(StepsHeaderContainer, {
     single: single
@@ -2149,12 +2157,12 @@ var StepsHeaderComponent = function StepsHeaderComponent(_ref) {
   }, /*#__PURE__*/React__default.createElement(Stack, {
     flexDirection: "row",
     alignItems: "center"
-  }, /*#__PURE__*/React__default.createElement("img", {
+  }, !withoutIcon && /*#__PURE__*/React__default.createElement("img", {
     src: "/images/checkout/vector-" + icon + ".svg",
     alt: "vector",
     width: 18,
     height: 18
-  }), /*#__PURE__*/React__default.createElement("h5", null, text, " ", username && "" + username)), /*#__PURE__*/React__default.createElement(HiOutlineChevronDown, {
+  }), /*#__PURE__*/React__default.createElement("h5", null, text, " ", username && "" + username)), !withoutIcon && /*#__PURE__*/React__default.createElement(HiOutlineChevronDown, {
     className: "dropIcon",
     style: closed ? {
       transform: 'rotate(-90deg)'
@@ -2426,11 +2434,14 @@ var AddressForm = function AddressForm(_ref) {
     sm: 8
   }, /*#__PURE__*/React__default.createElement(SaveButton, {
     type: "submit"
-  }, "save address")));
+  }, "Save address")));
 };
 
 var Step1 = function Step1(_ref) {
-  var addStore = _ref.addStore,
+  var handleBack = _ref.handleBack,
+      handleNext = _ref.handleNext,
+      setBilling = _ref.setBilling,
+      addStore = _ref.addStore,
       addStoreAddress = _ref.addStoreAddress,
       stores = _ref.stores,
       addresses = _ref.addresses,
@@ -2471,6 +2482,15 @@ var Step1 = function Step1(_ref) {
     resetAddress('billingAddress');
   };
 
+  var next = function next() {
+    setBilling({
+      store: selectedStore
+    }, {
+      billingAddress: selectedAddress
+    });
+    handleNext();
+  };
+
   return /*#__PURE__*/React__default.createElement(StepContainer, null, /*#__PURE__*/React__default.createElement(StepsHeaderComponent, {
     text: 'billing information',
     icon: 2
@@ -2516,167 +2536,117 @@ var Step1 = function Step1(_ref) {
     handleSubmit: handleSubmitAddress,
     onSubmit: addAddress,
     countries: countries
+  }), /*#__PURE__*/React__default.createElement(ButtonRow, {
+    handleBack: handleBack,
+    handleNext: function handleNext() {
+      next();
+    },
+    nextDisabled: !selectedStore || !selectedAddress || selectedStore === 99999999 || selectedAddress === 99999999
   })));
 };
 
 var Step2 = function Step2(_ref) {
-  var _Object$keys2;
-
   var handleBack = _ref.handleBack,
       _handleNext = _ref.handleNext,
       options = _ref.options,
       setShipping = _ref.setShipping,
       countries = _ref.countries,
-      setShippingMethod = _ref.setShippingMethod;
+      addShipping = _ref.addShipping,
+      showShipping = _ref.showShipping,
+      addresses = _ref.addresses;
 
   var _useForm = useForm(),
       control = _useForm.control,
-      dirtyFields = _useForm.formState.dirtyFields,
-      getValues = _useForm.getValues;
+      handleSubmit = _useForm.handleSubmit,
+      resetField = _useForm.resetField,
+      watch = _useForm.watch;
 
   var _React$useState = React__default.useState(options[0]),
       method = _React$useState[0],
       setmethod = _React$useState[1];
 
-  function Icon() {
-    return /*#__PURE__*/React__default.createElement(FiTruck, {
-      className: "icon"
-    });
-  }
+  var addressList = [].concat(addresses, [{
+    name: 'add shipping Address',
+    id: 99999999
+  }]);
+  var selectedAddress = watch('shippingAddress');
+
+  var onSubmit = function onSubmit(data) {
+    console.log(data);
+    addShipping(data);
+    resetField('shippingAddress');
+  };
 
   return /*#__PURE__*/React__default.createElement(StepContainer, null, /*#__PURE__*/React__default.createElement(StepsHeaderComponent, {
-    text: 'shipping information',
-    Icon: Icon
-  }), /*#__PURE__*/React__default.createElement(StepsContent, null, /*#__PURE__*/React__default.createElement(AddressForm, {
-    countries: countries,
-    control: control
-  }), ' ', /*#__PURE__*/React__default.createElement(CheckoutInput, {
-    controlls: {
-      name: 'city',
-      placeholder: 'City*',
-      control: control
+    text: showShipping ? 'shipping information' : 'shipping method',
+    icon: 3
+  }), /*#__PURE__*/React__default.createElement(StepsContent, null, showShipping && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Grid, {
+    container: true
+  }, /*#__PURE__*/React__default.createElement(Grid, {
+    item: true,
+    xs: 12,
+    sm: 10,
+    sx: {
+      padding: '1em 0'
     }
-  }), ' ', /*#__PURE__*/React__default.createElement(CheckoutInput, {
+  }, /*#__PURE__*/React__default.createElement(CheckoutSelect, {
     controlls: {
-      name: 'city',
-      placeholder: 'City*',
-      control: control
-    }
-  }), /*#__PURE__*/React__default.createElement(Grid, {
-    container: true,
-    columnSpacing: 0.5,
-    rowSpacing: 2,
-    sx: {
-      margin: '1em 0'
+      name: 'shippingAddress',
+      placeholder: 'Select shipping Address ',
+      control: control,
+      List: addressList,
+      key: 'name'
     }
+  }))), selectedAddress === 99999999 && /*#__PURE__*/React__default.createElement(AddressForm, {
+    control: control,
+    onSubmit: onSubmit,
+    handleSubmit: handleSubmit,
+    countries: countries
+  }), /*#__PURE__*/React__default.createElement(StepsHeaderComponent, {
+    text: 'shipping method',
+    icon: 3,
+    withoutIcon: showShipping
+  })), /*#__PURE__*/React__default.createElement(Stack, {
+    flexDirection: "column",
+    width: "100%",
+    alignItems: 'flex-start',
+    paddingBottom: '2em'
   }, options === null || options === void 0 ? void 0 : options.map(function (option, i) {
-    var _option$name, _option$name$toLowerC;
-
-    var fedex = option === null || option === void 0 ? void 0 : (_option$name = option.name) === null || _option$name === void 0 ? void 0 : (_option$name$toLowerC = _option$name.toLowerCase()) === null || _option$name$toLowerC === void 0 ? void 0 : _option$name$toLowerC.includes('fedex');
-    var replaced;
+    var _option$amount;
 
-    if (fedex) {
-      var _option$name2;
-
-      replaced = (_option$name2 = option.name) === null || _option$name2 === void 0 ? void 0 : _option$name2.replace(/fedex/i, ' ');
-    }
-
-    return /*#__PURE__*/React__default.createElement(Stack, {
-      flexDirection: "row",
-      justifyContent: "space-around",
-      aligItems: "center",
-      flexWrap: 'wrap'
-    }, /*#__PURE__*/React__default.createElement(DeliveryCard, {
+    return /*#__PURE__*/React__default.createElement(DeliveryOption, {
+      hovered: (option === null || option === void 0 ? void 0 : option.id) === (method === null || method === void 0 ? void 0 : method.id),
       onClick: function onClick() {
-        return setmethod(option);
-      }
-    }, fedex && /*#__PURE__*/React__default.createElement("img", {
-      src: "/images/fedex.png",
-      alt: "fedex"
-    }), fedex ? /*#__PURE__*/React__default.createElement("p", null, replaced) : /*#__PURE__*/React__default.createElement("p", null, /*#__PURE__*/React__default.createElement("p", null, option.name)), /*#__PURE__*/React__default.createElement("span", {
+        setmethod(option);
+      },
+      key: i
+    }, /*#__PURE__*/React__default.createElement("div", {
       className: "circle"
+    }, /*#__PURE__*/React__default.createElement("span", {
+      className: "inner"
     }, (option === null || option === void 0 ? void 0 : option.id) === (method === null || method === void 0 ? void 0 : method.id) && /*#__PURE__*/React__default.createElement("span", {
-      className: "smallCircle"
-    }))));
+      className: "fill"
+    }))), /*#__PURE__*/React__default.createElement("p", null, option === null || option === void 0 ? void 0 : option.name), /*#__PURE__*/React__default.createElement("h6", {
+      className: "amount"
+    }, "$", option === null || option === void 0 ? void 0 : (_option$amount = option.amount) === null || _option$amount === void 0 ? void 0 : _option$amount.toFixed(2)));
   })), /*#__PURE__*/React__default.createElement(ButtonRow, {
     handleBack: handleBack,
     handleNext: function handleNext() {
-      var _Object$keys;
-
-      if (((_Object$keys = Object.keys(dirtyFields)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) === 4) {
-        setShipping(getValues());
-        setShippingMethod(method);
+      setShipping(selectedAddress, method);
 
-        _handleNext();
-      }
+      _handleNext();
     },
-    nextDisabled: ((_Object$keys2 = Object.keys(dirtyFields)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length) !== 4
+    nextDisabled: showShipping && !selectedAddress || (selectedAddress === null || selectedAddress === void 0 ? void 0 : selectedAddress.id) === 99999999
   })));
 };
 
-var Step3 = function Step3(_ref) {
-  var _Object$keys2;
-
-  var handleBack = _ref.handleBack,
-      _handleNext = _ref.handleNext,
-      setPaymentDetails = _ref.setPaymentDetails,
-      payments = _ref.payments;
-
-  var _useForm = useForm(),
-      control = _useForm.control,
-      handleSubmit = _useForm.handleSubmit,
-      dirtyFields = _useForm.formState.dirtyFields,
-      getValues = _useForm.getValues;
-
-  var onSubmit = function onSubmit(data) {
-    console.log(data);
-  };
-
-  function Icon() {
-    return /*#__PURE__*/React__default.createElement(BiWallet, {
-      className: "icon"
-    });
-  }
-
-  var Images = ['visa', 'mastercard', 'paypal', 'stripe'];
-  return /*#__PURE__*/React__default.createElement(StepContainer, null, /*#__PURE__*/React__default.createElement(StepsHeaderComponent, {
-    text: 'Payments Method',
-    Icon: Icon
-  }), /*#__PURE__*/React__default.createElement(StepsContent, null, /*#__PURE__*/React__default.createElement(Grid, {
-    container: true,
-    rowSpacing: 2,
-    sx: {
-      margin: '1.5em 0'
-    }
-  }, payments === null || payments === void 0 ? void 0 : payments.map(function (payment, i) {
-    var _src;
-
-    var src = payment === null || payment === void 0 ? void 0 : payment.name;
-
-    if ((_src = src) !== null && _src !== void 0 && _src.toLowerCase().includes('card')) {
-      if (src !== 'masterCard') {
-        src = 'visa';
-      }
-    } else if (!Images.includes(src)) {
-      src = 'none';
-    }
-
-    return /*#__PURE__*/React__default.createElement(Grid, {
-      item: true,
-      key: i,
-      xs: 2.8,
-      sm: 1.5
-    }, /*#__PURE__*/React__default.createElement(CreditCard, {
-      tabIndex: 1
-    }, src !== 'none' ? /*#__PURE__*/React__default.createElement("img", {
-      src: "/images/" + src + ".png",
-      alt: payment.name
-    }) : /*#__PURE__*/React__default.createElement("p", null, payment.name)));
-  })), /*#__PURE__*/React__default.createElement(Grid, {
+var CreditCardForm = function CreditCardForm(_ref) {
+  var control = _ref.control;
+  return /*#__PURE__*/React__default.createElement(Grid, {
     container: true,
     component: 'form',
-    onSubmit: handleSubmit(onSubmit),
     rowSpacing: 2,
+    paddingLeft: "1em",
     columnSpacing: 2,
     sx: {
       paddingBottom: '1em'
@@ -2751,19 +2721,84 @@ var Step3 = function Step3(_ref) {
     padding: ".8em 0 0 0"
   }, /*#__PURE__*/React__default.createElement(Checkbox, {
     size: "small"
-  }), /*#__PURE__*/React__default.createElement("p", null, "Remember me")))), /*#__PURE__*/React__default.createElement(ButtonRow, {
+  }), /*#__PURE__*/React__default.createElement("p", null, "Remember the card"))));
+};
+
+var Step3 = function Step3(_ref) {
+  var _selectedMethod$name, _Object$keys;
+
+  var handleBack = _ref.handleBack,
+      _handleNext = _ref.handleNext,
+      setPaymentDetails = _ref.setPaymentDetails,
+      payments = _ref.payments;
+
+  var _useState = useState(payments && payments[0]),
+      selectedMethod = _useState[0],
+      setSelectedMethod = _useState[1];
+
+  var _useForm = useForm(),
+      control = _useForm.control,
+      dirtyFields = _useForm.formState.dirtyFields,
+      getValues = _useForm.getValues;
+
+  var Images = ['visa', 'mastercard', 'paypal', 'stripe'];
+  var isCard = selectedMethod === null || selectedMethod === void 0 ? void 0 : (_selectedMethod$name = selectedMethod.name) === null || _selectedMethod$name === void 0 ? void 0 : _selectedMethod$name.toLowerCase().includes('card');
+  return /*#__PURE__*/React__default.createElement(StepContainer, null, /*#__PURE__*/React__default.createElement(StepsHeaderComponent, {
+    text: 'Payments Method',
+    icon: 4
+  }), /*#__PURE__*/React__default.createElement(StepsContent, null, payments === null || payments === void 0 ? void 0 : payments.map(function (payment, i) {
+    var _payment$name;
+
+    if (payment !== null && payment !== void 0 && (_payment$name = payment.name) !== null && _payment$name !== void 0 && _payment$name.toLowerCase().includes('card')) {
+      return /*#__PURE__*/React__default.createElement(React__default.Fragment, {
+        key: i
+      }, /*#__PURE__*/React__default.createElement(PaymentLi, {
+        onClick: function onClick() {
+          return setSelectedMethod(payment);
+        }
+      }, /*#__PURE__*/React__default.createElement("div", {
+        className: "circle"
+      }, (selectedMethod === null || selectedMethod === void 0 ? void 0 : selectedMethod.id) === (payment === null || payment === void 0 ? void 0 : payment.id) && /*#__PURE__*/React__default.createElement("span", {
+        className: "innerCircle"
+      })), /*#__PURE__*/React__default.createElement("p", null, payment === null || payment === void 0 ? void 0 : payment.name)), /*#__PURE__*/React__default.createElement(Grid, {
+        container: true,
+        rowSpacing: 2,
+        paddingLeft: "1em",
+        paddingBottom: '1em'
+      }, Images === null || Images === void 0 ? void 0 : Images.map(function (img, i) {
+        return /*#__PURE__*/React__default.createElement(Grid, {
+          item: true,
+          key: i,
+          xs: 2.8,
+          sm: 1.5
+        }, /*#__PURE__*/React__default.createElement(CreditCard, {
+          tabIndex: 1
+        }, /*#__PURE__*/React__default.createElement("img", {
+          src: "/images/" + img + ".png",
+          alt: img.name
+        })));
+      })), /*#__PURE__*/React__default.createElement(CreditCardForm, {
+        control: control
+      }));
+    } else {
+      return /*#__PURE__*/React__default.createElement(PaymentLi, {
+        onClick: function onClick() {
+          return setSelectedMethod(payment);
+        }
+      }, /*#__PURE__*/React__default.createElement("div", {
+        className: "circle"
+      }, (selectedMethod === null || selectedMethod === void 0 ? void 0 : selectedMethod.id) === (payment === null || payment === void 0 ? void 0 : payment.id) && /*#__PURE__*/React__default.createElement("span", {
+        className: "innerCircle"
+      })), /*#__PURE__*/React__default.createElement("p", null, payment === null || payment === void 0 ? void 0 : payment.name));
+    }
+  }), /*#__PURE__*/React__default.createElement(ButtonRow, {
     handleBack: handleBack,
     handleNext: function handleNext() {
-      var _Object$keys;
-
-      if (((_Object$keys = Object.keys(dirtyFields)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) === 4) {
-        console.log('clicked', getValues());
-        setPaymentDetails(getValues());
+      setPaymentDetails(selectedMethod, getValues());
 
-        _handleNext();
-      }
+      _handleNext();
     },
-    nextDisabled: ((_Object$keys2 = Object.keys(dirtyFields)) === null || _Object$keys2 === void 0 ? void 0 : _Object$keys2.length) !== 4
+    nextDisabled: isCard && ((_Object$keys = Object.keys(dirtyFields)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) !== 4
   })));
 };
 
@@ -3013,9 +3048,10 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
       userName = _ref.userName,
       addStore = _ref.addStore,
       addStoreAddress = _ref.addStoreAddress,
-      setBillingAddress = _ref.setBillingAddress,
-      setShippingAddress = _ref.setShippingAddress,
-      setShippingMethod = _ref.setShippingMethod,
+      setBilling = _ref.setBilling,
+      addShipping = _ref.addShipping,
+      showShipping = _ref.showShipping,
+      setShowShipping = _ref.setShowShipping,
       deliveryOptions = _ref.deliveryOptions,
       countries = _ref.countries,
       setPaymentDetails = _ref.setPaymentDetails,
@@ -3027,7 +3063,6 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
       selectedPaymentMethod = _ref.selectedPaymentMethod,
       userStores = _ref.userStores,
       userAddresses = _ref.userAddresses,
-      showShipping = _ref.showShipping,
       clickRedirect = _ref.clickRedirect,
       ordering = _ref.ordering,
       deliveryCharges = _ref.deliveryCharges,
@@ -3109,8 +3144,8 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
       currstep: currStep,
       handleBack: handleBack,
       handleNext: handleNext,
-      setShipping: setShipping,
-      setBillingAddress: setBillingAddress,
+      setShipping: setShowShipping,
+      setBilling: setBilling,
       stores: userStores,
       addresses: userAddresses,
       addStore: addStore,
@@ -3126,9 +3161,10 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
       handleNext: handleNext,
       options: deliveryOptions,
       countries: countries,
-      setShipping: setShippingAddress,
-      setShippingMethod: setShippingMethod,
-      showShipping: showShipping
+      setShipping: setShipping,
+      showShipping: showShipping,
+      addresses: userAddresses,
+      addShipping: addShipping
     })), index === 3 && /*#__PURE__*/React__default.createElement(StepContent, {
       sx: {
         padding: 0