geer-builder 1.2.828 → 1.2.829

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 (4) hide show
  1. package/GCaptcha.vue +6 -4
  2. package/GCheckout.vue +5 -5
  3. package/dialogs/AddSlotDialog.vue +6 -5
  4. package/package.json +1 -1
package/GCaptcha.vue CHANGED
@@ -3,23 +3,25 @@
3
3
  <div class="title q-pa-sm">{{display_data.title}}</div>
4
4
 
5
5
  <div v-if="current_slot_info" class="q-pt-md q-pb-md text-center captcha__body">
6
- <div class="label">Your {{config.hasOwnProperty('captcha_currency') ? config.captcha_currency : 'Captcha'}} Points</div>
6
+ <!-- <div class="label">Your {{config.hasOwnProperty('captcha_currency') ? config.captcha_currency : 'Captcha'}} Points</div> -->
7
+ <div class="label">AdsPro Cpoints</div>
7
8
  <div class="value text-primary">{{ $_formatNumber(current_slot_info.hasOwnProperty('captcha_points') ? current_slot_info.captcha_points : 0, { decimal: config.hasOwnProperty('captcha_decimals') ? config.captcha_decimals : 2 }) }}</div>
8
- <div class="label">Total {{config.hasOwnProperty('captcha_currency') ? config.captcha_currency : 'Captcha'}} Points Earned</div>
9
+ <!-- <div class="label">Total {{config.hasOwnProperty('captcha_currency') ? config.captcha_currency : 'Captcha'}} Points Earned</div> -->
10
+ <div class="label">AdsPro Accumulated Cpoints</div>
9
11
  <div class="value">{{ $_formatNumber(current_slot_info.hasOwnProperty('captcha_points_earned') ? current_slot_info.captcha_points_earned : 0, { decimal: config.hasOwnProperty('captcha_decimals') ? config.captcha_decimals : 2 }) }}</div>
10
12
  </div>
11
13
  <div class="actions">
12
14
  <div class="left">
13
15
  <q-btn @click="checkExchangeToday()" size="12px" class="full-width q-pa-sm text-primary exchange-points-button" flat>
14
16
  <q-icon class="q-mr-sm " :name="display_data.exchange_icon" size="16px"></q-icon>
15
- Exchange Points
17
+ CONVERT CPOINTS
16
18
 
17
19
  </q-btn>
18
20
  </div>
19
21
  <div class="right">
20
22
  <q-btn @click="is_captcha_dialog_open = true" size="12px" class="full-width q-pa-sm text-primary start-captcha-button" flat>
21
23
  <q-icon class="q-mr-sm" :name="display_data.start_icon" size="16px"></q-icon>
22
- Start Captcha
24
+ EARN CPOINTS
23
25
  </q-btn>
24
26
  </div>
25
27
  </div>
package/GCheckout.vue CHANGED
@@ -53,9 +53,9 @@
53
53
  <div v-if="courierListChecker(merch)==true && payment_method.payment_method_id != 'cod' || payment_method.payment_method_id != 'gc_points' && courier_list_cod.length>1 && payment_method.payment_method_id == 'cod'" style="color:#05a;cursor:pointer;text-align:center;margin-left:12%;" @click="is_courier_list_open=true;pass_order_details={order:merch, payment_method:payment_method}">Select Delivery Option</div>
54
54
  <div v-else></div>
55
55
  <div>
56
- <div>Courier: {{merch.courier_chosen ? merch.courier_chosen : ''}}</div>
56
+ <div v-if="!is_adspro">Courier: {{merch.courier_chosen ? merch.courier_chosen : ''}}</div>
57
57
  <div v-if="(merch.voucher_deductions*-1) > 0">Voucher: {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} -{{$_formatNumber(merch.voucher_deductions, { decimal: 2})}}</div>
58
- <div>Shipping Fee: {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{$_formatNumber(merch.shipping_fee, { decimal: 2})}}</div>
58
+ <div v-if="!is_adspro">Shipping Fee: {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{$_formatNumber(merch.shipping_fee, { decimal: 2})}}</div>
59
59
  <div class="g-cash-lable" v-if="show_gcash_fee">GCash Fee: PHP {{$_formatNumber(gcash_fee, { decimal: 2})}}</div>
