QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-15 20:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: discount and adjustment fields

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-12-04 12:18:20 +02:00
parent 6ab461a212
commit 7dd09e2903
5 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/server/src/api/controllers/Purchases/Bills.ts
View File

@@ -153,7 +153,7 @@ export default class BillsController extends BaseController {
check('discount_type')
.default(DiscountType.Amount)
.isIn([DiscountType.Amount, DiscountType.Percentage]),
check('discount').optional().isDecimal().toFloat(),
check('discount').optional({ nullable: true }).isDecimal().toFloat(),
// # Adjustment
check('adjustment').optional({ nullable: true }).isNumeric().toFloat(),
@@ -204,7 +204,7 @@ export default class BillsController extends BaseController {
check('discount_type')
.default(DiscountType.Amount)
.isIn([DiscountType.Amount, DiscountType.Percentage]),
check('discount').optional().isDecimal().toFloat(),
check('discount').optional({ nullable: true }).isDecimal().toFloat(),
// # Adjustment
check('adjustment').optional({ nullable: true }).isNumeric().toFloat(),

4
packages/server/src/api/controllers/Sales/SalesEstimates.ts
View File

@@ -204,13 +204,13 @@ export default class SalesEstimatesController extends BaseController {
check('pdf_template_id').optional({ nullable: true }).isNumeric().toInt(),
// # Discount
check('discount').optional().isNumeric().toFloat(),
check('discount').optional({ nullable: true }).isNumeric().toFloat(),
check('discount_type')
.default(DiscountType.Amount)
.isIn([DiscountType.Amount, DiscountType.Percentage]),
// # Adjustment
check('adjustment').optional().isNumeric().toFloat(),
check('adjustment').optional({ nullable: true }).isNumeric().toFloat(),
];
}