geer-builder 1.2.826 → 1.2.828
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/GCodeVault.vue
CHANGED
|
@@ -82,7 +82,7 @@
|
|
|
82
82
|
</q-dialog>
|
|
83
83
|
|
|
84
84
|
<q-dialog :maximized="$q.platform.is.mobile" transition-show="slide-up" transition-hide="slide-down" v-model="is_open_add_slot_dialog">
|
|
85
|
-
<add-slot-dialog :is_heartzone="false" :is_enable_all_sponsor="enable_code_add_all_sponsor" :code="code" :lead_info="lead_info" @closeDialog="is_open_add_slot_dialog = false"></add-slot-dialog>
|
|
85
|
+
<add-slot-dialog :is_heartzone="false" :is_adspro="is_adspro" :is_enable_all_sponsor="enable_code_add_all_sponsor" :code="code" :lead_info="lead_info" @closeDialog="is_open_add_slot_dialog = false"></add-slot-dialog>
|
|
86
86
|
</q-dialog>
|
|
87
87
|
|
|
88
88
|
|
|
@@ -134,7 +134,8 @@ export default
|
|
|
134
134
|
{
|
|
135
135
|
enable_code_add_all_sponsor:Boolean,
|
|
136
136
|
lead_info:Object,
|
|
137
|
-
is_company_ultrapro:Boolean
|
|
137
|
+
is_company_ultrapro:Boolean,
|
|
138
|
+
is_adspro : Boolean
|
|
138
139
|
},
|
|
139
140
|
async mounted()
|
|
140
141
|
{
|
package/GMyPurchases.vue
CHANGED
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
</div>
|
|
22
22
|
</q-tab-panel>
|
|
23
23
|
<q-tab-panel class="tab-panel" name="to_pay">
|
|
24
|
-
<to-pay-tab @pay="openPaymentPage" :order_list="order_list"></to-pay-tab>
|
|
24
|
+
<to-pay-tab :hide_shipping="hide_shipping" @pay="openPaymentPage" :order_list="order_list"></to-pay-tab>
|
|
25
25
|
</q-tab-panel>
|
|
26
26
|
<q-tab-panel class="tab-panel bg-grey-2" name="cod_manual" >
|
|
27
27
|
<cod-manual :order_list="order_list"> </cod-manual>
|
|
@@ -76,6 +76,9 @@ export default {
|
|
|
76
76
|
cod_manual_count:0,
|
|
77
77
|
payment_method_list:[],
|
|
78
78
|
}),
|
|
79
|
+
props:{
|
|
80
|
+
hide_shipping : Boolean
|
|
81
|
+
},
|
|
79
82
|
watch:
|
|
80
83
|
{
|
|
81
84
|
order_list()
|
package/GRegistration.vue
CHANGED
|
@@ -149,14 +149,15 @@
|
|
|
149
149
|
</div>
|
|
150
150
|
|
|
151
151
|
<div class="buttons text-right" style="padding: 20px 20px 0 0">
|
|
152
|
-
<q-btn @click="termAgree()" color="primary" class="q-mr-sm">
|
|
153
|
-
<q-icon name="fa fa-check" size="14px" class="q-mr-sm"></q-icon>
|
|
154
|
-
I agree to the terms & Conditions
|
|
155
|
-
</q-btn>
|
|
156
152
|
<q-btn v-close-popup color="primary" class="q-mr-sm" outline>
|
|
157
153
|
<q-icon name="fa fa-times" size="14px" class="q-mr-sm"></q-icon>
|
|
158
154
|
close
|
|
159
155
|
</q-btn>
|
|
156
|
+
<q-btn @click="termAgree()" color="primary" class="q-mr-sm">
|
|
157
|
+
<q-icon name="fa fa-check" size="14px" class="q-mr-sm"></q-icon>
|
|
158
|
+
Agree
|
|
159
|
+
</q-btn>
|
|
160
|
+
|
|
160
161
|
</div>
|
|
161
162
|
</div>
|
|
162
163
|
</q-dialog>
|
|
Binary file
|
|
@@ -132,8 +132,8 @@
|
|
|
132
132
|
<!-- <div>Order Total ({{product_list[i].quantity}} Item): {{main_currency}} {{order_total}}</div> -->
|
|
133
133
|
<div>Status:</div>
|
|
134
134
|
<div class="order-items"> {{list.status == "to_pay" || list.status == "pre_processing" ? "Waiting for Payment" : "Waiting for platform to receive the payment"}}</div>
|
|
135
|
-
<div>Shipping Fee:</div>
|
|
136
|
-
<div class="order-items">{{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
|
|
135
|
+
<div v-if="!hide_shipping">Shipping Fee:</div>
|
|
136
|
+
<div v-if="!hide_shipping" class="order-items">{{main_currency}} {{$_formatNumber(list.orders.shipping_fee, { decimal: 2})}}</div>
|
|
137
137
|
<div v-if="public_settings.hasOwnProperty('custom_ecommerce_fee')">{{public_settings.custom_ecommerce_fee.label}}:</div>
|
|
138
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
139
|
<div>Order Total ({{list.orders.total_quantity}} Item):</div>
|
|
@@ -157,6 +157,7 @@ export default {
|
|
|
157
157
|
props:
|
|
158
158
|
[
|
|
159
159
|
'order_list',
|
|
160
|
+
'hide_shipping'
|
|
160
161
|
],
|
|
161
162
|
data: () =>
|
|
162
163
|
({
|
|
@@ -36,26 +36,31 @@
|
|
|
36
36
|
<div class="q-mt-sm">
|
|
37
37
|
<q-input :readonly="fixed_sponsor" v-model="field.sponsor" outlined :label="is_heartzone ? 'Enter Sponsor Slot Code' : 'Enter Sponsor'" stack-label></q-input>
|
|
38
38
|
</div>
|
|
39
|
-
<div class="instruction">If you will be the one who will we the owner of the new slot then please leave your e-mail in the field of
|
|
40
|
-
<q-btn @click="openDafaultSponsor()" v-if="field.sponsor == ''" unelevated class="full-width q-mt-sm" color="primary"><q-icon name="fa fa-check q-mr-sm" size="14px"></q-icon> Continue using default Sponsor</q-btn>
|
|
39
|
+
<div class="instruction">{{ is_adspro ? 'If you own the slot to be activated please leave it blank.' : 'If you will be the one who will we the owner of the new slot then please leave your e-mail in the field of Email for Slot Owner' }}</div>
|
|
40
|
+
<q-btn @click="openDafaultSponsor()" v-if="field.sponsor == ''" unelevated class="full-width q-mt-sm" color="primary"><q-icon name="fa fa-check q-mr-sm" size="14px"></q-icon> {{ is_adspro ? 'Auto Select Sponsor' : 'Continue using default Sponsor' }}</q-btn>
|
|
41
41
|
<q-btn type="submit" v-else :loading="submit_loading" unelevated class="full-width q-mt-md" color="primary"><q-icon name="fa fa-check q-mr-sm" size="14px"></q-icon> Verify Sponsor</q-btn>
|
|
42
42
|
</q-form>
|
|
43
|
-
<q-btn v-if="!is_heartzone" @click="openRegistration()" outline class="full-width q-mt-sm" color="primary"><q-icon name="fa fa-smile-beam q-mr-sm" size="14px"></q-icon> Register a Friend</q-btn>
|
|
43
|
+
<q-btn v-if="!is_heartzone || !is_adspro" @click="openRegistration()" outline class="full-width q-mt-sm" color="primary"><q-icon name="fa fa-smile-beam q-mr-sm" size="14px"></q-icon> Register a Friend</q-btn>
|
|
44
44
|
</q-step>
|
|
45
45
|
|
|
46
46
|
<q-step :color="is_heartzone ? 'white' : ''" :name="3" :title="is_heartzone ? '' : 'Verify All Details' " icon="assignment" :done="step > 3">
|
|
47
47
|
<div v-if="sponsor_info && code_info && owner_info" class="add-slot__verify-details">
|
|
48
48
|
<div class="title">Review Your Details</div>
|
|
49
49
|
<div class="breakdowns">
|
|
50
|
-
<div class="breakdown-label">Owner After Creation</div>
|
|
50
|
+
<div class="breakdown-label">{{ is_adspro ? 'Subscription Owner' : 'Owner After Creation' }}</div>
|
|
51
51
|
<div class="breakdown-value">{{ owner_info.full_name }}</div>
|
|
52
52
|
</div>
|
|
53
53
|
<div class="breakdowns">
|
|
54
|
-
<div class="breakdown-label">
|
|
54
|
+
<div class="breakdown-label">
|
|
55
|
+
{{ is_adspro ? 'Referrer Code' : 'Sponsor Code' }}
|
|
56
|
+
</div>
|
|
55
57
|
<div class="breakdown-value">{{ sponsor_info.slot_code }}</div>
|
|
56
58
|
</div>
|
|
57
59
|
<div class="breakdowns">
|
|
58
|
-
<div class="breakdown-label">
|
|
60
|
+
<div class="breakdown-label">
|
|
61
|
+
{{ is_adspro ? 'Referrer Name' : 'Sponsor Name' }}
|
|
62
|
+
|
|
63
|
+
</div>
|
|
59
64
|
<div class="breakdown-value">{{ sponsor_info.owner_info.full_name }}</div>
|
|
60
65
|
</div>
|
|
61
66
|
<div class="breakdowns">
|
|
@@ -67,11 +72,11 @@
|
|
|
67
72
|
<div class="breakdown-value">{{ code_info.data.pin }}</div>
|
|
68
73
|
</div>
|
|
69
74
|
<div class="breakdowns">
|
|
70
|
-
<div class="breakdown-label">Your Membership</div>
|
|
75
|
+
<div class="breakdown-label">{{ is_adspro ? 'Subscription' : 'Your Membership' }}</div>
|
|
71
76
|
<div class="breakdown-value">{{ code_info.data.membership.membership_name }}</div>
|
|
72
77
|
</div>
|
|
73
78
|
<div class="breakdowns">
|
|
74
|
-
<div class="breakdown-label">No. Of Slots</div>
|
|
79
|
+
<div class="breakdown-label">{{ is_adspro ? 'No. Of Subs' : 'No. Of Slots' }}</div>
|
|
75
80
|
<div class="breakdown-value">{{ code_info.data.slot_quantity }}</div>
|
|
76
81
|
</div>
|
|
77
82
|
</div>
|
|
@@ -82,12 +87,12 @@
|
|
|
82
87
|
<q-step :color="is_heartzone ? 'white' : ''" :name="4" :title="is_heartzone ? '' : 'Transaction Complete' " icon="star">
|
|
83
88
|
<div class="add-slot__complete text-center">
|
|
84
89
|
<div>
|
|
85
|
-
<q-img spinner-size="0" style="width: 120px; height: 120px"
|
|
90
|
+
<q-img spinner-size="0" style="width: 120px; height: 120px" src="../assets/statics/check.png"></q-img>
|
|
86
91
|
</div>
|
|
87
92
|
<div><b>Congratulations!</b></div>
|
|
88
|
-
<div class="q-pt-sm q-mr-lg q-ml-lg">Your slot has been successfully created
|
|
93
|
+
<div class="q-pt-sm q-mr-lg q-ml-lg">{{ is_adspro ? 'Your subscription has been successfully created!' : 'Your slot has been successfully created!' }}</div>
|
|
89
94
|
</div>
|
|
90
|
-
<q-btn v-close-popup type="button" :loading="submit_loading" unelevated class="full-width q-mt-md" color="primary" @click="$emit('closeTransactionComplete')"><q-icon name="fa fa-check q-mr-sm" size="14px"></q-icon> Transaction Complete</q-btn>
|
|
95
|
+
<q-btn v-close-popup type="button" :loading="submit_loading" unelevated class="full-width q-mt-md" color="primary" @click="$emit('closeTransactionComplete')"><q-icon name="fa fa-check q-mr-sm" size="14px"></q-icon> {{ is_adspro ? 'Subscription' : 'Transaction' }} Complete</q-btn>
|
|
91
96
|
</q-step>
|
|
92
97
|
</q-stepper>
|
|
93
98
|
<q-dialog v-model="is_open_registration_dialog_open">
|
|
@@ -147,6 +152,10 @@ export default
|
|
|
147
152
|
sponsor: "",
|
|
148
153
|
owner_email: "",
|
|
149
154
|
},
|
|
155
|
+
step1_title : 'Enter Your Code and Pin',
|
|
156
|
+
step2_title : 'Enter Slot Code of Sponsor and Email of Owner',
|
|
157
|
+
step3_title : 'Verify All Details',
|
|
158
|
+
step4_title : 'Transaction Complete',
|
|
150
159
|
fixed_sponsor: false,
|
|
151
160
|
code_info: null,
|
|
152
161
|
sponsor_info: null,
|
|
@@ -159,6 +168,7 @@ export default
|
|
|
159
168
|
props:
|
|
160
169
|
{
|
|
161
170
|
is_heartzone: Boolean,
|
|
171
|
+
is_adspro : Boolean,
|
|
162
172
|
is_enable_all_sponsor: Boolean,
|
|
163
173
|
is_show: Boolean,
|
|
164
174
|
code: Object,
|
|
@@ -203,9 +213,29 @@ export default
|
|
|
203
213
|
|
|
204
214
|
}
|
|
205
215
|
this.checkFixSponsor();
|
|
216
|
+
|
|
217
|
+
this.updateTitles();
|
|
206
218
|
},
|
|
207
219
|
methods:
|
|
208
220
|
{
|
|
221
|
+
updateTitles()
|
|
222
|
+
{
|
|
223
|
+
if(this.is_heartzone)
|
|
224
|
+
{
|
|
225
|
+
this.step1_title = '';
|
|
226
|
+
this.step2_title = '';
|
|
227
|
+
this.step3_title = '';
|
|
228
|
+
this.step4_title = '';
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
if(this.is_adspro)
|
|
232
|
+
{
|
|
233
|
+
this.step1_title = 'Please Enter Activation';
|
|
234
|
+
this.step2_title = 'Enter Referrer Details';
|
|
235
|
+
this.step3_title = 'Confirm Summary';
|
|
236
|
+
this.step4_title = '';
|
|
237
|
+
}
|
|
238
|
+
},
|
|
209
239
|
useDefaultSponsor(){
|
|
210
240
|
if(this.public_settings.hasOwnProperty('no_sponsor'))
|
|
211
241
|
{
|