Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend

src/controllers/supplierOrderController.js

@@ -10,6 +10,7 @@ const fastify = require("fastify")({
   logger: true,
 });
 const { Tanker, Tankerbooking,Bore,GovtPipeLine } = require('../models/tankers')
+const moment = require("moment");
 
 exports.orderStartedSms = async (request, reply) =>  {
 //console.log(bookingId,supplierContact,deliveryAgentContact,mobile)
@@ -377,14 +378,15 @@ exports.deliveryboystartandstop = async (req, reply) => {
 exports.amountUpdateByDeliveryBoy = async (req, reply) => {
   try {
     const { bookingId } = req.params;
-    const { amount_paid, payment_mode, orderStatus } = req.body;
+    const { amount_paid, payment_mode, orderStatus, deliveredDate } = req.body;
 
     const booking = await Tankerbooking.findOne({ bookingid: bookingId });
     if (!booking) {
       return reply.status(404).send({ message: "Booking not found" });
     }
 
-    const amount_initial_due = parseInt(booking.amount_due.replace(/,/g, ""), 10);
+    // const amount_initial_due = parseInt(booking.amount_due.replace(/,/g, ""), 10);
+    const amount_initial_due = booking.amount_due ? parseInt(booking.amount_due.replace(/,/g, ""), 10) : 0;
     const amount_due = amount_initial_due - parseInt(amount_paid.replace(/,/g, ""), 10);
 
     const updateData = {
@@ -392,14 +394,14 @@ exports.amountUpdateByDeliveryBoy = async (req, reply) => {
       payment_mode,
       orderStatus,
       amount_due,
-      payment_status: amount_due === 0 ? "paid" : "due"
+      payment_status: amount_due === 0 ? "paid" : "due",
+      deliveredDate: moment(deliveredDate, "DD-MM-YYYY HH:mm:ss").tz('Asia/Kolkata').format("DD-MM-YYYY HH:mm:ss"),
     };
 
     await Tankerbooking.findOneAndUpdate(
       { bookingid: bookingId },
       { $set: updateData }
     );
-
     reply.send({ status_code: 200, message: "Successfully updated" });
   } catch (err) {
     console.error(err);

src/models/tankers.js

@@ -8,6 +8,7 @@ const ObjectId = Schema.Types.ObjectId;
 // Store a random password reset code
 const code = Math.floor(100000 + Math.random() * 900000);
 const RoleSchema = new Schema({ name: String });
+const moment = require('moment');
 
 
 const tankersSchema = new mongoose.Schema({
@@ -69,7 +70,7 @@ const tankersbookingSchema = new mongoose.Schema({
     tankerRunningStatus: { type: String, default: "0" },
     longitude: { type : Number,default: 0.0},
     latitude: {type: Number,default: 0.0},
-
+    deliveredDate: { type: String, default: moment().format('DD-MM-YY HH:mm:ss') },
 });
 
 const boreSchema = new mongoose.Schema({

src/routes/supplierOrdersRoutes.js

@@ -321,7 +321,9 @@ module.exports = function (fastify, opts, next) {
 
           amount_paid: { type: "string" },
           payment_mode: { type: "string" },
-          orderStatus:{type:"string"}
+          orderStatus:{type:"string"},
+          deliveredDate: { type: "string"},
+
         },
       },
       security: [