farmcontrol/farmcontrol-api
2
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Add invoicing fields to shipment schema and update recalculation logic

Browse Source 
- Introduced new fields: 'invoicedAmount', 'invoicedAmountWithTax', 'invoicedAmountRemaining', and 'invoicedAmountWithTaxRemaining' to the shipment schema for better tracking of invoicing status.
- Updated the recalculation logic to compute remaining invoiced amounts based on the newly added fields.
This commit is contained in:
Tom Butcher 2025-12-28 02:11:50 +00:00
parent dd86075734
commit d3cbea45c5
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/database/schemas/inventory/shipment.schema.js
View File

@ -15,6 +15,10 @@ const shipmentSchema = new Schema(
amount: { type: Number, required: true }, amount: { type: Number, required: true },
amountWithTax: { type: Number, required: true }, amountWithTax: { type: Number, required: true },
taxRate: { type: Schema.Types.ObjectId, ref: 'taxRate', required: false }, taxRate: { type: Schema.Types.ObjectId, ref: 'taxRate', required: false },
invoicedAmount: { type: Number, required: false, default: 0 },
invoicedAmountWithTax: { type: Number, required: false, default: 0 },
invoicedAmountRemaining: { type: Number, required: false, default: 0 },
invoicedAmountWithTaxRemaining: { type: Number, required: false, default: 0 },
shippedAt: { type: Date, required: false }, shippedAt: { type: Date, required: false },
expectedAt: { type: Date, required: false }, expectedAt: { type: Date, required: false },
deliveredAt: { type: Date, required: false }, deliveredAt: { type: Date, required: false },
@ -50,12 +54,16 @@ shipmentSchema.statics.recalculate = async function (shipment, user) {
}); });
} }
const amountWithTax = shipment.amount * (1 + (taxRate?.rate || 0) / 100); const amountWithTax = parseFloat(
(shipment.amount || 0) * (1 + (taxRate?.rate || 0) / 100)
).toFixed(2);
await editObject({ await editObject({
model: shipmentModel, model: shipmentModel,
id: shipment._id, id: shipment._id,
updateData: { updateData: {
amountWithTax: amountWithTax, amountWithTax: amountWithTax,
invoicedAmountRemaining: shipment.amount - (shipment.invoicedAmount || 0),
invoicedAmountWithTaxRemaining: amountWithTax - (shipment.invoicedAmountWithTax || 0),
}, },
user, user,
recalculate: false, recalculate: false,