geer-builder 1.2.591 → 1.2.594
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 +4 -2
- package/GDirectDownlineWidget.vue +0 -4
- package/GLogin.vue +1 -1
- package/components/GProfile.vue +25 -12
- package/package.json +1 -1
package/GCheckout.vue
CHANGED
|
@@ -1452,7 +1452,7 @@ export default {
|
|
|
1452
1452
|
total_item_length += ((Number(pro.product.delivery_settings.length)*2.54)*Number(pro.quantity));
|
|
1453
1453
|
total_item_height += ((Number(pro.product.delivery_settings.height)*2.54)*Number(pro.quantity));
|
|
1454
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));
|
|
1455
|
+
total_item_price += ((Number(pro.selling_price)*Number(pro.quantity)));
|
|
1456
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
1457
|
});
|
|
1458
1458
|
total_item_width = Number(total_item_width.toFixed(2));
|
|
@@ -1486,18 +1486,21 @@ export default {
|
|
|
1486
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
1487
|
{
|
|
1488
1488
|
shipping_fee = this.$_formatNumber(small_pouch.shipping_fee, { decimal: 2});
|
|
1489
|
+
shipping_fee = Number(shipping_fee);
|
|
1489
1490
|
console.log(shipping_fee, 'shipping_fee');
|
|
1490
1491
|
packaging = "Small Pouch"
|
|
1491
1492
|
}
|
|
1492
1493
|
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
|
{
|
|
1494
1495
|
shipping_fee = this.$_formatNumber(medium_pouch.shipping_fee, { decimal: 2});
|
|
1496
|
+
shipping_fee = Number(shipping_fee);
|
|
1495
1497
|
console.log(shipping_fee, 'shipping_fee');
|
|
1496
1498
|
packaging = "Medium Pouch"
|
|
1497
1499
|
}
|
|
1498
1500
|
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
1501
|
{
|
|
1500
1502
|
shipping_fee = this.$_formatNumber(large_pouch.shipping_fee, { decimal: 2});
|
|
1503
|
+
shipping_fee = Number(shipping_fee);
|
|
1501
1504
|
console.log(shipping_fee, 'shipping_fee');
|
|
1502
1505
|
packaging = "Large Pouch"
|
|
1503
1506
|
}
|
|
@@ -1543,7 +1546,6 @@ export default {
|
|
|
1543
1546
|
// shipping_fee = Number(Number(shipping_fee).toFixed(2));
|
|
1544
1547
|
// }
|
|
1545
1548
|
|
|
1546
|
-
|
|
1547
1549
|
orders.shipping_fee = shipping_fee;
|
|
1548
1550
|
// this.checkout_info.shipping_total = 0;
|
|
1549
1551
|
if(this.payment_method.payment_method_id == "gc_points")
|
|
@@ -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/components/GProfile.vue
CHANGED
|
@@ -3,19 +3,24 @@
|
|
|
3
3
|
<g-card :mode="mode">
|
|
4
4
|
<div @click="$emit('closePopup')" class="profile" v-if="!hide_banner">
|
|
5
5
|
<div class="image">
|
|
6
|
-
<div
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
<q-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
6
|
+
<div class="profile-pic-holder" v-if="!hide_picture">
|
|
7
|
+
<div class="bg-image" :style="`background-image: url('${prop_user_info.hasOwnProperty('profile_picture') ? prop_user_info.profile_picture : default_profile_picture}')`"></div>
|
|
8
|
+
<div class="darkness"></div>
|
|
9
|
+
<q-avatar class="avatar" size="100px">
|
|
10
|
+
<q-img :src="prop_user_info.hasOwnProperty('profile_picture') ? prop_user_info.profile_picture : default_profile_picture"></q-img>
|
|
11
|
+
</q-avatar>
|
|
12
|
+
</div>
|
|
13
|
+
<div class="profile-details" v-if="profile_details">
|
|
14
|
+
<div class="total-earning-label">Total Earnings</div>
|
|
15
|
+
<div class="total-earning">{{$_formatNumber(slot_info.total_earned, { decimal: 2 })}}</div>
|
|
16
|
+
</div>
|
|
17
|
+
<div class="details" v-if="hide_name">
|
|
13
18
|
<div class="name">{{ prop_user_info.full_name }}</div>
|
|
14
19
|
<div class="email">{{ prop_user_info.email }}</div>
|
|
15
20
|
</div>
|
|
16
21
|
</div>
|
|
17
22
|
</div>
|
|
18
|
-
<div @click="$emit('closePopup')" class="pinfo">
|
|
23
|
+
<div @click="$emit('closePopup')" class="pinfo" :style="hide_rank ? 'grid-template-columns: 1fr 1fr 1fr 1fr;' : ''">
|
|
19
24
|
<div class="group">
|
|
20
25
|
<div class="val">{{ prop_user_info.slot_owned }}</div>
|
|
21
26
|
<div class="lab" v-if="is_company_ultrapro">Slot Count</div>
|
|
@@ -31,12 +36,12 @@
|
|
|
31
36
|
<div class="val">{{ prop_user_info.country_code }}</div>
|
|
32
37
|
<div class="lab">Country</div>
|
|
33
38
|
</div>
|
|
34
|
-
<div class="group" v-if="rank">
|
|
39
|
+
<div class="group" v-if="rank && !hide_rank">
|
|
35
40
|
<div class="val">{{ rank }}</div>
|
|
36
41
|
<div class="lab" v-if="is_company_ultrapro">Current Stairstep Rank</div>
|
|
37
42
|
<div class="lab" v-else>Rank</div>
|
|
38
43
|
</div>
|
|
39
|
-
<div class="group" v-if="membership">
|
|
44
|
+
<div class="group" v-if="membership && !hide_membership">
|
|
40
45
|
<div class="val">{{ membership }}</div>
|
|
41
46
|
<div class="lab" v-if="is_company_success">Type of Enrollment</div>
|
|
42
47
|
<div class="lab" v-else>Membership</div>
|
|
@@ -81,7 +86,7 @@ import DB_SLOT from '../models/DB_SLOT';
|
|
|
81
86
|
export default
|
|
82
87
|
{
|
|
83
88
|
mixins:[GlobalMixins],
|
|
84
|
-
props: ['prop_user_info', 'dialog','mode', 'create_slot','is_company_success', 'hide_banner', 'is_company_ultrapro'],
|
|
89
|
+
props: ['hide_name','profile_details','hide_picture','prop_user_info', 'dialog','mode', 'create_slot','is_company_success', 'hide_banner', 'is_company_ultrapro', 'hide_membership', 'hide_rank'],
|
|
85
90
|
components: { GCard, GCodeVault },
|
|
86
91
|
filters: { },
|
|
87
92
|
data:() =>
|
|
@@ -133,7 +138,15 @@ export default
|
|
|
133
138
|
grid-template-columns: 1fr 1fr;
|
|
134
139
|
border-top: 1px solid #eee;
|
|
135
140
|
}
|
|
136
|
-
|
|
141
|
+
.profile-details{
|
|
142
|
+
padding: 50px;
|
|
143
|
+
.total-earning-label{
|
|
144
|
+
font-size: 1rem;
|
|
145
|
+
}
|
|
146
|
+
.total-earning{
|
|
147
|
+
font-size: 2rem;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
137
150
|
.profile {
|
|
138
151
|
text-align: center;
|
|
139
152
|
position: relative;
|