geer-builder 1.2.755 → 1.2.757

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.
@@ -17,7 +17,7 @@
17
17
  <li>We will send a confirmation email to you once processed. If you do not receive one within 48 hours, you may call or contact us directly using this e-mail address.</li>
18
18
  </ol>
19
19
  <div class="headers">GENERAL RULES</div>
20
- <div class="rules">Pay the exact mount indicated above. Excess porton of your payment is forfeited. Payment less than the amount due will not be processed.
20
+ <div class="rules">Pay the exact mount indicated above. Excess portion of your payment is forfeited. Payment less than the amount due will not be processed.
21
21
 
22
22
  If you are paying multiple ORDERS Reference Numbers, pay separately for each reference number. Do not lump them into a single transaction.
23
23
 
package/GNoSlot.vue CHANGED
@@ -3,15 +3,15 @@
3
3
  <!-- NO SLOT -->
4
4
  <div>
5
5
  <g-card class="q-pa-lg" v-if="!is_enable_refresh && !is_no_code">
6
- <div class="q-mb-md message">We have detected that you don't have a <b>slot</b> yet.</div>
6
+ <div class="q-mb-md message">We have detected that you have a <b>slot</b> ready for activation kindly click "VERIFY".</div>
7
7
  <div>
8
8
  <q-btn @click="is_open_add_slot_dialog = true" color="primary" unelevated>
9
9
  <q-icon name="fa fa-plus" size="12px" class="q-mr-sm"></q-icon>
10
- Add Slot
10
+ VERIFY NOW
11
11
  </q-btn>
12
12
  </div>
13
13
  </g-card>
14
- <g-card class="q-pa-lg" v-if="is_enable_refresh || is_no_code">
14
+ <g-card class="q-pa-lg" v-else-if="is_enable_refresh || is_no_code">
15
15
  <div class="q-mb-md message">We have detected that you don't have a <b>slot</b> yet.</div>
16
16
  <div>
17
17
  <q-btn @click="$emit('refreshPage')" color="primary" unelevated>
@@ -56,7 +56,7 @@
56
56
  </g-card>
57
57
  </div>
58
58
  <q-dialog :maximized="$q.platform.is.mobile" transition-show="slide-up" transition-hide="slide-down" v-model="is_open_add_slot_dialog">
59
- <add-slot-dialog :code="code" @closeDialog="is_open_add_slot_dialog = false"></add-slot-dialog>
59
+ <add-slot-dialog :is_heartzone="is_heartzone" :code="code" @closeDialog="is_open_add_slot_dialog = false"></add-slot-dialog>
60
60
  </q-dialog>
61
61
  </div>
62
62
  <q-dialog v-model="is_beneficiary_dialog_open">
@@ -81,7 +81,7 @@ export default
81
81
  mixins: [GlobalMixins],
82
82
  data: () =>
83
83
  ({
84
- is_no_code: false,
84
+ is_no_code: true,
85
85
  is_open_add_slot_dialog: false,
86
86
  db_code: new DB_CODE(),
87
87
  code_list: [],
@@ -97,7 +97,8 @@ export default
97
97
  },
98
98
  props:
99
99
  {
100
- is_enable_refresh:Boolean
100
+ is_enable_refresh:Boolean,
101
+ is_heartzone:Boolean
101
102
  },
102
103
  methods:
103
104
  {
@@ -115,7 +116,27 @@ export default
115
116
  {
116
117
  await this.$bind('code_list', this.db_code.collection().where('recipient', '==', this.user_info.uid));
117
118
 
118
- if(this.code_list.length == 0 || !this.code_list.length)
119
+ this.code_list.forEach((code) =>
120
+ {
121
+ if(code.used)
122
+ {
123
+
124
+ }
125
+ else if(code.hasOwnProperty("membership") && code.membership.membership_id == 'merchant')
126
+ {
127
+ this.code = code;
128
+ }
129
+ else
130
+ {
131
+ this.code = code;
132
+ }
133
+ });
134
+
135
+ if(this.code)
136
+ {
137
+ this.is_no_code = false;
138
+ }
139
+ else
119
140
  {
120
141
  this.is_no_code = true;
121
142
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "geer-builder",
3
- "version": "1.2.755",
3
+ "version": "1.2.757",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {