added fields to update advance and reference number ,and one api to update advance

master^2
Varun 2 weeks ago
parent 43e62cd0f3
commit beb5433a27

@ -1816,6 +1816,7 @@ const today = new Date();
const datePart = today.toISOString().slice(0, 10).replace(/-/g, ''); // YYYYMMDD const datePart = today.toISOString().slice(0, 10).replace(/-/g, ''); // YYYYMMDD
const randomDigit = Math.floor(Math.random() * 10); // 09 const randomDigit = Math.floor(Math.random() * 10); // 09
const bookingId = `ARM${datePart}${randomDigit}`; const bookingId = `ARM${datePart}${randomDigit}`;
const amount_due = matchedSupplier.quoted_amount-matchedSupplier.advance_paid
const newBooking = new Tankerbooking({ const newBooking = new Tankerbooking({
bookingid: bookingId, bookingid: bookingId,
@ -1830,7 +1831,9 @@ const bookingId = `ARM${datePart}${randomDigit}`;
supplierName: supplier.suppliername, supplierName: supplier.suppliername,
supplierPhone: supplier.phone, supplierPhone: supplier.phone,
supplierAddress: customer.address, supplierAddress: customer.address,
amount_paid: String(matchedSupplier.advance_paid),
amount_due: String(amount_due),
advance_reference_number: matchedSupplier.advance_ref_number,
type_of_water: requestedBooking.type_of_water, type_of_water: requestedBooking.type_of_water,
capacity: requestedBooking.capacity, capacity: requestedBooking.capacity,
quantity: requestedBooking.quantity, quantity: requestedBooking.quantity,
@ -2076,3 +2079,55 @@ exports.updatestatusForSupplier = async (req, reply) => {
} }
}; };
exports.updateadvanceForSupplier = async (req, reply) => {
try {
const { _id } = req.params;
const { supplierId, advance_paid,advance_ref_number } = req.body;
if (!_id) {
return reply.code(400).send({ status_code: 400, message: '_id (param) is required' });
}
if (!supplierId) {
return reply.code(400).send({ status_code: 400, message: 'supplierId (body) is required' });
}
// Map short keywords to the stored values
// otherwise keep the original (but normalized) value
// Atomic update using positional $ operator
const filter = { _id, 'requested_suppliers.supplierId': supplierId };
const update = { $set: { 'requested_suppliers.$.advance_paid': advance_paid,'requested_suppliers.$.advance_ref_number': advance_ref_number } };
const updated = await RequestedBooking.findOneAndUpdate(filter, update, {
new: true,
runValidators: true,
}).lean();
if (!updated) {
// either booking _id not found OR supplierId not found inside requested_suppliers
const bookingExists = await RequestedBooking.findById(_id).lean();
if (!bookingExists) {
return reply.code(404).send({ status_code: 404, message: `Booking with _id ${_id} not found` });
}
// booking exists but supplier entry missing
return reply.code(404).send({
status_code: 404,
message: `Supplier ${supplierId} not found in requested_suppliers for booking ${_id}`,
});
}
return reply.code(200).send({
status_code: 200,
message: `status updated for supplier ${supplierId}`,
data: updated,
});
} catch (err) {
console.error('updatestatusForSupplier error:', err);
throw boom.boomify(err);
}
};

@ -165,6 +165,8 @@ const requestedSupplierSchema = new mongoose.Schema({
quoted_amount: Number, quoted_amount: Number,
time: {type:String,default:null}, // ✅ New field added here time: {type:String,default:null}, // ✅ New field added here
status:{type:String,default: "pending" }, status:{type:String,default: "pending" },
advance_paid: Number,
advance_ref_number: {type:String,default:null},
}, { _id: false }); }, { _id: false });
const requestedBookingSchema = new mongoose.Schema({ const requestedBookingSchema = new mongoose.Schema({

@ -58,6 +58,7 @@ const tankersbookingSchema = new mongoose.Schema({
stop_time:{ type: String, default: "null" }, stop_time:{ type: String, default: "null" },
quantityDelivered: { type: String, default: null}, quantityDelivered: { type: String, default: null},
amount_paid: { type: String, default: null }, amount_paid: { type: String, default: null },
advance_reference_number:{ type: String, default: null },
amount_due: { type: String, default: null }, amount_due: { type: String, default: null },
distrubance_price: { type: String, default: "none" }, distrubance_price: { type: String, default: "none" },
amount_difference: { type: String, default: "none" }, amount_difference: { type: String, default: "none" },

@ -1452,5 +1452,47 @@ fastify.route({
handler: userController.updatestatusForSupplier, handler: userController.updatestatusForSupplier,
}); });
fastify.route({
method: 'PUT',
url: '/api/request-advance-amount/:_id/supplier/advance',
schema: {
description:
'Update adavance with reference number for particular supplier by user',
tags: ['User'],
summary: 'Update adavance with reference number for particular supplier by user',
params: {
type: 'object',
properties: {
_id: { type: 'string', description: 'Booking _id' },
},
required: ['_id'],
},
body: {
type: 'object',
properties: {
supplierId: { type: 'string' },
advance_paid: { type: 'number' }, // ✅ fixed
advance_ref_number: { type: 'string' }
},
},
response: {
200: {
type: 'object',
},
400: { type: 'object' },
404: { type: 'object' },
},
security: [
{
basicAuth: [],
},
],
},
// preHandler: fastify.auth([fastify.authenticate]), // enable if needed
handler: userController.updateadvanceForSupplier,
});
next(); next();
}; };

Loading…
Cancel
Save