Commit Graph

136 Commits

Author SHA1 Message Date
Bilal Catic
582b249243 remove obsolete code 2019-07-31 14:21:51 +02:00
Bilal Catic
398a35f0c8 fix price and quantity in fee post request 2019-07-31 14:17:30 +02:00
Bilal Catic
0c6d481a69 fix fees formatting 2019-07-31 13:55:02 +02:00
Bilal Catic
db78a1eb69 Merge branch 'fix-undetected-booking-changes' into 'master'
Fix undetected booking changes

See merge request saburly/psihologija!30
2019-07-31 08:07:11 +00:00
Bilal Catic
b07c375d83 remove label and cost explanation from booking fees 2019-07-30 23:04:29 +02:00
Bilal Catic
3ccb80ad75 detect cancellation of newly created booking 2019-07-30 22:28:06 +02:00
Bilal Catic
095231c8a2 Merge branch 'speed-up-upload-process' into 'master'
prevent locking upload response; show processing status on upload screen

See merge request saburly/psihologija!29
2019-07-25 12:41:34 +00:00
Bilal Catic
8053093c0a prevent locking upload response; show processing status on upload screen 2019-07-25 14:40:33 +02:00
Bilal Catic
7f3030960e Merge branch 'create-database-connections-pool' into 'master'
Create database connections pool

See merge request saburly/psihologija!28
2019-07-25 04:29:44 +00:00
Bilal Catic
54ae3e4ef5 make dlock screen waiting for incident calculation to finish 2019-07-25 06:28:26 +02:00
Bilal Catic
2b271196a0 add pool option to the config 2019-07-25 06:27:22 +02:00
Bilal Catic
26458d9957 add pool option to the config 2019-07-25 06:27:02 +02:00
Bilal Catic
601f924e4f Merge branch 'implement-invoice-integration' into 'master'
Implement invoice integration

See merge request saburly/psihologija!27
2019-07-25 01:02:44 +00:00
Bilal Catic
84befa07ae add loading while adding fees to ORD 2019-07-25 03:01:09 +02:00
Bilal Catic
a5221da2f1 fix incidents date 2019-07-25 02:36:38 +02:00
Bilal Catic
71e034b6c2 invoice integration 2019-07-25 02:01:09 +02:00
Bilal Catic
aeffe86313 add router for "addFees" endpoint 2019-07-25 02:01:09 +02:00
Bilal Catic
7437972a53 send request to add fees in ORD 2019-07-25 02:01:09 +02:00
Bilal Catic
fdd4491e07 add button and modal dialog for invoice integration 2019-07-25 02:01:09 +02:00
Bilal Catic
5a6bc3cc6f add route and controller for invoice integration 2019-07-25 02:01:09 +02:00
Bilal Catic
ac1c82c16b control sequelize logging with env variable 2019-07-24 07:20:05 +02:00
Bilal Catic
4fefa3a08d fix too long unscheduled use intervals 2019-07-22 06:57:19 +02:00
Bilal Catic
dae71475ec fix undefined hourly rate bug 2019-07-22 06:03:22 +02:00
Bilal Catic
00988b0dac do not charge cancellation under 30 minutes of creation 2019-07-19 12:47:16 +02:00
Bilal Catic
ef40483c22 fix undefined hourlyRate bug 2019-07-19 12:16:20 +02:00
Bilal Catic
96e12db213 Merge branch 'fix-cancellation-charges-display' into 'master'
display cancellation charges correctly

See merge request saburly/psihologija!26
2019-07-16 08:18:03 +00:00
Bilal Catic
a27d71e578 display cancellation charges correctly 2019-07-16 10:16:43 +02:00
Bilal Catic
966dbd9bdc Merge branch 'add-cancellation-incidents' into 'master'
track and charge cancellation charges

See merge request saburly/psihologija!25
2019-07-16 00:52:52 +00:00
Bilal Catic
15faeac06f track and charge cancellation charges 2019-07-16 02:51:07 +02:00
Bilal Catic
e61476393c Merge branch 'add-booking-change-log-table' into 'master'
implement booking reservation change log

See merge request saburly/psihologija!24
2019-07-15 09:49:51 +00:00
Bilal Catic
e150ebc7e8 implement booking reservation change log 2019-07-15 01:24:18 +02:00
Bilal Catic
8a0e198690 Merge branch 'include-room-change-for-booking-change-incidents' into 'master'
Include room change for booking change incidents

See merge request saburly/psihologija!23
2019-07-12 02:46:15 +00:00
Bilal Catic
98899d6826 remove console log 2019-07-12 04:41:34 +02:00
Bilal Catic
ad9bdfa606 track room change for booking change incidents 2019-07-09 15:05:36 +02:00
Bilal Catic
edefaf7cf9 modify bookingChangeIncidents table 2019-07-09 14:17:36 +02:00
Bilal Catic
129e6e78d6 update readme 2019-07-08 20:46:14 +02:00
Bilal Catic
0560d1cb78 Merge branch 'include-cancelation-charges' into 'master'
make member clickable in booking change incidents table

See merge request saburly/psihologija!22
2019-07-08 18:28:14 +00:00
Bilal Catic
a11ce4252b make member clickable in booking change incidents table 2019-07-08 20:27:35 +02:00
Bilal Catic
2a35d78ba7 Merge branch 'include-cancelation-charges' into 'master'
Include cancelation charges

See merge request saburly/psihologija!21
2019-07-08 18:25:39 +00:00
Bilal Catic
f6e8e6667b display booking charge incidents; refactor frontend 2019-07-08 20:23:50 +02:00
Bilal Catic
c0d7418f3f include booking change incidents in report; refactor 2019-07-08 18:50:10 +02:00
Bilal Catic
6bed9aecc0 create incidents for booking changes 2019-07-08 18:23:32 +02:00
Bilal Catic
7aab1e538e fetch reservations, find and update changed reservations 2019-07-07 03:53:31 +02:00
Bilal Catic
aedb09d1be Merge branch 'improve-incidents-report-ui' into 'master'
Improve incidents report ui

See merge request saburly/psihologija!20
2019-07-07 01:47:02 +00:00
Bilal Catic
fb82f6d4da improve UI, refactor 2019-07-07 03:45:07 +02:00
Bilal Catic
8926956fca include all incident types in summary 2019-07-07 03:02:13 +02:00
Bilal Catic
79c8e9c9e2 set selected member in practice report dropdown 2019-07-07 02:58:11 +02:00
Bilal Catic
e3eee4139b modify UI to display incidents separately 2019-07-07 02:44:34 +02:00
Bilal Catic
bd513b7599 make difference between pre-reservation and post-reservation unscheduled use 2019-07-07 02:43:07 +02:00
Bilal Catic
5d3653cd65 make difference between door lock charges related to reservations and standalone incidents 2019-07-07 00:28:39 +02:00