 varun
|
42612bb437
|
tank name uniquenesst,added payment system to delivery boy
|
3 years ago |
 Bhaskara Kishore
|
b9de78e368
|
pass the timestamp in friend request api
|
3 years ago |
|
Bhaskara Kishore
|
0bcb16613f
|
pending and reject apis supplier and customer
|
3 years ago |
|
varun
|
18ac80e0a7
|
added capacity calculator
|
3 years ago |
|
varun
|
fef12c9389
|
added capacity calculator
|
3 years ago |
|
Bhaskara Kishore
|
79839e8c7e
|
longitude and latitude added user
|
3 years ago |
|
Bhaskara Kishore
|
cc36b04435
|
add field suppliername in deliveryboy side
|
3 years ago |
|
Bhaskara Kishore
|
002367524f
|
added longitude and latitude in user side
|
3 years ago |
|
Bhaskara Kishore
|
3bcc274e51
|
delivery boy login and phone verify
|
3 years ago |
|
Bhaskara Kishore
|
2881cf88c6
|
create a IOT device post and get apis
|
3 years ago |
|
varun
|
0e0398d5c8
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
d11e05d1a8
|
delivery boy start and stop
|
3 years ago |
|
Bhaskara Kishore
|
2b4f383b6a
|
changes friend-request
|
3 years ago |
|
Bhaskara Kishore
|
2b8d6902b7
|
friendrequest accept and reject particual customer
|
3 years ago |
|
Bhaskara Kishore
|
7eb2d40b86
|
DELETE api for bookingid
|
3 years ago |
|
varun
|
88babe0d4c
|
apis to get all delivery boys and active delivery boys under supplier
|
3 years ago |
|
varun
|
c11917f8ce
|
made changes in supplier and delivery
|
3 years ago |
|
varun
|
fe6e6825ac
|
made changes in supplier and delivery
|
3 years ago |
|
varun
|
a712ecb43b
|
made changes in supplier and delivery
|
3 years ago |
|
varun
|
60bf11771a
|
created bookings of supplier and delivery boys
|
3 years ago |
|
varun
|
e7544901a4
|
created bookings of supplier and delivery boys
|
3 years ago |
|
Bhaskara Kishore
|
43c14a804d
|
tanker order accepted and rejected
|
3 years ago |
|
Bhaskara Kishore
|
f01063df28
|
get all tanker booking data
|
3 years ago |
|
Bhaskara Kishore
|
7dda54bf69
|
adding summary
|
3 years ago |
|
Bhaskara Kishore
|
78bfa5afcc
|
connected customers
|
3 years ago |
|
Bhaskara Kishore
|
7ebe3e0963
|
price filed added in tanker storing booking
|
3 years ago |
|
Bhaskara Kishore
|
dda1cc78de
|
get all pending customer from friend-request
|
3 years ago |
|
Bhaskara Kishore
|
06342b492f
|
get all tanker booking details
|
3 years ago |
|
Bhaskara Kishore
|
0d2f022d9e
|
delete and update delivery boy details
|
3 years ago |
|
Bhaskara Kishore
|
642b4fa267
|
delivery boy phone verification
|
3 years ago |
|
Bhaskara Kishore
|
c78755ae4b
|
deliveryboy login
|
3 years ago |
|
varun
|
1ec8d8b6fa
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
45cb3ecf8a
|
pending/rejected connection
|
3 years ago |
|
Bhaskara Kishore
|
b318765013
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
2f1b03c086
|
update tanker schema changes
|
3 years ago |
|
varun
|
cb9fb519ea
|
getting connected suppliers
|
3 years ago |
|
varun
|
e3490c5424
|
once the connect request is sent it will not show in connection request
|
3 years ago |
|
varun
|
062ddaed4a
|
changes in getting active delivery boys
|
3 years ago |
|
varun
|
5ee7cc0910
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
e71b3d7eba
|
changes in getting active delivery boys
|
3 years ago |
|
Bhaskara Kishore
|
97994a556f
|
connection-request issue
|
3 years ago |
|
Bhaskara Kishore
|
94af513b6e
|
latitude and longitude
|
3 years ago |
|
Bhaskara Kishore
|
21b384c6ac
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
886e13b122
|
update current supplier
|
3 years ago |
|
varun
|
2383d245d2
|
connect status checking
|
3 years ago |
|
varun
|
cb1c4a1bcc
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
74f38478c3
|
test
|
3 years ago |
|
Bhaskara Kishore
|
a3c123ca59
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
e7cdd263ce
|
friend-request
|
3 years ago |
|
varun
|
305288679f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
1c9fc20e5f
|
made changes for sending otp to supplier
|
3 years ago |
|
Bhaskara Kishore
|
1e161f8453
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
616b883824
|
price convert to array
|
3 years ago |
|
varun
|
1b0fc4072c
|
made changes for sending otp to supplier
|
3 years ago |
|
varun
|
abee47ecd4
|
made changes for sending otp to supplier
|
3 years ago |
|
varun
|
5777768c62
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
68a6786a2e
|
fetching active delivery boys for a particular supplier
|
3 years ago |
|
varun
|
ab270bcc91
|
fetching active delivery boys for a particular supplier
|
3 years ago |
 raj
