@salesgenterp/ui-components 0.4.366 → 0.4.368

package/dist/index.js

@@ -324,29 +324,6 @@ var CARD_METHODS = {
   DEBIT_CARD: 3
 };
 
-var erLocalStorage = {
-  setItem: function setItem(key, value) {
-    localStorage.setItem(key, value);
-  },
-  getItem: function getItem(key) {
-    return localStorage.getItem(key);
-  },
-  removeItem: function removeItem(key) {
-    localStorage.removeItem(key);
-  },
-  setJSONItem: function setJSONItem(key, value) {
-    value = JSON.stringify(value);
-    localStorage.setItem(key, value);
-  },
-  getJSONItem: function getJSONItem(key) {
-    var returnValue = {};
-    try {
-      returnValue = localStorage.getItem(key) ? JSON.parse(localStorage.getItem(key)) : {};
-    } catch (e) {}
-    return returnValue;
-  }
-};
-
 var ErCache = /*#__PURE__*/function () {
   function ErCache() {
     this.sessionStorage = typeof window !== 'undefined' ? window.sessionStorage : {};
@@ -381,6 +358,29 @@ var ErCache = /*#__PURE__*/function () {
 }();
 var erCache = new ErCache();
 
+var erLocalStorage = {
+  setItem: function setItem(key, value) {
+    localStorage.setItem(key, value);
+  },
+  getItem: function getItem(key) {
+    return localStorage.getItem(key);
+  },
+  removeItem: function removeItem(key) {
+    localStorage.removeItem(key);
+  },
+  setJSONItem: function setJSONItem(key, value) {
+    value = JSON.stringify(value);
+    localStorage.setItem(key, value);
+  },
+  getJSONItem: function getJSONItem(key) {
+    var returnValue = {};
+    try {
+      returnValue = localStorage.getItem(key) ? JSON.parse(localStorage.getItem(key)) : {};
+    } catch (e) {}
+    return returnValue;
+  }
+};
+
 var byPassAuthAPIs = ['/authenticate'];
 var API_CACHE_PREFIX = 'API_CACHE';
 var getKeyFromPath = function getKeyFromPath(_ref) {
@@ -411,7 +411,7 @@ var setAPIDataToCache = function setAPIDataToCache(_ref3) {
 };
 var CancelToken = axios.CancelToken;
 var source;
-var API$1 = function API(apiData) {
+var API = function API(apiData) {
   try {
     var url = apiData.url,
       method = apiData.method,
@@ -421,32 +421,49 @@ var API$1 = function API(apiData) {
       body = apiData.body,
       isCancelToken = apiData.isCancelToken,
       cache = apiData.cache,
+      forceUpdateCache = apiData.forceUpdateCache,
       _apiData$headers = apiData.headers,
       headers = _apiData$headers === void 0 ? {} : _apiData$headers,
       successMessage = apiData.successMessage,
+      hideSuccessMessage = apiData.hideSuccessMessage,
       hideErrorMessage = apiData.hideErrorMessage,
       responseTypeData = apiData.responseTypeData,
+      notAppendApiText = apiData.notAppendApiText,
+      getStatusWithData = apiData.getStatusWithData,
+      processResponse = apiData.processResponse,
       apiEndPoint = apiData.apiEndPoint,
       token = apiData.token;
     return Promise.resolve(_finallyRethrows(function () {
       return _catch(function () {
         function _temp2() {
-          if (successMessage) {
-            alert(successMessage);
+          if (!hideSuccessMessage) {
+            if (successMessage) {
+              alert(successMessage);
+            }
           }
+          var apiResponse;
           if (responseTypeData) {
-            return response.data;
+            var _response;
+            apiResponse = (_response = response) === null || _response === void 0 ? void 0 : _response.data;
           } else {
-            return response.data.result;
+            var _response2, _response2$data, _response3, _response3$data, _response4, _response4$data;
+            apiResponse = getStatusWithData ? _extends({
+              status: (_response2 = response) === null || _response2 === void 0 ? void 0 : (_response2$data = _response2.data) === null || _response2$data === void 0 ? void 0 : _response2$data.status
+            }, (_response3 = response) === null || _response3 === void 0 ? void 0 : (_response3$data = _response3.data) === null || _response3$data === void 0 ? void 0 : _response3$data.result) : (_response4 = response) === null || _response4 === void 0 ? void 0 : (_response4$data = _response4.data) === null || _response4$data === void 0 ? void 0 : _response4$data.result;
           }
+          return processResponse ? processResponse(apiResponse) : apiResponse;
         }
         var apiUrl = ("/" + url).replace(/\/\//g, '/');
         var accessToken = token;
-        var requestHeaders = headers;
+        var requestHeaders = _extends({}, headers, {
+          Accept: "application/json, text/plain"
+        });
+        if (formData) {
+          requestHeaders['Content-Type'] = 'multipart/form-data';
+        }
         if (byPassAuthAPIs.indexOf(url) === -1 && accessToken) {
-          requestHeaders = _extends({}, headers, {
-            Authorization: "Bearer " + accessToken,
-            Accept: "application/json, text/plain"
+          requestHeaders = _extends({}, requestHeaders, {
+            Authorization: "Bearer " + accessToken
           });
         }
         var response;
@@ -460,7 +477,7 @@ var API$1 = function API(apiData) {
           apiUrl = "" + (API_END_POINT || apiEndPoint) + apiUrl;
         }
         var _temp = function () {
-          if (cache && getAPICacheData({
+          if (!forceUpdateCache && cache && getAPICacheData({
             path: apiUrl,
             queryParams: queryParams
           })) {
@@ -491,44 +508,17 @@ var API$1 = function API(apiData) {
         }();
         return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
       }, function (exception) {
-        var _exit = false;
-        function _temp4(_result4) {
-          return _exit ? _result4 : function () {
-            if (axios.isCancel(exception)) {} else {
-              return Promise.resolve(handleError({
-                exception: exception,
-                url: url,
-                apiData: apiData,
-                hideErrorMessage: hideErrorMessage
-              }));
-            }
-          }();
-        }
-        var exceptionResponse = exception.response;
-        var _temp3 = function () {
-          if (exceptionResponse.data.hasError) {
-            return function () {
-              if (!hideErrorMessage) {
-                alert(exceptionResponse.data.error.message);
-                return function () {
-                  if (exceptionResponse.data.exception) {
-                    return Promise.resolve(handleError({
-                      exception: exception,
-                      apiEndPoint: apiEndPoint,
-                      url: url,
-                      apiData: apiData,
-                      hideErrorMessage: true
-                    })).then(function (_await$handleError) {
-                      _exit = true;
-                      return _await$handleError;
-                    });
-                  }
-                }();
-              }
-            }();
+        return function () {
+          if (axios.isCancel(exception)) {} else {
+            return Promise.resolve(handleError({
+              exception: exception,
+              url: url,
+              apiData: apiData,
+              hideErrorMessage: hideErrorMessage,
+              getStatusWithData: getStatusWithData
+            }));
           }
         }();
-        return _temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3);
       });
     }, function (_wasThrown, _result) {
       if (_wasThrown) throw _result;
@@ -538,35 +528,35 @@ var API$1 = function API(apiData) {
     return Promise.reject(e);
   }
 };
-API$1.get = function (url, options) {
-  return API$1(_extends({
+API.get = function (url, options) {
+  return API(_extends({
     url: url,
     method: 'get'
   }, options));
 };
-API$1.put = function (url, body, options) {
-  return API$1(_extends({
+API.put = function (url, body, options) {
+  return API(_extends({
     url: url,
     body: body,
     method: 'put'
   }, options));
 };
-API$1.patch = function (url, body, options) {
-  return API$1(_extends({
+API.patch = function (url, body, options) {
+  return API(_extends({
     url: url,
     body: body,
     method: 'patch'
   }, options));
 };
-API$1.post = function (url, body, options) {
-  return API$1(_extends({
+API.post = function (url, body, options) {
+  return API(_extends({
     url: url,
     body: body,
     method: 'post'
   }, options));
 };
-API$1["delete"] = function (url, body, options) {
-  return API$1(_extends({
+API["delete"] = function (url, body, options) {
+  return API(_extends({
     url: url,
     body: body,
     method: 'delete'
@@ -576,32 +566,25 @@ var handleError = function handleError(_ref6) {
   var exception = _ref6.exception,
     url = _ref6.url,
     apiData = _ref6.apiData,
-    hideErrorMessage = _ref6.hideErrorMessage;
+    hideErrorMessage = _ref6.hideErrorMessage,
+    getStatusWithData = _ref6.getStatusWithData;
   try {
-    var _apiData$throwExcepti = apiData.throwException,
-      throwException = _apiData$throwExcepti === void 0 ? true : _apiData$throwExcepti,
-      errorMessage = apiData.errorMessage,
-      showAPIError = apiData.showAPIError;
-    if (exception.response && (exception.response.status === 401 || exception.response.status === 403) && url !== '/authenticate' && url !== '/refreshToken') {
-      try {} catch (e) {
-        alert(e);
-        if (throwException) {
-          throw exception;
-        }
-      }
-    } else {
+    var errorMessage = apiData === null || apiData === void 0 ? void 0 : apiData.errorMessage;
+    var exceptionResponse = exception === null || exception === void 0 ? void 0 : exception.response;
+    if (url !== '/refreshToken') {
       if (!hideErrorMessage) {
-        var errMessage = errorMessage;
-        if (showAPIError) {
-          errMessage = lodash.get(exception, 'response.data.message');
-        }
-        alert(errMessage);
-      }
-      if (throwException) {
-        throw exception;
+        var _exceptionResponse$da, _exceptionResponse$da2, _exceptionResponse$da3, _exceptionResponse$da4;
+        alert((exceptionResponse === null || exceptionResponse === void 0 ? void 0 : (_exceptionResponse$da = exceptionResponse.data) === null || _exceptionResponse$da === void 0 ? void 0 : (_exceptionResponse$da2 = _exceptionResponse$da.error) === null || _exceptionResponse$da2 === void 0 ? void 0 : _exceptionResponse$da2.details) || (exceptionResponse === null || exceptionResponse === void 0 ? void 0 : (_exceptionResponse$da3 = exceptionResponse.data) === null || _exceptionResponse$da3 === void 0 ? void 0 : (_exceptionResponse$da4 = _exceptionResponse$da3.error) === null || _exceptionResponse$da4 === void 0 ? void 0 : _exceptionResponse$da4.message) || errorMessage || 'Something went wrong.');
       }
     }
-    return Promise.resolve();
+    if (getStatusWithData) {
+      var _exception$response, _exception$response2, _exception$response2$, _exception$response2$2;
+      return Promise.resolve({
+        status: exception === null || exception === void 0 ? void 0 : (_exception$response = exception.response) === null || _exception$response === void 0 ? void 0 : _exception$response.status,
+        message: exception === null || exception === void 0 ? void 0 : (_exception$response2 = exception.response) === null || _exception$response2 === void 0 ? void 0 : (_exception$response2$ = _exception$response2.data) === null || _exception$response2$ === void 0 ? void 0 : (_exception$response2$2 = _exception$response2$.error) === null || _exception$response2$2 === void 0 ? void 0 : _exception$response2$2.message
+      });
+    }
+    throw exception;
   } catch (e) {
     return Promise.reject(e);
   }
@@ -620,7 +603,7 @@ var getcsvData = function getcsvData(_ref3) {
     token = _ref3.token;
   try {
     return Promise.resolve(_catch(function () {
-      return Promise.resolve(API$1({
+      return Promise.resolve(API({
         method: 'GET',
         url: url,
         responseTypeData: 'blob',
@@ -684,12 +667,28 @@ var MuiButton = function MuiButton(props) {
     disabled: loading ? true : disabled
   }), loading ? /*#__PURE__*/React__default.createElement(material.CircularProgress, {
     color: "inherit",
-    size: 21
+    size: 20
   }) : children));
 };
 var ButtonContainer = styled__default(material.Button)(_templateObject$1 || (_templateObject$1 = _taggedTemplateLiteralLoose(["\n  background: ", " !important;\n"])), function (props) {
   return props.primaryColor;
 });
+var MuiIconButton = function MuiIconButton(props) {
+  var fontColor = props.fontColor,
+    primaryColor = props.primaryColor,
+    children = props.children,
+    loading = props.loading,
+    disabled = props.disabled;
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(material.IconButton, _extends({
+    fontColor: fontColor,
+    primaryColor: primaryColor
+  }, props, {
+    disabled: loading ? true : disabled
+  }), loading ? /*#__PURE__*/React__default.createElement(material.CircularProgress, {
+    color: "inherit",
+    size: 16
+  }) : children));
+};
 
 var convertCamCaseToSnake = function convertCamCaseToSnake(child) {
   var _Object$keys;
@@ -938,7 +937,7 @@ var ContactUsForm = function ContactUsForm(_ref) {
           };
           setIsLoading(true);
           var _temp = _catch(function () {
-            return Promise.resolve(API$1({
+            return Promise.resolve(API({
               apiEndPoint: apiEndPoint === null || apiEndPoint === void 0 ? void 0 : apiEndPoint.replace('/api', '/services/pdf'),
               method: 'POST',
               url: "/email/customer/contact-us",
@@ -1083,7 +1082,7 @@ var APIStaticPage = function APIStaticPage(_ref) {
                   setStaticPage(_response3);
                   var _temp = function (_response, _response$title, _response2, _response2$urlAlias) {
                     if (((_response = _response3) === null || _response === void 0 ? void 0 : (_response$title = _response.title) === null || _response$title === void 0 ? void 0 : _response$title.toLowerCase()) === 'contact us' || ((_response2 = _response3) === null || _response2 === void 0 ? void 0 : (_response2$urlAlias = _response2.urlAlias) === null || _response2$urlAlias === void 0 ? void 0 : _response2$urlAlias.toLowerCase()) === 'contact-us') {
-                      return Promise.resolve(API$1({
+                      return Promise.resolve(API({
                         apiEndPoint: apiEndPoint,
                         url: "/store"
                       })).then(function (storeData) {
@@ -1098,7 +1097,7 @@ var APIStaticPage = function APIStaticPage(_ref) {
                 var _response3;
                 var _temp2 = function () {
                   if (id || alias) {
-                    return Promise.resolve(API$1({
+                    return Promise.resolve(API({
                       apiEndPoint: apiEndPoint,
                       url: "/ecommerce/staticPage",
                       queryParams: {
@@ -1227,7 +1226,7 @@ var ChangePassword = function ChangePassword(_ref) {
       };
       setIsLoading(true);
       var _temp = _catch(function () {
-        return Promise.resolve(API$1({
+        return Promise.resolve(API({
           apiEndPoint: apiEndPoint,
           token: token,
           method: 'POST',
@@ -1502,7 +1501,7 @@ var APITable = React.forwardRef(function (_ref, ref) {
                 apiResponse = _asyncService;
               });
             } else {
-              return Promise.resolve(API$1(_extends({}, apiData, {
+              return Promise.resolve(API(_extends({}, apiData, {
                 queryParams: queryParams
               }))).then(function (_API) {
                 apiResponse = _API;
@@ -1677,7 +1676,7 @@ var getPaymentMethods = function getPaymentMethods(_ref) {
   var apiEndPoint = _ref.apiEndPoint,
     token = _ref.token;
   try {
-    return Promise.resolve(API$1({
+    return Promise.resolve(API({
       apiEndPoint: apiEndPoint,
       token: token,
       url: "/store/paymentMode"
@@ -1690,7 +1689,7 @@ var getStoreFeatureDetails = function getStoreFeatureDetails(_ref2) {
   var apiEndPoint = _ref2.apiEndPoint,
     token = _ref2.token;
   try {
-    return Promise.resolve(API$1({
+    return Promise.resolve(API({
       apiEndPoint: apiEndPoint,
       token: token,
       url: "/store/feature"
@@ -1704,7 +1703,7 @@ var getAuthorizeDotNetCreditCards = function getAuthorizeDotNetCreditCards(_ref3
     token = _ref3.token,
     customerId = _ref3.customerId;
   try {
-    return Promise.resolve(API$1({
+    return Promise.resolve(API({
       apiEndPoint: apiEndPoint,
       token: token,
       url: "/ecommerce/authoriseDotNet/customerProfile?customerId=" + customerId
@@ -1718,7 +1717,7 @@ var addAuthoriseDotNetCard = function addAuthoriseDotNetCard(_ref4) {
     token = _ref4.token,
     body = _ref4.body;
   try {
-    return Promise.resolve(API$1({
+    return Promise.resolve(API({
       apiEndPoint: apiEndPoint,
       token: token,
       url: "/ecommerce/authoriseDotNet/paymentProfile",
@@ -1730,6 +1729,54 @@ var addAuthoriseDotNetCard = function addAuthoriseDotNetCard(_ref4) {
     return Promise.reject(e);
   }
 };
+var getCartDiscountList = function getCartDiscountList(_ref5) {
+  var apiEndPoint = _ref5.apiEndPoint,
+    token = _ref5.token;
+  try {
+    return Promise.resolve(API({
+      apiEndPoint: apiEndPoint,
+      token: token,
+      url: "/cartDiscount?storeId=2"
+    }));
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var addCartDiscount = function addCartDiscount(_ref7) {
+  var apiEndPoint = _ref7.apiEndPoint,
+    token = _ref7.token,
+    body = _ref7.body;
+  try {
+    return Promise.resolve(API({
+      apiEndPoint: apiEndPoint,
+      token: token,
+      url: "/cartDiscount?storeId=2",
+      method: 'post',
+      body: body,
+      successMessage: 'Discount added successfully.',
+      errorMessage: 'Error in adding discount.'
+    }));
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var deleteCartDiscount = function deleteCartDiscount(_ref8) {
+  var apiEndPoint = _ref8.apiEndPoint,
+    token = _ref8.token,
+    discountId = _ref8.discountId;
+  try {
+    return Promise.resolve(API({
+      apiEndPoint: apiEndPoint,
+      token: token,
+      url: "/cartDiscount?cartDiscountMapId=" + discountId + "&storeId=2",
+      method: 'delete',
+      successMessage: 'Discount removed successfully.',
+      errorMessage: 'Error in removing discount.'
+    }));
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
 
 var _templateObject$9;
 var _excluded$2 = ["children", "onClose", "fontColor"];
@@ -1911,7 +1958,7 @@ var getStatesById = function getStatesById(_ref) {
     token = _ref.token,
     id = _ref.id;
   try {
-    return Promise.resolve(API$1({
+    return Promise.resolve(API({
       apiEndPoint: apiEndPoint,
       token: token,
       url: "/country/" + id + "/allState",
@@ -1925,7 +1972,7 @@ var getCountry = function getCountry(_ref2) {
   var apiEndPoint = _ref2.apiEndPoint,
     token = _ref2.token;
   try {
-    return Promise.resolve(API$1({
+    return Promise.resolve(API({
       apiEndPoint: apiEndPoint,
       token: token,
       url: "/country/all",
@@ -2254,7 +2301,7 @@ var PaymentModal = function PaymentModal(_ref) {
           };
           setDataLoading(true);
           var _temp = _catch(function () {
-            return Promise.resolve(API$1({
+            return Promise.resolve(API({
               url: "/ecommerce/order/" + orderId + "?storeIds=" + storeIdList,
               apiEndPoint: apiEndPoint,
               token: token
@@ -2333,7 +2380,7 @@ var PaymentModal = function PaymentModal(_ref) {
           authorizeDotNetCustomerPaymentProfileId: authorizeDotNetCardData === null || authorizeDotNetCardData === void 0 ? void 0 : authorizeDotNetCardData.customerPaymentProfileId,
           authorizeDotNetCustomerProfileId: customerCreditCards === null || customerCreditCards === void 0 ? void 0 : (_customerCreditCards$3 = customerCreditCards.profile) === null || _customerCreditCards$3 === void 0 ? void 0 : _customerCreditCards$3.customerProfileId
         }), ['authorizeDotNetCard']));
-        return Promise.resolve(API$1({
+        return Promise.resolve(API({
           apiEndPoint: apiEndPoint,
           token: token,
           method: 'post',
@@ -2689,14 +2736,14 @@ var Dashboard = function Dashboard(_ref) {
     (function () {
       try {
         var _temp = _catch(function () {
-          return Promise.resolve(API$1({
+          return Promise.resolve(API({
             url: "/ecommerce/customer",
             apiEndPoint: apiEndPoint,
             token: token,
             hideErrorMessage: true
           })).then(function (customerDataResponse) {
             setCustomerData(customerDataResponse);
-            return Promise.resolve(API$1({
+            return Promise.resolve(API({
               url: "/ecommerce/dashboard",
               apiEndPoint: apiEndPoint,
               token: token
@@ -3156,7 +3203,7 @@ var MyProfile = function MyProfile(_ref) {
     (function () {
       try {
         var _temp = _catch(function () {
-          return Promise.resolve(API$1({
+          return Promise.resolve(API({
             apiEndPoint: apiEndPoint,
             token: token,
             url: "/ecommerce/customer",
@@ -3179,7 +3226,7 @@ var MyProfile = function MyProfile(_ref) {
       };
       setIsLoading(true);
       var _temp2 = _catch(function () {
-        return Promise.resolve(API$1({
+        return Promise.resolve(API({
           apiEndPoint: apiEndPoint,
           token: token,
           method: 'put',
@@ -3733,13 +3780,13 @@ var Statement = function Statement(_ref) {
         var _temp2 = function () {
           if (token && apiEndPoint) {
             var _temp = _catch(function () {
-              return Promise.resolve(API$1({
+              return Promise.resolve(API({
                 url: "/ecommerce/customer",
                 apiEndPoint: apiEndPoint,
                 token: token
               })).then(function (customerDataResponse) {
                 setCustomerData(customerDataResponse);
-                return Promise.resolve(API$1({
+                return Promise.resolve(API({
                   apiEndPoint: apiEndPoint,
                   token: token,
                   url: "/ecommerce/customer/child"
@@ -3770,7 +3817,7 @@ var Statement = function Statement(_ref) {
       var _customerData$custome3, _customerData$custome4;
       setLoading(true);
       var customerIds = queryParams !== null && queryParams !== void 0 && queryParams.customerIds ? (queryParams === null || queryParams === void 0 ? void 0 : queryParams.customerIds) + "," + (customerData === null || customerData === void 0 ? void 0 : (_customerData$custome3 = customerData.customerDto) === null || _customerData$custome3 === void 0 ? void 0 : _customerData$custome3.id) : customerData === null || customerData === void 0 ? void 0 : (_customerData$custome4 = customerData.customerDto) === null || _customerData$custome4 === void 0 ? void 0 : _customerData$custome4.id;
-      return Promise.resolve(API$1({
+      return Promise.resolve(API({
         url: "/ecommerce/customer/report/statement?storeIds=" + storeIdList + "&page=0&size=20",
         apiEndPoint: apiEndPoint,
         token: token,
@@ -3996,7 +4043,7 @@ var AddEditAddress = function AddEditAddress(_ref) {
       setIsLoading(true);
       var _temp2 = _catch(function () {
         var _customer$customerDto, _customer$customerDto2;
-        return Promise.resolve(API$1({
+        return Promise.resolve(API({
           apiEndPoint: apiEndPoint,
           token: token,
           url: "/ecommerce/customer/" + (customer === null || customer === void 0 ? void 0 : (_customer$customerDto = customer.customerDto) === null || _customer$customerDto === void 0 ? void 0 : _customer$customerDto.id) + "/address",
@@ -4322,7 +4369,7 @@ var StoreTabs = function StoreTabs(_ref) {
     try {
       var _temp2 = _catch(function () {
         var _customer$customerDto2;
-        return Promise.resolve(API$1({
+        return Promise.resolve(API({
           apiEndPoint: apiEndPoint,
           token: token,
           url: "/ecommerce/customer/" + (customer === null || customer === void 0 ? void 0 : (_customer$customerDto2 = customer.customerDto) === null || _customer$customerDto2 === void 0 ? void 0 : _customer$customerDto2.id) + "/address",
@@ -4389,7 +4436,7 @@ var StoreList = function StoreList(_ref) {
     setCustomer = _useState[1];
   React.useEffect(function () {
     try {
-      return Promise.resolve(API$1({
+      return Promise.resolve(API({
         apiEndPoint: apiEndPoint,
         token: token,
         url: "/ecommerce/customer",
@@ -4528,7 +4575,7 @@ var AccountDetails = function AccountDetails(_ref) {
         };
         setDataLoading(true);
         var _temp = _catch(function () {
-          return Promise.resolve(API$1({
+          return Promise.resolve(API({
             apiEndPoint: apiEndPoint,
             token: token,
             url: "/store"
@@ -4935,7 +4982,7 @@ var BrandList = function BrandList(_ref) {
         };
         setLoading(true);
         var _temp = _catch(function () {
-          return Promise.resolve(API$1({
+          return Promise.resolve(API({
             apiEndPoint: apiEndPoint,
             url: "/ecommerce/brand/list?size=" + (size || 20)
           })).then(function (data) {
@@ -4997,7 +5044,7 @@ var AsyncDataLoad = function AsyncDataLoad(_ref) {
               data = _asyncService;
             });
           } else {
-            return Promise.resolve(API$1(_extends({
+            return Promise.resolve(API(_extends({
               apiEndPoint: apiEndPoint,
               token: token,
               hideErrorMessage: true
@@ -5053,7 +5100,7 @@ var BrandStock = function BrandStock(_ref) {
     (function () {
       try {
         var _temp = _catch(function () {
-          return Promise.resolve(API$1({
+          return Promise.resolve(API({
             apiEndPoint: apiEndPoint,
             url: "/ecommerce/brand/list?size=9999"
           })).then(function (brandList) {
@@ -5072,7 +5119,7 @@ var BrandStock = function BrandStock(_ref) {
     var brand = _ref2.brand;
     return Promise.resolve(_catch(function () {
       var data = [];
-      return Promise.resolve(API$1({
+      return Promise.resolve(API({
         apiEndPoint: apiEndPoint,
         url: "/ecommerce/product/brand?brandIdList=" + (brand === null || brand === void 0 ? void 0 : brand.id) + "&storeIds=2&size=9999"
       })).then(function (products) {
@@ -5084,7 +5131,7 @@ var BrandStock = function BrandStock(_ref) {
         data = products === null || products === void 0 ? void 0 : products.content;
         var updatePromises = [];
         var _temp2 = _forOf(products === null || products === void 0 ? void 0 : products.content, function (product) {
-          return Promise.resolve(API$1({
+          return Promise.resolve(API({
             apiEndPoint: apiEndPoint,
             url: "/ecommerce/product/" + (product === null || product === void 0 ? void 0 : product.productId) + "?storeIds=2"
           })).then(function (childProducts) {
@@ -5316,7 +5363,7 @@ var CartPageSection = styled__default.section(_templateObject$s || (_templateObj
 }, function (props) {
   return props.bg || '#FAE8E5';
 });
-var CartPageContainer = styled__default.div(_templateObject2$i || (_templateObject2$i = _taggedTemplateLiteralLoose(["\n  max-width: ", ";\n  width: ", ";\n  display: flex;\n  flex-direction: row;\n  justify-content: space-between;\n  align-items: flex-start;\n  padding: 2rem;\n  padding-bottom: 2em;\n  border-radius: 12px;\n  opacity: ", ";\n  .scrollDiv {\n    width: 68%;\n    height: 630px;\n    max-height: 630px;\n    display: flex;\n    flex-direction: column;\n    overflow-y: auto;\n    margin-right: 0.3em;\n    &::-webkit-scrollbar {\n      width: 10px;\n    }\n\n    /* Track */\n    &::-webkit-scrollbar-track {\n      background: ", ";\n      border-radius: 16px;\n    }\n\n    /* Handle */\n    &::-webkit-scrollbar-thumb {\n      background: ", ";\n      border-radius: 16px;\n    }\n    /* box-shadow: 0px 20px 35px rgba(0, 0, 0, 0.05); */\n  }\n  table {\n    border-collapse: separate;\n    border-spacing: 0 4px;\n    row-gap: 4px;\n  }\n\n  td {\n    /* border: solid 1px #000; */\n    border-style: none solid solid none;\n    /* padding: 10px; */\n    /* margin-bottom:5px; */\n  }\n\n  tr:first-child td:first-child {\n    border-top-left-radius: 10px;\n  }\n  tr td:last-child {\n    border-top-right-radius: 10px;\n    border-bottom-right-radius: 10px;\n  }\n\n  tr td:first-child {\n    border-bottom-left-radius: 10px;\n    border-top-left-radius: 10px;\n  }\n  tr td:last-child {\n    border-bottom-right-radius: 10px;\n  }\n\n  tr td {\n    border-top-style: solid;\n  }\n  tr td:first-child {\n    border-left-style: solid;\n  }\n\n  @media only screen and (max-width: 1200px) {\n    flex-direction: column;\n    align-items: center;\n    padding: 1rem 0;\n    .scrollDiv {\n      width: 100%;\n      margin: 0;\n      margin-bottom: 2em;\n      // padding: 0 0.4em;\n    }\n  }\n"])), function (props) {
+var CartPageContainer = styled__default.div(_templateObject2$i || (_templateObject2$i = _taggedTemplateLiteralLoose(["\n  max-width: ", ";\n  width: ", ";\n  display: flex;\n  flex-direction: row;\n  justify-content: space-between;\n  align-items: flex-start;\n  padding: 2rem;\n  padding-bottom: 2em;\n  border-radius: 12px;\n  opacity: ", ";\n  .scrollDiv {\n    width: 68%;\n    max-height: 630px;\n    display: flex;\n    flex-direction: column;\n    overflow-y: auto;\n    margin-right: 0.3em;\n    &::-webkit-scrollbar {\n      width: 10px;\n    }\n\n    /* Track */\n    &::-webkit-scrollbar-track {\n      background: ", ";\n      border-radius: 16px;\n    }\n\n    /* Handle */\n    &::-webkit-scrollbar-thumb {\n      background: ", ";\n      border-radius: 16px;\n    }\n    /* box-shadow: 0px 20px 35px rgba(0, 0, 0, 0.05); */\n  }\n  table {\n    border-collapse: separate;\n    border-spacing: 0 4px;\n    row-gap: 4px;\n  }\n\n  td {\n    /* border: solid 1px #000; */\n    border-style: none solid solid none;\n    /* padding: 10px; */\n    /* margin-bottom:5px; */\n  }\n\n  tr:first-child td:first-child {\n    border-top-left-radius: 10px;\n  }\n  tr td:last-child {\n    border-top-right-radius: 10px;\n    border-bottom-right-radius: 10px;\n  }\n\n  tr td:first-child {\n    border-bottom-left-radius: 10px;\n    border-top-left-radius: 10px;\n  }\n  tr td:last-child {\n    border-bottom-right-radius: 10px;\n  }\n\n  tr td {\n    border-top-style: solid;\n  }\n  tr td:first-child {\n    border-left-style: solid;\n  }\n\n  @media only screen and (max-width: 1200px) {\n    flex-direction: column;\n    align-items: center;\n    padding: 1rem 0;\n    .scrollDiv {\n      width: 100%;\n      margin: 0;\n      margin-bottom: 2em;\n      // padding: 0 0.4em;\n    }\n  }\n"])), function (props) {
   return props.maxWidth || '1600px';
 }, function (props) {
   return "min(" + (props.maxWidth || '1600px') + ",100%)";
@@ -5345,7 +5392,7 @@ var CartTableCell = styled__default(material.TableCell)(_templateObject6$5 || (_
 }, function (props) {
   return "" + props.color || 'inherit';
 });
-var CartTableContainer = styled__default(material.TableContainer)(_templateObject7$4 || (_templateObject7$4 = _taggedTemplateLiteralLoose(["\n  max-height: 580px;\n  min-height: 440px;\n  padding-right: 1rem;\n\n  &::-webkit-scrollbar {\n    width: 10px;\n  }\n\n  /* Track */\n  &::-webkit-scrollbar-track {\n    background: ", ";\n    border-radius: 16px;\n    width: 100%;\n  }\n\n  /* Handle */\n  &::-webkit-scrollbar-thumb {\n    border-radius: 16px;\n    margin: 5px 2px;\n    background: ", ";\n  }\n  @media screen and (max-width: 768px) {\n    padding: 0;\n  }\n"])), function (props) {
+var CartTableContainer = styled__default(material.TableContainer)(_templateObject7$4 || (_templateObject7$4 = _taggedTemplateLiteralLoose(["\n  max-height: 580px;\n  padding-right: 1rem;\n\n  &::-webkit-scrollbar {\n    width: 10px;\n  }\n\n  /* Track */\n  &::-webkit-scrollbar-track {\n    background: ", ";\n    border-radius: 16px;\n    width: 100%;\n  }\n\n  /* Handle */\n  &::-webkit-scrollbar-thumb {\n    border-radius: 16px;\n    margin: 5px 2px;\n    background: ", ";\n  }\n  @media screen and (max-width: 768px) {\n    padding: 0;\n  }\n"])), function (props) {
   return 'rgba(102, 112, 128, 0.5)';
 }, function (props) {
   return props.color;
@@ -6847,7 +6894,7 @@ function EnhancedTable(_ref) {
       handleIncrementDecrement: handleIncrementDecrement,
       handleRemoveProduct: handleRemoveProduct
     });
-  }))))), /*#__PURE__*/React.createElement(CartButtonsRow, {
+  }))))), (cartArray === null || cartArray === void 0 ? void 0 : cartArray.length) > 0 && /*#__PURE__*/React.createElement(CartButtonsRow, {
     bg: styles === null || styles === void 0 ? void 0 : (_styles$Btn2 = styles.Btn) === null || _styles$Btn2 === void 0 ? void 0 : _styles$Btn2.background,
     color: styles === null || styles === void 0 ? void 0 : (_styles$Btn3 = styles.Btn) === null || _styles$Btn3 === void 0 ? void 0 : _styles$Btn3.color
   }, /*#__PURE__*/React.createElement("button", {
@@ -6989,7 +7036,7 @@ var CartPageMainRetail = function CartPageMainRetail(_ref) {
 };
 
 var _templateObject$v, _templateObject2$l, _templateObject3$f, _templateObject4$c, _templateObject5$a, _templateObject6$8, _templateObject7$6, _templateObject8$4;
-var CartSummaryContainer = styled__default.div(_templateObject$v || (_templateObject$v = _taggedTemplateLiteralLoose(["\n  width: 25rem;\n  max-width: 100%;\n  display: flex;\n  flex-direction: column;\n  background: ", ";\n  color: ", ";\n  border-radius: 20px;\n  padding: 2em 3em;\n  align-items: center;\n  /* margin-top: 3em; */\n  p {\n    font-size: 1.189em;\n    font-weight: 600;\n    align-self: flex-start;\n    color: inherit;\n    margin: 0;\n    padding: 0;\n  }\n  .continueShopping {\n    font-size: 0.75em;\n    color: inherit;\n    text-transform: capitalize;\n    height: 20px;\n    border-bottom: 1px solid;\n    border-color: ", ";\n    cursor: pointer;\n  }\n"])), function (props) {
+var CartSummaryContainer = styled__default.div(_templateObject$v || (_templateObject$v = _taggedTemplateLiteralLoose(["\n  width: 25rem;\n  max-width: 100%;\n  display: flex;\n  flex-direction: column;\n  background: ", ";\n  color: ", ";\n  border-radius: 20px;\n  padding: 2em;\n  align-items: center;\n  /* margin-top: 3em; */\n  p {\n    font-size: 1.189em;\n    font-weight: 600;\n    align-self: flex-start;\n    color: inherit;\n    margin: 0;\n    padding: 0;\n  }\n  .continueShopping {\n    font-size: 0.75em;\n    color: inherit;\n    text-transform: capitalize;\n    height: 20px;\n    border-bottom: 1px solid;\n    border-color: ", ";\n    cursor: pointer;\n  }\n"])), function (props) {
   return props.background || '#667080';
 }, function (props) {
   return props.color || 'white';
@@ -7001,10 +7048,10 @@ var CartSummaryRow = styled__default.div(_templateObject2$l || (_templateObject2
 }, function (props) {
   return props.h5 || '1.31em';
 });
-var CartSummaryHr = styled__default.span(_templateObject3$f || (_templateObject3$f = _taggedTemplateLiteralLoose(["\n  border: none;\n  width: 100%;\n  height: 1px;\n  background-color: ", ";\n  margin: 1.2em 0;\n"])), function (props) {
+var CartSummaryHr = styled__default.span(_templateObject3$f || (_templateObject3$f = _taggedTemplateLiteralLoose(["\n  border: none;\n  width: 100%;\n  height: 1px;\n  background-color: ", ";\n  margin: 1em 0;\n"])), function (props) {
   return props.color || 'rgba(255, 255, 255, 0.5)';
 });
-var CartSummaryInputBox = styled__default.form(_templateObject4$c || (_templateObject4$c = _taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: row;\n  justify-content: center;\n  align-items: center;\n  padding-bottom: ", ";\n  background-color: transparent;\n  width: 100%;\n  input {\n    width: 65%;\n    height: 2.44rem;\n    padding: 0.2rem 0.8rem;\n\n    text-transform: capitalize;\n    font-size: 0.89rem;\n    margin-right: 0.1em;\n\n    border: none;\n    outline: none;\n    background: ", ";\n    color: ", ";\n    &::placeholder {\n      color: ", ";\n    }\n  }\n  button {\n    width: 35%;\n    height: 2.44rem;\n    line-height: 0.8rem;\n    background: ", ";\n    display: grid;\n    color: ", ";\n    place-items: center;\n    border: none;\n    outline: none;\n    text-transform: uppercase;\n    cursor: pointer;\n    font-size: 0.75em;\n    transition: 0.3s;\n    &:hover {\n      letter-spacing: 1px;\n      background: ", ";\n    }\n  }\n"])), function (props) {
+var CartSummaryInputBox = styled__default.form(_templateObject4$c || (_templateObject4$c = _taggedTemplateLiteralLoose(["\n  display: flex;\n  flex-direction: row;\n  justify-content: center;\n  align-items: center;\n  padding-bottom: ", ";\n  background-color: transparent;\n  width: 100%;\n  input {\n    width: 65%;\n    height: 2.5rem;\n    padding: 0.2rem 0.8rem;\n    font-size: 0.89rem;\n    border: none;\n    outline: none;\n    background: ", ";\n    color: ", ";\n    &::placeholder {\n      color: ", ";\n    }\n  }\n  button {\n    width: 35%;\n    height: 2.5rem;\n    line-height: 0.8rem;\n    background: ", ";\n    display: grid;\n    color: ", ";\n    place-items: center;\n    border: none;\n    border-radius: 0;\n    outline: none;\n    text-transform: uppercase;\n    cursor: pointer;\n    font-size: 0.75em;\n    transition: 0.3s;\n    &:hover {\n      letter-spacing: 1px;\n      background: ", ";\n    }\n  }\n"])), function (props) {
   return props.paddingBottom ? '0' : '0';
 }, function (props) {
   return props.background || '#bfc3ca';
@@ -7019,8 +7066,8 @@ var CartSummaryInputBox = styled__default.form(_templateObject4$c || (_templateO
 }, function (props) {
   return props.btn || '#393f48';
 });
-var DiscountCouponContainer = styled__default.div(_templateObject5$a || (_templateObject5$a = _taggedTemplateLiteralLoose(["\n  padding: 0.6rem 0;\n  width: 100%;\n"])));
-var DiscountCouponCard = styled__default.div(_templateObject6$8 || (_templateObject6$8 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  padding: 0.3rem;\n  svg {\n    color: ", ";\n    cursor: pointer;\n    font-size: 1.4rem;\n  }\n"])), function (props) {
+var DiscountCouponContainer = styled__default.div(_templateObject5$a || (_templateObject5$a = _taggedTemplateLiteralLoose(["\n  padding-top: 0.5rem;\n  width: 100%;\n  max-height: 200px;\n  overflow: auto;\n"])));
+var DiscountCouponCard = styled__default.div(_templateObject6$8 || (_templateObject6$8 = _taggedTemplateLiteralLoose(["\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  padding: 0.3rem;\n  button {\n    color: ", ";\n    font-size: 1.4rem;\n    &:hover {\n      color: red;\n    }\n  }\n"])), function (props) {
   return props.btn || '#393f48';
 });
 var CartSummaryCheckoutBtn = styled__default.button(_templateObject7$6 || (_templateObject7$6 = _taggedTemplateLiteralLoose(["\n  font-size: 0.95em;\n  font-weight: 600;\n  background: ", ";\n  color: ", ";\n  cursor: pointer;\n  text-transform: uppercase;\n  border: none;\n  outline: none;\n  width: 16.81em;\n  height: 3.4em;\n  display: grid;\n  place-items: center;\n  font-size: 0.75em;\n  padding: 0;\n  font-size: 0.94em;\n  margin: 1em auto;\n  transition: 0.3s;\n  margin-top: 3em;\n  &:hover {\n    opacity: 0.8;\n  }\n"])), function (props) {
@@ -7048,7 +7095,8 @@ var CartSummary = function CartSummary(_ref) {
     onChangeDiscountCoupon = _ref.onChangeDiscountCoupon,
     _ref$discountCoupons = _ref.discountCoupons,
     discountCoupons = _ref$discountCoupons === void 0 ? [] : _ref$discountCoupons,
-    cartDiscount = _ref.cartDiscount;
+    cartDiscount = _ref.cartDiscount,
+    couponDiscountTotal = _ref.couponDiscountTotal;
   var storeIdList = (storeData === null || storeData === void 0 ? void 0 : (_storeData$map = storeData.map(function (data) {
     return data === null || data === void 0 ? void 0 : data.id;
   })) === null || _storeData$map === void 0 ? void 0 : _storeData$map.join(',')) || 2;
@@ -7060,39 +7108,26 @@ var CartSummary = function CartSummary(_ref) {
   var _useState2 = React.useState(''),
     couponText = _useState2[0],
     setCouponText = _useState2[1];
-  var _useState3 = React.useState(discountCoupons),
-    discountCouponData = _useState3[0],
-    setDiscountCouponData = _useState3[1];
   var ValidateDiscountCoupon = function ValidateDiscountCoupon(value) {
     try {
       var _temp3 = function () {
         if (apiEndPoint && token) {
           var _temp2 = function _temp2() {
+            setCouponText('');
             setButtonLoading(false);
           };
-          var couponListObj = {
-            couponNames: [value],
-            totalCartAmount: subtotal
+          var body = {
+            cartTotal: cartAmount,
+            couponCode: value
           };
           setButtonLoading(true);
           var _temp = _catch(function () {
-            return Promise.resolve(API$1({
+            return Promise.resolve(addCartDiscount({
               apiEndPoint: apiEndPoint,
               token: token,
-              method: 'POST',
-              url: "/ecommerce/discount/validate?storeId=" + storeIdList,
-              body: couponListObj
-            })).then(function (response) {
-              var couponData = response === null || response === void 0 ? void 0 : response.map(function (item) {
-                return {
-                  id: item.discountId,
-                  discountName: item.discountName,
-                  couponCode: item.couponCode,
-                  amount: item.amount
-                };
-              });
-              setDiscountCouponData(lodash.uniqBy([].concat(discountCouponData, couponData), 'id'));
-              onChangeDiscountCoupon && onChangeDiscountCoupon(lodash.uniqBy([].concat(discountCouponData, couponData), 'id'));
+              body: body
+            })).then(function () {
+              onChangeDiscountCoupon && onChangeDiscountCoupon();
             });
           }, function () {});
           return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
@@ -7103,10 +7138,6 @@ var CartSummary = function CartSummary(_ref) {
       return Promise.reject(e);
     }
   };
-  var discountTotal = cartDiscount || 0;
-  discountCouponData === null || discountCouponData === void 0 ? void 0 : discountCouponData.forEach(function (element) {
-    discountTotal = discountTotal + element.amount;
-  });
   return /*#__PURE__*/React__default.createElement(CartSummaryContainer, {
     background: cartSummary.bg,
     color: cartSummary.color
@@ -7114,7 +7145,7 @@ var CartSummary = function CartSummary(_ref) {
     color: cartSummary.hr
   }), /*#__PURE__*/React__default.createElement(CartSummaryRow, null, /*#__PURE__*/React__default.createElement("h6", null, "subtotal"), /*#__PURE__*/React__default.createElement("h5", null, renderMoney(subtotal))), /*#__PURE__*/React__default.createElement(CartSummaryHr, {
     color: cartSummary.hr
-  }), /*#__PURE__*/React__default.createElement(CartSummaryRow, null, /*#__PURE__*/React__default.createElement("h6", null, "Discount"), /*#__PURE__*/React__default.createElement("h5", null, renderMoney(discountTotal))), /*#__PURE__*/React__default.createElement(CartSummaryHr, {
+  }), /*#__PURE__*/React__default.createElement(CartSummaryRow, null, /*#__PURE__*/React__default.createElement("h6", null, "Order Discount"), /*#__PURE__*/React__default.createElement("h5", null, renderMoney(cartDiscount))), /*#__PURE__*/React__default.createElement(CartSummaryHr, {
     color: cartSummary.hr
   }), /*#__PURE__*/React__default.createElement(CartSummaryInputBox, {
     background: cartSummary === null || cartSummary === void 0 ? void 0 : (_cartSummary$input = cartSummary.input) === null || _cartSummary$input === void 0 ? void 0 : _cartSummary$input.bg,
@@ -7138,32 +7169,31 @@ var CartSummary = function CartSummary(_ref) {
     type: "submit",
     variant: "contained",
     loading: buttonLoading
-  }, "apply coupon")), /*#__PURE__*/React__default.createElement(DiscountCouponContainer, {
+  }, "apply coupon")), (discountCoupons === null || discountCoupons === void 0 ? void 0 : discountCoupons.length) > 0 && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(DiscountCouponContainer, {
     background: cartSummary === null || cartSummary === void 0 ? void 0 : (_cartSummary$input3 = cartSummary.input) === null || _cartSummary$input3 === void 0 ? void 0 : _cartSummary$input3.bg,
     color: cartSummary === null || cartSummary === void 0 ? void 0 : (_cartSummary$input4 = cartSummary.input) === null || _cartSummary$input4 === void 0 ? void 0 : _cartSummary$input4.color,
     btn: Btn === null || Btn === void 0 ? void 0 : Btn.background,
     Btncolor: Btn === null || Btn === void 0 ? void 0 : Btn.color
-  }, discountCouponData === null || discountCouponData === void 0 ? void 0 : discountCouponData.map(function (coupon) {
-    var _cartSummary$input5, _cartSummary$input6;
-    return /*#__PURE__*/React__default.createElement(DiscountCouponCard, {
-      background: cartSummary === null || cartSummary === void 0 ? void 0 : (_cartSummary$input5 = cartSummary.input) === null || _cartSummary$input5 === void 0 ? void 0 : _cartSummary$input5.bg,
-      color: cartSummary === null || cartSummary === void 0 ? void 0 : (_cartSummary$input6 = cartSummary.input) === null || _cartSummary$input6 === void 0 ? void 0 : _cartSummary$input6.color,
-      btn: Btn === null || Btn === void 0 ? void 0 : Btn.background,
-      Btncolor: Btn === null || Btn === void 0 ? void 0 : Btn.color
-    }, /*#__PURE__*/React__default.createElement("span", null, coupon === null || coupon === void 0 ? void 0 : coupon.discountName, " ", "(" + renderMoney(coupon === null || coupon === void 0 ? void 0 : coupon.amount) + ")"), /*#__PURE__*/React__default.createElement(md.MdDelete, {
-      onClick: function onClick() {
-        var data = discountCouponData === null || discountCouponData === void 0 ? void 0 : discountCouponData.filter(function (f) {
-          return (f === null || f === void 0 ? void 0 : f.id) !== (coupon === null || coupon === void 0 ? void 0 : coupon.id);
-        });
-        setDiscountCouponData(data);
-        onChangeDiscountCoupon(data);
-      }
-    }));
+  }, discountCoupons === null || discountCoupons === void 0 ? void 0 : discountCoupons.map(function (coupon, index) {
+    return /*#__PURE__*/React__default.createElement(DiscountItemCard, {
+      key: index,
+      index: index,
+      discountCoupons: discountCoupons,
+      cartSummary: cartSummary,
+      Btn: Btn,
+      coupon: coupon,
+      deleteCartDiscount: deleteCartDiscount,
+      onChangeDiscountCoupon: onChangeDiscountCoupon,
+      apiEndPoint: apiEndPoint,
+      token: token
+    });
   })), /*#__PURE__*/React__default.createElement(CartSummaryHr, {
     color: cartSummary.hr
+  }), /*#__PURE__*/React__default.createElement(CartSummaryRow, null, /*#__PURE__*/React__default.createElement("h6", null, "Coupon Discount"), /*#__PURE__*/React__default.createElement("h5", null, renderMoney(couponDiscountTotal)))), /*#__PURE__*/React__default.createElement(CartSummaryHr, {
+    color: cartSummary.hr
   }), /*#__PURE__*/React__default.createElement(CartSummaryRow, {
     h5: "1.64em"
-  }, /*#__PURE__*/React__default.createElement("h6", null, "order total"), /*#__PURE__*/React__default.createElement("h5", null, renderMoney(totalCartPrice + ((selectedShipping === null || selectedShipping === void 0 ? void 0 : selectedShipping.amount) || 0) - discountTotal))), /*#__PURE__*/React__default.createElement(CartSummaryRow, {
+  }, /*#__PURE__*/React__default.createElement("h6", null, "order total"), /*#__PURE__*/React__default.createElement("h5", null, renderMoney(totalCartPrice + ((selectedShipping === null || selectedShipping === void 0 ? void 0 : selectedShipping.amount) || 0) - couponDiscountTotal))), /*#__PURE__*/React__default.createElement(CartSummaryRow, {
     justify: "center"
   }, /*#__PURE__*/React__default.createElement(CartSummaryCheckoutBtn, {
     onClick: function onClick() {
@@ -7182,6 +7212,62 @@ var CartSummary = function CartSummary(_ref) {
     }
   }, "Continue to shopping")));
 };
+var DiscountItemCard = function DiscountItemCard(_ref2) {
+  var _cartSummary$input5, _cartSummary$input6;
+  var index = _ref2.index,
+    discountCoupons = _ref2.discountCoupons,
+    cartSummary = _ref2.cartSummary,
+    Btn = _ref2.Btn,
+    coupon = _ref2.coupon,
+    deleteCartDiscount = _ref2.deleteCartDiscount,
+    onChangeDiscountCoupon = _ref2.onChangeDiscountCoupon,
+    apiEndPoint = _ref2.apiEndPoint,
+    token = _ref2.token;
+  var _useState3 = React.useState(false),
+    deleteLoading = _useState3[0],
+    setDeleteLoading = _useState3[1];
+  return /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      display: 'flex',
+      flexDirection: 'column'
+    }
+  }, /*#__PURE__*/React__default.createElement(DiscountCouponCard, {
+    background: cartSummary === null || cartSummary === void 0 ? void 0 : (_cartSummary$input5 = cartSummary.input) === null || _cartSummary$input5 === void 0 ? void 0 : _cartSummary$input5.bg,
+    color: cartSummary === null || cartSummary === void 0 ? void 0 : (_cartSummary$input6 = cartSummary.input) === null || _cartSummary$input6 === void 0 ? void 0 : _cartSummary$input6.color,
+    btn: Btn === null || Btn === void 0 ? void 0 : Btn.background,
+    Btncolor: Btn === null || Btn === void 0 ? void 0 : Btn.color
+  }, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("span", null, coupon === null || coupon === void 0 ? void 0 : coupon.couponCode)), /*#__PURE__*/React__default.createElement("b", null, renderMoney(coupon === null || coupon === void 0 ? void 0 : coupon.amount))), /*#__PURE__*/React__default.createElement(MuiIconButton, {
+    loading: deleteLoading,
+    onClick: function onClick() {
+      try {
+        var _temp6 = function _temp6() {
+          setDeleteLoading(false);
+        };
+        setDeleteLoading(true);
+        var _temp5 = _catch(function () {
+          return Promise.resolve(deleteCartDiscount({
+            apiEndPoint: apiEndPoint,
+            token: token,
+            discountId: coupon === null || coupon === void 0 ? void 0 : coupon.id
+          })).then(function () {
+            function _temp4(_onChangeDiscountCoup) {
+              _onChangeDiscountCoup;
+            }
+            return onChangeDiscountCoupon ? Promise.resolve(onChangeDiscountCoupon()).then(_temp4) : _temp4(onChangeDiscountCoupon);
+          });
+        }, function () {});
+        return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5));
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }
+  }, /*#__PURE__*/React__default.createElement(md.MdDelete, null))), (discountCoupons === null || discountCoupons === void 0 ? void 0 : discountCoupons.length) - 1 !== index && /*#__PURE__*/React__default.createElement(CartSummaryHr, {
+    color: cartSummary.hr,
+    style: {
+      margin: 0
+    }
+  }));
+};
 
 var CartPageComponent = function CartPageComponent(_ref) {
   var _styles$input;
@@ -7198,8 +7284,6 @@ var CartPageComponent = function CartPageComponent(_ref) {
     loading = _ref.loading,
     imgnotfoundUrl = _ref.imgnotfoundUrl,
     styles = _ref.styles,
-    onChangeDiscountCoupon = _ref.onChangeDiscountCoupon,
-    discountCoupons = _ref.discountCoupons,
     disabledSelectAllProductCheckbox = _ref.disabledSelectAllProductCheckbox;
   var _useState = React.useState([]),
     storeData = _useState[0],
@@ -7207,6 +7291,13 @@ var CartPageComponent = function CartPageComponent(_ref) {
   var _useWindowSize = useWindowSize(),
     width = _useWindowSize.width;
   var retail = width <= 768;
+  var _useState2 = React.useState([]),
+    discountCoupons = _useState2[0],
+    setDiscountCoupons = _useState2[1];
+  var _useState3 = React.useState(),
+    customer = _useState3[0],
+    setCustomer = _useState3[1];
+  var couponDiscountTotal = lodash.sumBy(discountCoupons, 'amount');
   React.useEffect(function () {
     (function () {
       try {
@@ -7230,6 +7321,77 @@ var CartPageComponent = function CartPageComponent(_ref) {
       }
     })();
   }, []);
+  React.useEffect(function () {
+    (function () {
+      try {
+        var _temp4 = function () {
+          if (apiEndPoint && token) {
+            var _temp3 = _catch(function () {
+              return Promise.resolve(API({
+                apiEndPoint: apiEndPoint,
+                token: token,
+                url: "/ecommerce/customer",
+                hideErrorMessage: true
+              })).then(function (data) {
+                setCustomer(data);
+              });
+            }, function () {});
+            if (_temp3 && _temp3.then) return _temp3.then(function () {});
+          }
+        }();
+        return _temp4 && _temp4.then ? _temp4.then(function () {}) : void 0;
+      } catch (e) {
+        Promise.reject(e);
+      }
+    })();
+  }, [token]);
+  React.useEffect(function () {
+    (function () {
+      try {
+        var _temp5 = function () {
+          if (customer) {
+            return Promise.resolve(getDiscountList()).then(function () {});
+          }
+        }();
+        return _temp5 && _temp5.then ? _temp5.then(function () {}) : void 0;
+      } catch (e) {
+        Promise.reject(e);
+      }
+    })();
+  }, [cartData, customer]);
+  var inDebounce;
+  var getDiscountList = function getDiscountList() {
+    try {
+      inDebounce = setTimeout(function () {
+        (function () {
+          try {
+            var _temp7 = function () {
+              if (apiEndPoint && token) {
+                var _temp6 = _catch(function () {
+                  return Promise.resolve(getCartDiscountList({
+                    apiEndPoint: apiEndPoint,
+                    token: token
+                  })).then(function (data) {
+                    setDiscountCoupons(data);
+                  });
+                }, function () {});
+                if (_temp6 && _temp6.then) return _temp6.then(function () {});
+              }
+            }();
+            return _temp7 && _temp7.then ? _temp7.then(function () {}) : void 0;
+          } catch (e) {
+            Promise.reject(e);
+          }
+        })();
+      }, 500);
+      return Promise.resolve();
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+  var onChangeDiscountCoupon = function onChangeDiscountCoupon() {
+    return Promise.resolve(getDiscountList()).then(function () {});
+  };
   var onChangeQuantity = function onChangeQuantity(product) {
     handleIncrementDecrement(product, product);
   };
@@ -7277,7 +7439,8 @@ var CartPageComponent = function CartPageComponent(_ref) {
     loading: loading,
     cartDiscount: cartData === null || cartData === void 0 ? void 0 : cartData.cartDiscount,
     onChangeDiscountCoupon: onChangeDiscountCoupon,
-    discountCoupons: discountCoupons
+    discountCoupons: discountCoupons,
+    couponDiscountTotal: couponDiscountTotal
   })));
 };
 var checkMinMaxQty = function checkMinMaxQty(_ref2) {
@@ -7637,7 +7800,7 @@ var HomeBanner = function HomeBanner(_ref) {
         };
         setLoading(true);
         var _temp = _catch(function () {
-          return Promise.resolve(API$1({
+          return Promise.resolve(API({
             apiEndPoint: apiEndPoint,
             token: token,
             url: "/home/sliderTypes"
@@ -7665,7 +7828,7 @@ var HomeBanner = function HomeBanner(_ref) {
       return Promise.resolve(function () {
         if (businessTypeId) {
           return _catch(function () {
-            return Promise.resolve(API$1({
+            return Promise.resolve(API({
               apiEndPoint: apiEndPoint,
               token: token,
               url: "/home/sliderImages?sliderTypeId=" + sliderTypeId + "&businessTypeId=" + businessTypeId
@@ -7826,7 +7989,7 @@ var OutOfStock = function OutOfStock(_ref) {
               }
               var _temp = function () {
                 if (tag === 'variant') {
-                  return Promise.resolve(API$1({
+                  return Promise.resolve(API({
                     apiEndPoint: apiEndPoint,
                     method: 'POST',
                     url: "/ecommerce/product/notifyWhenInStock",
@@ -7835,7 +7998,7 @@ var OutOfStock = function OutOfStock(_ref) {
                     successMessage: 'Created notification successfully.'
                   })).then(function () {});
                 } else {
-                  return Promise.resolve(API$1({
+                  return Promise.resolve(API({
                     apiEndPoint: apiEndPoint,
                     method: 'POST',
                     url: "/ecommerce/product/notifyWhenInStock",
@@ -8208,7 +8371,7 @@ var AsyncSelectField = function AsyncSelectField(_ref) {
           if (!(scanningRef !== null && scanningRef !== void 0 && scanningRef.current) && apiData && apiData.url) {
             var defaultQueryParams = (apiData.getQueryParams ? apiData.getQueryParams() : apiData.queryParams) || {};
             var defaultParam = !apiData.getQueryParams && {};
-            return Promise.resolve(API$1(_extends({}, apiData, {
+            return Promise.resolve(API(_extends({}, apiData, {
               isCancelToken: false,
               queryParams: _extends({
                 size: DEFAULT_SEARCH_RESULT_SIZE
@@ -8259,7 +8422,7 @@ var AsyncSelectField = function AsyncSelectField(_ref) {
                     var _ref2;
                     var defaultQueryParams = (apiData.getQueryParams ? apiData.getQueryParams(searchValue) : apiData.queryParams) || {};
                     var defaultParam = !apiData.getQueryParams && (_ref2 = {}, _ref2[queryParam] = searchValue, _ref2);
-                    return Promise.resolve(API$1(_extends({}, apiData, {
+                    return Promise.resolve(API(_extends({}, apiData, {
                       isCancelToken: true,
                       queryParams: _extends({
                         size: DEFAULT_SEARCH_RESULT_SIZE
@@ -8319,7 +8482,7 @@ var AsyncSelectField = function AsyncSelectField(_ref) {
         var _temp9 = function () {
           if (isSearchProduct && apiData && apiData.url && searchValue.length >= minSearchChar) {
             var defaultQueryParams = (apiData.getScanQueryParams ? apiData.getScanQueryParams(searchValue) : apiData.queryParams) || {};
-            return Promise.resolve(API$1(_extends({}, apiData, {
+            return Promise.resolve(API(_extends({}, apiData, {
               url: apiData.scanUrl,
               queryParams: _extends({}, defaultQueryParams, {
                 size: DEFAULT_SEARCH_RESULT_SIZE
@@ -8632,7 +8795,7 @@ var CartPageSection$1 = styled__default.section(_templateObject$E || (_templateO
 }, function (props) {
   return props.bg || '#FAE8E5';
 });
-var CartPageContainer$1 = styled__default.div(_templateObject2$s || (_templateObject2$s = _taggedTemplateLiteralLoose(["\n  max-width: ", ";\n  width: ", ";\n  display: flex;\n  flex-direction: row;\n  justify-content: space-between;\n  align-items: flex-start;\n  border-radius: 28px 28px 28px 14px;\n  padding: 2em 2.5em;\n  padding-bottom: 3em;\n  border-radius: 28px;\n  opacity: ", ";\n  .scrollDiv {\n    width: 68%;\n    height: 630px;\n    max-height: 630px;\n    display: flex;\n    flex-direction: column;\n    overflow-y: auto;\n\n    margin-right: 0.3em;\n    &::-webkit-scrollbar {\n      width: 10px;\n    }\n\n    /* Track */\n    &::-webkit-scrollbar-track {\n      background: ", ";\n\n      border-radius: 16px;\n    }\n\n    /* Handle */\n    &::-webkit-scrollbar-thumb {\n      background: ", ";\n      border-radius: 16px;\n      border: 2px solid;\n    }\n    /* box-shadow: 0px 20px 35px rgba(0, 0, 0, 0.05); */\n  }\n  table {\n    border-collapse: separate;\n    border-spacing: 0 4px;\n    row-gap: 4px;\n  }\n\n  td {\n    /* border: solid 1px #000; */\n    border-style: none solid solid none;\n    /* padding: 10px; */\n    /* margin-bottom:5px; */\n  }\n\n  tr:first-child td:first-child {\n    border-top-left-radius: 10px;\n  }\n  tr td:last-child {\n    border-top-right-radius: 10px;\n    border-bottom-right-radius: 10px;\n  }\n\n  tr td:first-child {\n    border-bottom-left-radius: 10px;\n    border-top-left-radius: 10px;\n  }\n  tr td:last-child {\n    border-bottom-right-radius: 10px;\n  }\n\n  tr td {\n    border-top-style: solid;\n  }\n  tr td:first-child {\n    border-left-style: solid;\n  }\n\n  @media only screen and (max-width: 1200px) {\n    flex-direction: column;\n    align-items: center;\n    padding: 0.5em;\n    .scrollDiv {\n      width: 100%;\n      margin: 0;\n      margin-bottom: 2em;\n      padding: 0 0.4em;\n    }\n  }\n"])), function (props) {
+var CartPageContainer$1 = styled__default.div(_templateObject2$s || (_templateObject2$s = _taggedTemplateLiteralLoose(["\n  max-width: ", ";\n  width: ", ";\n  display: flex;\n  flex-direction: row;\n  justify-content: space-between;\n  align-items: flex-start;\n  border-radius: 28px 28px 28px 14px;\n  padding: 2em 2.5em;\n  padding-bottom: 3em;\n  border-radius: 28px;\n  opacity: ", ";\n  .scrollDiv {\n    width: 68%;\n    max-height: 630px;\n    display: flex;\n    flex-direction: column;\n    overflow-y: auto;\n\n    margin-right: 0.3em;\n    &::-webkit-scrollbar {\n      width: 10px;\n    }\n\n    /* Track */\n    &::-webkit-scrollbar-track {\n      background: ", ";\n\n      border-radius: 16px;\n    }\n\n    /* Handle */\n    &::-webkit-scrollbar-thumb {\n      background: ", ";\n      border-radius: 16px;\n      border: 2px solid;\n    }\n    /* box-shadow: 0px 20px 35px rgba(0, 0, 0, 0.05); */\n  }\n  table {\n    border-collapse: separate;\n    border-spacing: 0 4px;\n    row-gap: 4px;\n  }\n\n  td {\n    /* border: solid 1px #000; */\n    border-style: none solid solid none;\n    /* padding: 10px; */\n    /* margin-bottom:5px; */\n  }\n\n  tr:first-child td:first-child {\n    border-top-left-radius: 10px;\n  }\n  tr td:last-child {\n    border-top-right-radius: 10px;\n    border-bottom-right-radius: 10px;\n  }\n\n  tr td:first-child {\n    border-bottom-left-radius: 10px;\n    border-top-left-radius: 10px;\n  }\n  tr td:last-child {\n    border-bottom-right-radius: 10px;\n  }\n\n  tr td {\n    border-top-style: solid;\n  }\n  tr td:first-child {\n    border-left-style: solid;\n  }\n\n  @media only screen and (max-width: 1200px) {\n    flex-direction: column;\n    align-items: center;\n    padding: 0.5em;\n    .scrollDiv {\n      width: 100%;\n      margin: 0;\n      margin-bottom: 2em;\n      padding: 0 0.4em;\n    }\n  }\n"])), function (props) {
   return props.maxWidth || '1600px';
 }, function (props) {
   return "min(" + (props.maxWidth || '1600px') + ",100%)";
@@ -8931,7 +9094,7 @@ var QuickOrder = function QuickOrder(_ref) {
     (function () {
       try {
         var _temp = _catch(function () {
-          return Promise.resolve(API$1({
+          return Promise.resolve(API({
             apiEndPoint: apiEndPoint,
             token: token,
             url: "/store"
@@ -9174,7 +9337,7 @@ var StaticPageList = function StaticPageList(_ref) {
             };
             setLoading(true);
             var _temp = _catch(function () {
-              return Promise.resolve(API$1({
+              return Promise.resolve(API({
                 apiEndPoint: apiEndPoint,
                 url: "/ecommerce/staticPage/list?page=0&size=9999",
                 queryParams: queryParams
@@ -9302,12 +9465,12 @@ var SwitchUser = function SwitchUser(_ref) {
     try {
       if (token && apiEndPoint) {
         try {
-          var getCustomer = API$1({
+          var getCustomer = API({
             apiEndPoint: apiEndPoint,
             token: token,
             url: "/ecommerce/customer"
           });
-          var getChildCustomer = API$1({
+          var getChildCustomer = API({
             apiEndPoint: apiEndPoint,
             token: token,
             url: "/ecommerce/customer/child"
@@ -9487,12 +9650,7 @@ var CheckoutSummary = function CheckoutSummary(_ref) {
     shippingMethod = _ref.shippingMethod,
     bg = _ref.bg,
     color = _ref.color,
-    discountCoupons = _ref.discountCoupons,
     orderTotal = _ref.orderTotal;
-  var discountTotal = 0;
-  discountCoupons === null || discountCoupons === void 0 ? void 0 : discountCoupons.forEach(function (element) {
-    discountTotal = discountTotal + element.amount;
-  });
   return /*#__PURE__*/React__default.createElement(CheckoutSummaryContainer, {
     bg: bg,
     color: color
@@ -9507,14 +9665,21 @@ var CheckoutSummary = function CheckoutSummary(_ref) {
     style: {
       fontSize: '1rem'
     }
-  }, renderMoney((orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.taxAmount) || 0))) : null, discountTotal && discountTotal > 0 ? /*#__PURE__*/React__default.createElement(TextRow, null, /*#__PURE__*/React__default.createElement("p", {
+  }, renderMoney((orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.taxAmount) || 0))) : null, (orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.cartDiscount) > 0 ? /*#__PURE__*/React__default.createElement(TextRow, null, /*#__PURE__*/React__default.createElement("p", {
+    className: "text"
+  }, "Order Discount:"), /*#__PURE__*/React__default.createElement("h6", {
+    className: "total",
+    style: {
+      fontSize: '1rem'
+    }
+  }, renderMoney((orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.cartDiscount) || 0))) : null, (orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.couponDiscountTotal) > 0 ? /*#__PURE__*/React__default.createElement(TextRow, null, /*#__PURE__*/React__default.createElement("p", {
     className: "text"
-  }, "Discount Total:"), /*#__PURE__*/React__default.createElement("h6", {
+  }, "Coupon Discount:"), /*#__PURE__*/React__default.createElement("h6", {
     className: "total",
     style: {
       fontSize: '1rem'
     }
-  }, renderMoney(discountTotal || 0))) : null, /*#__PURE__*/React__default.createElement(FilledInfo, null, /*#__PURE__*/React__default.createElement("h6", {
+  }, renderMoney((orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.couponDiscountTotal) || 0))) : null, /*#__PURE__*/React__default.createElement(FilledInfo, null, /*#__PURE__*/React__default.createElement("h6", {
     className: "heading"
   }, "Billing Information"), billingInformation ? /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("p", {
     className: "bold"
@@ -10149,14 +10314,9 @@ var Step2 = function Step2(_ref) {
     showShipping = _ref.showShipping,
     styles = _ref.styles,
     shippingAddressId = _ref.shippingAddressId,
-    discountCoupons = _ref.discountCoupons,
     showShippingPriceRangeLimit = _ref.showShippingPriceRangeLimit,
     customer = _ref.customer;
-  var discountTotal = 0;
-  discountCoupons === null || discountCoupons === void 0 ? void 0 : discountCoupons.forEach(function (element) {
-    discountTotal = discountTotal + element.amount;
-  });
-  var totalCartPrice = ((orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.totalAmount) || 0) - discountTotal;
+  var totalCartPrice = (orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.totalAmount) || 0;
   var modifyOptions = (_filter = lodash.filter(options, {
     ecommerce: true
   })) === null || _filter === void 0 ? void 0 : _filter.map(function (item) {
@@ -10283,7 +10443,7 @@ var Step2 = function Step2(_ref) {
         return Promise.resolve(function () {
           if (shipStore || shipStore !== null && shipStore !== void 0 && shipStore.showSkuOnSalePage) {
             return _catch(function () {
-              return Promise.resolve(API$1({
+              return Promise.resolve(API({
                 apiEndPoint: apiEndPoint,
                 token: token,
                 url: "/shipstation/getShippingRates",
@@ -10297,7 +10457,7 @@ var Step2 = function Step2(_ref) {
             return function () {
               if (carrier !== null && carrier !== void 0 && carrier.id) {
                 return _catch(function () {
-                  return Promise.resolve(API$1({
+                  return Promise.resolve(API({
                     apiEndPoint: apiEndPoint,
                     token: token,
                     url: "/shipping/options/v1?parentShippingId=" + (carrier === null || carrier === void 0 ? void 0 : carrier.id)
@@ -11027,7 +11187,7 @@ var ConsentForm = function ConsentForm(_ref) {
           };
           setLoadingData(true);
           var _temp = _catch(function () {
-            return Promise.resolve(API$1({
+            return Promise.resolve(API({
               apiEndPoint: apiEndPoint,
               url: "/ecommerce/staticPage/list",
               queryParams: {
@@ -11038,7 +11198,7 @@ var ConsentForm = function ConsentForm(_ref) {
             })).then(function (staticPageDataResponse) {
               var _staticPageDataRespon;
               setStaticPageData(staticPageDataResponse === null || staticPageDataResponse === void 0 ? void 0 : (_staticPageDataRespon = staticPageDataResponse.content) === null || _staticPageDataRespon === void 0 ? void 0 : _staticPageDataRespon[0]);
-              return Promise.resolve(API$1({
+              return Promise.resolve(API({
                 apiEndPoint: apiEndPoint,
                 token: token,
                 url: "/cartLineItem/totalTax",
@@ -11048,7 +11208,7 @@ var ConsentForm = function ConsentForm(_ref) {
                 }
               })).then(function (taxDataResponse) {
                 setTaxData(taxDataResponse);
-                return Promise.resolve(API$1({
+                return Promise.resolve(API({
                   apiEndPoint: apiEndPoint,
                   token: token,
                   url: "/store"
@@ -11228,7 +11388,7 @@ var PaypalComponent = function PaypalComponent(_ref) {
       try {
         var _temp2 = function () {
           if (paymentWithPaypal) {
-            return Promise.resolve(API$1({
+            return Promise.resolve(API({
               apiEndPoint: apiEndPoint,
               token: token,
               url: "/payment/paypal/config"
@@ -11325,10 +11485,6 @@ var Step4 = function Step4(_ref) {
   var _React$useState3 = React__default.useState(''),
     comments = _React$useState3[0],
     setComments = _React$useState3[1];
-  var discountTotal = 0;
-  discountCoupons === null || discountCoupons === void 0 ? void 0 : discountCoupons.forEach(function (element) {
-    discountTotal = discountTotal + element.amount;
-  });
   var storeCr = storeCredits > (orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.totalAmount) ? orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.totalAmount : storeCredits;
   var onSubmitPaypal = function onSubmitPaypal(transactionId) {
     try {
@@ -11442,7 +11598,20 @@ var Step4 = function Step4(_ref) {
     align: "right"
   }, /*#__PURE__*/React__default.createElement("p", {
     className: "max sm  primaryColor"
-  }, renderMoney((orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.taxAmount) || 0)))), discountCoupons === null || discountCoupons === void 0 ? void 0 : discountCoupons.map(function (coupon) {
+  }, renderMoney((orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.taxAmount) || 0)))), (orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.cartDiscount) > 0 ? /*#__PURE__*/React__default.createElement(StyledTableRow, null, /*#__PURE__*/React__default.createElement(StyledTableCell, {
+    colSpan: 1,
+    noSmall: true
+  }), /*#__PURE__*/React__default.createElement(StyledTableCell, {
+    colSpan: 1
+  }), /*#__PURE__*/React__default.createElement(StyledTableCell, {
+    colSpan: 1
+  }, /*#__PURE__*/React__default.createElement("p", {
+    className: "max sm"
+  }, "Order Discount")), /*#__PURE__*/React__default.createElement(StyledTableCell, {
+    align: "right"
+  }, /*#__PURE__*/React__default.createElement("p", {
+    className: "max sm  primaryColor"
+  }, renderMoney(orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.cartDiscount)))) : null, discountCoupons === null || discountCoupons === void 0 ? void 0 : discountCoupons.map(function (coupon) {
     return /*#__PURE__*/React__default.createElement(StyledTableRow, null, /*#__PURE__*/React__default.createElement(StyledTableCell, {
       colSpan: 1,
       noSmall: true
@@ -11455,7 +11624,7 @@ var Step4 = function Step4(_ref) {
       style: {
         fontSize: '0.8rem'
       }
-    }, coupon === null || coupon === void 0 ? void 0 : coupon.discountName)), /*#__PURE__*/React__default.createElement(StyledTableCell, {
+    }, coupon === null || coupon === void 0 ? void 0 : coupon.name)), /*#__PURE__*/React__default.createElement(StyledTableCell, {
       align: "right"
     }, /*#__PURE__*/React__default.createElement("p", {
       className: "max sm  primaryColor",
@@ -11463,7 +11632,7 @@ var Step4 = function Step4(_ref) {
         fontSize: '0.8rem'
       }
     }, renderMoney(coupon === null || coupon === void 0 ? void 0 : coupon.amount))));
-  }), discountTotal && discountTotal > 0 ? /*#__PURE__*/React__default.createElement(StyledTableRow, null, /*#__PURE__*/React__default.createElement(StyledTableCell, {
+  }), (orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.couponDiscountTotal) > 0 ? /*#__PURE__*/React__default.createElement(StyledTableRow, null, /*#__PURE__*/React__default.createElement(StyledTableCell, {
     colSpan: 1,
     noSmall: true
   }), /*#__PURE__*/React__default.createElement(StyledTableCell, {
@@ -11472,11 +11641,11 @@ var Step4 = function Step4(_ref) {
     colSpan: 1
   }, /*#__PURE__*/React__default.createElement("p", {
     className: "max sm"
-  }, "Discount Total")), /*#__PURE__*/React__default.createElement(StyledTableCell, {
+  }, "Total Coupon Discount")), /*#__PURE__*/React__default.createElement(StyledTableCell, {
     align: "right"
   }, /*#__PURE__*/React__default.createElement("p", {
     className: "max sm  primaryColor"
-  }, renderMoney(discountTotal)))) : null, storeCredits && storeCredits > 0 ? /*#__PURE__*/React__default.createElement(StyledTableRow, null, /*#__PURE__*/React__default.createElement(StyledTableCell, {
+  }, renderMoney(orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.couponDiscountTotal)))) : null, storeCredits && storeCredits > 0 ? /*#__PURE__*/React__default.createElement(StyledTableRow, null, /*#__PURE__*/React__default.createElement(StyledTableCell, {
     colSpan: 1,
     noSmall: true
   }), /*#__PURE__*/React__default.createElement(StyledTableCell, {
@@ -11673,8 +11842,6 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
     cartData = _ref.cartData,
     handleLogin = _ref.handleLogin,
     placeOrder = _ref.placeOrder,
-    _ref$discountCoupons = _ref.discountCoupons,
-    discountCoupons = _ref$discountCoupons === void 0 ? [] : _ref$discountCoupons,
     clickRedirect = _ref.clickRedirect,
     shippingText = _ref.shippingText,
     showShippingPriceRangeLimit = _ref.showShippingPriceRangeLimit,
@@ -11732,10 +11899,9 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
   var _useState17 = React.useState({}),
     orderTotal = _useState17[0],
     setOrderTotal = _useState17[1];
-  var discountTotal = 0;
-  discountCoupons === null || discountCoupons === void 0 ? void 0 : discountCoupons.forEach(function (element) {
-    discountTotal = discountTotal + element.amount;
-  });
+  var _useState18 = React.useState([]),
+    discountCoupons = _useState18[0],
+    setDiscountCoupons = _useState18[1];
   React.useEffect(function () {
     if (apiEndPoint && token) {
       (function () {
@@ -11791,7 +11957,7 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
                 if (_temp2 && _temp2.then) return _temp2.then(function () {});
               }
               var _temp3 = _catch(function () {
-                return Promise.resolve(API$1({
+                return Promise.resolve(API({
                   apiEndPoint: apiEndPoint,
                   token: token,
                   url: "/shipping/options"
@@ -11802,7 +11968,7 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
               return _temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3);
             };
             var _temp5 = _catch(function () {
-              return Promise.resolve(API$1({
+              return Promise.resolve(API({
                 apiEndPoint: apiEndPoint,
                 token: token,
                 url: "/ecommerce/customer",
@@ -11827,63 +11993,96 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
       setCurrStep(0);
     }
   }, [customer, currStep]);
+  var inDebounce;
   React.useEffect(function () {
-    (function () {
-      try {
-        var _temp9 = function _temp9() {
-          var _taxAmount, _ref2, _ref3, _cartData$totalCartPr, _ref4;
-          var totalData = {
-            taxAmount: parseFloat((_taxAmount = taxAmount) === null || _taxAmount === void 0 ? void 0 : _taxAmount.toFixed(2)),
-            shippingAmount: parseFloat((_ref2 = (shippingMethod === null || shippingMethod === void 0 ? void 0 : shippingMethod.amount) || 0) === null || _ref2 === void 0 ? void 0 : _ref2.toFixed(2)),
-            adjustmentValue: parseFloat((_ref3 = ccProcessingFees ? (cartData === null || cartData === void 0 ? void 0 : cartData.totalCartPrice) * (ccProcessingFees / 100) : 0) === null || _ref3 === void 0 ? void 0 : _ref3.toFixed(2)),
-            subTotal: parseFloat(cartData === null || cartData === void 0 ? void 0 : (_cartData$totalCartPr = cartData.totalCartPrice) === null || _cartData$totalCartPr === void 0 ? void 0 : _cartData$totalCartPr.toFixed(2)),
-            totalAmount: parseFloat((_ref4 = (cartData === null || cartData === void 0 ? void 0 : cartData.totalCartPrice) + taxAmount - discountTotal + ((shippingMethod === null || shippingMethod === void 0 ? void 0 : shippingMethod.amount) || 0) + (ccProcessingFees ? (cartData === null || cartData === void 0 ? void 0 : cartData.totalCartPrice) * (ccProcessingFees / 100) : 0)) === null || _ref4 === void 0 ? void 0 : _ref4.toFixed(2)),
-            totalQuantity: cartData === null || cartData === void 0 ? void 0 : cartData.totalCartQuantity
-          };
-          setOrderTotal(totalData);
-        };
-        var taxAmount = 0;
-        var _temp8 = function (_cartData$cartLineIte) {
-          if (taxExempt && shippingAddressId && (cartData === null || cartData === void 0 ? void 0 : (_cartData$cartLineIte = cartData.cartLineItemDtoList) === null || _cartData$cartLineIte === void 0 ? void 0 : _cartData$cartLineIte.length) > 0) {
-            return Promise.resolve(API$1({
-              apiEndPoint: apiEndPoint,
-              token: token,
-              url: "/cartLineItem/totalTax",
-              queryParams: {
-                storeId: 2,
-                customerShippingAddressId: shippingAddressId
-              }
-            })).then(function (taxData) {
-              var _customer$customerDto;
-              taxAmount = !(customer !== null && customer !== void 0 && (_customer$customerDto = customer.customerDto) !== null && _customer$customerDto !== void 0 && _customer$customerDto.taxable) ? 0 : lodash.sumBy(taxData, 'taxAmount') || 0;
-            });
-          }
-        }();
-        return _temp8 && _temp8.then ? _temp8.then(_temp9) : _temp9(_temp8);
-      } catch (e) {
-        Promise.reject(e);
-      }
-    })();
-  }, [cartData, shippingMethod, ccProcessingFees, shippingAddressId]);
+    if (customer) {
+      cartTotalOnChangeData();
+    }
+  }, [customer, cartData, shippingMethod, ccProcessingFees, shippingAddressId]);
+  var cartTotalOnChangeData = function cartTotalOnChangeData() {
+    clearTimeout(inDebounce);
+    inDebounce = setTimeout(function () {
+      (function () {
+        try {
+          var _temp13 = function () {
+            if (apiEndPoint && token) {
+              var _temp12 = function _temp12() {
+                function _temp10() {
+                  var _taxAmount, _ref2, _ref3, _cartData$cartDiscoun, _cartData$cartSubTota, _ref4;
+                  var totalData = {
+                    taxAmount: parseFloat((_taxAmount = _taxAmount2) === null || _taxAmount === void 0 ? void 0 : _taxAmount.toFixed(2)),
+                    shippingAmount: parseFloat((_ref2 = (shippingMethod === null || shippingMethod === void 0 ? void 0 : shippingMethod.amount) || 0) === null || _ref2 === void 0 ? void 0 : _ref2.toFixed(2)),
+                    couponDiscountTotal: _couponDiscountTotal,
+                    adjustmentValue: parseFloat((_ref3 = ccProcessingFees ? (cartData === null || cartData === void 0 ? void 0 : cartData.totalCartPrice) * (ccProcessingFees / 100) : 0) === null || _ref3 === void 0 ? void 0 : _ref3.toFixed(2)),
+                    cartDiscount: parseFloat(cartData === null || cartData === void 0 ? void 0 : (_cartData$cartDiscoun = cartData.cartDiscount) === null || _cartData$cartDiscoun === void 0 ? void 0 : _cartData$cartDiscoun.toFixed(2)),
+                    subTotal: parseFloat(cartData === null || cartData === void 0 ? void 0 : (_cartData$cartSubTota = cartData.cartSubTotal) === null || _cartData$cartSubTota === void 0 ? void 0 : _cartData$cartSubTota.toFixed(2)),
+                    totalAmount: parseFloat((_ref4 = (cartData === null || cartData === void 0 ? void 0 : cartData.totalCartPrice) + _taxAmount2 + ((shippingMethod === null || shippingMethod === void 0 ? void 0 : shippingMethod.amount) || 0) - _couponDiscountTotal + (ccProcessingFees ? (cartData === null || cartData === void 0 ? void 0 : cartData.totalCartPrice) * (ccProcessingFees / 100) : 0)) === null || _ref4 === void 0 ? void 0 : _ref4.toFixed(2)),
+                    totalQuantity: cartData === null || cartData === void 0 ? void 0 : cartData.totalCartQuantity
+                  };
+                  setOrderTotal(totalData);
+                }
+                var _temp9 = _catch(function () {
+                  return Promise.resolve(getCartDiscountList({
+                    apiEndPoint: apiEndPoint,
+                    token: token
+                  })).then(function (discountCouponsData) {
+                    var _ref5;
+                    _couponDiscountTotal = parseFloat((_ref5 = lodash.sumBy(discountCouponsData, 'amount') || 0) === null || _ref5 === void 0 ? void 0 : _ref5.toFixed(2));
+                    setDiscountCoupons(discountCouponsData);
+                  });
+                }, function () {});
+                return _temp9 && _temp9.then ? _temp9.then(_temp10) : _temp10(_temp9);
+              };
+              var _taxAmount2 = 0;
+              var _couponDiscountTotal = 0;
+              var _temp11 = function (_cartData$cartLineIte) {
+                if (taxExempt && shippingAddressId && (cartData === null || cartData === void 0 ? void 0 : (_cartData$cartLineIte = cartData.cartLineItemDtoList) === null || _cartData$cartLineIte === void 0 ? void 0 : _cartData$cartLineIte.length) > 0) {
+                  var _temp8 = _catch(function () {
+                    return Promise.resolve(API({
+                      apiEndPoint: apiEndPoint,
+                      token: token,
+                      url: "/cartLineItem/totalTax",
+                      queryParams: {
+                        storeId: 2,
+                        customerShippingAddressId: shippingAddressId
+                      }
+                    })).then(function (taxData) {
+                      var _customer$customerDto;
+                      _taxAmount2 = !(customer !== null && customer !== void 0 && (_customer$customerDto = customer.customerDto) !== null && _customer$customerDto !== void 0 && _customer$customerDto.taxable) ? 0 : lodash.sumBy(taxData, 'taxAmount') || 0;
+                    });
+                  }, function () {});
+                  if (_temp8 && _temp8.then) return _temp8.then(function () {});
+                }
+              }();
+              return _temp11 && _temp11.then ? _temp11.then(_temp12) : _temp12(_temp11);
+            }
+          }();
+          return _temp13 && _temp13.then ? _temp13.then(function () {}) : void 0;
+        } catch (e) {
+          Promise.reject(e);
+        }
+      })();
+    }, 500);
+  };
   var onLoginCustomer = function onLoginCustomer(data) {
     try {
-      var _temp11 = function _temp11() {
+      var _temp15 = function _temp15() {
         setLoginLoading(false);
       };
       setLoginLoading(true);
-      var _temp10 = _catch(function () {
+      var _temp14 = _catch(function () {
         return Promise.resolve(handleLogin(data)).then(function () {});
       }, function () {});
-      return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(_temp11) : _temp11(_temp10));
+      return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(_temp15) : _temp15(_temp14));
     } catch (e) {
       return Promise.reject(e);
     }
   };
   var addStoreAddress = function addStoreAddress(data) {
     try {
-      var _temp13 = _catch(function () {
+      var _temp17 = _catch(function () {
         var _customer$customerDto2, _customer$customerDto3;
-        return Promise.resolve(API$1({
+        return Promise.resolve(API({
           apiEndPoint: apiEndPoint,
           token: token,
           method: 'POST',
@@ -11894,9 +12093,9 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
           successMessage: 'Address added successfully.',
           errorMessage: 'Error in added the address.'
         })).then(function (result) {
-          var _temp12 = function () {
+          var _temp16 = function () {
             if (result) {
-              return Promise.resolve(API$1({
+              return Promise.resolve(API({
                 apiEndPoint: apiEndPoint,
                 token: token,
                 url: "/ecommerce/customer"
@@ -11905,10 +12104,10 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
               });
             }
           }();
-          if (_temp12 && _temp12.then) return _temp12.then(function () {});
+          if (_temp16 && _temp16.then) return _temp16.then(function () {});
         });
       }, function () {});
-      return Promise.resolve(_temp13 && _temp13.then ? _temp13.then(function () {}) : void 0);
+      return Promise.resolve(_temp17 && _temp17.then ? _temp17.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -11952,11 +12151,11 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
   };
   var onPlaceOrder = function onPlaceOrder(note, transactionId) {
     try {
-      var _temp15 = function _temp15() {
+      var _temp19 = function _temp19() {
         setOrdering(false);
       };
       setOrdering(true);
-      var _temp14 = _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
@@ -12013,12 +12212,12 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
             paymentModeId: selectedStoreCredits === null || selectedStoreCredits === void 0 ? void 0 : selectedStoreCredits.id
           }];
         } else if (selectedStoreCredits && (selectedStoreCredits === null || selectedStoreCredits === void 0 ? void 0 : selectedStoreCredits.amount) < (orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.totalAmount)) {
-          var _selectedStoreCredits, _ref5;
+          var _selectedStoreCredits, _ref6;
           orderPaymentList = [{
             amount: parseFloat(selectedStoreCredits === null || selectedStoreCredits === void 0 ? void 0 : (_selectedStoreCredits = selectedStoreCredits.amount) === null || _selectedStoreCredits === void 0 ? void 0 : _selectedStoreCredits.toFixed(2)),
             paymentModeId: selectedStoreCredits === null || selectedStoreCredits === void 0 ? void 0 : selectedStoreCredits.id
           }, _extends({
-            amount: parseFloat((_ref5 = (orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.totalAmount) - (selectedStoreCredits === null || selectedStoreCredits === void 0 ? void 0 : selectedStoreCredits.amount)) === null || _ref5 === void 0 ? void 0 : _ref5.toFixed(2)),
+            amount: parseFloat((_ref6 = (orderTotal === null || orderTotal === void 0 ? void 0 : orderTotal.totalAmount) - (selectedStoreCredits === null || selectedStoreCredits === void 0 ? void 0 : selectedStoreCredits.amount)) === null || _ref6 === void 0 ? void 0 : _ref6.toFixed(2)),
             paymentModeId: selectedPaymentMethod === null || selectedPaymentMethod === void 0 ? void 0 : selectedPaymentMethod.id
           }, authorizeCustomerCardData)];
         } else {
@@ -12041,7 +12240,7 @@ var CheckoutPageComponent = function CheckoutPageComponent(_ref) {
         }
         return Promise.resolve(placeOrder(body)).then(function () {});
       }, function () {});
-      return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(_temp15) : _temp15(_temp14));
+      return Promise.resolve(_temp18 && _temp18.then ? _temp18.then(_temp19) : _temp19(_temp18));
     } catch (e) {
       return Promise.reject(e);
     }