From 7fc13208342cc28a785788e34ec3b9c79580e2c5 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Fri, 1 Dec 2023 17:04:11 +0200 Subject: [PATCH] fix(server): allow decimal amount in sale/purchase transactions. --- packages/server/src/api/controllers/Purchases/Bills.ts | 2 +- .../server/src/api/controllers/Purchases/BillsPayments.ts | 2 +- .../server/src/api/controllers/Purchases/VendorCredit.ts | 5 ++--- packages/server/src/api/controllers/Sales/CreditNotes.ts | 2 +- packages/server/src/api/controllers/Sales/PaymentReceives.ts | 2 +- packages/server/src/api/controllers/Sales/SalesReceipts.ts | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packages/server/src/api/controllers/Purchases/Bills.ts b/packages/server/src/api/controllers/Purchases/Bills.ts index 61fc5cf70..2cd9e62de 100644 --- a/packages/server/src/api/controllers/Purchases/Bills.ts +++ b/packages/server/src/api/controllers/Purchases/Bills.ts @@ -122,7 +122,7 @@ export default class BillsController extends BaseController { check('entries.*.index').exists().isNumeric().toInt(), check('entries.*.item_id').exists().isNumeric().toInt(), check('entries.*.rate').exists().isNumeric().toFloat(), - check('entries.*.quantity').exists().isNumeric().toFloat(), + check('entries.*.quantity').exists().isNumeric().toInt(), check('entries.*.discount') .optional({ nullable: true }) .isNumeric() diff --git a/packages/server/src/api/controllers/Purchases/BillsPayments.ts b/packages/server/src/api/controllers/Purchases/BillsPayments.ts index 8959fdd8e..a663a3032 100644 --- a/packages/server/src/api/controllers/Purchases/BillsPayments.ts +++ b/packages/server/src/api/controllers/Purchases/BillsPayments.ts @@ -121,7 +121,7 @@ export default class BillsPayments extends BaseController { check('entries').exists().isArray({ min: 1 }), check('entries.*.index').optional().isNumeric().toInt(), check('entries.*.bill_id').exists().isNumeric().toInt(), - check('entries.*.payment_amount').exists().isNumeric().toInt(), + check('entries.*.payment_amount').exists().isNumeric().toFloat(), ]; } diff --git a/packages/server/src/api/controllers/Purchases/VendorCredit.ts b/packages/server/src/api/controllers/Purchases/VendorCredit.ts index 95405851c..3d2832308 100644 --- a/packages/server/src/api/controllers/Purchases/VendorCredit.ts +++ b/packages/server/src/api/controllers/Purchases/VendorCredit.ts @@ -173,7 +173,7 @@ export default class VendorCreditController extends BaseController { check('entries.*.index').exists().isNumeric().toInt(), check('entries.*.item_id').exists().isNumeric().toInt(), check('entries.*.rate').exists().isNumeric().toFloat(), - check('entries.*.quantity').exists().isNumeric().toFloat(), + check('entries.*.quantity').exists().isNumeric().toInt(), check('entries.*.discount') .optional({ nullable: true }) .isNumeric() @@ -211,12 +211,11 @@ export default class VendorCreditController extends BaseController { check('branch_id').optional({ nullable: true }).isNumeric().toInt(), check('entries').isArray({ min: 1 }), - check('entries.*.id').optional().isNumeric().toInt(), check('entries.*.index').exists().isNumeric().toInt(), check('entries.*.item_id').exists().isNumeric().toInt(), check('entries.*.rate').exists().isNumeric().toFloat(), - check('entries.*.quantity').exists().isNumeric().toFloat(), + check('entries.*.quantity').exists().isNumeric().toInt(), check('entries.*.discount') .optional({ nullable: true }) .isNumeric() diff --git a/packages/server/src/api/controllers/Sales/CreditNotes.ts b/packages/server/src/api/controllers/Sales/CreditNotes.ts index 29bcae2fb..77b506c7d 100644 --- a/packages/server/src/api/controllers/Sales/CreditNotes.ts +++ b/packages/server/src/api/controllers/Sales/CreditNotes.ts @@ -222,7 +222,7 @@ export default class PaymentReceivesController extends BaseController { check('entries.*.index').exists().isNumeric().toInt(), check('entries.*.item_id').exists().isNumeric().toInt(), check('entries.*.rate').exists().isNumeric().toFloat(), - check('entries.*.quantity').exists().isNumeric().toFloat(), + check('entries.*.quantity').exists().isNumeric().toInt(), check('entries.*.discount') .optional({ nullable: true }) .isNumeric() diff --git a/packages/server/src/api/controllers/Sales/PaymentReceives.ts b/packages/server/src/api/controllers/Sales/PaymentReceives.ts index ec210ad23..7cfa93a00 100644 --- a/packages/server/src/api/controllers/Sales/PaymentReceives.ts +++ b/packages/server/src/api/controllers/Sales/PaymentReceives.ts @@ -142,7 +142,7 @@ export default class PaymentReceivesController extends BaseController { check('entries.*.id').optional({ nullable: true }).isNumeric().toInt(), check('entries.*.index').optional().isNumeric().toInt(), check('entries.*.invoice_id').exists().isNumeric().toInt(), - check('entries.*.payment_amount').exists().isNumeric().toInt(), + check('entries.*.payment_amount').exists().isNumeric().toFloat(), ]; } diff --git a/packages/server/src/api/controllers/Sales/SalesReceipts.ts b/packages/server/src/api/controllers/Sales/SalesReceipts.ts index d364826b6..3eabcf84e 100644 --- a/packages/server/src/api/controllers/Sales/SalesReceipts.ts +++ b/packages/server/src/api/controllers/Sales/SalesReceipts.ts @@ -117,7 +117,7 @@ export default class SalesReceiptsController extends BaseController { check('entries.*.index').exists().isNumeric().toInt(), check('entries.*.item_id').exists().isNumeric().toInt(), check('entries.*.quantity').exists().isNumeric().toInt(), - check('entries.*.rate').exists().isNumeric().toInt(), + check('entries.*.rate').exists().isNumeric().toFloat(), check('entries.*.discount') .optional({ nullable: true }) .isNumeric()