geer-builder 1.2.958 → 1.2.959

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.
Files changed (15) hide show
  1. package/GCheckout.vue +157 -1
  2. package/GEarningBreakdownWidget.vue +5 -4
  3. package/GUpdateProfile.vue +4 -2
  4. package/components/EarningBreakdownWidget/EarningsLog.vue +14 -3
  5. package/components/KUploader.scss +89 -33
  6. package/components/KUploader.vue +22 -20
  7. package/components/MyPurchases/tabs/CodManual.vue +16 -11
  8. package/components/MyPurchases/tabs/CompletedTab.vue +14 -9
  9. package/components/MyPurchases/tabs/ProcessingTab.vue +15 -10
  10. package/components/MyPurchases/tabs/ToPayTab.vue +14 -9
  11. package/components/MyPurchases/tabs/ToPickedTab.vue +14 -9
  12. package/components/MyPurchases/tabs/ToReceiveTab.vue +14 -9
  13. package/components/MyPurchases/tabs/ToShipTab.vue +14 -9
  14. package/components/MyPurchases/tabs/cancelled.vue +14 -9
  15. package/package.json +1 -1
package/GCheckout.vue CHANGED
@@ -208,6 +208,23 @@
208
208
  <div v-if="!is_adspro" class="text-right">{{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{$_formatNumber(this.checkout_info.shipping_total, { decimal: 2})}}</div>
209
209
  <div v-if="(this.checkout_info.voucher_total*-1)>0">Voucher Discount: </div>
210
210
  <div v-if="(this.checkout_info.voucher_total*-1)>0" class="text-right">{{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} -{{$_formatNumber(this.checkout_info.voucher_total, { decimal: 2})}}</div>
211
+ <!-- Coupon Code Input -->
212
+ <div v-if="show_coupon_code" style="grid-column: 1 / -1;" class="q-mt-sm q-mb-sm">
213
+ <div style="display:flex; align-items:center;">
214
+ <q-input dense outlined v-model="coupon_code_input" label="Coupon Code"
215
+ @input="coupon_code_input = coupon_code_input.toUpperCase()"
216
+ style="flex:1;" class="q-mr-sm"></q-input>
217
+ <q-btn :loading="is_coupon_loading" dense color="primary" label="Apply"
218
+ @click="applyProductCoupon" no-caps></q-btn>
219
+ <q-btn v-if="applied_product_coupon" dense flat color="negative" icon="close"
220
+ @click="removeProductCoupon" class="q-ml-xs"></q-btn>
221
+ </div>
222
+ </div>
223
+ <!-- Coupon Discount line -->
224
+ <div v-if="show_coupon_code && coupon_discount_total > 0">Coupon Discount: </div>
225
+ <div v-if="show_coupon_code && coupon_discount_total > 0" class="text-right">
226
+ {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} -{{$_formatNumber(coupon_discount_total, { decimal: 2})}}
227
+ </div>
211
228
  <div v-if="this.public_settings.hasOwnProperty('custom_ecommerce_fee') && payment_method.payment_method_id !='gc_points'">{{public_settings.custom_ecommerce_fee.label}}: </div>
212
229
  <div v-if="this.public_settings.hasOwnProperty('custom_ecommerce_fee') && payment_method.payment_method_id !='gc_points'" class="text-right">{{main_currency}} {{$_formatNumber(custom_fees, { decimal: 2})}}<template v-if="public_settings.hasOwnProperty('custom_ecommerce_fee') && public_settings.custom_ecommerce_fee.percentage">(<b>{{public_settings.custom_ecommerce_fee.value}}%</b>)</template></div>
213
230
  <div><b>Total Payment: </b></div>
@@ -366,6 +383,23 @@
366
383
  <div v-if="this.public_settings.hasOwnProperty('custom_ecommerce_fee') && payment_method.payment_method_id !='gc_points'" >{{main_currency}} {{$_formatNumber(custom_fees, { decimal: 2})}}<template v-if="public_settings.hasOwnProperty('custom_ecommerce_fee') && public_settings.custom_ecommerce_fee.percentage">(<b>{{public_settings.custom_ecommerce_fee.value}}%</b>)</template></div>
367
384
  <div>Shipping Total: </div>
368
385
  <div>{{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{$_formatNumber(this.checkout_info.shipping_total, { decimal: 2})}}</div>
386
+ <!-- Coupon Code Input (Mobile) -->
387
+ <div v-if="show_coupon_code" style="grid-column: 1 / -1;" class="q-mt-sm q-mb-sm">
388
+ <div style="display:flex; align-items:center;">
389
+ <q-input dense outlined v-model="coupon_code_input" label="Coupon Code"
390
+ @input="coupon_code_input = coupon_code_input.toUpperCase()"
391
+ style="flex:1;" class="q-mr-sm"></q-input>
392
+ <q-btn :loading="is_coupon_loading" dense color="primary" label="Apply"
393
+ @click="applyProductCoupon" no-caps></q-btn>
394
+ <q-btn v-if="applied_product_coupon" dense flat color="negative" icon="close"
395
+ @click="removeProductCoupon" class="q-ml-xs"></q-btn>
396
+ </div>
397
+ </div>
398
+ <!-- Coupon Discount line (Mobile) -->
399
+ <div v-if="show_coupon_code && coupon_discount_total > 0">Coupon Discount: </div>
400
+ <div v-if="show_coupon_code && coupon_discount_total > 0" class="text-right">
401
+ {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} -{{$_formatNumber(coupon_discount_total, { decimal: 2})}}
402
+ </div>
369
403
  </div>
370
404
  </div>
371
405
 
@@ -440,7 +474,7 @@ import EcommerceMaintenance from './dialogs/EcommerceMaintenance';
440
474
  export default {
441
475
  components: { EcommerceMaintenance,SelectShippingOptions, AddNewAddressForm ,ProcessCheckoutConfirmDialog, GLoader, axios ,ChooseCourierDialog, SelectVoucherDialog},
442
476
  mixins: [GlobalMixins],
443
- props:{ checkout_list: Array, show_discount_badge: Boolean, is_heartzone: Boolean, is_adspro : Boolean },
477
+ props:{ checkout_list: Array, show_discount_badge: Boolean, is_heartzone: Boolean, is_adspro : Boolean, show_coupon_code: Boolean },
444
478
  data: () =>
445
479
  ({
446
480
  is_branch_pickup:false,
@@ -495,6 +529,10 @@ export default {
495
529
  courier_list_cod:[],
496
530
  pass_merchant_order: {},
497
531
  all_voucher_list:[],
532
+ applied_product_coupon: null,
533
+ coupon_code_input: '',
534
+ coupon_discount_total: 0,
535
+ is_coupon_loading: false,
498
536
  cod_payment_limit:999999,
499
537
  online_payment_limit:999999,
500
538
  hide_voucher:false,
@@ -985,6 +1023,95 @@ export default {
985
1023
  this.pass_merchant_order = Object.assign({},merch);
986
1024
  this.is_select_voucher_open = true;
987
1025
  },
1026
+ async applyProductCoupon()
1027
+ {
1028
+ if (!this.coupon_code_input || !this.coupon_code_input.trim())
1029
+ {
1030
+ this.$q.dialog({ html: true, title: 'Invalid Coupon', message: 'Please enter a coupon code.' });
1031
+ return;
1032
+ }
1033
+ this.is_coupon_loading = true;
1034
+ try
1035
+ {
1036
+ // Collect cart product IDs for backend validation
1037
+ let cart_product_ids = [];
1038
+ for (let m = 0; m < this.groupedProducts.length; m++)
1039
+ {
1040
+ for (let p = 0; p < this.groupedProducts[m].products.length; p++)
1041
+ {
1042
+ let pid = this.groupedProducts[m].products[p].product_id || '';
1043
+ if (pid && cart_product_ids.indexOf(pid) === -1)
1044
+ {
1045
+ cart_product_ids.push(pid);
1046
+ }
1047
+ }
1048
+ }
1049
+ let result = await this.$_fbCall('memberValidateProductCoupon', {
1050
+ coupon_code: this.coupon_code_input.trim().toUpperCase(),
1051
+ cart_product_ids: cart_product_ids
1052
+ });
1053
+ this.applied_product_coupon = result;
1054
+ this.coupon_discount_total = this.computeCouponDiscount();
1055
+ await this.getShippingFee();
1056
+ this.$q.dialog({ html: true, title: 'Coupon Applied', message: 'Coupon code <b>' + this.applied_product_coupon.coupon_code + '</b> applied successfully!' });
1057
+ }
1058
+ catch (error)
1059
+ {
1060
+ this.applied_product_coupon = null;
1061
+ this.coupon_discount_total = 0;
1062
+ this.$q.dialog({ html: true, title: 'Invalid Coupon', message: error.message || 'Invalid coupon code.' });
1063
+ }
1064
+ this.is_coupon_loading = false;
1065
+ },
1066
+ removeProductCoupon()
1067
+ {
1068
+ this.applied_product_coupon = null;
1069
+ this.coupon_code_input = '';
1070
+ this.coupon_discount_total = 0;
1071
+ this.getShippingFee();
1072
+ },
1073
+ computeCouponDiscount()
1074
+ {
1075
+ if (!this.applied_product_coupon) return 0;
1076
+
1077
+ var coupon = this.applied_product_coupon;
1078
+ var product_ids = coupon.product_ids || [];
1079
+ var total_coupon_discount = 0;
1080
+
1081
+ for (var m = 0; m < this.groupedProducts.length; m++)
1082
+ {
1083
+ var merch = this.groupedProducts[m];
1084
+ for (var p = 0; p < merch.products.length; p++)
1085
+ {
1086
+ var prod = merch.products[p];
1087
+ var pid = prod.product_id || (prod.id ? prod.id : '');
1088
+ if (product_ids.indexOf(pid) !== -1)
1089
+ {
1090
+ var unit_price = Number(prod.selling_price);
1091
+ var qty = Number(prod.quantity);
1092
+ var discount_amount = 0;
1093
+
1094
+ if (coupon.discount_type === 'fix_discount')
1095
+ {
1096
+ discount_amount = Number(coupon.discount) * qty;
1097
+ }
1098
+ else if (coupon.discount_type === 'percent')
1099
+ {
1100
+ discount_amount = (unit_price * (Number(coupon.discount) / 100)) * qty;
1101
+ }
1102
+
1103
+ // Cap: cannot make product price go below 0
1104
+ var max_discount = unit_price * qty;
1105
+ if (discount_amount > max_discount)
1106
+ {
1107
+ discount_amount = max_discount;
1108
+ }
1109
+ total_coupon_discount += discount_amount;
1110
+ }
1111
+ }
1112
+ }
1113
+ return Number(total_coupon_discount.toFixed(2));
1114
+ },
988
1115
  courierListChecker(order)
989
1116
  {
990
1117
  // this.courier_settings.courier_list.forEach(cour => {
@@ -2277,6 +2404,13 @@ export default {
2277
2404
  // });
2278
2405
 
2279
2406
  }
2407
+ // Apply product coupon discount (after vouchers, before custom fees)
2408
+ this.coupon_discount_total = 0;
2409
+ if (this.applied_product_coupon)
2410
+ {
2411
+ this.coupon_discount_total = this.computeCouponDiscount();
2412
+ this.checkout_info.grand_total -= this.coupon_discount_total;
2413
+ }
2280
2414
  if(this.public_settings.hasOwnProperty('custom_ecommerce_fee') && this.payment_method.payment_method_id != 'gc_points')
2281
2415
  {
2282
2416
  if(this.public_settings.custom_ecommerce_fee.percentage)
@@ -2380,6 +2514,16 @@ export default {
2380
2514
  },
2381
2515
  async proceedCheckout()
2382
2516
  {
2517
+ // Auto-apply coupon if user typed one but didn't click Apply
2518
+ if (this.show_coupon_code && this.coupon_code_input && this.coupon_code_input.trim() && !this.applied_product_coupon)
2519
+ {
2520
+ await this.applyProductCoupon();
2521
+ if (!this.applied_product_coupon)
2522
+ {
2523
+ return;
2524
+ }
2525
+ }
2526
+
2383
2527
  if(this.show_gcash_fee && this.gcash_fee > 0)
2384
2528
  {
2385
2529
  this.checkout_info.grand_total + this.gcash_fee;
@@ -2552,6 +2696,18 @@ export default {
2552
2696
  },
2553
2697
  async executeProceedCheckout()
2554
2698
  {
2699
+ // Attach product coupon data if applied
2700
+ if (this.applied_product_coupon)
2701
+ {
2702
+ this.checkout_info.applied_product_coupon = {
2703
+ coupon_code: this.applied_product_coupon.coupon_code,
2704
+ coupon_id: this.applied_product_coupon.id,
2705
+ discount_type: this.applied_product_coupon.discount_type,
2706
+ discount: this.applied_product_coupon.discount,
2707
+ product_ids: this.applied_product_coupon.product_ids
2708
+ };
2709
+ this.checkout_info.coupon_discount_total = this.coupon_discount_total;
2710
+ }
2555
2711
  if(this.checkout_info.payment_method.payment_method_id == "wallet")
2556
2712
  {
2557
2713
  this.sale_id = await this.$_fbCall('memberProceedCheckout', this.checkout_info)
package/GEarningBreakdownWidget.vue CHANGED
@@ -122,11 +122,12 @@ export default
122
122
  {
123
123
  complan_plan.breakdown_complan.map((val) =>
124
124
  {
125
- let res = { icon: val.icon, active: val.active, label: val.label, complan: val.key, amount : 0, last_update: null, show:val.show };
125
+ let extra_keys = val.extra_keys && Array.isArray(val.extra_keys) ? val.extra_keys : [];
126
+ let res = { icon: val.icon, active: val.active, label: val.label, complan: val.key, amount : 0, last_update: null, show:val.show, extra_keys: extra_keys };
126
127
  this.earning_breakdown.forEach((breakdown) =>
127
128
  {
128
129
  let another_keyword = val.key+"_convert";
129
- if(breakdown.id == val.key || breakdown.id == another_keyword)
130
+ if(breakdown.id == val.key || breakdown.id == another_keyword || extra_keys.indexOf(breakdown.id) !== -1)
130
131
  {
131
132
  res.amount = res.amount+breakdown.amount;
132
133
  res.last_update = breakdown.last_update;
@@ -141,9 +142,9 @@ export default
141
142
  }
142
143
  });
143
144
 
144
- for (var key in this.earning_breakdown_slot.temporary_wallet)
145
+ for (var key in this.earning_breakdown_slot.temporary_wallet)
145
146
  {
146
- if(key == val.key)
147
+ if(key == val.key || extra_keys.indexOf(key) !== -1)
147
148
  {
148
149
  res.amount = res.amount +this.earning_breakdown_slot.temporary_wallet[key];
149
150
  }
package/GUpdateProfile.vue CHANGED
@@ -224,8 +224,10 @@ export default {
224
224
  padding: 5px 20px;
225
225
 
226
226
  &-label {
227
- color: #aaa;
228
- margin-bottom: 5px;
227
+ color: #6b7280;
228
+ font-size: 13px;
229
+ font-weight: 600;
230
+ margin-bottom: 8px;
229
231
  }
230
232
 
231
233
  input {
package/components/EarningBreakdownWidget/EarningsLog.vue CHANGED
@@ -100,11 +100,22 @@ export default
100
100
  .orderBy('created_date', 'desc')
101
101
  .limit(this.pageSize);
102
102
 
103
+ let types = [this.complan_details.complan];
104
+
103
105
  if (this.complan_details.complan == "binary_three") {
104
- query = baseQuery.where("type", "in", ["binary_three", "binary_three_mentors"]);
106
+ types.push("binary_three_mentors");
107
+ }
108
+ if (this.complan_details.complan == "pass_up_bonus") {
109
+ types.push("pass_up_upline_cycle");
105
110
  }
106
- else if (this.complan_details.complan == "pass_up_bonus") {
107
- query = baseQuery.where("type", "in", ["pass_up_bonus", "pass_up_upline_cycle"]);
111
+ if (this.complan_details.extra_keys && Array.isArray(this.complan_details.extra_keys)) {
112
+ for (var i = 0; i < this.complan_details.extra_keys.length; i++) {
113
+ types.push(this.complan_details.extra_keys[i]);
114
+ }
115
+ }
116
+
117
+ if (types.length > 1) {
118
+ query = baseQuery.where("type", "in", types);
108
119
  } else {
109
120
  query = baseQuery.where("type", "==", this.complan_details.complan);
110
121
  }
package/components/KUploader.scss CHANGED
@@ -1,47 +1,103 @@
1
1
  .kuploader {
2
+ max-width: 100%;
3
+ overflow: hidden;
2
4
  &__container {
3
- height: 20px;
4
5
  width: 100%;
5
- border: 1px dashed #aaa;
6
- border-radius: 5px;
7
- height: 40px;
8
- color: #ccc;
9
- padding-top: 20px;
6
+ max-width: 100%;
7
+ border: 2px dashed #d1d5db;
8
+ border-radius: 10px;
9
+ padding: 24px 16px;
10
+ background: #fafafa;
11
+ color: #9ca3af;
12
+ display: flex;
13
+ flex-direction: column;
14
+ align-items: center;
15
+ justify-content: center;
16
+ gap: 8px;
10
17
  text-align: center;
11
- box-sizing: content-box;
18
+ box-sizing: border-box;
19
+ cursor: pointer;
20
+ transition: border-color 0.2s, background 0.2s;
21
+ font-size: 13px;
22
+
23
+ .q-icon {
24
+ font-size: 28px;
25
+ color: #9ca3af;
26
+ }
27
+
28
+ &:hover {
29
+ border-color: #6b7280;
30
+ background: #f3f4f6;
31
+ }
12
32
  }
13
33
  &__output {
34
+ width: 100%;
35
+ }
36
+
37
+ &__preview-row {
38
+ display: flex;
39
+ align-items: center;
40
+ gap: 12px;
41
+ padding: 12px;
42
+ border: 1px solid #e5e7eb;
43
+ border-radius: 10px;
44
+ background: #fafafa;
45
+ }
46
+
47
+ &__avatar {
14
48
  position: relative;
49
+ width: 72px;
50
+ height: 72px;
51
+ border-radius: 50%;
52
+ overflow: hidden;
53
+ flex-shrink: 0;
54
+ cursor: pointer;
55
+ border: 2px solid #e5e7eb;
15
56
 
16
- .image {
17
- line-height: 0;
18
-
19
- img {
20
- max-width: 100%;
21
- }
22
- video {
23
- max-width: 100%;
24
- }
57
+ img {
58
+ width: 100%;
59
+ height: 100%;
60
+ object-fit: cover;
61
+ display: block;
25
62
  }
26
- .loading {
27
- position: absolute;
28
- top: 0;
29
- left: 0;
30
- right: 0;
31
- bottom: 0;
32
- background-color: rgba(0,0,0,0.7);
33
- text-align: center;
34
- display: grid;
35
- grid-template-columns: 1fr;
36
- align-items: center;
37
- justify-items: center;
38
-
39
- .loader {
40
- color: #fff;
41
- }
42
-
63
+ }
64
+
65
+ &__avatar-overlay {
66
+ position: absolute;
67
+ inset: 0;
68
+ background: rgba(0,0,0,0.5);
69
+ display: flex;
70
+ align-items: center;
71
+ justify-content: center;
72
+ }
73
+
74
+ &__preview-actions {
75
+ display: flex;
76
+ flex-direction: column;
77
+ gap: 8px;
78
+ margin-left: auto;
79
+ align-items: flex-end;
80
+ }
81
+ &__change {
82
+ display: flex;
83
+ align-items: center;
84
+ gap: 4px;
85
+ padding: 5px 12px;
86
+ border: 1px solid #d1d5db;
87
+ border-radius: 6px;
88
+ background: white;
89
+ color: #374151;
90
+ font-size: 12px;
91
+ font-weight: 600;
92
+ cursor: pointer;
93
+ transition: background 0.2s;
94
+
95
+ &:hover {
96
+ background: #f3f4f6;
43
97
  }
44
98
  }
99
+
100
+
45
101
  .hidden-uploader {
46
102
  display: none;
47
103
  }
package/components/KUploader.vue CHANGED
@@ -1,14 +1,23 @@
1
1
  <template>
2
2
  <div class="kuploader">
3
3
  <div v-if="!uploading" class="kuploader__container" @click="openFileBrowser()">
4
- <q-icon name="fa fa-upload"></q-icon> Click here to upload
4
+ <q-icon name="cloud_upload"></q-icon>
5
+ <span>Click to upload photo</span>
6
+ <span style="font-size: 11px; color: #c0c0c0;">PNG, JPG accepted</span>
5
7
  </div>
6
8
  <div v-if="uploading" class="kuploader__output">
7
- <div @click="openFileBrowser()" class="image" ref="upload_output">
8
- <img :src="this.value">
9
- </div>
10
- <div class="loading" v-if="!is_done">
11
- <q-circular-progress class="loader" show-value font-size="12px" :value="progress" size="50px" :thickness="0.22" color="primary" track-color="white" />
9
+ <div class="kuploader__preview-row">
10
+ <div class="kuploader__avatar" @click="openFileBrowser()">
11
+ <img :src="preview_src || value" />
12
+ <div class="kuploader__avatar-overlay" v-if="!is_done">
13
+ <q-circular-progress show-value font-size="12px" :value="progress" size="40px" :thickness="0.22" color="white" track-color="grey-7" />
14
+ </div>
15
+ </div>
16
+ <div class="kuploader__preview-actions">
17
+ <button class="kuploader__change" @click.stop="openFileBrowser()">
18
+ <q-icon name="edit" size="13px" /> Change photo
19
+ </button>
20
+ </div>
12
21
  </div>
13
22
  </div>
14
23
  <input accept="image/*" @change="uploadFile()" ref="uploader" class="hidden-uploader" type="file">
@@ -35,6 +44,7 @@
35
44
  uploading : false,
36
45
  is_done : false,
37
46
  progress : 0,
47
+ preview_src : '',
38
48
  image:
39
49
  {
40
50
  file : '',
@@ -47,15 +57,7 @@
47
57
  this.file_reader = new FileReader();
48
58
  this.file_reader.onload = (fileLoadedEvent) =>
49
59
  {
50
- var srcData = fileLoadedEvent.target.result; // <--- data: base64
51
-
52
- this.$refs.upload_output.innerHTML = '';
53
-
54
- var newImage = document.createElement('img');
55
- newImage.src = srcData;
56
-
57
- this.$refs.upload_output.innerHTML = newImage.outerHTML;
58
- this.image = newImage.outerHTML;
60
+ this.preview_src = fileLoadedEvent.target.result;
59
61
  }
60
62
  },
61
63
  watch:
@@ -63,7 +65,7 @@
63
65
  value()
64
66
  {
65
67
  if(this.value)
66
- {
68
+ {
67
69
  this.uploading = true;
68
70
  this.is_done = true;
69
71
  }
@@ -86,14 +88,14 @@
86
88
  this.storeToCloudStorage(image)
87
89
  .then(url => {
88
90
  this.$emit('input', url);
89
- this.is_done = true;
91
+ this.is_done = true;
90
92
  })
91
93
  },
92
94
  async storeToCloudStorage(file) {
93
95
  console.log("FILE: ", file);
94
96
  let form_data = new FormData();
95
97
  form_data.append('image', file);
96
- let image = await axios.post('https://uploader.geer.solutions', form_data,
98
+ let image = await axios.post('https://uploader.geer.solutions', form_data,
97
99
  {
98
100
  onUploadProgress: progressEvent =>
99
101
  {
@@ -106,7 +108,7 @@
106
108
 
107
109
 
108
110
  // let STORAGE = STORAGE_ROOT(`${this.id}/images/${this.filename}`);
109
-
111
+
110
112
  // const metadata = {contentType: file.type};
111
113
 
112
114
  // const uploadTask = STORAGE.put(file, metadata);
@@ -115,7 +117,7 @@
115
117
  // return new Promise((resolve, reject) => {
116
118
  // uploadTask.on('state_changed', function(snapshot) {
117
119
  // // Progress indicator
118
- // _this.progress = parseInt((snapshot.bytesTransferred / snapshot.totalBytes) * 100);
120
+ // _this.progress = parseInt((snapshot.bytesTransferred / snapshot.totalBytes) * 100);
119
121
  // }, function(error) {
120
122
  // reject(error);
121
123
  // }, function() {
package/components/MyPurchases/tabs/CodManual.vue CHANGED
@@ -41,10 +41,10 @@
41
41
  <div>{{field.product_name ? field.product_name : field.product_sku}}</div>
42
42
  <div v-if="field.product.variant_details" style="color:gray;font-size:12px;max-width:100%;overflow-wrap:break-word;">Variation:{{field.product.variant_details.variation_combination.toString()}}</div>
43
43
  </div>
44
- <div class="labels__price">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
44
+ <div class="labels__price"><span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
45
45
  <div class="labels__quantity">{{field.quantity}}</div>
46
46
  <div class="labels__quantity">{{field.discount_merge_percent || field.discount_percent}}</div>
47
- <div class="labels__subtotal">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
47
+ <div class="labels__subtotal"><span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
48
48
  </div>
49
49
  </div>
50
50
  </div>
@@ -58,7 +58,10 @@
58
58
  <div class="col-4" style="font-weight:600;"> {{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
59
59
  <div v-if="list.orders.voucher_deductions < 0" class="col-4"></div>
60
60
  <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Voucher:</div>
61
- <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
61
+ <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
62
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4"></div>
63
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Coupon Discount:</div>
64
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;"> -{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
62
65
  <div class="col-4"></div>
63
66
 
64
67
  <template v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">
@@ -115,10 +118,10 @@
115
118
  <div class="product-info">
116
119
  <div class="product-name">Product: {{field.product_name ? field.product_name : field.product_sku}}</div>
117
120
  <div class="product-variation" v-if="field.product.variant_details">Variation: {{field.product.variant_details.variation_combination.toString()}}</div>
118
- <div class="product-price">Price: {{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
121
+ <div class="product-price">Price: <span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
119
122
  <div class="product-qty">Qty: {{field.quantity}}</div>
120
- <div class="product-discount">Discount: {{fiefield.discount_merge_percent || field.discount_percent}}</div>
121
- <div class="product-subtotal">Total: {{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
123
+ <div class="product-discount">Discount: {{field.discount_merge_percent || field.discount_percent}}</div>
124
+ <div class="product-subtotal">Total: <span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
122
125
  </div>
123
126
  </div>
124
127
  </div>
@@ -130,13 +133,15 @@
130
133
  <div class="order-items">{{list.status == "cod_manual" ? "COD Manual Processing" : ""}}</div>
131
134
  <div>Shipping Fee:</div>
132
135
  <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
133
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
134
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
135
- <div>Order Total ({{list.orders.total_quantity}} Item):</div>
136
- <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
136
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
137
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
138
+ <div v-if="list.orders.coupon_deduction > 0">Coupon Discount:</div>
139
+ <div v-if="list.orders.coupon_deduction > 0" class="order-items">-{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
140
+ <div>Order Total ({{list.orders.total_quantity}} Item):</div>
141
+ <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
137
142
  </div>
138
143
  </div>
139
- </div>
144
+ </div>
140
145
  </div>
141
146
 
142
147
  </div>
package/components/MyPurchases/tabs/CompletedTab.vue CHANGED
@@ -43,10 +43,10 @@
43
43
  <div>{{field.product_name ? field.product_name : field.product_sku}}</div>
44
44
  <div v-if="field.product.variant_details" style="color:gray;font-size:12px;max-width:100%;overflow-wrap:break-word;">Variation:{{field.product.variant_details.variation_combination.toString()}}</div>
45
45
  </div>
46
- <div class="labels__price">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
46
+ <div class="labels__price"><span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
47
47
  <div class="labels__quantity">{{field.quantity}}</div>
48
48
  <div class="labels__quantity">{{field.discount_merge_percent || field.discount_percent}}</div>
49
- <div class="labels__subtotal">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
49
+ <div class="labels__subtotal"><span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
50
50
  </div>
51
51
  </div>
52
52
  </div>
@@ -60,7 +60,10 @@
60
60
  <div class="col-4" style="font-weight:600;"> {{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
61
61
  <div v-if="list.orders.voucher_deductions < 0" class="col-4"></div>
62
62
  <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Voucher:</div>
63
- <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
63
+ <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
64
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4"></div>
65
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Coupon Discount:</div>
66
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;"> -{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
64
67
  <div class="col-4"></div>
65
68
 
66
69
  <template v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">
@@ -129,10 +132,10 @@
129
132
  <div class="product-info">
130
133
  <div class="product-name">Product: {{field.product_name ? field.product_name : field.product_sku}}</div>
131
134
  <div class="product-variation" v-if="field.product.variant_details">Variation: {{field.product.variant_details.variation_combination.toString()}}</div>
132
- <div class="product-price">Price: {{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
135
+ <div class="product-price">Price: <span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
133
136
  <div class="product-qty">Qty: {{field.quantity}}</div>
134
137
  <div class="product-discount">Discount: {{field.discount_merge_percent || field.discount_percent}}</div>
135
- <div class="product-subtotal">Total: {{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
138
+ <div class="product-subtotal">Total: <span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
136
139
  </div>
137
140
  </div>
138
141
  </div>
@@ -146,10 +149,12 @@
146
149
  <div class="order-items">{{list.status == "completed" ? "Completed" : ""}}</div>
147
150
  <div>Shipping Fee:</div>
148
151
  <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
149
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
150
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
151
- <div>Order Total ({{list.orders.total_quantity}} Item):</div>
152
- <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
152
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
153
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
154
+ <div v-if="list.orders.coupon_deduction > 0">Coupon Discount:</div>
155
+ <div v-if="list.orders.coupon_deduction > 0" class="order-items">-{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
156
+ <div>Order Total ({{list.orders.total_quantity}} Item):</div>
157
+ <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
153
158
  </div>
154
159
  <div v-if="!list.rated" style="background:white;text-align:right;padding:10px 15px 10px 0px;"><q-btn no-caps color="primary" @click="list.orders.products.length>1 ? ChooseProdToRate(list) : rateNow(list)" label="Rate"></q-btn></div>
155
160
  <!-- <div style="background:white;text-align:right;padding:0px 20px 10px 0px;"><q-btn dense color="primary" @click="shipNow(i)" label="Ship Now"></q-btn></div> -->
package/components/MyPurchases/tabs/ProcessingTab.vue CHANGED
@@ -44,10 +44,10 @@
44
44
  <div>{{field.product_name ? field.product_name : field.product_sku}}</div>
45
45
  <div v-if="field.product.variant_details" style="color:gray;font-size:12px;max-width:100%;overflow-wrap:break-word;">Variation:{{field.product.variant_details.variation_combination.toString()}}</div>
46
46
  </div>
47
- <div class="labels__price">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
47
+ <div class="labels__price"><span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
48
48
  <div class="labels__quantity">{{field.quantity}}</div>
49
49
  <div class="labels__quantity">{{field.discount_merge_percent || field.discount_percent}}</div>
50
- <div class="labels__subtotal">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
50
+ <div class="labels__subtotal"><span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
51
51
  </div>
52
52
  </div>
53
53
  </div>
@@ -61,7 +61,10 @@
61
61
  <div class="col-4" style="font-weight:600;"> {{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
62
62
  <div v-if="list.orders.voucher_deductions < 0" class="col-4"></div>
63
63
  <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Voucher:</div>
64
- <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
64
+ <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
65
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4"></div>
66
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Coupon Discount:</div>
67
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;"> -{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
65
68
  <div class="col-4"></div>
66
69
 
67
70
  <template v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">
@@ -123,10 +126,10 @@
123
126
  <div class="product-info">
124
127
  <div class="product-name">Product: {{field.product_name ? field.product_name : field.product_sku}}</div>
125
128
  <div class="product-variation" v-if="field.product.variant_details">Variation: {{field.product.variant_details.variation_combination.toString()}}</div>
126
- <div class="product-price">Price: {{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
129
+ <div class="product-price">Price: <span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
127
130
  <div class="product-qty">Qty: {{field.quantity}}</div>
128
131
  <div class="product-discount">Discount: {{field.discount_merge_percent || field.discount_percent}}</div>
129
- <div class="product-subtotal">Total: {{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
132
+ <div class="product-subtotal">Total: <span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
130
133
  </div>
131
134
  </div>
132
135
  </div>
@@ -139,13 +142,15 @@
139
142
  <div class="order-items">{{list.status == "processing" ? "Pending" : "Processing"}}</div>
140
143
  <div>Shipping Fee:</div>
141
144
  <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
142
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
143
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
144
- <div>Order Total ({{list.orders.total_quantity}} Item):</div>
145
- <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
145
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
146
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
147
+ <div v-if="list.orders.coupon_deduction > 0">Coupon Discount:</div>
148
+ <div v-if="list.orders.coupon_deduction > 0" class="order-items">-{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
149
+ <div>Order Total ({{list.orders.total_quantity}} Item):</div>
150
+ <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
146
151
  </div>
147
152
  </div>
148
- </div>
153
+ </div>
149
154
  </div>
150
155
 
151
156
  </div>
package/components/MyPurchases/tabs/ToPayTab.vue CHANGED
@@ -44,10 +44,10 @@
44
44
  <div>{{field.product_name ? field.product_name : field.product_sku}}</div>
45
45
  <div v-if="field.product.variant_details" style="color:gray;font-size:12px;max-width:100%;overflow-wrap:break-word;">Variation:{{field.product.variant_details.variation_combination.toString()}}</div>
46
46
  </div>
47
- <div class="labels__price">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
47
+ <div class="labels__price"><span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
48
48
  <div class="labels__quantity">{{field.quantity}}</div>
49
49
  <div class="labels__quantity">{{field.discount_merge_percent || field.discount_percent}}</div>
50
- <div class="labels__subtotal">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
50
+ <div class="labels__subtotal"><span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
51
51
  </div>
52
52
  </div>
53
53
  </div>
@@ -61,7 +61,10 @@
61
61
  <div class="col-4" style="font-weight:600;"> {{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
62
62
  <div v-if="list.orders.voucher_deductions < 0" class="col-4"></div>
63
63
  <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Voucher:</div>
64
- <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
64
+ <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
65
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4"></div>
66
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Coupon Discount:</div>
67
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;"> -{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
65
68
  <div class="col-4"></div>
66
69
 
67
70
  <template v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">
@@ -118,10 +121,10 @@
118
121
  <div class="product-info">
119
122
  <div class="product-name">Product: {{field.product_name ? field.product_name : field.product_sku}}</div>
120
123
  <div class="product-variation" v-if="field.product.variant_details">Variation: {{field.product.variant_details.variation_combination.toString()}}</div>
121
- <div class="product-price">Price: {{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
124
+ <div class="product-price">Price: <span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
122
125
  <div class="product-qty">Qty: {{field.quantity}}</div>
123
126
  <div class="product-discount">Discount: {{field.discount_merge_percent || field.discount_percent}}</div>
124
- <div class="product-subtotal">Total: {{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
127
+ <div class="product-subtotal">Total: <span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
125
128
  </div>
126
129
  </div>
127
130
  </div>
@@ -134,10 +137,12 @@
134
137
  <div class="order-items"> {{list.status == "to_pay" || list.status == "pre_processing" ? "Waiting for Payment" : "Waiting for platform to receive the payment"}}</div>
135
138
  <div v-if="!hide_shipping">Shipping Fee:</div>
136
139
  <div v-if="!hide_shipping" class="order-items">{{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
137
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
138
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
139
- <div>Order Total ({{list.orders.total_quantity}} Item):</div>
140
- <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
140
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
141
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
142
+ <div v-if="list.orders.coupon_deduction > 0">Coupon Discount:</div>
143
+ <div v-if="list.orders.coupon_deduction > 0" class="order-items">-{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
144
+ <div>Order Total ({{list.orders.total_quantity}} Item):</div>
145
+ <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
141
146
  </div>
142
147
  <div style="background:white;text-align:right;padding:10px" v-if="list.status == 'to_pay'"><q-btn dense no-caps color="primary" @click="payNow(i)" label="Pay Now"></q-btn></div>
143
148
  </div>
package/components/MyPurchases/tabs/ToPickedTab.vue CHANGED
@@ -44,10 +44,10 @@
44
44
  <div>{{field.product_name ? field.product_name : field.product_sku}}</div>
45
45
  <div v-if="field.product.variant_details" style="color:gray;font-size:12px;max-width:100%;overflow-wrap:break-word;">Variation:{{field.product.variant_details.variation_combination.toString()}}</div>
46
46
  </div>
47
- <div class="labels__price">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
47
+ <div class="labels__price"><span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
48
48
  <div class="labels__quantity">{{field.quantity}}</div>
49
49
  <div class="labels__quantity">{{field.discount_merge_percent || field.discount_percent}}</div>
50
- <div class="labels__subtotal">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
50
+ <div class="labels__subtotal"><span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
51
51
  </div>
52
52
  </div>
53
53
  </div>
@@ -61,7 +61,10 @@
61
61
  <div class="col-4" style="font-weight:600;"> {{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
62
62
  <div v-if="list.orders.voucher_deductions < 0" class="col-4"></div>
63
63
  <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Voucher:</div>
64
- <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
64
+ <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
65
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4"></div>
66
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Coupon Discount:</div>
67
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;"> -{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
65
68
  <div class="col-4"></div>
66
69
 
67
70
  <template v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">
@@ -133,10 +136,10 @@
133
136
  <div class="product-info">
134
137
  <div class="product-name">Product: {{field.product_name ? field.product_name : field.product_sku}}</div>
135
138
  <div class="product-variation" v-if="field.product.variant_details">Variation: {{field.product.variant_details.variation_combination.toString()}}</div>
136
- <div class="product-price">Price: {{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
139
+ <div class="product-price">Price: <span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
137
140
  <div class="product-qty">Qty: {{field.quantity}}</div>
138
141
  <div class="product-discount">Discount: {{field.discount_merge_percent || field.discount_percent}}</div>
139
- <div class="product-subtotal">Total: {{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
142
+ <div class="product-subtotal">Total: <span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
140
143
  </div>
141
144
  </div>
142
145
  </div>
@@ -150,10 +153,12 @@
150
153
  <div class="order-items">{{list.status == "to_picked" ? "Ready to Pickup" : "Delivered"}}</div>
151
154
  <div>Shipping Fee:</div>
152
155
  <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
153
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
154
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
155
- <div>Order Total ({{list.orders.total_quantity}} Item): </div>
156
- <div class="order-items"> {{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
156
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
157
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
158
+ <div v-if="list.orders.coupon_deduction > 0">Coupon Discount:</div>
159
+ <div v-if="list.orders.coupon_deduction > 0" class="order-items">-{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
160
+ <div>Order Total ({{list.orders.total_quantity}} Item): </div>
161
+ <div class="order-items"> {{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
157
162
  <!-- <div>Courier:</div> -->
158
163
  <!-- <div class="order-items">{{list.shipping_details.courier}}</div> -->
159
164
  <!-- <div>Tracking Number:</div> -->
package/components/MyPurchases/tabs/ToReceiveTab.vue CHANGED
@@ -48,10 +48,10 @@
48
48
  <div>{{field.product_name ? field.product_name : field.product_sku}}</div>
49
49
  <div v-if="field.product.variant_details" style="color:gray;font-size:12px;max-width:100%;overflow-wrap:break-word;">Variation:{{field.product.variant_details.variation_combination.toString()}}</div>
50
50
  </div>
51
- <div class="labels__price">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
51
+ <div class="labels__price"><span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
52
52
  <div class="labels__quantity">{{field.quantity}}</div>
53
53
  <div class="labels__quantity">{{field.discount_merge_percent || field.discount_percent}}</div>
54
- <div class="labels__subtotal">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
54
+ <div class="labels__subtotal"><span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
55
55
  </div>
56
56
  </div>
57
57
  </div>
@@ -65,7 +65,10 @@
65
65
  <div class="col-4" style="font-weight:600;"> {{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
66
66
  <div v-if="list.orders.voucher_deductions < 0" class="col-4"></div>
67
67
  <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Voucher:</div>
68
- <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
68
+ <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
69
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4"></div>
70
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Coupon Discount:</div>
71
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;"> -{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
69
72
  <div class="col-4"></div>
70
73
 
71
74
  <template v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">
@@ -139,10 +142,10 @@
139
142
  <div class="product-info">
140
143
  <div class="product-name">Product: {{field.product_name ? field.product_name : field.product_sku}}</div>
141
144
  <div class="product-variation" v-if="field.product.variant_details">Variation: {{field.product.variant_details.variation_combination.toString()}}</div>
142
- <div class="product-price">Price: {{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
145
+ <div class="product-price">Price: <span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
143
146
  <div class="product-qty">Qty: {{field.quantity}}</div>
144
147
  <div class="product-discount">Discount: {{field.discount_merge_percent || field.discount_percent}}</div>
145
- <div class="product-subtotal">Total: {{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
148
+ <div class="product-subtotal">Total: <span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
146
149
  </div>
147
150
  </div>
148
151
  </div>
@@ -156,10 +159,12 @@
156
159
  <div class="order-items">{{list.status == "shipping" ? "Shipping" : "Delivered"}}</div>
157
160
  <div>Shipping Fee:</div>
158
161
  <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
159
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
160
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
161
- <div>Order Total ({{list.orders.total_quantity}} Item): </div>
162
- <div class="order-items"> {{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
162
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
163
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
164
+ <div v-if="list.orders.coupon_deduction > 0">Coupon Discount:</div>
165
+ <div v-if="list.orders.coupon_deduction > 0" class="order-items">-{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
166
+ <div>Order Total ({{list.orders.total_quantity}} Item): </div>
167
+ <div class="order-items"> {{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
163
168
  <div>Courier:</div>
164
169
  <div class="order-items">{{list.shipping_details ? list.shipping_details.courier : 'Waiting for courier'}}</div>
165
170
  <div>Tracking Number:</div>
package/components/MyPurchases/tabs/ToShipTab.vue CHANGED
@@ -42,10 +42,10 @@
42
42
  <div>{{field.product_name ? field.product_name : field.product_sku}}</div>
43
43
  <div v-if="field.product.variant_details" style="color:gray;font-size:12px;max-width:100%;overflow-wrap:break-word;">Variation:{{field.product.variant_details.variation_combination.toString()}}</div>
44
44
  </div>
45
- <div class="labels__price">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
45
+ <div class="labels__price"><span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
46
46
  <div class="labels__quantity">{{field.quantity}}</div>
47
47
  <div class="labels__quantity">{{field.discount_merge_percent || field.discount_percent}}</div>
48
- <div class="labels__subtotal">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
48
+ <div class="labels__subtotal"><span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
49
49
  </div>
50
50
  </div>
51
51
  </div>
@@ -59,7 +59,10 @@
59
59
  <div class="col-4" style="font-weight:600;"> {{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
60
60
  <div v-if="list.orders.voucher_deductions < 0" class="col-4"></div>
61
61
  <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Voucher:</div>
62
- <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
62
+ <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
63
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4"></div>
64
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Coupon Discount:</div>
65
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;"> -{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
63
66
  <div class="col-4"></div>
64
67
 
65
68
  <template v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">
@@ -116,10 +119,10 @@
116
119
  <div class="product-info">
117
120
  <div class="product-name">Product: {{field.product_name ? field.product_name : field.product_sku}}</div>
118
121
  <div class="product-variation" v-if="field.product.variant_details">Variation: {{field.product.variant_details.variation_combination.toString()}}</div>
119
- <div class="product-price">Price: {{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
122
+ <div class="product-price">Price: <span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
120
123
  <div class="product-qty">Qty: {{field.quantity}}</div>
121
124
  <div class="product-discount">Discount: {{field.discount_merge_percent || field.discount_percent}}</div>
122
- <div class="product-subtotal">Total: {{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
125
+ <div class="product-subtotal">Total: <span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
123
126
  </div>
124
127
  </div>
125
128
  </div>
@@ -132,10 +135,12 @@
132
135
  <div class="order-items">{{list.status == "to_ship" ? "Ready to Ship" : ""}}</div>
133
136
  <div>Shipping Fee: </div>
134
137
  <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
135
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
136
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
137
- <div>Order Total ({{list.orders.total_quantity}} Item):</div>
138
- <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
138
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
139
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
140
+ <div v-if="list.orders.coupon_deduction > 0">Coupon Discount:</div>
141
+ <div v-if="list.orders.coupon_deduction > 0" class="order-items">-{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
142
+ <div>Order Total ({{list.orders.total_quantity}} Item):</div>
143
+ <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
139
144
  </div>
140
145
  </div>
141
146
  </div>
package/components/MyPurchases/tabs/cancelled.vue CHANGED
@@ -44,10 +44,10 @@
44
44
  <div>{{field.product_name ? field.product_name : field.product_sku}}</div>
45
45
  <div v-if="field.product.variant_details" style="color:gray;font-size:12px;max-width:100%;overflow-wrap:break-word;">Variation:{{field.product.variant_details.variation_combination.toString()}}</div>
46
46
  </div>
47
- <div class="labels__price">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
47
+ <div class="labels__price"><span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
48
48
  <div class="labels__quantity">{{field.quantity}}</div>
49
49
  <div class="labels__quantity">{{field.discount_merge_percent || field.discount_percent}}</div>
50
- <div class="labels__subtotal">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
50
+ <div class="labels__subtotal"><span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
51
51
  </div>
52
52
  </div>
53
53
  </div>
@@ -61,7 +61,10 @@
61
61
  <div class="col-4" style="font-weight:600;"> {{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
62
62
  <div v-if="list.orders.voucher_deductions < 0" class="col-4"></div>
63
63
  <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Voucher:</div>
64
- <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
64
+ <div v-if="list.orders.voucher_deductions < 0" class="col-4" style="font-weight:600;"> {{main_currency}} -{{$_formatNumber(list.orders.voucher_deductions, { decimal: 2})}}</div>
65
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4"></div>
66
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;margin-left:auto;text-align:left;">Coupon Discount:</div>
67
+ <div v-if="list.orders.coupon_deduction > 0" class="col-4" style="font-weight:600;"> -{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
65
68
  <div class="col-4"></div>
66
69
 
67
70
  <template v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">
@@ -124,10 +127,10 @@
124
127
  <div class="product-info">
125
128
  <div class="product-name">Product: {{field.product_name ? field.product_name : field.product_sku}}</div>
126
129
  <div class="product-variation" v-if="field.product.variant_details">Variation: {{field.product.variant_details.variation_combination.toString()}}</div>
127
- <div class="product-price">Price: {{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</div>
130
+ <div class="product-price">Price: <span v-if="field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.selling_price, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_discounted_price >= 0 && field.coupon_discounted_price != field.selling_price ? field.coupon_discounted_price : field.selling_price, { decimal: 2})}}</div>
128
131
  <div class="product-qty">Qty: {{field.quantity}}</div>
129
132
  <div class="product-discount">Discount: {{field.discount_merge_percent || field.discount_percent}}</div>
130
- <div class="product-subtotal">Total: {{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</div>
133
+ <div class="product-subtotal">Total: <span v-if="field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total" style="text-decoration:line-through;color:#999;">{{main_currency}} {{ $_formatNumber(field.item_total, { decimal: 2})}}</span> {{main_currency}} {{ $_formatNumber(field.coupon_item_total >= 0 && field.coupon_item_total != field.item_total ? field.coupon_item_total : field.item_total, { decimal: 2})}}</div>
131
134
  </div>
132
135
  </div>
133
136
  </div>
@@ -141,10 +144,12 @@
141
144
  <div class="order-items">{{list.status == "cancelled" ? "Cancelled" : ""}}</div>
142
145
  <div>Shipping Fee:</div>
143
146
  <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
144
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
145
- <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
146
- <div>Order Total ({{list.orders.total_quantity}} Item):</div>
147
- <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
147
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
148
+ <div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')" class="order-items">{{main_currency}} {{$_formatNumber(list.orders[public_settings.custom_ecommerce_fee.id], { decimal: 2})}}</div>
149
+ <div v-if="list.orders.coupon_deduction > 0">Coupon Discount:</div>
150
+ <div v-if="list.orders.coupon_deduction > 0" class="order-items">-{{main_currency}} {{$_formatNumber(list.orders.coupon_deduction, { decimal: 2})}}</div>
151
+ <div>Order Total ({{list.orders.total_quantity}} Item):</div>
152
+ <div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.order_total, { decimal: 2})}}</div>
148
153
  </div>
149
154
  </div>
150
155
  </div>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geer-builder",
3
- "version": "1.2.958",
3
+ "version": "1.2.959",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {