geer-builder 1.2.739 → 1.2.741

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.
@@ -66,6 +66,8 @@ export default {
66
66
  }),
67
67
  async mounted()
68
68
  {
69
+ // let test = this.$router;
70
+ // console.log(test);
69
71
  await this.$_getSlotInfo();
70
72
  if(this.current_slot_info)
71
73
  this.slot_code=this.current_slot_info.slot_code
@@ -110,6 +112,16 @@ export default {
110
112
  sessionStorage.removeItem("order_id");
111
113
  this.order_id = "";
112
114
  this.$q.loading.hide();
115
+
116
+ this.settings = await this.$_getData('public_settings');
117
+ if(this.settings.hasOwnProperty("after_submit_pof_routes"))
118
+ {
119
+ this.$router.push({ name: this.settings.after_submit_pof_routes });
120
+ }
121
+ else
122
+ {
123
+ this.$router.push({ name: "my_purchases" });
124
+ }
113
125
  }
114
126
  catch(error)
115
127
  {
package/GRegistration.vue CHANGED
@@ -2,6 +2,20 @@
2
2
  <div class="g-registration">
3
3
  <q-form @submit="submitCreateAccount()">
4
4
 
5
+ <!-- full name -->
6
+ <div class="g-registration__fields" style="margin-bottom:100px;" v-if="sponsor_full_name">
7
+ <div class="label" style="margin-bottom:15px;">Sponsor Details</div>
8
+
9
+ <div class="label">Slot code</div>
10
+ <div class="input">
11
+ <q-input readonly v-model="form_data.sponsor" dense placeholder="" outlined stack-label/>
12
+ </div>
13
+ <div class="label">Name</div>
14
+ <div class="input">
15
+ <q-input readonly v-model="sponsor_full_name" dense placeholder="" outlined stack-label/>
16
+ </div>
17
+ </div>
18
+
5
19
  <!-- full name -->
6
20
  <div class="g-registration__fields">
7
21
  <div class="label">Full Name *</div>
@@ -101,10 +115,10 @@
101
115
  </div>
102
116
 
103
117
  <!-- create account -->
118
+ <div v-if="!mbot" class="term"><q-checkbox v-model="val" /> <span @click="is_term_and_condition_open =true" class="term_span"> By clicking sign-up, I have read and I agree to the Company Policies, Terms and Conditions, Rules and Regulation, Code of Conduct And Ethical Standards and the Privacy Policy</span></div>
104
119
  <div class="g-registration__fields q-mt-md">
105
120
  <q-btn :loading="is_submitting" unelevated class="full-width" color="primary" type="submit"> {{mbot ? 'Register' : 'Sign Up'}}</q-btn>
106
121
  </div>
107
- <div v-if="!mbot" class="term"><q-checkbox v-model="val" /> <span @click="is_term_and_condition_open =true" class="term_span"> By clicking sign-up, I have read and I agree to the Company Policies, Terms and Conditions, Rules and Regulation, Code of Conduct And Ethical Standards and the Privacy Policy</span></div>
108
122
  <!--
109
123
  <div class="social-holder">
110
124
  <div class="social-title">
@@ -185,7 +199,8 @@ export default
185
199
  region_list : [],
186
200
  international_country:false,
187
201
  showPassword: false,
188
- showPasswordConfirm: false
202
+ showPasswordConfirm: false,
203
+ sponsor_full_name: null
189
204
  }),
190
205
  async mounted()
191
206
  {
@@ -214,8 +229,23 @@ export default
214
229
  this.international_country= true;
215
230
  }
216
231
 
232
+ if(!this.form_data.sponsor && this.terms_and_conditions.hasOwnProperty('registration_sponsor') && this.terms_and_conditions.registration_sponsor.active && this.is_heartzone)
233
+ {
234
+ if(this.terms_and_conditions.registration_sponsor.default_sponsor)
235
+ {
236
+ this.form_data.sponsor = this.terms_and_conditions.registration_sponsor.default_sponsor ? this.terms_and_conditions.registration_sponsor.default_sponsor : null;
237
+ }
238
+ }
239
+
240
+ if(this.form_data.sponsor && this.is_heartzone)
241
+ {
242
+ let callbackgetName = await this.$_fbCall('frontGetSponsorName', this.form_data);
243
+ this.sponsor_full_name = callbackgetName.data;
244
+ }
245
+
217
246
  },
218
247
  props:{
248
+ is_heartzone : Boolean,
219
249
  friend_sponsor : Boolean,
220
250
  active_slot: String,
221
251
  mbot:Boolean,
@@ -265,7 +295,6 @@ export default
265
295
  throw new Error('Password confirmation does not match. Please try again.');
266
296
  }
267
297
 
268
- console.log(this.form_data);
269
298
  let callbackCreateAccount = await this.$_fbCall('frontRegistration', this.form_data);
270
299
  this.$emit('success', this.form_data);
271
300
  this.is_submitting = false;
@@ -19,7 +19,7 @@
19
19
  <div class="btn">
20
20
  <q-btn @click="$router.push({ name: 'front_registration', query: { sponsor: slot_info.slot_code } })" color="primary" unelevated>CLICK HERE TO JOIN NOW!</q-btn>
21
21
  </div>
