sidharth.kothari
/
retailer-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

This commit is contained in:
rakesh 2022-01-14 12:57:45 +05:30
parent 4bdc1d9abf
commit a01c4a865d
3 changed files with 15 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git_info.json
View File

@ -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"}

127
src/routes/retailer/checkout_page.vue
View File

@ -464,11 +464,11 @@
v-if="shippingInformations.totals.grandTotal !== 0" v-if="shippingInformations.totals.grandTotal !== 0"
> >
<v-radio <v-radio
:label="shippingInformations.paymentMethods[1].title" :label="shippingInformations.paymentMethods[0].title"
:value="shippingInformations.paymentMethods[1].code" :value="shippingInformations.paymentMethods[0].code"
class="black--text" class="black--text"
></v-radio> ></v-radio>
<div v-if="paymentMethod === 'braintree'"> <div v-if="paymentMethod === 'purchaseorder'">
<v-checkbox <v-checkbox
label="My billing and shipping address are the same" label="My billing and shipping address are the same"
v-model="sameAddress" v-model="sameAddress"
@ -634,10 +634,10 @@
> >
</v-col> </v-col>
</v-row> </v-row>
<v-row> <!-- <v-row>
<CardPayment <CardPayment
@submitCardPayment="submitCardPayment" @submitCardPayment="submitCardPayment"
/> />-->
<!-- <v-col cols="12" sm="6"> <!-- <v-col cols="12" sm="6">
<v-braintree <v-braintree
:authorization="braintreeAuthKey" :authorization="braintreeAuthKey"
@ -652,7 +652,7 @@
</template> </template>
</v-braintree> </v-braintree>
</v-col>--> </v-col>-->
</v-row> <!--</v-row>-->
</div> </div>
<!-- <v-divider class="my-3"></v-divider> <!-- <v-divider class="my-3"></v-divider>
<v-radio <v-radio
@ -847,23 +847,7 @@
</v-col> </v-col>
</v-row> </v-row>
<v-row class="pl-3"> <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-col cols="12" align="right">
<v-btn <v-btn
class="primary mx-3 text-uppercase" class="primary mx-3 text-uppercase"
@ -1329,21 +1313,7 @@
</v-col> </v-col>
</v-row> </v-row>
<v-row class="pl-3"> <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-col cols="12" align="right">
<v-btn <v-btn
class="primary mx-3 text-uppercase" class="primary mx-3 text-uppercase"
@ -1390,7 +1360,7 @@
</v-radio-group> </v-radio-group>
<v-divider></v-divider> <v-divider></v-divider>
</v-col> </v-col>
<v-col cols="12" class="py-0"> <!-- <v-col cols="12" class="py-0">
<v-expansion-panels <v-expansion-panels
accordion accordion
light light
@ -1464,70 +1434,9 @@
</v-expansion-panel-content> </v-expansion-panel-content>
</v-expansion-panel> </v-expansion-panel>
</v-expansion-panels> </v-expansion-panels>
</v-col> </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-row> </v-row>
</v-col> </v-col>
<v-col cols="12" sm="5" md="4" class="pl-3 d-none d-sm-block"> <v-col cols="12" sm="5" md="4" class="pl-3 d-none d-sm-block">
@ -1655,17 +1564,7 @@
}}</span }}</span
> >
</v-col> </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"> <v-col cols="12" class="d-flex justify-space-between">
<h3>Estimated Total</h3> <h3>Estimated Total</h3>
<span <span

2
src/services/user.service.js
View File

@ -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) => { export const doDeleteAddress = wrapRequest((addressId) => {
const requestOptions = { const requestOptions = {