|
7725eaec7e
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
raj
|
54a2decdfd
|
changes updated controllers models routes
|
3 years ago |
|
Bhaskara Kishore
|
bac957e25f
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
f9ce6aa9be
|
connection-status
|
3 years ago |
|
raj
|
3bd6b0e953
|
updating tankers
|
3 years ago |
|
Bhaskara Kishore
|
fb2da04f9a
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
e26b2fee31
|
connected status list
|
3 years ago |
|
raj
|
5c28bf1784
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
raj
|
5c2261c239
|
Commit message
|
3 years ago |
|
varun
|
0f11d82f36
|
mobile number verification
|
3 years ago |
|
varun
|
f49d0f0ed3
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
varun
|
17b0b38719
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
varun
|
a12804ef33
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
varun
|
19f847be0c
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
varun
|
af0f91a51d
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
varun
|
81296fd723
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
varun
|
b06f001dbc
|
made changes in tanker.js,tankercontrollers,tanker routes
|
3 years ago |
|
Bhaskara Kishore
|
33a6689dad
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
bdde35206a
|
create a api status connected to display list
|
3 years ago |
|
varun
|
06c9fd2006
|
changes in tanker
|
3 years ago |
|
varun
|
e30e79327c
|
changes in add tanker
|
3 years ago |
|
Bhaskara Kishore
|
c66f1fcba6
|
In tankerschema side add price and changes
|
3 years ago |
|
Bhaskara Kishore
|
8d57fc40ef
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
c8c50556a2
|
supplier- user connection
|
3 years ago |
|
varun
|
f3cf84a119
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
a1d5b7f7fc
|
created delivery boys
|
3 years ago |
|
Bhaskara Kishore
|
542b9203cf
|
changes
|
3 years ago |
|
Bhaskara Kishore
|
b387e6ad12
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
65cafdc44d
|
office_address null issue fix
|
3 years ago |
|
Bhaskara Kishore
|
5756a15196
|
office_address null issue fix
|
3 years ago |
|
varun
|
7ec394bc98
|
made changes in tanker
|
3 years ago |
|
varun
|
94a979fc53
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
df639eb0b8
|
made changes in tanker
|
3 years ago |
|
Bhaskara Kishore
|
3215745a50
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
3e190a2e50
|
All Supplier, Current Supplier, GetSingle Supplier
|
3 years ago |
|
varun
|
3895bc7161
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
0814cfffd0
|
start and stop
|
3 years ago |
|
Bhaskara Kishore
|
ab55b64cb2
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
0e3b79525d
|
user and supplier friend-request accept and reject
|
3 years ago |
|
varun
|
2c969dc1be
|
start and stop -main changes
|
3 years ago |
|
varun
|
54b50ad8e4
|
start and stop -main
|
3 years ago |
|
varun
|
ff9a79b5d8
|
start and stop
|
3 years ago |
|
varun
|
25369ffb7d
|
start and stop
|
3 years ago |
|
varun
|
2c5dd9f475
|
start and stop
|
3 years ago |
|
varun
|
dc65e33af5
|
start and stop
|
3 years ago |
|
varun
|
203ea714ce
|
start and stop
|
3 years ago |
|
varun
|
c8768e3db6
|
start and stop
|
3 years ago |
|
varun
|
2e5bc65d63
|
start and stop
|
3 years ago |
|
varun
|
e60f9a018e
|
profile picture
|
3 years ago |
|
varun
|
8572101083
|
checking start and stop
|
3 years ago |
|
varun
|
f5edc7c60d
|
initial update removed in updating tank levels
|
3 years ago |
|
varun
|
3292af9179
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
59a3325ec5
|
made changes in profile picture and created get all tanker data
|
3 years ago |
|
Bhaskara Kishore
|
fc6cf869cc
|
supplierId changes
|
3 years ago |
|
varun
|
144587e196
|
made changes
|
3 years ago |
|
varun
|
3fcc7a91b1
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
9a4974a006
|
made changes
|
3 years ago |
|
varun
|
10c3320e4b
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
5eb6223911
|
make changes in start and stop
|
3 years ago |
|
varun
|
1c205f7630
|
made changes in tank levels,start and stop
|
3 years ago |
|
varun
|
636d286763
|
made changes in tank levels,start and stop
|
3 years ago |
|
varun
|
099ac09a87
|
made changes in tank levels,start and stop
|
3 years ago |
|
varun
|
e65b2b757f
|
made changes in tank levels,start and stop
|
3 years ago |
|
Bhaskara Kishore
|
4844be2e7c
|
supplier phone verifyApi
|
3 years ago |
|
Bhaskara Kishore
|
a0a2114a36
|
error
|
3 years ago |
|
Bhaskara Kishore
|
c945240adf
|
module_err
|
3 years ago |
|
Bhaskara Kishore
|
df3f1f1637
|
module_error
|
3 years ago |
|
Bhaskara Kishore
|
1b0e23a806
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
Bhaskara Kishore
|
d5e9daabe7
|
supplier schema signup and signin
|
3 years ago |
|
varun
|
bc0776b99d
|
changes in tanks and start and stop regarding bore to sump
|
3 years ago |
|
Bhaskara Kishore
|
243df39ab1
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
commit
|
3 years ago |
|
Bhaskara Kishore
|
0742bc6469
|
Supplier Schema and signup,signin
|
3 years ago |
|
varun
|
caf6686afb
|
changes in tanks and start and stop regarding bore to sump
|
3 years ago |
|
varun
|
ef291f20e7
|
changes in tanks and start and stop regarding bore to sump
|
3 years ago |
|
varun
|
d88bb6578a
|
changes in tanks and start and stop regarding bore to sump
|
3 years ago |
|
varun
|
68f92cee98
|
changes in tanks and start and stop regarding bore to sump
|
3 years ago |
|
varun
|
79b11363e6
|
changes in tanks and start and stop regarding bore to sump
|
3 years ago |
|
varun
|
aeba3d8af5
|
changes in tanks and start and stop
|
3 years ago |
|
Bhaskara Kishore
|
2321ea6077
|
logout
|
3 years ago |
|
Bhaskara Kishore
|
955b5936d4
|
logout functionality
|
3 years ago |
|
varun
|
7f06730530
|
changes in motor status
|
3 years ago |
|
varun
|
9db0671b49
|
made changes in customer id and changed tank location to lower case while creating them
|
3 years ago |
|
varun
|
4d22f4605b
|
motor on and off status functionality
|
3 years ago |
|
varun
|
3b6f227fbf
|
madce changes in create connections
|
3 years ago |
|
varun
|
a1be104b61
|
created schema for start and stop in tanks.js and made changes start and stop to store data
|
3 years ago |
|
varun
|
b6286cf82c
|
made changes in create connections and tanks controllers regarding start and stop
|
3 years ago |
|
varun
|
6af9949a28
|
removed percentages growth and decrease system in start and stop,update tank levels, created desired tank level system,and written bore to overhead
|
3 years ago |
|
varun
|
e980d26523
|
created delete connections
|
3 years ago |
|
varun
|
89c27bbfd8
|
created delete connections
|
3 years ago |
|
varun
|
ec04441bb2
|
created delete connections
|
3 years ago |
|
varun
|
85c3f75ede
|
made changes in start and stop,created consumption
|
3 years ago |
|
varun
|
2a279e3ce4
|
made changes in start and stop,created consumption
|
3 years ago |
|
varun
|
d381d95533
|
made changes in start and stop,created consumption
|
3 years ago |
|
varun
|
daaf44494d
|
creating start and stop,made changes in update tank levels
|
3 years ago |
|
varun
|
d3efa93238
|
creating start and stop
|
3 years ago |
|
varun
|
c4202f29d1
|
made changes in tanks.js
|
3 years ago |
|
varun
|
5b52b7c660
|
made changes in tanks controller
|
3 years ago |
|
varun
|
8702c293c7
|
made changes in tanks controller
|
3 years ago |
|
varun
|
d7be8badb0
|
made changes in tanks controller
|
3 years ago |
|
varun
|
af6892f8b1
|
made changes in tanks controller
|
3 years ago |
|
varun
|
2b871d1114
|
made changes in tanks controller
|
3 years ago |
|
varun
|
ce802ed7bd
|
made changes in tanks controller
|
3 years ago |
|
varun
|
27bd372904
|
made changes in tanks controller
|
3 years ago |
|
varun
|
d18ec3f03b
|
made changes in tanker
|
3 years ago |
|
varun
|
dfb2c0710c
|
made changes in tanker
|
3 years ago |
|
varun
|
74df460ec4
|
made changes in tanker
|
3 years ago |
|
varun
|
a0fd1f1f0d
|
made changes in tanker
|
3 years ago |
|
varun
|
0753b7cd03
|
made changes in tanker
|
3 years ago |
|
varun
|
ca16d9f4e6
|
made changes in create connections
|
3 years ago |
|
varun
|
6b9f68297e
|
token expiry changed to 30d
|
3 years ago |
|
varun
|
0b7d7dfd9d
|
token expiry changed to 30000
|
3 years ago |
|
varun
|
98d977b063
|
token expiry changed 15d
|
3 years ago |
|
varun
|
8df7e44626
|
token expiry changed 30100MS
|
3 years ago |
|
varun
|
7ef67bfb0a
|
token expiry changed 301
|
3 years ago |
|
varun
|
204e3df465
|
changed token expiry to 300 seconds for test
|
3 years ago |
|
varun
|
5263286763
|
changed token expiry to 300 seconds for test
|
3 years ago |
|
varun
|
db8b059fd0
|
changed token expiry to 60 seconds for test
|
3 years ago |
|
varun
|
5740713b68
|
added date and time for tanker booking
|
3 years ago |
|
varun
|
a8dc441425
|
added date and time for tanker booking
|
3 years ago |
|
varun
|
471944b3e5
|
made update tank levels api hit automatically when get tank levels called
|
3 years ago |
|
varun
|
6d1dc5611d
|
made update tank levels api hit automatically when get tank levels called
|
3 years ago |
|
varun
|
0446f665c8
|
made changes in tanker controller
|
3 years ago |
|
varun
|
9b2ceca8d8
|
made changes in tanker controller
|
3 years ago |
|
varun
|
c8b54ee6cf
|
made changes in tanker controller
|
3 years ago |
|
varun
|
bbd3db023e
|
made changes in tank creation
|
3 years ago |
|
varun
|
1c03ff6f25
|
creating sms and logout api
|
3 years ago |
|
varun
|
706b914fad
|
made chanbges in tanks controllers in update water level
|
3 years ago |
|
varun
|
e3b00c6782
|
created get booking data of a tanker
|
3 years ago |
|
varun
|
0bdd1ad280
|
made changes in token
|
3 years ago |
|
varun
|
e5b9b620bf
|
made changes in profile picture in login
|
3 years ago |
|
varun
|
a79616bbbf
|
made changes in reset token
|
3 years ago |
|
varun
|
ba48363af9
|
made changes in reset token test 3
|
3 years ago |
|
varun
|
160cdefe62
|
made changes in reset token test 2
|
3 years ago |
|
varun
|
483d2f9745
|
made changes in reset token test
|
3 years ago |
|
varun
|
660084974d
|
made changes in reset token
|
3 years ago |
|
varun
|
ca641ecdc5
|
Merge branch 'master' of http://35.207.205.18:3000/Arminta/watermanagement-backend
|
3 years ago |
|
varun
|
4378056ca9
|
order status in tanker.js
|
3 years ago |
|
varun
|
014b14b561
|
made changes in tanks controllers
|
3 years ago |
|
varun
|
9f213c2038
|
made changes in tankers booking data and tankers.js and controllers
|
3 years ago |
 gitadmin
|
f2c244835a
|
Testing automated deployment of code changes-1
|
3 years ago |
|
gitadmin
|
2fe17bd259
|
Testing automated deployment of code changes
|
3 years ago |
|
gitadmin
|
6c18995a93
|
Updated ip address to point to dev api host.
This file should be ignore in the git until the config file parser is implemented in the code to auto point the api to the correct host
|
3 years ago |
