geer-builder 1.2.477 → 1.2.481

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 (25) hide show
  1. package/GCheckout.vue +7 -1
  2. package/GDirectDownlineWidget.vue +2 -1
  3. package/GProcessSale.vue +25 -7
  4. package/GProcessSaleGc.vue +18 -0
  5. package/components/ApplyMerchant/ApplyMerchantUploader.vue +0 -1
  6. package/components/Checkout/SelectVoucherDialog.vue +1 -1
  7. package/components/MyPurchases/tabs/CodManual.vue +3 -2
  8. package/components/MyPurchases/tabs/CompletedTab.vue +3 -0
  9. package/components/MyPurchases/tabs/OrderMobile.scss +1 -0
  10. package/components/MyPurchases/tabs/ProcessingTab.vue +3 -0
  11. package/components/MyPurchases/tabs/ToPayTab.vue +3 -0
  12. package/components/MyPurchases/tabs/ToPickedTab.vue +3 -0
  13. package/components/MyPurchases/tabs/ToReceiveTab.vue +5 -2
  14. package/components/MyPurchases/tabs/ToShipTab.vue +3 -0
  15. package/components/MyPurchases/tabs/cancelled.vue +3 -0
  16. package/components/MyTransactions/tabs/ApprovalTab.vue +4 -0
  17. package/components/MyTransactions/tabs/Cancelled.vue +4 -0
  18. package/components/MyTransactions/tabs/CodManual.vue +4 -0
  19. package/components/MyTransactions/tabs/CompletedTab.vue +4 -0
  20. package/components/MyTransactions/tabs/ShippingTab.vue +4 -0
  21. package/components/MyTransactions/tabs/ToPayTab.vue +4 -0
  22. package/components/MyTransactions/tabs/ToPickedTab.vue +4 -0
  23. package/components/MyTransactions/tabs/ToShipTab.vue +4 -0
  24. package/models/DB_MERCHANT_FRONT.js +9 -0
  25. package/package.json +1 -1
