From 0658d2892d268f78012c3915099afbda1809d03b Mon Sep 17 00:00:00 2001 From: varun Date: Fri, 14 Apr 2023 01:35:51 -0400 Subject: [PATCH] added customer mobile,customer name,supplier name and mobile number --- src/controllers/supplierOrderController.js | 4 +++- src/controllers/tankersController.js | 11 ++++++++++- src/models/tankers.js | 6 +++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/controllers/supplierOrderController.js b/src/controllers/supplierOrderController.js index e543a5a9..17717fde 100644 --- a/src/controllers/supplierOrderController.js +++ b/src/controllers/supplierOrderController.js @@ -200,9 +200,11 @@ exports.deliveryboystartandstop = async (req, reply) => { //let start_time,stop_time const bookingId = req.params.bookingId const bookingdata = await Tankerbooking.findOne({bookingid: bookingId}) - // console.log(bookingdata,"0") + // console.log(bookingdata.supplierId,"6") + const customerId = bookingdata.customerId; + console.log(customerId) const action = req.body.action const receiver_tank = bookingdata.tankName // console.log(receiver_tank,"5") diff --git a/src/controllers/tankersController.js b/src/controllers/tankersController.js index cd674f82..88968c5e 100644 --- a/src/controllers/tankersController.js +++ b/src/controllers/tankersController.js @@ -185,7 +185,12 @@ exports.tankerBooking = async (req, reply) => { const month = (date.getMonth() + 1).toString().padStart(2, '0') const day = date.getDate().toString().padStart(2, '0') const bookingId = `ARM${year}${month}${day}${b_id}` - + const customer = await User.findOne({customerId:customerId}) + const customer_mobile = customer.phoneNumber + const customer_name = customer.username + const supplier = await Supplier.findOne({supplierId:req.body.supplierId}) + const supplier_name = supplier.suppliername + const supplier_mobile = supplier.phoneNumber var booking_id = await Tankerbooking.findOne({ bookingid: bookingId}) if(booking_id){ b_id= await generateBookingId() @@ -228,6 +233,10 @@ exports.tankerBooking = async (req, reply) => { tankersBookingData.tankLocation = usertobeInserted.tankLocation; //tankersBookingData.date = usertobeInserted.date; //tankersBookingData.time = usertobeInserted.time; + tankersBookingData.customerPhone = customer_mobile; + tankersBookingData.supplierPhone = supplier_mobile; + tankersBookingData.customerName = customer_name; + tankersBookingData.supplierName = supplier_name; } } diff --git a/src/models/tankers.js b/src/models/tankers.js index 37bf742b..7739fba5 100644 --- a/src/models/tankers.js +++ b/src/models/tankers.js @@ -57,7 +57,11 @@ const tankersbookingSchema = new mongoose.Schema({ amount_paid: { type: String, default: null }, amount_due: { type: String, default: null }, payment_mode: { type: String, default: null }, - remarks : { type: String, default: null } + remarks : { type: String, default: null }, + customerPhone : { type: String, default: null }, + supplierPhone : { type: String, default: null }, + customerName : { type: String, default: null }, + supplierName : { type: String, default: null }, });