From 0d6dcc8dced37980ed400dbc5a7e065e0d668910 Mon Sep 17 00:00:00 2001 From: varun Date: Fri, 28 Apr 2023 06:07:50 -0400 Subject: [PATCH] created delivery tracking sms, created accounts for user and particular supplier --- src/controllers/supplierController.js | 1 + src/controllers/supplierOrderController.js | 1 + src/controllers/tankersController.js | 1 + src/controllers/tanksController.js | 1 + src/controllers/userController.js | 1 + src/models/tankers.js | 1 + src/routes/supplierOrdersRoutes.js | 1 + src/routes/supplierRoute.js | 1 + src/routes/tankersRoute.js | 1 + src/routes/tanksRoute.js | 1 + src/routes/usersRoute.js | 1 + 11 files changed, 11 insertions(+) diff --git a/src/controllers/supplierController.js b/src/controllers/supplierController.js index 696d54dc..c7b30335 100644 --- a/src/controllers/supplierController.js +++ b/src/controllers/supplierController.js @@ -135,6 +135,7 @@ exports.loginDeliveryBoy = async (req) => { supplier.description = suppliertobeInserted.description } + console.log("---------checkurl ecnoded string-----------------------"); // Store hash in your password DB. diff --git a/src/controllers/supplierOrderController.js b/src/controllers/supplierOrderController.js index 5aae078e..048265d4 100644 --- a/src/controllers/supplierOrderController.js +++ b/src/controllers/supplierOrderController.js @@ -34,6 +34,7 @@ exports.orderStartedSms = async (request, reply) => { } }; + const req = http.request(apiUrl, options, (res) => { let data = ''; res.on('data', (chunk) => { diff --git a/src/controllers/tankersController.js b/src/controllers/tankersController.js index a6bfb87e..1bbf17b7 100644 --- a/src/controllers/tankersController.js +++ b/src/controllers/tankersController.js @@ -695,6 +695,7 @@ exports.distrubanceStatus = async (req, reply) => { } + reply.send({ status_code: 200, data: booking}); // return tank; } catch (err) { diff --git a/src/controllers/tanksController.js b/src/controllers/tanksController.js index a150267a..528a3902 100644 --- a/src/controllers/tanksController.js +++ b/src/controllers/tanksController.js @@ -331,6 +331,7 @@ exports.motorAction = async (req, reply) => { // } + if(supplier_tank_type==="bore" && receiver_type === "sump"){ const receiver_capacity = parseInt(receiver_tank_info.capacity.replace(/,/g, ''), 10) // console.log(receiver_capacity,"0",receiver_tank_info.tankName) diff --git a/src/controllers/userController.js b/src/controllers/userController.js index aa772fb8..92aecb3f 100644 --- a/src/controllers/userController.js +++ b/src/controllers/userController.js @@ -424,6 +424,7 @@ exports.sendSms = async (request, reply) => { const apiUrl = `https://smslogin.co/v3/api.php?username=${username}&apikey=${apiKey}&senderid=${senderId}&mobile=${mobile}&message=${encodeURIComponent(message)}`; + const options = { method: 'GET', headers: { diff --git a/src/models/tankers.js b/src/models/tankers.js index 2aefd1f2..c897dba5 100644 --- a/src/models/tankers.js +++ b/src/models/tankers.js @@ -29,6 +29,7 @@ const tankersSchema = new mongoose.Schema({ }); + const tankersbookingSchema = new mongoose.Schema({ customerId: { type: String, default: null }, diff --git a/src/routes/supplierOrdersRoutes.js b/src/routes/supplierOrdersRoutes.js index 6db65960..2f83adae 100644 --- a/src/routes/supplierOrdersRoutes.js +++ b/src/routes/supplierOrdersRoutes.js @@ -149,6 +149,7 @@ module.exports = function (fastify, opts, next) { + fastify.get("/api/getsupplierbookings/:supplierId", { schema: { tags: ["Supplier"], diff --git a/src/routes/supplierRoute.js b/src/routes/supplierRoute.js index 70a13a79..7182a28e 100644 --- a/src/routes/supplierRoute.js +++ b/src/routes/supplierRoute.js @@ -382,6 +382,7 @@ module.exports = function (fastify, opts, next) { handler: validationHandler.deleteDeliveryBoy, }); + fastify.route({ method: "PUT", diff --git a/src/routes/tankersRoute.js b/src/routes/tankersRoute.js index a8ee099b..e9d8fbf2 100644 --- a/src/routes/tankersRoute.js +++ b/src/routes/tankersRoute.js @@ -793,6 +793,7 @@ module.exports = function (fastify, opts, next) { }, }, + security: [ { basicAuth: [], diff --git a/src/routes/tanksRoute.js b/src/routes/tanksRoute.js index 0eb7e1e4..cfcfac74 100644 --- a/src/routes/tanksRoute.js +++ b/src/routes/tanksRoute.js @@ -432,6 +432,7 @@ module.exports = function (fastify, opts, next) { handler: tanksController.checkStatusofIot, }); + fastify.route({ method: 'GET', url: '/waterlevel-sum', diff --git a/src/routes/usersRoute.js b/src/routes/usersRoute.js index a4778684..fba890dc 100644 --- a/src/routes/usersRoute.js +++ b/src/routes/usersRoute.js @@ -230,6 +230,7 @@ module.exports = function (fastify, opts, next) { validationHandler.sendPasswordResetCode(request, reply); }, }); + fastify.route({ method: "POST",