geer-builder 1.2.696 → 1.2.697
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/GAutoShipProduct.vue +21 -6
- package/package.json +1 -1
package/GAutoShipProduct.vue
CHANGED
|
@@ -175,6 +175,11 @@
|
|
|
175
175
|
<q-radio v-model="payment_method" :val="method.value" :label="method.label" />
|
|
176
176
|
</template>
|
|
177
177
|
<form v-if="method.type === 'card'" class="method-card" @submit.prevent="method.save()">
|
|
178
|
+
<div class="method-card__row">
|
|
179
|
+
<div class="item">
|
|
180
|
+
<div class="item__label">Amount to be charged: {{card_saved_amount}}</div>
|
|
181
|
+
</div>
|
|
182
|
+
</div>
|
|
178
183
|
<div class="method-card__row">
|
|
179
184
|
<div class="item">
|
|
180
185
|
<div class="item__label">Card Number</div>
|
|
@@ -480,6 +485,7 @@ export default {
|
|
|
480
485
|
is_add_address_dialog_open: false,
|
|
481
486
|
all_address : [],
|
|
482
487
|
all_address_recheck : [],
|
|
488
|
+
card_saved_amount : 0,
|
|
483
489
|
purchase_this_month: false,
|
|
484
490
|
send_url_cofirmation: null,
|
|
485
491
|
send_url: null,
|
|
@@ -525,6 +531,10 @@ export default {
|
|
|
525
531
|
async selectedAddress() {
|
|
526
532
|
await this.computeShippingFee();
|
|
527
533
|
},
|
|
534
|
+
user_info()
|
|
535
|
+
{
|
|
536
|
+
this.onChangeTotal();
|
|
537
|
+
},
|
|
528
538
|
total_price() {
|
|
529
539
|
this.onChangeTotal();
|
|
530
540
|
},
|
|
@@ -556,6 +566,11 @@ export default {
|
|
|
556
566
|
|
|
557
567
|
this.xendit_delivery_day = this.user_info.xendit_autoship_day ? this.user_info.xendit_autoship_day : 1;
|
|
558
568
|
|
|
569
|
+
/**
|
|
570
|
+
* pre fill checked products
|
|
571
|
+
*/
|
|
572
|
+
await this.checkedProducts();
|
|
573
|
+
|
|
559
574
|
// this.public_api_key = "xnd_public_development_9oa8BwOyCyM3pQeDUGt6pPqj72AJ9y3Tj2oi65xdVjPzs04RBtocqffigYxoWd";
|
|
560
575
|
|
|
561
576
|
this.public_api_key = public_settings.xendit_public_key;
|
|
@@ -610,17 +625,16 @@ export default {
|
|
|
610
625
|
this.is_update_profile_dialog_open = true;
|
|
611
626
|
}
|
|
612
627
|
|
|
613
|
-
|
|
614
|
-
* pre fill checked products
|
|
615
|
-
*/
|
|
616
|
-
this.checkedProducts();
|
|
628
|
+
|
|
617
629
|
},
|
|
618
630
|
methods:
|
|
619
631
|
{
|
|
620
632
|
onChangeTotal() {
|
|
621
633
|
const card = this.payment_method_list.find(method => method.type === 'card');
|
|
622
634
|
if (!card) return;
|
|
623
|
-
card.data.amount = Number(this.
|
|
635
|
+
card.data.amount = Number(this.user_info.autoship_total_price) + Number(this.shipping_fee);
|
|
636
|
+
this.card_saved_amount = Number(this.user_info.autoship_total_price) + Number(this.shipping_fee);
|
|
637
|
+
// alert(this.user_info.autoship_total_price);
|
|
624
638
|
},
|
|
625
639
|
async checkedProducts() {
|
|
626
640
|
this.shipping_products.forEach((d, i) =>
|
|
@@ -941,7 +955,7 @@ export default {
|
|
|
941
955
|
{
|
|
942
956
|
outlined: true,
|
|
943
957
|
title: "Confirmation",
|
|
944
|
-
message: `Your total price for autoship will be ${ formatNumber(total_price + this.shipping_fee,{decimal:2}) }`,
|
|
958
|
+
message: `Your total price for autoship will be ${ formatNumber(total_price + this.shipping_fee,{decimal:2}) } (After saving, your account will be unlink from card please link it again after saving.)`,
|
|
945
959
|
html:true,
|
|
946
960
|
cancel: true,
|
|
947
961
|
persistent: true
|
|
@@ -970,6 +984,7 @@ export default {
|
|
|
970
984
|
|
|
971
985
|
}
|
|
972
986
|
this.$q.loading.hide();
|
|
987
|
+
this.onChangeTotal();
|
|
973
988
|
})
|
|
974
989
|
|
|
975
990
|
|