geer-builder 1.2.957 → 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 (16) hide show
  1. package/GCheckout.vue +157 -1
  2. package/GEarningBreakdownWidget.vue +5 -4
  3. package/GUpdateProfile.vue +241 -166
  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/models/DB_CMS.js +9 -0
  16. package/package.json +1 -1
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>