diff --git a/git_info.json b/git_info.json index 00ba1e5..569feb3 100644 --- a/git_info.json +++ b/git_info.json @@ -1 +1 @@ -{"branch_name":"beta","last_commit_date":"2022-01-13T12:17:16.000Z","last_commit_author":"rakesh","last_commit_hash":"56e9907bc5a0fecf46025bb6e637c4e3aa826907"} \ No newline at end of file +{"branch_name":"beta","last_commit_date":"2022-01-13T12:18:47.000Z","last_commit_author":"rakesh","last_commit_hash":"ee7c6f3a49e48818ac40c66d22cd3c4418d9abff"} \ No newline at end of file diff --git a/src/routes/retailer/checkout_page.vue b/src/routes/retailer/checkout_page.vue index df8225a..a91354e 100644 --- a/src/routes/retailer/checkout_page.vue +++ b/src/routes/retailer/checkout_page.vue @@ -21,21 +21,7 @@ - - - - - - - - - + --> - - - New Address - - +
@@ -2070,12 +2046,7 @@ export default { canonical: function () { return this.$route.meta.canonical; }, - giftCardCreditBalance: function () { - return this.$store.state.storeCredit.giftCardCreditBalance; - }, - storeCreditInProgress: function () { - return this.$store.state.storeCredit.storeCreditInProgress; - }, + hideAndShowFields: function () { //let currentName = this.$router.history.current.name; // if (currentName === "CheckoutPage" && this.tabs == "shippingTab") { @@ -3567,27 +3538,13 @@ export default { //this.$store.dispatch("userCartProduct/cartProductList"); //this.$store.dispatch("userCartProduct/productTotalAmt"); this.$store.dispatch("userCartProduct/fetchCartCoupon"); - if (this.basicInfo) { - this.$store - .dispatch("storeCredit/fetchGiftCardCreditBalance", this.basicInfo.id) - .catch(() => { - this.showStoreCredit = false; - }); - } + this.localStorageInitialOperation(); - this.setDiscountTextCode(); + // this.setDiscountTextCode(); // let checkOutTab = localStorage.getItem("cr_checkOutTab") // if(checkOutTab==='reviewTab') this.tabs = "reviewTab"; - } else { - if (this.guestQuoteId) { - //this.$store.dispatch("cartProduct/cartProductList", this.guestQuoteId); - this.$store.dispatch("guestInfo/basicInfo"); - //this.$store.dispatch("cartProduct/productTotalAmt", this.guestQuoteId); - this.$store.dispatch("cartProduct/fetchCartCoupon", this.guestQuoteId); - this.setDiscountTextCode(); - } - } + } this.verifyAddress(); this.stockFlagHideShow(); if (this.cartProductsItem) { diff --git a/src/services/user.service.js b/src/services/user.service.js index 11e094d..3bbeedd 100644 --- a/src/services/user.service.js +++ b/src/services/user.service.js @@ -78,7 +78,7 @@ export const doFetchCountries = wrapRequest(() => { } }; - return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/directory/countries`, requestOptions) + return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/directory/countries`, requestOptions) }); export const doFetchBasicInfo = meWrapRequest(() => { @@ -215,7 +215,7 @@ export const doChangePassword = meWrapRequest((currentPassword, newPassword) => "newPassword": newPassword }) }; - return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/customers/retailer/password`, requestOptions) + return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/customers/me/password`, requestOptions) }); export const doFetchEstimatedShippingMethods = wrapRequest((one, address) => { let streetAddress = []; @@ -257,7 +257,7 @@ export const doFetchEstimatedShippingMethods = wrapRequest((one, address) => { }), }; - return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/carts/mine/estimate-shipping-methods`, requestOptions) + return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/carts/mine/estimate-shipping-methods`, requestOptions) }); export const doShippingInformation = wrapRequest((one, address, estimated, suggestedAddress) => { let streetAddress = [];