geer-builder 1.2.959 → 1.2.961
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
CHANGED
|
@@ -40,7 +40,11 @@
|
|
|
40
40
|
</q-select>
|
|
41
41
|
</div>
|
|
42
42
|
<div class="field col-2"></div>
|
|
43
|
-
<div class="field col-4">
|
|
43
|
+
<div class="field col-4" v-if="enable_sale_branch_counter">
|
|
44
|
+
<label class="label">Sale Branch No.</label>
|
|
45
|
+
<q-input readonly v-model="field.inventory_branch_log_number" class="input" dense outlined />
|
|
46
|
+
</div>
|
|
47
|
+
<div class="field col-4" v-else>
|
|
44
48
|
<label class="label">Sale No.</label>
|
|
45
49
|
<q-input readonly v-model="field.inventory_log_number" class="input" dense outlined />
|
|
46
50
|
</div>
|
|
@@ -114,7 +118,15 @@
|
|
|
114
118
|
<div class="field col-2">
|
|
115
119
|
|
|
116
120
|
</div>
|
|
117
|
-
<div class="field col-4">
|
|
121
|
+
<div class="field col-4" v-if="enable_sale_branch_counter">
|
|
122
|
+
<label class="label">Sale Branch No.</label>
|
|
123
|
+
<q-input readonly v-model="field.inventory_branch_log_number" class="input" dense outlined />
|
|
124
|
+
<q-toggle
|
|
125
|
+
v-model="refill"
|
|
126
|
+
label="Refill Inventory"
|
|
127
|
+
/>
|
|
128
|
+
</div>
|
|
129
|
+
<div class="field col-4" v-else>
|
|
118
130
|
<label class="label">Sale No.</label>
|
|
119
131
|
<q-input readonly v-model="field.inventory_log_number" class="input" dense outlined />
|
|
120
132
|
<q-toggle
|
|
@@ -285,6 +297,7 @@ export default
|
|
|
285
297
|
({
|
|
286
298
|
hide_receive_payment_button:false,
|
|
287
299
|
is_change_payment_dialog_open:false,
|
|
300
|
+
enable_sale_branch_counter:false,
|
|
288
301
|
up_coin_pay:false,
|
|
289
302
|
up_coin_button:false,
|
|
290
303
|
point_value_pay:false,
|
|
@@ -316,6 +329,7 @@ export default
|
|
|
316
329
|
field: {
|
|
317
330
|
email: '',
|
|
318
331
|
inventory_log_number: "",
|
|
332
|
+
inventory_branch_log_number: "",
|
|
319
333
|
product_list: [],
|
|
320
334
|
memo: "",
|
|
321
335
|
manager_discount : 0,
|
|
@@ -350,14 +364,13 @@ export default
|
|
|
350
364
|
components: { ChangePaymentMethod,AddBatchDialog, GProduct, ProcessSaleConfirmDialog, DiscountDialog, AddPaymentDialog, SaleChooseSlotDialog,ManagerOverrideDialog },
|
|
351
365
|
async mounted()
|
|
352
366
|
{
|
|
353
|
-
await this.getCount();
|
|
354
367
|
await this.getDiscountData();
|
|
368
|
+
await this.getCount();
|
|
355
369
|
if(this.stockist)
|
|
356
370
|
{
|
|
357
371
|
this.field.stockist = this.stockist;
|
|
358
372
|
}
|
|
359
373
|
|
|
360
|
-
|
|
361
374
|
if(this.user_info && this.user_info.branch_slot)
|
|
362
375
|
{
|
|
363
376
|
let get_owner_info = await this.db_slot.get(this.user_info.branch_slot);
|
|
@@ -664,6 +677,15 @@ export default
|
|
|
664
677
|
async getCount()
|
|
665
678
|
{
|
|
666
679
|
this.field.inventory_log_number = await this.db_counter.getCount('sale') + 1;
|
|
680
|
+
if(this.user_info && this.user_info.branch_slot)
|
|
681
|
+
{
|
|
682
|
+
if(this.public_settings.enable_sale_branch_counter)
|
|
683
|
+
{
|
|
684
|
+
this.enable_sale_branch_counter = true;
|
|
685
|
+
}
|
|
686
|
+
|
|
687
|
+
this.field.inventory_branch_log_number = await this.db_counter.getCount('sale_'+this.user_info.branch_slot) + 1;
|
|
688
|
+
}
|
|
667
689
|
},
|
|
668
690
|
async submit(override = false,bypass_slot = false)
|
|
669
691
|
{
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
:batch_number="sale.batch_number"
|
|
10
10
|
:lot_number="sale.lot_number"
|
|
11
11
|
:customer="sale.customer"
|
|
12
|
-
:number="sale.sale_id"
|
|
12
|
+
:number="sale.branch_sale_id ? sale.branch_sale_id : sale.sale_id"
|
|
13
13
|
:transaction_date="sale.created_date"
|
|
14
14
|
:sub_total="sale.sub_total"
|
|
15
15
|
:grand_total="sale.grand_total"
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
:batch_number="sale.batch_number"
|
|
8
8
|
:lot_number="sale.lot_number"
|
|
9
9
|
:customer="sale.customer"
|
|
10
|
-
:number="sale.sale_id"
|
|
10
|
+
:number="sale.branch_sale_id ? sale.branch_sale_id : sale.sale_id"
|
|
11
11
|
:transaction_date="sale.created_date"
|
|
12
12
|
:sub_total="sale.sub_total"
|
|
13
13
|
:grand_total="sale.grand_total"
|
|
@@ -50,6 +50,10 @@
|
|
|
50
50
|
<div class="breakdown-label">New Membership</div>
|
|
51
51
|
<div class="breakdown-value">{{ code_info.data.membership.membership_name }}</div>
|
|
52
52
|
</div>
|
|
53
|
+
<div class="breakdown" v-if="code_info.data.upgrade_to_ps === 'Yes'">
|
|
54
|
+
<div class="breakdown-label">Slot Type</div>
|
|
55
|
+
<div class="breakdown-value">{{ slot_info.slot_type }} → PS</div>
|
|
56
|
+
</div>
|
|
53
57
|
|
|
54
58
|
</div>
|
|
55
59
|
|