318 Commits

Author SHA1 Message Date
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
Bilal Catic
72bb874d85 Merge branch 'fix-door-lock-charge-bug' into 'master'
fix door lock charges - unlocked incident

See merge request saburly/psihologija!19
2019-07-03 12:35:47 +00:00
Bilal Catic
23b0924b5a include unscheduled use between reservations 2019-07-03 14:34:34 +02:00
Bilal Catic
2b492025fb fix door lock charges 2019-07-03 11:50:23 +02:00
Bilal Catic
fc4d374e23 fix door lock charges - unlocked incident 2019-07-02 10:12:56 +02:00
Bilal Catic
b9715a1ebe Merge branch 'fix-door-lock-charge-bug' into 'master'
fix invalid door lock charges

See merge request saburly/psihologija!18
2019-07-01 01:37:12 +00:00
Bilal Catic
26d58b87f2 fix invalid door lock charges 2019-07-01 03:35:02 +02:00
Bilal Catic
5bbf7016dc Merge branch 'add-door-lock-charges-screen' into 'master'
Add door lock charges screen

See merge request saburly/psihologija!17
2019-06-25 10:57:28 +00:00
Bilal Catic
e03f634aff fix timezone conversion when fetching booking reservations 2019-06-25 12:10:54 +02:00
Bilal Catic
7f0042633c refactor; save date and time in UTC correctly 2019-06-25 12:10:54 +02:00
Bilal Catic
0a95129e98 do not report unknown member multiple times; read dlock timestamps in correct timezone 2019-06-25 12:10:54 +02:00
Bilal Catic
8198f35343 Merge branch 'add-door-lock-charges-screen' into 'master'
add link to member summary report from incidents table

See merge request saburly/psihologija!16
2019-06-21 09:39:39 +00:00
Bilal Catic
f7c30919e6 add link to member summary report from incidents table 2019-06-21 11:36:42 +02:00
Bilal Catic
ac92401960 Merge branch 'add-door-lock-charges-screen' into 'master'
improve date picker, allow inline button

See merge request saburly/psihologija!15
2019-06-20 17:00:49 +00:00
Bilal Catic
2e12daf1e4 fix inline button 2019-06-20 18:01:36 +02:00
Bilal Catic
6aabe0f3fc improve date picker, allow inline button 2019-06-20 14:12:02 +02:00
Bilal Catic
edbe1f1e59 Merge branch 'add-door-lock-charges-screen' into 'master'
sort members fetched from OfficeRnD

See merge request saburly/psihologija!13
2019-06-20 11:36:43 +00:00
Bilal Catic
6a0ef53031 display summary for selected member and dates 2019-06-20 13:34:27 +02:00
Bilal Catic
7455514b40 sort members fetched from OfficeRnD 2019-06-20 00:06:21 +02:00