60
60
  <div class="text-bold">Order Total ({{merch.total_quantity}} Item): {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{show_gcash_fee ? $_formatNumber(merch.order_total + gcash_fee, { decimal: 2}) : $_formatNumber(merch.order_total, { decimal: 2}) }}</div>
61
61
  </div>
@@ -198,8 +198,8 @@
198
198
  <div class="order-grid">
199
199
  <div>Merchandise Subtotal: </div>
200
200
  <div class="text-right"> {{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{$_formatNumber(this.checkout_info.sub_total, { decimal: 2})}}</div>
201
- <div>Shipping Total: </div>
202
- <div class="text-right">{{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{$_formatNumber(this.checkout_info.shipping_total, { decimal: 2})}}</div>
201
+ <div v-if="!is_adspro">Shipping Total: </div>
202
+ <div v-if="!is_adspro" class="text-right">{{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} {{$_formatNumber(this.checkout_info.shipping_total, { decimal: 2})}}</div>
203
203
  <div v-if="(this.checkout_info.voucher_total*-1)>0">Voucher Discount: </div>
204
204
  <div v-if="(this.checkout_info.voucher_total*-1)>0" class="text-right">{{payment_method.payment_method_id =='gc_points' ? 'GC' : main_currency}} -{{$_formatNumber(this.checkout_info.voucher_total, { decimal: 2})}}</div>
205
205
  <div v-if="this.public_settings.hasOwnProperty('custom_ecommerce_fee') && payment_method.payment_method_id !='gc_points'">{{public_settings.custom_ecommerce_fee.label}}: </div>
@@ -417,7 +417,7 @@ import EcommerceMaintenance from './dialogs/EcommerceMaintenance';
417
417
  export default {
418
418
  components: { EcommerceMaintenance,SelectShippingOptions, AddNewAddressForm ,ProcessCheckoutConfirmDialog, GLoader, axios ,ChooseCourierDialog, SelectVoucherDialog},
419
419
  mixins: [GlobalMixins],
420
- props:{ checkout_list: Array, show_discount_badge: Boolean, is_heartzone: Boolean },
420
+ props:{ checkout_list: Array, show_discount_badge: Boolean, is_heartzone: Boolean, is_adspro : Boolean },
421
421
  data: () =>
422
422
  ({
423
423
  is_branch_pickup:false,
package/dialogs/AddSlotDialog.vue CHANGED
@@ -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 :color="is_heartzone ? 'white' : ''" :name="1" :title="is_heartzone ? '' : 'Enter Your Code and Pin' " icon="settings" :done="step > 1">
16
+ <q-step :color="is_heartzone ? 'white' : ''" :name="1" :title="step1_title " 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 :color="is_heartzone ? 'white' : ''" :name="2" :title="is_heartzone ? '' : 'Enter Slot Code of Sponsor and Email of Owner' " icon="fa fa-arrow-up" :done="step > 2">
29
+ <q-step :color="is_heartzone ? 'white' : ''" :name="2" :title="step2_title" icon="fa fa-arrow-up" :done="step > 2">
30
30
 
31
31
  <q-form @submit.prevent="verifySponsor()">
32
32
  <div class="q-mt-sm">
@@ -40,10 +40,10 @@
40
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 || !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>
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
- <q-step :color="is_heartzone ? 'white' : ''" :name="3" :title="is_heartzone ? '' : 'Verify All Details' " icon="assignment" :done="step > 3">
46
+ <q-step :color="is_heartzone ? 'white' : ''" :name="3" :title="step3_title" 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">
@@ -84,7 +84,7 @@
84
84
  <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>
85
85
  <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>
86
86
  </q-step>
87
- <q-step :color="is_heartzone ? 'white' : ''" :name="4" :title="is_heartzone ? '' : 'Transaction Complete' " icon="star">
87
+ <q-step :color="is_heartzone ? 'white' : ''" :name="4" :title="step4_title" icon="star">
88
88
  <div class="add-slot__complete text-center">
89
89
  <div>
90
90
  <q-img spinner-size="0" style="width: 120px; height: 120px" src="../assets/statics/check.png"></q-img>
@@ -220,6 +220,7 @@ export default
220
220
  {
221
221
  updateTitles()
222
222
  {
223
+ console.log(this.is_heartzone, this.is_adspro)
223
224
  if(this.is_heartzone)
224
225
  {
225
226
  this.step1_title = '';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geer-builder",
3
- "version": "1.2.828",
3
+ "version": "1.2.829",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {