geer-builder 1.2.884 → 1.2.886
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/GProcessSale.vue +11 -1
- package/GProcessSaleGc.vue +6 -1
- package/dialogs/AddPaymentDialog.vue +4 -8
- package/package.json +1 -1
package/GProcessSale.vue
CHANGED
|
@@ -186,7 +186,15 @@
|
|
|
186
186
|
</div>
|
|
187
187
|
</div>
|
|
188
188
|
|
|
189
|
+
<div class="field col-12 q-px-lg q-mb-md">
|
|
190
|
+
<q-checkbox v-model="auto_activate" label="Activate slot immediately upon successful payment" />
|
|
191
|
+
</div>
|
|
192
|
+
|
|
189
193
|
<div class="buttons text-right">
|
|
194
|
+
<div class="field col-12 q-px-lg q-mb-md" style="">
|
|
195
|
+
<q-checkbox v-model="auto_activate" label="Activate slot immediately upon successful payment" />
|
|
196
|
+
</div>
|
|
197
|
+
|
|
190
198
|
<q-btn v-if="up_coin_button" color="primary" @click="upcoinPay()" unelevated style="margin-right:5px">
|
|
191
199
|
<q-icon name="fas fa-coins" size="14px" class="q-mr-sm"></q-icon>
|
|
192
200
|
UPCoin Pay
|
|
@@ -227,7 +235,7 @@
|
|
|
227
235
|
</q-dialog>
|
|
228
236
|
|
|
229
237
|
<q-dialog v-model="is_dialog_payment_open">
|
|
230
|
-
<add-payment-dialog @closePopup="is_dialog_payment_open = false; $emit('closePopup')" @receivePayment="getPayment" :selected_slot="this.slot_reference"></add-payment-dialog>
|
|
238
|
+
<add-payment-dialog @closePopup="is_dialog_payment_open = false; $emit('closePopup')" @receivePayment="getPayment" :selected_slot="this.slot_reference" :auto_activate="auto_activate"></add-payment-dialog>
|
|
231
239
|
</q-dialog>
|
|
232
240
|
|
|
233
241
|
<q-dialog v-model="is_discount_dialog_open">
|
|
@@ -303,6 +311,7 @@ export default
|
|
|
303
311
|
special_cd_pay_amount:0,
|
|
304
312
|
special_cd_pay_amount_max:0,
|
|
305
313
|
sale_id: 0,
|
|
314
|
+
auto_activate: false,
|
|
306
315
|
db_slot: new DB_SLOT(),
|
|
307
316
|
db_counter: new DB_COUNTER(),
|
|
308
317
|
stockist_list: [],
|
|
@@ -1224,6 +1233,7 @@ export default
|
|
|
1224
1233
|
}
|
|
1225
1234
|
}
|
|
1226
1235
|
.bottom-grid{
|
|
1236
|
+
padding-bottom:100px;
|
|
1227
1237
|
.batch
|
|
1228
1238
|
{
|
|
1229
1239
|
.batch-holder{
|
package/GProcessSaleGc.vue
CHANGED
|
@@ -169,6 +169,10 @@
|
|
|
169
169
|
</div>
|
|
170
170
|
</div>
|
|
171
171
|
|
|
172
|
+
<div class="field col-12 q-px-lg q-mb-md" v-if="is_already_choose_slot">
|
|
173
|
+
<q-checkbox v-model="auto_activate" label="Activate slot immediately upon successful payment" />
|
|
174
|
+
</div>
|
|
175
|
+
|
|
172
176
|
<div class="buttons text-right">
|
|
173
177
|
<!-- <q-btn color="primary" @click=openDiscount unelevated style="margin-right:5px">
|
|
174
178
|
<q-icon name="fa fa-percent" size="14px" class="q-mr-sm"></q-icon>
|
|
@@ -198,7 +202,7 @@
|
|
|
198
202
|
</q-dialog>
|
|
199
203
|
|
|
200
204
|
<q-dialog v-model="is_dialog_payment_open">
|
|
201
|
-
<add-payment-dialog @closePopup="is_dialog_payment_open = false; $emit('closePopup')" @receivePayment="getPayment" :gc="true" :selected_slot="this.slot_reference"></add-payment-dialog>
|
|
205
|
+
<add-payment-dialog @closePopup="is_dialog_payment_open = false; $emit('closePopup')" @receivePayment="getPayment" :gc="true" :selected_slot="this.slot_reference" :auto_activate="auto_activate"></add-payment-dialog>
|
|
202
206
|
</q-dialog>
|
|
203
207
|
|
|
204
208
|
<q-dialog v-model="is_discount_dialog_open">
|
|
@@ -256,6 +260,7 @@ export default
|
|
|
256
260
|
is_dialog_confirm_open: false,
|
|
257
261
|
is_inventory_dialog_open: false,
|
|
258
262
|
sale_id: 0,
|
|
263
|
+
auto_activate: false,
|
|
259
264
|
db_slot: new DB_SLOT(),
|
|
260
265
|
db_counter: new DB_COUNTER(),
|
|
261
266
|
stockist_list: [],
|
|
@@ -40,9 +40,6 @@
|
|
|
40
40
|
<div class="field col-12">
|
|
41
41
|
<q-input type="textarea" v-model="field.remarks" label="Remarks" stack-label></q-input>
|
|
42
42
|
</div>
|
|
43
|
-
<div class="field col-12 q-mt-md">
|
|
44
|
-
<q-checkbox v-model="field.auto_activate" label="Activate slot immediately upon successful payment" />
|
|
45
|
-
</div>
|
|
46
43
|
</div>
|
|
47
44
|
<div class="buttons text-right">
|
|
48
45
|
<q-btn type="submit" color="primary" class="full-width" unelevated>
|
|
@@ -66,15 +63,14 @@ export default
|
|
|
66
63
|
event: null,
|
|
67
64
|
field: {
|
|
68
65
|
payment_amount:"",
|
|
69
|
-
remarks:""
|
|
70
|
-
auto_activate: false
|
|
66
|
+
remarks:""
|
|
71
67
|
},
|
|
72
68
|
payment_options : [],
|
|
73
69
|
selected_slot_info : {wallet:0,points:{gc:0}},
|
|
74
70
|
public_setting:null,
|
|
75
71
|
hide_up_coin:true
|
|
76
72
|
}),
|
|
77
|
-
props: ['selected_slot', 'gc'],
|
|
73
|
+
props: ['selected_slot', 'gc', 'auto_activate'],
|
|
78
74
|
async mounted()
|
|
79
75
|
{
|
|
80
76
|
this.public_settings = await this.$_getData('public_settings');
|
|
@@ -106,13 +102,13 @@ export default
|
|
|
106
102
|
}
|
|
107
103
|
else
|
|
108
104
|
{
|
|
109
|
-
this.$emit('receivePayment', this.field);
|
|
105
|
+
this.$emit('receivePayment', {...this.field, auto_activate: this.auto_activate});
|
|
110
106
|
this.$emit('closePopup')
|
|
111
107
|
}
|
|
112
108
|
}
|
|
113
109
|
else
|
|
114
110
|
{
|
|
115
|
-
this.$emit('receivePayment', this.field);
|
|
111
|
+
this.$emit('receivePayment', {...this.field, auto_activate: this.auto_activate});
|
|
116
112
|
this.$emit('closePopup')
|
|
117
113
|
}
|
|
118
114
|
},
|