package/GCheckout.vue CHANGED
@@ -1363,6 +1363,7 @@ export default {
1363
1363
  orders.applied_voucher.forEach(vouch => {
1364
1364
  if(vouch.voucher_type == 'Discount')
1365
1365
  {
1366
+ console.log(`Voucher ${vouch.voucher_type}`);
1366
1367
  if(vouch.discount_type=='fix_discount')
1367
1368
  {
1368
1369
  voucher_deductions += Number(vouch.discount);
@@ -1376,13 +1377,18 @@ export default {
1376
1377
  }
1377
1378
  else if(vouch.voucher_type == 'Shipping')
1378
1379
  {
1380
+ console.log(`Voucher ${vouch.voucher_type}`);
1381
+ console.log(`Type ${vouch.discount_type}`);
1382
+ console.log(`sf ${orders.order_sub_total}`);
1383
+ console.log(`discount ${vouch.discount}`);
1384
+
1379
1385
  if(vouch.discount_type=='fix_discount')
1380
1386
  {
1381
1387
  shipping_voucher_deduction += Number(vouch.discount);
1382
1388
  }
1383
1389
  else if(vouch.discount_type=='percent')
1384
1390
  {
1385
- let converted_fromt_percent = orders.order_sub_total * (vouch.discount/100);
1391
+ let converted_fromt_percent = orders.shipping_fee * (vouch.discount/100);
1386
1392
  converted_fromt_percent = converted_fromt_percent.toFixed(2);
1387
1393
  shipping_voucher_deduction += Number(converted_fromt_percent);
1388
1394
  }
package/GDirectDownlineWidget.vue CHANGED
@@ -13,7 +13,8 @@
13
13
  </div>
14
14
 
15
15
  <div class="q-pt-sm">
16
- <div class="label">Period PV</div>
16
+ <div class="label" v-if="is_company_success">Monthly sales participation</div>
17
+ <div class="label" v-else>Period PV</div>
17
18
  <div class="value text-primary">{{ period_pv}}</div>
18
19
  </div>
19
20
  <div class="q-pt-sm" v-if="is_unity">
package/GProcessSale.vue CHANGED
@@ -105,7 +105,10 @@
105
105
  <template v-if="slot_reference != null ">
106
106
  <label class="label row q-mt-sm">{{slot_reference == 'no_slot' ? "No Slot Selected" : slot_reference}}</label>
107
107
  </template>
108
-
108
+ <template v-if="show_address">
109
+ <label class="label row q-mt-sm">Address:{{auto_fill_address}}</label>
110
+ <label class="label row q-mt-sm">Contact: {{auto_fill_contact}}</label>
111
+ </template>
109
112
 
110
113
  </div>
111
114
  <div class="field col-2">
@@ -283,6 +286,9 @@ export default
283
286
  refill : false,
284
287
  slot_choose :false,
285
288
  public_settings:{},
289
+ show_address:false,
290
+ auto_fill_address:'',
291
+ auto_fill_contact:'',
286
292
  }),
287
293
  props: ['stockist'],
288
294
  components: { AddBatchDialog, GProduct, ProcessSaleConfirmDialog, DiscountDialog, AddPaymentDialog, SaleChooseSlotDialog,ManagerOverrideDialog },
@@ -364,8 +370,14 @@ export default
364
370
  {
365
371
  this.is_sale_choose_slot_dialog_open = true
366
372
  },
367
- setModel (val) {
373
+ setAddress(val)
374
+ {
375
+ console.log(val, 'asdasd');
376
+ },
377
+ setModel (val)
378
+ {
368
379
  this.field.email = val;
380
+ // let customer_info = await new DB_USER().collection().where("keywords", "array-contains", val).get()
369
381
  },
370
382
  async filterFn (val, update, abort) {
371
383
  // call abort() at any time if you can't retrieve data somehow
@@ -431,13 +443,21 @@ export default
431
443
  },
432
444
  async submit(override = false,bypass_slot = false)
433
445
  {
446
+ if(this.public_settings.hasOwnProperty('cashier_auto_fill_address') && this.public_settings.cashier_auto_fill_address)
447
+ {
448
+ let customer_info = await new DB_USER().collection().where("email", "==", this.field.email).get();
449
+ if(customer_info.docs.length > 0)
450
+ {
451
+ this.show_address = true;
452
+ this.auto_fill_address = customer_info.docs[0].data().location ? customer_info.docs[0].data().location : '';
453
+ this.auto_fill_contact = customer_info.docs[0].data().contact_number ? customer_info.docs[0].data().contact_number : '';
454
+ }
455
+ }
456
+
434
457
  this.field.payment = this.payment_list;
435
458
  this.field.payment_amount = this.paymentTotal;
436
459
  this.field.balanceTotal = this.balanceTotal;
437
460
  this.field.transaction_refill = this.refill;
438
-
439
-
440
-
441
461
  if(override)
442
462
  {
443
463
  this.record_balance = this.balanceTotal * -1
@@ -730,8 +750,6 @@ export default
730
750
  },
731
751
  async updateTable()
732
752
  {
733
- console.log('update');
734
- console.log(this.field.product_list);
735
753
  if(this.field.product_list.length > 0)
736
754
  {
737
755
  let key = 'product_id'
package/GProcessSaleGc.vue CHANGED
@@ -104,6 +104,10 @@
104
104
  <template v-if="slot_reference != null ">
105
105
  <label class="label row q-mt-sm">{{slot_reference == 'no_slot' ? "No Slot Selected" : slot_reference}}</label>
106
106
  </template>
107
+ <template v-if="show_address">
108
+ <label class="label row q-mt-sm">Address:{{auto_fill_address}}</label>
109
+ <label class="label row q-mt-sm">Contact: {{auto_fill_contact}}</label>
110
+ </template>
107
111
 
108
112
 
109
113
  </div>
@@ -279,6 +283,9 @@ export default
279
283
  payment_type:{method_key:"gc", method_name:"GC"},
280
284
  remarks:'GC payment'
281
285
  },
286
+ show_address:false,
287
+ auto_fill_address:'',
288
+ auto_fill_contact:'',
282
289
  }),
283
290
  props: ['stockist'],
284
291
  components: { GProduct, ProcessSaleConfirmDialog, DiscountDialog, AddPaymentDialog, SaleChooseSlotDialog,ManagerOverrideDialog },
@@ -461,6 +468,17 @@ export default
461
468
  },
462
469
  async submit(override = false,bypass_slot = false)
463
470
  {
471
+ if(this.public_settings.hasOwnProperty('cashier_auto_fill_address') && this.public_settings.cashier_auto_fill_address)
472
+ {
473
+ let customer_info = await new DB_USER().collection().where("email", "==", this.field.email).get();
474
+ if(customer_info.docs.length > 0)
475
+ {
476
+ this.show_address = true;
477
+ this.auto_fill_address = customer_info.docs[0].data().location ? customer_info.docs[0].data().location : '';
478
+ this.auto_fill_contact = customer_info.docs[0].data().contact_number ? customer_info.docs[0].data().contact_number : '';
479
+ }
480
+ }
481
+
464
482
  this.field.payment = this.payment_list;
465
483
  this.field.payment_amount = this.paymentTotal;
466
484
  this.field.balanceTotal = this.balanceTotal;
package/components/ApplyMerchant/ApplyMerchantUploader.vue CHANGED
@@ -22,7 +22,6 @@
22
22
  <label v-if="i==0 && show_default" style="position:absolute;bottom:11px;left:27px;font-weight:600; color: #fff">Default</label>
23
23
  </div>
24
24
  </div>
25
-
26
25
  </div>
27
26
  <input accept="image/x-png,image/jpeg" @change="uploadFile()" ref="uploader" class="hidden-uploader" id=pictureuploader multiple type="file">
28
27
 
package/components/Checkout/SelectVoucherDialog.vue CHANGED
@@ -1,6 +1,6 @@
1
1
  <template>
2
2
  <div class="select-voucher-dialog">
3
- <div class="voucher-dialog-header">{{merchant_order_details.merchant_name}} Vouchers</div>
3
+ <div class="voucher-dialog-header" style="text-transform:uppercase">{{merchant_order_details.merchant_name}} Vouchers</div>
4
4
  <div class="add-voucher-input">
5
5
  Add Voucher
6
6
  <q-input class="q-ml-sm" @input="textToUpper" @keyup.enter="applyVoucher()" placeholder="Voucher code" v-model="input_voucher" dense outlined ></q-input>
package/components/MyPurchases/tabs/CodManual.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
  <div class="shipping_details" v-if="list.shipping_address">
11
12
  <div class="name__number"> {{list.shipping_address.full_name}} {{list.shipping_address.phone_number}} </div>
@@ -86,9 +87,8 @@
86
87
  <div class="shipping-address">
87
88
  <div class="header__container">
88
89
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
90
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
89
91
  </div>
90
-
91
-
92
92
  <div class="shipping-details" v-if="list.shipping_address">
93
93
  <div class="shipping-grid">
94
94
  <div class="shipping-name"> {{list.shipping_address.full_name}}</div>
@@ -210,6 +210,7 @@ export default {
210
210
  .header__container{
211
211
  display: flex;
212
212
  align-items: center;
213
+ justify-content: space-between;
213
214
  .header{
214
215
  border-top: 2px dashed;
215
216
  width: 100%;
package/components/MyPurchases/tabs/CompletedTab.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
  <div class="shipping_details" v-if="list.shipping_address">
11
12
  <div class="name__number"> {{list.shipping_address.full_name}} {{list.shipping_address.phone_number}} </div>
@@ -96,6 +97,7 @@
96
97
  <div class="shipping-address">
97
98
  <div class="header__container">
98
99
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
100
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
99
101
  </div>
100
102
 
101
103
  <div class="shipping-details" v-if="list.shipping_address">
@@ -233,6 +235,7 @@ export default {
233
235
  .header__container{
234
236
  display: flex;
235
237
  align-items: center;
238
+ justify-content: space-between;
236
239
  .header{
237
240
  border-top: 2px dashed;
238
241
  width: 100%;
package/components/MyPurchases/tabs/OrderMobile.scss CHANGED
@@ -7,6 +7,7 @@
7
7
  .header__container{
8
8
  display: flex;
9
9
  align-items: center;
10
+ justify-content: space-between;
10
11
  .header{
11
12
  border-top: 2px dashed;
12
13
  width: 100%;
package/components/MyPurchases/tabs/ProcessingTab.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
  <div class="shipping_details" v-if="list.shipping_address">
11
12
  <div class="name__number"> {{list.shipping_address.full_name}} {{list.shipping_address.phone_number}} </div>
@@ -90,6 +91,7 @@
90
91
  <div class="shipping-address">
91
92
  <div class="header__container">
92
93
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
94
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
93
95
  </div>
94
96
 
95
97
 
@@ -215,6 +217,7 @@ export default {
215
217
  .header__container{
216
218
  display: flex;
217
219
  align-items: center;
220
+ justify-content: space-between;
218
221
  .header{
219
222
  border-top: 2px dashed;
220
223
  width: 100%;
package/components/MyPurchases/tabs/ToPayTab.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
  <div class="shipping_details" v-if="list.shipping_address">
11
12
  <div class="name__number"> {{list.shipping_address.full_name}} {{list.shipping_address.phone_number}} </div>
@@ -91,6 +92,7 @@
91
92
  <div class="shipping-address">
92
93
  <div class="header__container">
93
94
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
95
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
94
96
  </div>
95
97
  <div class="shipping-details" v-if="list.shipping_address">
96
98
  <div class="shipping-grid">
@@ -219,6 +221,7 @@ export default {
219
221
  .header__container{
220
222
  display: flex;
221
223
  align-items: center;
224
+ justify-content: space-between;
222
225
  .header{
223
226
  border-top: 2px dashed;
224
227
  width: 100%;
package/components/MyPurchases/tabs/ToPickedTab.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Pickup Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
  <div class="shipping_details" v-if="list.orders.merchant_details.pickup_address">
11
12
  <div class="name__number"> {{list.orders.merchant_name}} {{list.orders.merchant_details.pickup_address.phone_number}} </div>
@@ -103,6 +104,7 @@
103
104
  <div class="shipping-address">
104
105
  <div class="header__container">
105
106
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
107
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
106
108
  </div>
107
109
  <div class="shipping-details" v-if="list.shipping_address">
108
110
  <div class="shipping-grid">
@@ -275,6 +277,7 @@ export default {
275
277
  .header__container{
276
278
  display: flex;
277
279
  align-items: center;
280
+ justify-content: space-between;
278
281
  .header{
279
282
  border-top: 2px dashed;
280
283
  width: 100%;
package/components/MyPurchases/tabs/ToReceiveTab.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
  <div class="shipping_details" v-if="list.shipping_address">
11
12
  <div class="name__number"> {{list.shipping_address.full_name}} {{list.shipping_address.phone_number}} </div>
@@ -89,7 +90,7 @@
89
90
  </div>
90
91
  <div v-if="list.status =='delivered' || list.status =='shipping'" style="background:white;text-align:right;padding:0px 20px 10px 0px;">
91
92
  <q-btn dense color="primary" no-caps @click="openTrackingDialog(i)" label="Trace Order" style="margin: 0 10px"></q-btn>
92
- <q-btn dense color="primary" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
93
+ <q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='cod' || list.status =='shipping' && list.payment_method.payment_method_id != 'cod'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
93
94
  </div>
94
95
  </div>
95
96
  </div>
@@ -103,6 +104,7 @@
103
104
  <div class="shipping-address">
104
105
  <div class="header__container">
105
106
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
107
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
106
108
  </div>
107
109
  <div class="shipping-details" v-if="list.shipping_address">
108
110
  <div class="shipping-grid">
@@ -158,7 +160,7 @@
158
160
  </div>
159
161
  <div v-if="list.status =='delivered' || list.status =='shipping'" style="background:white;text-align:right;padding:10px">
160
162
  <q-btn dense color="primary" no-caps @click="openTrackingDialog(i)" label="Trace Order" style="margin: 0 10px"></q-btn>
161
- <q-btn dense color="primary" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
163
+ <q-btn dense color="primary" v-if="list.status =='delivered' && list.payment_method.payment_method_id =='cod' || list.status =='shipping' && list.payment_method.payment_method_id != 'cod'" no-caps @click="orderReceived(i)" label="Order Received"></q-btn>
162
164
  </div>
163
165
  </div>
164
166
  </div>
@@ -275,6 +277,7 @@ export default {
275
277
  .header__container{
276
278
  display: flex;
277
279
  align-items: center;
280
+ justify-content: space-between;
278
281
  .header{
279
282
  border-top: 2px dashed;
280
283
  width: 100%;
package/components/MyPurchases/tabs/ToShipTab.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
  <div class="shipping_details" v-if="list.shipping_address">
11
12
  <div class="name__number"> {{list.shipping_address.full_name}} {{list.shipping_address.phone_number}} </div>
@@ -88,6 +89,7 @@
88
89
  <div class="shipping-address">
89
90
  <div class="header__container">
90
91
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
92
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
91
93
  </div>
92
94
  <div class="shipping-details" v-if="list.shipping_address">
93
95
  <div class="shipping-grid">
@@ -199,6 +201,7 @@ export default {
199
201
  .header__container{
200
202
  display: flex;
201
203
  align-items: center;
204
+ justify-content: space-between;
202
205
  .header{
203
206
  border-top: 2px dashed;
204
207
  width: 100%;
package/components/MyPurchases/tabs/cancelled.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
  <div class="shipping_details" v-if="list.shipping_address">
11
12
  <div class="name__number"> {{list.shipping_address.full_name}} {{list.shipping_address.phone_number}} </div>
@@ -93,6 +94,7 @@
93
94
  <div class="shipping-address">
94
95
  <div class="header__container">
95
96
  <div class="header" style="border-top:none"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
97
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
96
98
  </div>
97
99
 
98
100
  <div class="shipping-details" v-if="list.shipping_address">
@@ -214,6 +216,7 @@ export default {
214
216
  .header__container{
215
217
  display: flex;
216
218
  align-items: center;
219
+ justify-content: space-between;
217
220
  .header{
218
221
  border-top: 2px dashed;
219
222
  width: 100%;
package/components/MyTransactions/tabs/ApprovalTab.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
 
11
12
  <div class="shipping-details" v-if="list.shipping_address">
@@ -101,6 +102,7 @@
101
102
  <div class="shipping-address">
102
103
  <div class="header__container">
103
104
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
105
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
104
106
  </div>
105
107
 
106
108
  <div class="shipping-details" v-if="list.shipping_address">
@@ -243,6 +245,7 @@ export default {
243
245
  .header__container{
244
246
  display: flex;
245
247
  align-items: center;
248
+ justify-content: space-between;
246
249
  .header{
247
250
  padding: 10px;
248
251
  font-weight: 500;
@@ -382,6 +385,7 @@ export default {
382
385
  .header__container{
383
386
  display: flex;
384
387
  align-items: center;
388
+ justify-content: space-between;
385
389
  .header{
386
390
  padding: 10px;
387
391
  font-weight: 500;
package/components/MyTransactions/tabs/Cancelled.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
  <div class="shipping_details" v-if="list.shipping_address">
11
12
  <div class="name__number"> {{list.shipping_address.full_name}} {{list.shipping_address.phone_number}} </div>
@@ -92,6 +93,7 @@
92
93
  <div class="shipping-address">
93
94
  <div class="header__container">
94
95
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
96
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
95
97
  </div>
96
98
 
97
99
  <div class="shipping-details" v-if="list.shipping_address">
@@ -210,6 +212,7 @@ export default {
210
212
  .header__container{
211
213
  display: flex;
212
214
  align-items: center;
215
+ justify-content: space-between;
213
216
  .header{
214
217
  padding: 10px;
215
218
  font-weight: 500;
@@ -378,6 +381,7 @@ export default {
378
381
  .header__container{
379
382
  display: flex;
380
383
  align-items: center;
384
+ justify-content: space-between;
381
385
  .header{
382
386
  padding: 10px;
383
387
  font-weight: 500;
package/components/MyTransactions/tabs/CodManual.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
 
11
12
  <div class="shipping-details" v-if="list.shipping_address">
@@ -104,6 +105,7 @@
104
105
  <div class="shipping-address">
105
106
  <div class="header__container">
106
107
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
108
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
107
109
  </div>
108
110
 
109
111
  <div class="shipping-details" v-if="list.shipping_address">
@@ -250,6 +252,7 @@ export default {
250
252
  .header__container{
251
253
  display: flex;
252
254
  align-items: center;
255
+ justify-content: space-between;
253
256
  .header{
254
257
  padding: 10px;
255
258
  font-weight: 500;
@@ -389,6 +392,7 @@ export default {
389
392
  .header__container{
390
393
  display: flex;
391
394
  align-items: center;
395
+ justify-content: space-between;
392
396
  .header{
393
397
  padding: 10px;
394
398
  font-weight: 500;
package/components/MyTransactions/tabs/CompletedTab.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
  <div class="shipping-details" v-if="list.shipping_address">
11
12
  <div class="shipping-grid">
@@ -94,6 +95,7 @@
94
95
  <div class="shipping-address">
95
96
  <div class="header__container">
96
97
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
98
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
97
99
  </div>
98
100
 
99
101
  <div class="shipping-details" v-if="list.shipping_address">
@@ -206,6 +208,7 @@ export default {
206
208
  .header__container{
207
209
  display: flex;
208
210
  align-items: center;
211
+ justify-content: space-between;
209
212
  .header{
210
213
  padding: 10px;
211
214
  font-weight: 500;
@@ -311,6 +314,7 @@ export default {
311
314
  .header__container{
312
315
  display: flex;
313
316
  align-items: center;
317
+ justify-content: space-between;
314
318
  .header{
315
319
  padding: 10px;
316
320
  font-weight: 500;
package/components/MyTransactions/tabs/ShippingTab.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
  <div class="shipping-details" v-if="list.shipping_address">
11
12
  <div class="shipping-grid">
@@ -105,6 +106,7 @@
105
106
  <div class="shipping-address">
106
107
  <div class="header__container">
107
108
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
109
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
108
110
  </div>
109
111
 
110
112
  <div class="shipping-details" v-if="list.shipping_address">
@@ -246,6 +248,7 @@ export default {
246
248
  .header__container{
247
249
  display: flex;
248
250
  align-items: center;
251
+ justify-content: space-between;
249
252
  .header{
250
253
  padding: 10px;
251
254
  font-weight: 500;
@@ -349,6 +352,7 @@ export default {
349
352
  .header__container{
350
353
  display: flex;
351
354
  align-items: center;
355
+ justify-content: space-between;
352
356
  .header{
353
357
  padding: 10px;
354
358
  font-weight: 500;
package/components/MyTransactions/tabs/ToPayTab.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
  <div class="shipping-details" v-if="list.shipping_address">
11
12
  <div class="shipping-grid">
@@ -82,6 +83,7 @@
82
83
  <div class="shipping-address">
83
84
  <div class="header__container">
84
85
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
86
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
85
87
  </div>
86
88
 
87
89
  <div class="shipping-details" v-if="list.shipping_address">
@@ -185,6 +187,7 @@ export default {
185
187
  .header__container{
186
188
  display: flex;
187
189
  align-items: center;
190
+ justify-content: space-between;
188
191
  .header{
189
192
  padding: 10px;
190
193
  font-weight: 500;
@@ -292,6 +295,7 @@ export default {
292
295
  .header__container{
293
296
  display: flex;
294
297
  align-items: center;
298
+ justify-content: space-between;
295
299
  .header{
296
300
  padding: 10px;
297
301
  font-weight: 500;
package/components/MyTransactions/tabs/ToPickedTab.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Pickup Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
 
11
12
  <div class="shipping-details" v-if="list.orders.merchant_details.pickup_address">
@@ -102,6 +103,7 @@
102
103
  <div class="shipping-address">
103
104
  <div class="header__container">
104
105
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
106
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
105
107
  </div>
106
108
 
107
109
  <div class="shipping-details" v-if="list.shipping_address">
@@ -234,6 +236,7 @@ export default {
234
236
  .header__container{
235
237
  display: flex;
236
238
  align-items: center;
239
+ justify-content: space-between;
237
240
  .header{
238
241
  padding: 10px;
239
242
  font-weight: 500;
@@ -373,6 +376,7 @@ export default {
373
376
  .header__container{
374
377
  display: flex;
375
378
  align-items: center;
379
+ justify-content: space-between;
376
380
  .header{
377
381
  padding: 10px;
378
382
  font-weight: 500;
package/components/MyTransactions/tabs/ToShipTab.vue CHANGED
@@ -6,6 +6,7 @@
6
6
  <div class="shipping-address">
7
7
  <div class="header__container">
8
8
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
9
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
9
10
  </div>
10
11
  <div class="shipping-details" v-if="list.shipping_address">
11
12
  <div class="shipping-grid">
@@ -94,6 +95,7 @@
94
95
  <div class="shipping-address">
95
96
  <div class="header__container">
96
97
  <div class="header"><q-icon name="fas fa-map-marker-alt"></q-icon>Delivery Address </div>
98
+ <div class="header"><q-icon name="fas fa-calendar"></q-icon> {{ $_formatDate(list.created_date, 'MM/DD/YY (hh:mm A)') }}</div>
97
99
  </div>
98
100
 
99
101
  <div class="shipping-details" v-if="list.shipping_address">
@@ -216,6 +218,7 @@ export default {
216
218
  .header__container{
217
219
  display: flex;
218
220
  align-items: center;
221
+ justify-content: space-between;
219
222
  .header{
220
223
  padding: 10px;
221
224
  font-weight: 500;
@@ -324,6 +327,7 @@ export default {
324
327
  .header__container{
325
328
  display: flex;
326
329
  align-items: center;
330
+ justify-content: space-between;
327
331
  .header{
328
332
  padding: 10px;
329
333
  font-weight: 500;
package/models/DB_MERCHANT_FRONT.js ADDED
@@ -0,0 +1,9 @@
1
+ import MODEL from './MODEL';
2
+
3
+ export default class DB_FRONT_MERCHANT extends MODEL
4
+ {
5
+ constructor()
6
+ {
7
+ super('merchant_front');
8
+ }
9
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geer-builder",
3
- "version": "1.2.477",
3
+ "version": "1.2.481",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {