From 2de94606315bc6dd9a43eb30bc999ac1d7eba4e2 Mon Sep 17 00:00:00 2001 From: varun Date: Wed, 17 May 2023 02:32:23 -0400 Subject: [PATCH] made changes in distrubance amount --- src/controllers/supplierOrderController.js | 19 +++++++++++++ src/controllers/tankersController.js | 6 ++--- src/models/tankers.js | 1 + src/routes/supplierOrdersRoutes.js | 31 ++++++++++++++++++++++ 4 files changed, 54 insertions(+), 3 deletions(-) diff --git a/src/controllers/supplierOrderController.js b/src/controllers/supplierOrderController.js index 9a9cf817..472c8152 100644 --- a/src/controllers/supplierOrderController.js +++ b/src/controllers/supplierOrderController.js @@ -784,4 +784,23 @@ exports.getBillingInfo = async (req, reply) => { } catch (err) { reply.status(400).send({ message: err.message }); } +}; + + +exports.getAlldistrubanceamountsdetails = async (req, reply) => { + const limit = parseInt(req.query.limit) || 100; + const page = parseInt(req.query.page) || 1; + const startindex = (page - 1) * limit; + const customerId = req.params.customerId + try { + await Tankerbooking.find({ customerId: customerId, payment_status: "due",distrubance_status:"1"}) + .limit(limit) + .skip(startindex) + .exec() + .then((docs) => { + reply.send({ status_code: 200, data: docs, count: docs.length }); + }) + } catch (err) { + reply.status(400).send({ message: err.message }); + } }; \ No newline at end of file diff --git a/src/controllers/tankersController.js b/src/controllers/tankersController.js index 759b1631..4159a4a8 100644 --- a/src/controllers/tankersController.js +++ b/src/controllers/tankersController.js @@ -684,15 +684,15 @@ exports.distrubanceStatus = async (req, reply) => { const distrubance_price = parseInt(booking.distrubance_price .replace(/,/g, ''), 10) const price = parseInt(booking.price.replace(/,/g, ''), 10) const amount_due = parseInt(booking.amount_due .replace(/,/g, ''), 10) - const price_variation = price-distrubance_price + const price_variation = price-distrubance_price if (action === "accept") { - await Tankerbooking.findOneAndUpdate({ bookingid:bookingid }, { $set: { amount_due: price,amount_difference:"0" } }); + await Tankerbooking.findOneAndUpdate({ bookingid:bookingid }, { $set: { amount_due: distrubance_price,amount_difference:price_variation},distrubance_status:"1" }); } if (action === "reject") { - await Tankerbooking.findOneAndUpdate({ bookingid:bookingid }, { $set: { amount_due: distrubance_price,amount_difference:"0" } }); + await Tankerbooking.findOneAndUpdate({ bookingid:bookingid }, { $set: { amount_due: price,amount_difference:"0",distrubance_status:"0" } }); } diff --git a/src/models/tankers.js b/src/models/tankers.js index 017002cc..7614c549 100644 --- a/src/models/tankers.js +++ b/src/models/tankers.js @@ -71,6 +71,7 @@ const tankersbookingSchema = new mongoose.Schema({ longitude: { type : Number,default: 0.0}, latitude: {type: Number,default: 0.0}, deliveredDate: { type: String, default: null }, + distrubance_status: { type: String, default: "0" }, }); const boreSchema = new mongoose.Schema({ diff --git a/src/routes/supplierOrdersRoutes.js b/src/routes/supplierOrdersRoutes.js index 6c2a9b20..669ec2a4 100644 --- a/src/routes/supplierOrdersRoutes.js +++ b/src/routes/supplierOrdersRoutes.js @@ -712,6 +712,37 @@ module.exports = function (fastify, opts, next) { }); + fastify.route({ + method: "GET", + url: "/api/getAlldistrubanceamountsdetails/:customerId", + schema: { + tags: ["Supplier-Order"], + description:"This is to get all distrubance amount accounts", + summary: "This is to get all distrubance amount accounts", + params: { + required: ["customerId"], + type: "object", + properties: { + customerId: { + type: "string", + description: "customerId", + }, + }, + }, + + security: [ + { + basicAuth: [], + }, + ], + + }, + handler:supplierOrderController.getAlldistrubanceamountsdetails, + + }); + + + next(); }