fixes
This commit is contained in:
rakesh
parent
4bdc1d9abf
commit
a01c4a865d
|
|
@ -1 +1 @@
|
|||
{"branch_name":"beta","last_commit_date":"2022-01-13T12:18:47.000Z","last_commit_author":"rakesh","last_commit_hash":"ee7c6f3a49e48818ac40c66d22cd3c4418d9abff"}
|
||||
{"branch_name":"beta","last_commit_date":"2022-01-13T13:54:00.000Z","last_commit_author":"rakesh","last_commit_hash":"4bdc1d9abfc813b05544d9192739ad4cc4e20f95"}
|
||||
|
|
@ -464,11 +464,11 @@
|
|||
v-if="shippingInformations.totals.grandTotal !== 0"
|
||||
>
|
||||
<v-radio
|
||||
:label="shippingInformations.paymentMethods[1].title"
|
||||
:value="shippingInformations.paymentMethods[1].code"
|
||||
:label="shippingInformations.paymentMethods[0].title"
|
||||
:value="shippingInformations.paymentMethods[0].code"
|
||||
class="black--text"
|
||||
></v-radio>
|
||||
<div v-if="paymentMethod === 'braintree'">
|
||||
<div v-if="paymentMethod === 'purchaseorder'">
|
||||
<v-checkbox
|
||||
label="My billing and shipping address are the same"
|
||||
v-model="sameAddress"
|
||||
|
|
@ -634,10 +634,10 @@
|
|||
>
|
||||
</v-col>
|
||||
</v-row>
|
||||
<v-row>
|
||||
<!-- <v-row>
|
||||
<CardPayment
|
||||
@submitCardPayment="submitCardPayment"
|
||||
/>
|
||||
/>-->
|
||||
<!-- <v-col cols="12" sm="6">
|
||||
<v-braintree
|
||||
:authorization="braintreeAuthKey"
|
||||
|
|
@ -652,7 +652,7 @@
|
|||
</template>
|
||||
</v-braintree>
|
||||
</v-col>-->
|
||||
</v-row>
|
||||
<!--</v-row>-->
|
||||
</div>
|
||||
<!-- <v-divider class="my-3"></v-divider>
|
||||
<v-radio
|
||||
|
|
@ -847,23 +847,7 @@
|
|||
</v-col>
|
||||
</v-row>
|
||||
<v-row class="pl-3">
|
||||
<v-col
|
||||
cols="12"
|
||||
v-if="
|
||||
giftCardCreditBalance >
|
||||
shippingInformations.totals.subtotal +
|
||||
shippingInformations.totals
|
||||
.baseShippingInclTax
|
||||
"
|
||||
>
|
||||
<p>
|
||||
Gift Card amount applied to order:${{
|
||||
shippingInformations.totals.subtotal +
|
||||
shippingInformations.totals
|
||||
.baseShippingInclTax
|
||||
}}
|
||||
</p>
|
||||
</v-col>
|
||||
|
||||
<v-col cols="12" align="right">
|
||||
<v-btn
|
||||
class="primary mx-3 text-uppercase"
|
||||
|
|
@ -1329,21 +1313,7 @@
|
|||
</v-col>
|
||||
</v-row>
|
||||
<v-row class="pl-3">
|
||||
<v-col
|
||||
cols="12"
|
||||
v-if="
|
||||
giftCardCreditBalance >
|
||||
cartProductTotalAmt.subtotal +
|
||||
cartProductTotalAmt.baseShippingInclTax
|
||||
"
|
||||
>
|
||||
<p>
|
||||
Gift Card amount applied to order:${{
|
||||
cartProductTotalAmt.subtotal +
|
||||
cartProductTotalAmt.baseShippingInclTax
|
||||
}}
|
||||
</p>
|
||||
</v-col>
|
||||
|
||||
<v-col cols="12" align="right">
|
||||
<v-btn
|
||||
class="primary mx-3 text-uppercase"
|
||||
|
|
@ -1390,7 +1360,7 @@
|
|||
</v-radio-group>
|
||||
<v-divider></v-divider>
|
||||
</v-col>
|
||||
<v-col cols="12" class="py-0">
|
||||
<!-- <v-col cols="12" class="py-0">
|
||||
<v-expansion-panels
|
||||
accordion
|
||||
light
|
||||
|
|
@ -1464,70 +1434,9 @@
|
|||
</v-expansion-panel-content>
|
||||
</v-expansion-panel>
|
||||
</v-expansion-panels>
|
||||
</v-col>
|
||||
<div v-if="!giftCardProduct">
|
||||
<v-row
|
||||
class="pl-4"
|
||||
v-show="
|
||||
giftCardCreditBalance != 0 &&
|
||||
shippingInformations.totals.grandTotal != 0 &&
|
||||
shippingInformations.totals.totalSegments[5].value ==
|
||||
0 &&
|
||||
this.userAuth &&
|
||||
showStoreCredit
|
||||
"
|
||||
>
|
||||
<hr />
|
||||
<v-col cols="12">
|
||||
<p class="mb-5">Store Credit</p>
|
||||
<p>
|
||||
${{ giftCardCreditBalance }} Store Credit available
|
||||
</p>
|
||||
</v-col>
|
||||
<v-col cols="12" align="right">
|
||||
<v-btn
|
||||
class="primary mx-3 text-uppercase"
|
||||
@click="useStoreCredit()"
|
||||
tile
|
||||
depressed
|
||||
>Use Store Credit</v-btn
|
||||
>
|
||||
</v-col>
|
||||
</v-row>
|
||||
</div>
|
||||
<div
|
||||
v-if="
|
||||
giftCardProduct && cartProductTotalAmt.totalSegments
|
||||
"
|
||||
>
|
||||
<v-row
|
||||
class="pl-4"
|
||||
v-show="
|
||||
giftCardCreditBalance != 0 &&
|
||||
cartProductTotalAmt.totalSegments[5].value === 0 &&
|
||||
this.userAuth &&
|
||||
showStoreCredit &&
|
||||
cartProductTotalAmt.grandTotal !== 0
|
||||
"
|
||||
>
|
||||
<hr />
|
||||
<v-col cols="12">
|
||||
<p class="mb-5">Store Credit</p>
|
||||
<p>
|
||||
${{ giftCardCreditBalance }} Store Credit available
|
||||
</p>
|
||||
</v-col>
|
||||
<v-col cols="12" align="right">
|
||||
<v-btn
|
||||
class="primary mx-3 text-uppercase"
|
||||
@click="useStoreCredit()"
|
||||
tile
|
||||
depressed
|
||||
>Use Store Credit</v-btn
|
||||
>
|
||||
</v-col>
|
||||
</v-row>
|
||||
</div>
|
||||
</v-col>-->
|
||||
|
||||
|
||||
</v-row>
|
||||
</v-col>
|
||||
<v-col cols="12" sm="5" md="4" class="pl-3 d-none d-sm-block">
|
||||
|
|
@ -1655,17 +1564,7 @@
|
|||
}}</span
|
||||
>
|
||||
</v-col>
|
||||
<v-col
|
||||
cols="12"
|
||||
class="d-flex justify-space-between"
|
||||
v-if="
|
||||
shippingInformations.totals.totalSegments[5]
|
||||
.value !== 0
|
||||
"
|
||||
>
|
||||
<span>{{ giftCardCreditBalance }} Store Credit</span>
|
||||
<span>-${{ giftCardCreditBalance }}</span>
|
||||
</v-col>
|
||||
|
||||
<v-col cols="12" class="d-flex justify-space-between">
|
||||
<h3>Estimated Total</h3>
|
||||
<span
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ export const doShippingInformation = wrapRequest((one, address, estimated, sugge
|
|||
}
|
||||
})
|
||||
};
|
||||
return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/carts/mine/shipping-information`, requestOptions)
|
||||
return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/carts/mine/shipping-information`, requestOptions)
|
||||
});
|
||||
export const doDeleteAddress = wrapRequest((addressId) => {
|
||||
const requestOptions = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue