diff --git a/src/controllers/tankersController.js b/src/controllers/tankersController.js index 3add7e5d..b685f324 100644 --- a/src/controllers/tankersController.js +++ b/src/controllers/tankersController.js @@ -133,7 +133,7 @@ exports.tankerBooking = async (req, reply) => { checkFormEncoding = isUserFormUrlEncoded(req); if (checkFormEncoding.isUserFormUrlEncoded) { usertobeInserted = checkFormEncoding.tankersBookingData; - console.log("thsi true url string"); + console.log("thsi true url string");s tankersBookingData.bookingid = bookingId; tankersBookingData.capacity = usertobeInserted.capacity; tankersBookingData.typeofwater = usertobeInserted.typeofwater; @@ -141,9 +141,6 @@ exports.tankerBooking = async (req, reply) => { tankersBookingData.dateOfOrder = usertobeInserted.dateOfOrder; - - - } } diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index 3c70347a..00e7c606 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -28,8 +28,9 @@ console.log(req.params); type: req.body.type, tankLocation:req.body.tankLocation, }; + var tank_name = req.body.tankName - var i_tank = await Tank.findOne({ tankName: tank_name}) + var i_tank = await Tank.findOne({ tankName: tank_name,userName:username}) if(i_tank){ throw new Error('tankname already exists'); } @@ -67,7 +68,7 @@ exports.updateTanksInfo = async (req, reply) => { const tankName = req.params.tankName; const tank = req.body; const { ...updateData } = tank; - const update = await Tank.findOneAndUpdate({ tankName: tankName }, updateData, { new: true }); + const update = await Tank.findOneAndUpdate({ tankName: tankName, }, updateData, { new: true }); //return update; reply.send({ status_code: 200, data: update }); diff --git a/src/models/tankers.js b/src/models/tankers.js index 2e0e6735..2c0a0545 100644 --- a/src/models/tankers.js +++ b/src/models/tankers.js @@ -25,9 +25,14 @@ const tankersbookingSchema = new mongoose.Schema({ dateOfOrder: { type: String, default: null }, typeofwater: { type: String, default: null }, capacity: { type: String, default: null }, - address: { type: String, default: null }, - amount : { type: String, default: "due" }, + address: { type: String, default: null }, + payment_status : { type: String, default: "due" }, //orderStatus: { type: String, default: "due" }, + quantityDelivered: { type: String, default: null}, + amount_paid: { type: String, default: null }, + amount_due: { type: String, default: null }, + payment_mode: { type: String, default: null }, + remarks : { type: String, default: null }, });