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

src/controllers/supplierController.js

@@ -73,6 +73,7 @@ exports.loginSupplier = async (req) => {
           lastName: req.body.lastName,
           contactNumber: req.body.phone,
           alternativeContactNumber: req.body.alternativeContactNumber,
+          office_address: req.body.office_address,
           country: req.body.country,
           state: req.body.state,
           city: req.body.city,

src/handlers/supplierHandler.js

@@ -79,7 +79,7 @@ isSupplierFormUrlEncoded = (req) => {
         s_data = {
           suppliername: req.body.suppliername,
           phone: req.body.phone,
-          office_address: req.body.address1,
+          office_address: req.body.office_address,
           password: req.body.password,
           emails: [
             {
@@ -189,7 +189,7 @@ exports.loginSupplier = async(request, reply) =>{
             phone: loginObject.supplier.phone,
             supplierId: loginObject.supplier.supplierId,
             suppliername: loginObject.supplier.suppliername,
-            office_address:  loginObject.supplier.profile.address1,
+            office_address:  loginObject.supplier.profile.office_address,
             phoneVerified: loginObject.supplier.phoneVerified,
             oneTimePasswordSetFlag: loginObject.supplier.oneTimePasswordSetFlag,
             type: loginObject.supplier.profile.role,
@@ -207,7 +207,7 @@ exports.loginSupplier = async(request, reply) =>{
             phone: loginObject.supplier.phone,
             supplierId: loginObject.supplier.supplierId,
             suppliername: loginObject.supplier.suppliername,
-            office_address:  loginObject.supplier.profile.address1,
+            office_address:  loginObject.supplier.profile.office_address,
             phoneVerified: loginObject.supplier.phoneVerified,
             oneTimePasswordSetFlag: loginObject.supplier.oneTimePasswordSetFlag,
             type: loginObject.supplier.profile.role,