geer-builder 1.2.589 → 1.2.592
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/GCheckout.vue +161 -0
- package/GDirectDownlineWidget.vue +0 -4
- package/GLogin.vue +1 -1
- package/GSlotWallet.vue +11 -9
- package/components/ApplyMerchant/ApplyMerchantDialog.vue +11 -3
- package/components/GProfile.vue +3 -3
- package/package.json +1 -1
package/GCheckout.vue
CHANGED
|
@@ -1408,6 +1408,167 @@ export default {
|
|
|
1408
1408
|
// console.log(Number(shipping_fee))
|
|
1409
1409
|
console.log(packaging)
|
|
1410
1410
|
}
|
|
1411
|
+
else if(orders.courier_chosen == "Manual Shipping")
|
|
1412
|
+
{
|
|
1413
|
+
let total_item_width = 0;
|
|
1414
|
+
let total_item_length = 0;
|
|
1415
|
+
let total_item_height = 0;
|
|
1416
|
+
let total_item_weight = 0;
|
|
1417
|
+
let total_item_price = 0;
|
|
1418
|
+
let total_item_volume_weight = 0;
|
|
1419
|
+
let shipping_fee = 0;
|
|
1420
|
+
let packaging = '';
|
|
1421
|
+
let origin_region = "";
|
|
1422
|
+
if(orders.merchant_details.pickup_address.region.hasOwnProperty('name'))
|
|
1423
|
+
origin_region = orders.merchant_details.pickup_address.region.reg_code;
|
|
1424
|
+
else
|
|
1425
|
+
origin_region = orders.merchant_details.pickup_address.region.region_id == "north_luzon" || orders.merchant_details.pickup_address.region.region_id == "south_luzon" ? "luzon" : orders.merchant_details.pickup_address.region.region_id;
|
|
1426
|
+
|
|
1427
|
+
|
|
1428
|
+
let destination_choice = "";
|
|
1429
|
+
if(this.shipping_address.region.hasOwnProperty('name'))
|
|
1430
|
+
destination_choice = this.shipping_address.region.reg_code;
|
|
1431
|
+
else
|
|
1432
|
+
destination_choice = this.shipping_address.region.region_id == "north_luzon" || this.shipping_address.region.region_id == "south_luzon" ? "luzon" : this.shipping_address.region.region_id;
|
|
1433
|
+
|
|
1434
|
+
let courier_index = this.courier_settings.courier_list.map(function(e) { return e.courier_label; }).indexOf(orders.courier_chosen);
|
|
1435
|
+
if(courier_index>=0)
|
|
1436
|
+
{
|
|
1437
|
+
let origin_index = "";
|
|
1438
|
+
if(orders.merchant_details.pickup_address.region.hasOwnProperty('name'))
|
|
1439
|
+
origin_index = this.courier_settings.courier_list[courier_index].rate.findIndex(x => x.reg_code.includes(origin_region));
|
|
1440
|
+
else
|
|
1441
|
+
origin_index = this.courier_settings.courier_list[courier_index].rate.map(function(e) { return e.origin; }).indexOf(origin_region);
|
|
1442
|
+
if(origin_index>=0)
|
|
1443
|
+
{
|
|
1444
|
+
let destination_index=""
|
|
1445
|
+
if(this.shipping_address.region.hasOwnProperty('name'))
|
|
1446
|
+
destination_index = this.courier_settings.courier_list[courier_index].rate[origin_index].shipping_rates.findIndex(x => x.reg_code.includes(destination_choice));
|
|
1447
|
+
else
|
|
1448
|
+
destination_index = this.courier_settings.courier_list[courier_index].rate[origin_index].shipping_rates.map(function(e) { return e.destination_id; }).indexOf(destination_choice);
|
|
1449
|
+
|
|
1450
|
+
orders.products.forEach(pro => {
|
|
1451
|
+
total_item_width += ((Number(pro.product.delivery_settings.width)*2.54)*Number(pro.quantity));
|
|
1452
|
+
total_item_length += ((Number(pro.product.delivery_settings.length)*2.54)*Number(pro.quantity));
|
|
1453
|
+
total_item_height += ((Number(pro.product.delivery_settings.height)*2.54)*Number(pro.quantity));
|
|
1454
|
+
total_item_weight += ((Number(pro.product.delivery_settings.weight)/1000)*Number(pro.quantity));
|
|
1455
|
+
total_item_price += (Number(pro.selling_price)*Number(pro.quantity));
|
|
1456
|
+
total_item_volume_weight += Number((((Number(pro.product.delivery_settings.width)*2.54) * (Number(pro.product.delivery_settings.length)*2.54) * (Number(pro.product.delivery_settings.height)*2.54))*pro.quantity).toFixed());
|
|
1457
|
+
});
|
|
1458
|
+
total_item_width = Number(total_item_width.toFixed(2));
|
|
1459
|
+
total_item_length = Number(total_item_length.toFixed(2));
|
|
1460
|
+
total_item_height = Number(total_item_height.toFixed(2));
|
|
1461
|
+
total_item_price = Number(total_item_price.toFixed(2));
|
|
1462
|
+
|
|
1463
|
+
console.log(total_item_width, 'total_item_width');
|
|
1464
|
+
console.log(total_item_length, 'total_item_length');
|
|
1465
|
+
console.log(total_item_height, 'total_item_height');
|
|
1466
|
+
console.log(total_item_price, 'total_item_price');
|
|
1467
|
+
|
|
1468
|
+
if(destination_index>=0)
|
|
1469
|
+
{
|
|
1470
|
+
/*----------small and large*/
|
|
1471
|
+
let small_pouch = this.courier_settings.courier_list[courier_index].rate[origin_index].shipping_rates[destination_index].small_pouch;
|
|
1472
|
+
let medium_pouch = this.courier_settings.courier_list[courier_index].rate[origin_index].shipping_rates[destination_index].medium_pouch;
|
|
1473
|
+
let large_pouch = this.courier_settings.courier_list[courier_index].rate[origin_index].shipping_rates[destination_index].large_pouch;
|
|
1474
|
+
|
|
1475
|
+
/*-------------------------------------- */
|
|
1476
|
+
let own_packaging = this.courier_settings.courier_list[courier_index].rate[origin_index].shipping_rates[destination_index].own_packaging;
|
|
1477
|
+
// let item_total_volume = Number((this.width * this.length * this.height).toFixed());
|
|
1478
|
+
// item_total_volume = item_total_volume * this.quantity;
|
|
1479
|
+
|
|
1480
|
+
let volume_weight = Number((total_item_volume_weight/3500).toFixed(2));
|
|
1481
|
+
volume_weight = Math.ceil(volume_weight);
|
|
1482
|
+
let kg_weight = total_item_weight;
|
|
1483
|
+
if(volume_weight>kg_weight) kg_weight = volume_weight;
|
|
1484
|
+
else kg_weight = kg_weight;
|
|
1485
|
+
|
|
1486
|
+
if(total_item_width <= small_pouch.width && total_item_length <= small_pouch.length && total_item_height <= small_pouch.height && total_item_weight <= small_pouch.max_kg)
|
|
1487
|
+
{
|
|
1488
|
+
shipping_fee = this.$_formatNumber(small_pouch.shipping_fee, { decimal: 2});
|
|
1489
|
+
console.log(shipping_fee, 'shipping_fee');
|
|
1490
|
+
packaging = "Small Pouch"
|
|
1491
|
+
}
|
|
1492
|
+
else if(total_item_width <= medium_pouch.width && total_item_length <= medium_pouch.length && total_item_height <= medium_pouch.height && total_item_weight <= medium_pouch.max_kg)
|
|
1493
|
+
{
|
|
1494
|
+
shipping_fee = this.$_formatNumber(medium_pouch.shipping_fee, { decimal: 2});
|
|
1495
|
+
console.log(shipping_fee, 'shipping_fee');
|
|
1496
|
+
packaging = "Medium Pouch"
|
|
1497
|
+
}
|
|
1498
|
+
else if(total_item_width <= large_pouch.width && total_item_length <= large_pouch.length && total_item_height <= large_pouch.height && total_item_weight <= large_pouch.max_kg)
|
|
1499
|
+
{
|
|
1500
|
+
shipping_fee = this.$_formatNumber(large_pouch.shipping_fee, { decimal: 2});
|
|
1501
|
+
console.log(shipping_fee, 'shipping_fee');
|
|
1502
|
+
packaging = "Large Pouch"
|
|
1503
|
+
}
|
|
1504
|
+
else
|
|
1505
|
+
{
|
|
1506
|
+
let kg_exceed = 0;
|
|
1507
|
+
let total_exceed_price = 0;
|
|
1508
|
+
if(kg_weight > own_packaging.max_kg)
|
|
1509
|
+
{
|
|
1510
|
+
kg_exceed = kg_weight - own_packaging.max_kg;
|
|
1511
|
+
shipping_fee = own_packaging.shipping_fee;
|
|
1512
|
+
kg_exceed = Math.ceil(kg_exceed);
|
|
1513
|
+
total_exceed_price = kg_exceed*own_packaging.exceeding_kg_fee;
|
|
1514
|
+
|
|
1515
|
+
shipping_fee += total_exceed_price;
|
|
1516
|
+
// shipping_fee = this.$_formatNumber(shipping_fee, { decimal: 2});
|
|
1517
|
+
shipping_fee = shipping_fee.toFixed(2);
|
|
1518
|
+
}
|
|
1519
|
+
else
|
|
1520
|
+
{
|
|
1521
|
+
shipping_fee = own_packaging.shipping_fee;
|
|
1522
|
+
// shipping_fee = this.$_formatNumber(shipping_fee, { decimal: 2});
|
|
1523
|
+
shipping_fee = Number(shipping_fee.toFixed(2));
|
|
1524
|
+
|
|
1525
|
+
}
|
|
1526
|
+
packaging = "Own Packaging";
|
|
1527
|
+
}
|
|
1528
|
+
}
|
|
1529
|
+
}
|
|
1530
|
+
else
|
|
1531
|
+
{
|
|
1532
|
+
shipping_fee =0;
|
|
1533
|
+
}
|
|
1534
|
+
}
|
|
1535
|
+
|
|
1536
|
+
//shipping fee vat
|
|
1537
|
+
// if(shipping_fee>0)
|
|
1538
|
+
// {
|
|
1539
|
+
// shipping_fee = Number(shipping_fee)
|
|
1540
|
+
// let vat = Number(total_item_price)*Number(0.01);
|
|
1541
|
+
// shipping_fee = Number(shipping_fee) + vat;
|
|
1542
|
+
// shipping_fee = shipping_fee+(shipping_fee*0.12);
|
|
1543
|
+
// shipping_fee = Number(Number(shipping_fee).toFixed(2));
|
|
1544
|
+
// }
|
|
1545
|
+
|
|
1546
|
+
|
|
1547
|
+
orders.shipping_fee = shipping_fee;
|
|
1548
|
+
// this.checkout_info.shipping_total = 0;
|
|
1549
|
+
if(this.payment_method.payment_method_id == "gc_points")
|
|
1550
|
+
{
|
|
1551
|
+
shipping_fee = 0;
|
|
1552
|
+
orders.shipping_fee = 0;
|
|
1553
|
+
// per_kg_exceeded=0;
|
|
1554
|
+
}
|
|
1555
|
+
orders.order_total = 0;
|
|
1556
|
+
orders.order_sub_total = 0;
|
|
1557
|
+
orders.products.forEach(product => {
|
|
1558
|
+
orders.order_total += product.item_total;
|
|
1559
|
+
orders.order_sub_total += product.item_total;
|
|
1560
|
+
// orders.order_total += orders.shipping_fee;
|
|
1561
|
+
});
|
|
1562
|
+
// this.checkout_info.shipping_total = this.checkout_info.shipping_total + orders.shipping_fee;
|
|
1563
|
+
merchandise_subtotal += orders.order_total;
|
|
1564
|
+
orders.order_total += orders.shipping_fee;
|
|
1565
|
+
shipping_total += orders.shipping_fee;
|
|
1566
|
+
// this.checkout_info.grand_total = shipping_total + merchandise_subtotal;
|
|
1567
|
+
// this.checkout_info.sub_total = merchandise_subtotal;
|
|
1568
|
+
// this.checkout_info.shipping_total = shipping_total;
|
|
1569
|
+
// console.log(Number(shipping_fee))
|
|
1570
|
+
console.log(packaging)
|
|
1571
|
+
}
|
|
1411
1572
|
else if(orders.courier_chosen == "Branch Pickup")
|
|
1412
1573
|
{
|
|
1413
1574
|
let shipping_fee = 0;
|
|
@@ -46,10 +46,6 @@
|
|
|
46
46
|
<q-icon name="fa fa-calendar" size="14px" class="q-mr-sm" ></q-icon>
|
|
47
47
|
<div>Unilevel Breakdown</div>
|
|
48
48
|
</q-btn>
|
|
49
|
-
<q-btn color="primary" unelevated v-if="show_unilevel_breakdown" @click="is_repeat_sale_dialog_open = true" style="margin:2px auto; width:75%;">
|
|
50
|
-
<q-icon name="fa fa-calendar" size="14px" class="q-mr-sm" ></q-icon>
|
|
51
|
-
<div>Unilevel Breakdown</div>
|
|
52
|
-
</q-btn>
|
|
53
49
|
<q-btn v-close-popup color="primary" @click="direct()" style="margin:2px auto; width:75%;">
|
|
54
50
|
<q-icon name="fa fa-user" size="14px" class="q-mr-sm"></q-icon>
|
|
55
51
|
<div v-if="is_company_success">Direct Enrollees List</div>
|
package/GLogin.vue
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<div class="g-login">
|
|
3
3
|
<q-form @submit="submitLogin()">
|
|
4
4
|
<div class="g-login__fields">
|
|
5
|
-
<div class="label"> {{mbot ? 'Emails Address':'Emails Address
|
|
5
|
+
<div class="label"> {{mbot ? 'Emails Address':'Emails Address'}}</div>
|
|
6
6
|
<div class="input">
|
|
7
7
|
<q-input :disable="is_submitting" v-model="form_data.email" dense placeholder="Enter Email" class="input input-email" outlined stack-label/>
|
|
8
8
|
</div>
|
package/GSlotWallet.vue
CHANGED
|
@@ -60,15 +60,17 @@
|
|
|
60
60
|
</q-btn>
|
|
61
61
|
</div>
|
|
62
62
|
</div>
|
|
63
|
-
|
|
64
|
-
<div class="setion-holder">
|
|
65
|
-
<
|
|
66
|
-
<
|
|
67
|
-
<
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
63
|
+
|
|
64
|
+
<div class="setion-holder points-holder">
|
|
65
|
+
<div class="button-holder">
|
|
66
|
+
<q-btn size="12px" class="full-width q-pa-sm text-primary" flat v-if="show_points_history == true" @click="is_points_logs_dialog_open=true;">
|
|
67
|
+
<div class="icon-holder" v-if="!is_company_ultrapro">
|
|
68
|
+
<q-icon class="q-mr-sm" name="fas fa-wallet" size="16px"></q-icon>
|
|
69
|
+
</div>
|
|
70
|
+
<div v-if="is_company_ultrapro">Points History</div>
|
|
71
|
+
<div v-else>Points Logs</div>
|
|
72
|
+
</q-btn>
|
|
73
|
+
</div>
|
|
72
74
|
</div>
|
|
73
75
|
|
|
74
76
|
<div class="section-holder" v-if="temp_wallet">
|
|
@@ -14,6 +14,9 @@
|
|
|
14
14
|
<div>
|
|
15
15
|
<b>Merchant Details:</b>
|
|
16
16
|
</div>
|
|
17
|
+
<div class="q-mt-sm">
|
|
18
|
+
<q-input v-model="merchant_details.email" dense outlined label="Business Email *"></q-input>
|
|
19
|
+
</div>
|
|
17
20
|
<div class="q-mt-sm">
|
|
18
21
|
<q-input v-model="merchant_details.business_name" @input="autoCompleteTesting" dense outlined label="Business Name *"></q-input>
|
|
19
22
|
</div>
|
|
@@ -86,6 +89,7 @@ export default {
|
|
|
86
89
|
slot_code: '',
|
|
87
90
|
},
|
|
88
91
|
merchant_details: {
|
|
92
|
+
email:"",
|
|
89
93
|
business_name: "",
|
|
90
94
|
business_address: "",
|
|
91
95
|
business_contact_number: "",
|
|
@@ -129,9 +133,13 @@ export default {
|
|
|
129
133
|
},
|
|
130
134
|
methods: {
|
|
131
135
|
async registerAsMerchant() {
|
|
132
|
-
if(this.merchant_details.
|
|
136
|
+
if(this.merchant_details.email.length<=3)
|
|
137
|
+
{
|
|
138
|
+
this.$q.dialog({ title: 'An Error Has Occured', message: "Invalid Business Email!" });
|
|
139
|
+
}
|
|
140
|
+
else if(this.merchant_details.email.length<=3)
|
|
133
141
|
{
|
|
134
|
-
this.$q.dialog({ title: 'An Error Has Occured', message: "Invalid Business
|
|
142
|
+
this.$q.dialog({ title: 'An Error Has Occured', message: "Invalid Business Email!" });
|
|
135
143
|
}
|
|
136
144
|
else if(this.merchant_details.business_address<=3)
|
|
137
145
|
{
|
|
@@ -179,7 +187,7 @@ export default {
|
|
|
179
187
|
{
|
|
180
188
|
this.$q.loading.show();
|
|
181
189
|
this.merchant_details.pickup_address = this.pickup_address_details;
|
|
182
|
-
this.merchant_details.email = this.user_info.email? this.user_info.email : '';
|
|
190
|
+
// this.merchant_details.email = this.user_info.email? this.user_info.email : '';
|
|
183
191
|
if( this.public_settings && this.public_settings.apply_merchant_custom_fields && this.public_settings.apply_merchant_custom_fields.length <= 0 || this.public_settings && !this.public_settings.apply_merchant_custom_fields)
|
|
184
192
|
{
|
|
185
193
|
delete this.merchant_details.additional_details;
|
package/components/GProfile.vue
CHANGED
|
@@ -31,12 +31,12 @@
|
|
|
31
31
|
<div class="val">{{ prop_user_info.country_code }}</div>
|
|
32
32
|
<div class="lab">Country</div>
|
|
33
33
|
</div>
|
|
34
|
-
<div class="group" v-if="rank">
|
|
34
|
+
<div class="group" v-if="rank && !hide_rank">
|
|
35
35
|
<div class="val">{{ rank }}</div>
|
|
36
36
|
<div class="lab" v-if="is_company_ultrapro">Current Stairstep Rank</div>
|
|
37
37
|
<div class="lab" v-else>Rank</div>
|
|
38
38
|
</div>
|
|
39
|
-
<div class="group" v-if="membership">
|
|
39
|
+
<div class="group" v-if="membership && !hide_membership">
|
|
40
40
|
<div class="val">{{ membership }}</div>
|
|
41
41
|
<div class="lab" v-if="is_company_success">Type of Enrollment</div>
|
|
42
42
|
<div class="lab" v-else>Membership</div>
|
|
@@ -81,7 +81,7 @@ import DB_SLOT from '../models/DB_SLOT';
|
|
|
81
81
|
export default
|
|
82
82
|
{
|
|
83
83
|
mixins:[GlobalMixins],
|
|
84
|
-
props: ['prop_user_info', 'dialog','mode', 'create_slot','is_company_success', 'hide_banner', 'is_company_ultrapro'],
|
|
84
|
+
props: ['prop_user_info', 'dialog','mode', 'create_slot','is_company_success', 'hide_banner', 'is_company_ultrapro', 'hide_membership', 'hide_rank'],
|
|
85
85
|
components: { GCard, GCodeVault },
|
|
86
86
|
filters: { },
|
|
87
87
|
data:() =>
|