fixes
This commit is contained in:
parent
ee7c6f3a49
commit
4bdc1d9abf
|
@ -1 +1 @@
|
||||||
{"branch_name":"beta","last_commit_date":"2022-01-13T12:17:16.000Z","last_commit_author":"rakesh","last_commit_hash":"56e9907bc5a0fecf46025bb6e637c4e3aa826907"}
|
{"branch_name":"beta","last_commit_date":"2022-01-13T12:18:47.000Z","last_commit_author":"rakesh","last_commit_hash":"ee7c6f3a49e48818ac40c66d22cd3c4418d9abff"}
|
|
@ -21,21 +21,7 @@
|
||||||
</v-row>
|
</v-row>
|
||||||
</v-container>
|
</v-container>
|
||||||
</v-overlay>
|
</v-overlay>
|
||||||
<v-overlay :value="storeCreditInProgress" :opacity="0.8">
|
|
||||||
<v-container>
|
|
||||||
<v-row>
|
|
||||||
<v-col cols="12" class="d-flex justify-center align-center">
|
|
||||||
<v-progress-circular
|
|
||||||
indeterminate
|
|
||||||
size="80"
|
|
||||||
color="white"
|
|
||||||
align="center"
|
|
||||||
justify="center"
|
|
||||||
></v-progress-circular>
|
|
||||||
</v-col>
|
|
||||||
</v-row>
|
|
||||||
</v-container>
|
|
||||||
</v-overlay>
|
|
||||||
<v-container
|
<v-container
|
||||||
v-if="cartProductsProgress || shippingInformationsInProgress"
|
v-if="cartProductsProgress || shippingInformationsInProgress"
|
||||||
class="text-center"
|
class="text-center"
|
||||||
|
@ -280,17 +266,7 @@
|
||||||
<!-- </v-row> -->
|
<!-- </v-row> -->
|
||||||
</v-col>
|
</v-col>
|
||||||
</v-row>
|
</v-row>
|
||||||
<v-row v-if="!userLocalAddressFlag">
|
|
||||||
<v-col cols="auto">
|
|
||||||
<v-btn
|
|
||||||
class="primary"
|
|
||||||
depressed
|
|
||||||
tile
|
|
||||||
@click="openDialogForEditAddress()"
|
|
||||||
>New Address</v-btn
|
|
||||||
>
|
|
||||||
</v-col>
|
|
||||||
</v-row>
|
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<v-row>
|
<v-row>
|
||||||
|
@ -2070,12 +2046,7 @@ export default {
|
||||||
canonical: function () {
|
canonical: function () {
|
||||||
return this.$route.meta.canonical;
|
return this.$route.meta.canonical;
|
||||||
},
|
},
|
||||||
giftCardCreditBalance: function () {
|
|
||||||
return this.$store.state.storeCredit.giftCardCreditBalance;
|
|
||||||
},
|
|
||||||
storeCreditInProgress: function () {
|
|
||||||
return this.$store.state.storeCredit.storeCreditInProgress;
|
|
||||||
},
|
|
||||||
hideAndShowFields: function () {
|
hideAndShowFields: function () {
|
||||||
//let currentName = this.$router.history.current.name;
|
//let currentName = this.$router.history.current.name;
|
||||||
// if (currentName === "CheckoutPage" && this.tabs == "shippingTab") {
|
// if (currentName === "CheckoutPage" && this.tabs == "shippingTab") {
|
||||||
|
@ -3567,26 +3538,12 @@ export default {
|
||||||
//this.$store.dispatch("userCartProduct/cartProductList");
|
//this.$store.dispatch("userCartProduct/cartProductList");
|
||||||
//this.$store.dispatch("userCartProduct/productTotalAmt");
|
//this.$store.dispatch("userCartProduct/productTotalAmt");
|
||||||
this.$store.dispatch("userCartProduct/fetchCartCoupon");
|
this.$store.dispatch("userCartProduct/fetchCartCoupon");
|
||||||
if (this.basicInfo) {
|
|
||||||
this.$store
|
|
||||||
.dispatch("storeCredit/fetchGiftCardCreditBalance", this.basicInfo.id)
|
|
||||||
.catch(() => {
|
|
||||||
this.showStoreCredit = false;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
this.localStorageInitialOperation();
|
this.localStorageInitialOperation();
|
||||||
this.setDiscountTextCode();
|
// this.setDiscountTextCode();
|
||||||
|
|
||||||
// let checkOutTab = localStorage.getItem("cr_checkOutTab")
|
// let checkOutTab = localStorage.getItem("cr_checkOutTab")
|
||||||
// if(checkOutTab==='reviewTab') this.tabs = "reviewTab";
|
// 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.verifyAddress();
|
||||||
this.stockFlagHideShow();
|
this.stockFlagHideShow();
|
||||||
|
|
|
@ -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(() => {
|
export const doFetchBasicInfo = meWrapRequest(() => {
|
||||||
|
@ -215,7 +215,7 @@ export const doChangePassword = meWrapRequest((currentPassword, newPassword) =>
|
||||||
"newPassword": 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) => {
|
export const doFetchEstimatedShippingMethods = wrapRequest((one, address) => {
|
||||||
let streetAddress = [];
|
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) => {
|
export const doShippingInformation = wrapRequest((one, address, estimated, suggestedAddress) => {
|
||||||
let streetAddress = [];
|
let streetAddress = [];
|
||||||
|
|
Loading…
Reference in New Issue