From 27d8faeabf5a14bedc31da5b56288baa0cbea804 Mon Sep 17 00:00:00 2001 From: varun Date: Fri, 5 May 2023 03:48:39 -0400 Subject: [PATCH] made changes in distrubance amount --- src/controllers/supplierOrderController.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/controllers/supplierOrderController.js b/src/controllers/supplierOrderController.js index 019b857c..895da4c8 100644 --- a/src/controllers/supplierOrderController.js +++ b/src/controllers/supplierOrderController.js @@ -261,8 +261,9 @@ exports.deliveryboystartandstop = async (req, reply) => { const bookingdata = await Tankerbooking.findOne({bookingid: bookingId}) const ordered_quantity = parseInt((bookingdata.capacity).replace(/,/g, ''), 10) const price = parseInt((bookingdata.price).replace(/,/g, ''), 10) - const price_per_liter = ordered_quantity/price - + console.log("price"+"="+price) + const price_per_liter = price/ordered_quantity + console.log("price_per_liter"+"="+price_per_liter) // console.log(bookingdata.supplierId,"6") const customerId = bookingdata.customerId; @@ -358,10 +359,14 @@ exports.deliveryboystartandstop = async (req, reply) => { const quantity_delivered = final_receiver_waterlevel-start_water_level // const distrubance_price = parseInt(quantity_delivered.replace(/,/g, ''), 10)*price_per_liter const distrubance_price = quantity_delivered * price_per_liter + console.log("distrubance_price"+"="+distrubance_price) + const amount_difference = price - distrubance_price + console.log("amount_difference"+"="+amount_difference) + await Tankerbooking.findOneAndUpdate({bookingid:bookingId}, { $set: { final_water_level: final_receiver_waterlevel ,stop_time:stop_time,quantityDelivered:quantity_delivered,distrubance_price:distrubance_price,amount_difference:amount_difference,tankerRunningStatus:"0"} }); - reply.send({ status_code: 200, "stop time": stop_time,"final water level":final_receiver_waterlevel}); + reply.send({ status_code: 200, "stop time": stop_time,"final water level":final_receiver_waterlevel,quantityDelivered:quantity_delivered,distrubance_price:distrubance_price,amount_difference:amount_difference}); } else { throw new Error("Invalid action"); }