22
- <div class="invitation text-primary">You were invited by<br><b>{{ slot_info.owner_info.full_name }}</b></div>
22
+ <div class="invitation text-primary">You are invited by<br><b>{{ slot_info.owner_info.full_name }}</b></div>
23
23
 
24
24
  <div class="invitation"></div>
25
25
  </div>
@@ -16,7 +16,7 @@
16
16
  <div class="header__container">
17
17
  <div class="header-slot-code">
18
18
  <div><q-icon name="fas fa-ticket-alt" class="q-mr-sm q-ml-xs"></q-icon>Slot Code: {{list.slot_code}}</div>
19
- <div class="status">Status: <div class="value" :style="list.status == 'to_pay' ? 'color:#a29e9e;' : 'color:darkviolet;'">{{list.status == "to_pay" || list.status == "pre_processing" ? "Waiting for Payment" : "Waiting for platform to Received the payment"}}</div></div>
19
+ <div class="status">Status: <div class="value" :style="list.status == 'to_pay' ? 'color:#a29e9e;' : 'color:darkviolet;'">{{list.status == "to_pay" || list.status == "pre_processing" ? "Waiting for Payment" : "Waiting for platform to receive the payment"}}</div></div>
20
20
  </div>
21
21
  </div>
22
22
  <div style="display:flex;background:#eeee;border-top: 1px solid rgb(194, 189, 189);">
@@ -131,7 +131,7 @@
131
131
  <div class="order-info">
132
132
  <!-- <div>Order Total ({{product_list[i].quantity}} Item): {{main_currency}} {{order_total}}</div> -->
133
133
  <div>Status:</div>
134
- <div class="order-items"> {{list.status == "to_pay" || list.status == "pre_processing" ? "Waiting for Payment" : "Waiting for platform to Received the payment"}}</div>
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
135
  <div>Shipping Fee:</div>
136
136
  <div 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>
@@ -19,7 +19,7 @@
19
19
  <div class="header__container">
20
20
  <div class="header-slot-code">
21
21
  <div><q-icon name="fas fa-ticket-alt" class="q-mr-sm q-ml-xs"></q-icon>Slot Code: {{list.slot_code ? list.slot_code : "No Slot Code"}}</div>
22
- <div class="status">Status: <div class="value" :style="list.status == 'to_pay' ? 'color:#a29e9e;' : 'color:darkviolet;'">{{list.status == "to_pay" ? "Waiting for Payment" : "Waiting for platform to Received the payment"}}</div></div>
22
+ <div class="status">Status: <div class="value" :style="list.status == 'to_pay' ? 'color:#a29e9e;' : 'color:darkviolet;'">{{list.status == "to_pay" ? "Waiting for Payment" : "Waiting for platform to receive the payment"}}</div></div>
23
23
  </div>
24
24
  </div>
25
25
  <div style="display:flex;background:white;border-top: 1px solid rgb(194, 189, 189);">
@@ -13,7 +13,7 @@
13
13
 
14
14
  <q-card-section class="content">
15
15
  <q-stepper flat v-model="step" vertical color="primary" animated>
16
- <q-step :name="1" title="Enter Your Code and Pin" icon="settings" :done="step > 1">
16
+ <q-step :name="1" :title="is_heartzone ? '' : 'Enter Your Code and Pin' " icon="settings" :done="step > 1">
17
17
  <q-form @submit.prevent="verifyCode()">
18
18
  <div class="q-mt-sm">
19
19
  <q-input v-model="field.code" outlined label="Enter Code" stack-label></q-input>
@@ -26,7 +26,7 @@
26
26
  </q-form>
27
27
  </q-step>
28
28
 
29
- <q-step :name="2" title="Enter Slot Code of Sponsor and Email of Owner" icon="fa fa-arrow-up" :done="step > 2">
29
+ <q-step :name="2" :title="is_heartzone ? '' : 'Enter Slot Code of Sponsor and Email of Owner' " icon="fa fa-arrow-up" :done="step > 2">
30
30
 
31
31
  <q-form @submit.prevent="verifySponsor()">
32
32
  <div class="q-mt-sm">
@@ -43,7 +43,7 @@
43
43
  <q-btn @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
- <q-step :name="3" title="Verify All Details" icon="assignment" :done="step > 3">
46
+ <q-step :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">
@@ -79,7 +79,7 @@
79
79
  <q-btn @click="confirmDetails()" type="button" :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> Confirm Details</q-btn>
80
80
  <q-btn @click="step = 1" type="button" outline unelevated class="full-width q-mt-sm" color="primary"><q-icon name="fa fa-times q-mr-sm" size="14px"></q-icon> Cancel</q-btn>
81
81
  </q-step>
82
- <q-step :name="4" title="Transaction Complete" icon="star">
82
+ <q-step :name="4" :title="is_heartzone ? '' : 'Transaction Complete' " icon="star">
83
83
  <div class="add-slot__complete text-center">
84
84
  <div>
85
85
  <q-img spinner-size="0" style="width: 120px; height: 120px" :src="'../../../../statics/success.png'"></q-img>
@@ -158,6 +158,7 @@ export default
158
158
  components: { GRegistration },
159
159
  props:
160
160
  {
161
+ is_heartzone: Boolean,
161
162
  is_enable_all_sponsor: Boolean,
162
163
  is_show: Boolean,
163
164
  code: Object,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geer-builder",
3
- "version": "1.2.739",
3
+ "version": "1.2.741",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {