geer-builder 1.2.963 → 1.2.965
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/GAutoShipProduct.vue +0 -2
- package/GProcessSale.vue +13 -2
- package/GTransaction.vue +1 -1
- package/GTransactionHistory.vue +1 -1
- package/components/ProcessSaleConfirmDialog.vue +1 -1
- package/components/SaleInvoice.vue +1 -1
- package/dialogs/XenditCreditCardGet.vue +0 -1
- package/models/DB_SLOT.js +5 -0
- package/package.json +1 -1
package/GAutoShipProduct.vue
CHANGED
|
@@ -571,8 +571,6 @@ export default {
|
|
|
571
571
|
*/
|
|
572
572
|
await this.checkedProducts();
|
|
573
573
|
|
|
574
|
-
// this.public_api_key = "xnd_public_development_9oa8BwOyCyM3pQeDUGt6pPqj72AJ9y3Tj2oi65xdVjPzs04RBtocqffigYxoWd";
|
|
575
|
-
|
|
576
574
|
this.public_api_key = public_settings.xendit_public_key;
|
|
577
575
|
|
|
578
576
|
if(this.user_info.is_xendit_updated == true)
|
package/GProcessSale.vue
CHANGED
|
@@ -302,6 +302,7 @@ export default
|
|
|
302
302
|
hide_receive_payment_button:false,
|
|
303
303
|
is_change_payment_dialog_open:false,
|
|
304
304
|
enable_sale_branch_counter:false,
|
|
305
|
+
sale_branch_prefix:'',
|
|
305
306
|
up_coin_pay:false,
|
|
306
307
|
up_coin_button:false,
|
|
307
308
|
point_value_pay:false,
|
|
@@ -716,8 +717,18 @@ export default
|
|
|
716
717
|
{
|
|
717
718
|
this.enable_sale_branch_counter = true;
|
|
718
719
|
}
|
|
719
|
-
|
|
720
|
-
|
|
720
|
+
|
|
721
|
+
let branch_count = await this.db_counter.getCount('sale_'+this.user_info.branch_slot) + 1;
|
|
722
|
+
let slot_info = await this.db_slot.get(this.user_info.branch_slot);
|
|
723
|
+
if(slot_info && slot_info.sale_branch_prefix)
|
|
724
|
+
{
|
|
725
|
+
this.sale_branch_prefix = slot_info.sale_branch_prefix;
|
|
726
|
+
this.field.inventory_branch_log_number = slot_info.sale_branch_prefix + '-' + branch_count;
|
|
727
|
+
}
|
|
728
|
+
else
|
|
729
|
+
{
|
|
730
|
+
this.field.inventory_branch_log_number = branch_count;
|
|
731
|
+
}
|
|
721
732
|
}
|
|
722
733
|
},
|
|
723
734
|
async submit(override = false,bypass_slot = false)
|
package/GTransaction.vue
CHANGED
|
@@ -142,7 +142,7 @@ export default
|
|
|
142
142
|
{
|
|
143
143
|
name : 'sale_id',
|
|
144
144
|
label : 'Sale ID',
|
|
145
|
-
field : row => row.branch_sale_id ? row.branch_sale_id : row.sale_id,
|
|
145
|
+
field : row => row.branch_sale_id ? (row.sale_branch_prefix ? row.sale_branch_prefix + '-' + row.branch_sale_id : row.branch_sale_id) : row.sale_id,
|
|
146
146
|
align : 'left',
|
|
147
147
|
required: true,
|
|
148
148
|
format: val => `${val}`,
|
package/GTransactionHistory.vue
CHANGED
|
@@ -75,7 +75,7 @@ export default
|
|
|
75
75
|
{
|
|
76
76
|
name : 'sale_id',
|
|
77
77
|
label : 'Sale ID',
|
|
78
|
-
field : row => row.sale_id,
|
|
78
|
+
field : row => row.branch_sale_id ? (row.sale_branch_prefix ? row.sale_branch_prefix + '-' + row.branch_sale_id : row.branch_sale_id) : row.sale_id,
|
|
79
79
|
align : 'left',
|
|
80
80
|
required: true,
|
|
81
81
|
format: val => `${val}`,
|
|
@@ -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.branch_sale_id ? sale.branch_sale_id : sale.sale_id"
|
|
12
|
+
:number="sale.branch_sale_id ? (sale.sale_branch_prefix ? sale.sale_branch_prefix + '-' + 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.branch_sale_id ? sale.branch_sale_id : sale.sale_id"
|
|
10
|
+
:number="sale.branch_sale_id ? (sale.sale_branch_prefix ? sale.sale_branch_prefix + '-' + 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"
|
|
@@ -128,7 +128,6 @@ export default {
|
|
|
128
128
|
this.credit_card_details.card_exp_year = "2040";
|
|
129
129
|
this.credit_card_details.card_cvn = "123";
|
|
130
130
|
|
|
131
|
-
// this.public_api_key = "xnd_public_development_9oa8BwOyCyM3pQeDUGt6pPqj72AJ9y3Tj2oi65xdVjPzs04RBtocqffigYxoWd";
|
|
132
131
|
this.public_api_key = public_settings.xendit_public_key;
|
|
133
132
|
|
|
134
133
|
if (!document.getElementById('xendit-script'))
|
package/models/DB_SLOT.js
CHANGED
|
@@ -27,6 +27,11 @@ export default class DB_SLOT extends MODEL
|
|
|
27
27
|
{
|
|
28
28
|
let data = await this.collection().where('referral_code', '==', code).get();
|
|
29
29
|
|
|
30
|
+
if(data.size === 0)
|
|
31
|
+
{
|
|
32
|
+
data = await this.collection().where('custom_referral_code', '==', code).get();
|
|
33
|
+
}
|
|
34
|
+
|
|
30
35
|
if(data.size === 0)
|
|
31
36
|
{
|
|
32
37
|
return false;
|