Bilal Catic
|
dd4d909b5d
|
add plan name filter for discount
|
2019-08-14 12:18:35 +02:00 |
|
Bilal Catic
|
3403b8e9c4
|
Merge branch 'fix-discount-support' into 'master'
fix bug with date of discount
See merge request saburly/psihologija!36
|
2019-08-14 06:36:32 +00:00 |
|
Bilal Catic
|
418cfc6549
|
fix bug with date of discount
|
2019-08-14 08:35:04 +02:00 |
|
Bilal Catic
|
0bf41ab0bf
|
Merge branch 'add-discount-support' into 'master'
Add discount support
See merge request saburly/psihologija!35
|
2019-08-13 13:38:20 +00:00 |
|
Bilal Catic
|
876297b698
|
add negative fee for discount
|
2019-08-13 15:36:14 +02:00 |
|
Bilal Catic
|
832c0f8eeb
|
refactor function for getting all bookings to allow more filters
|
2019-08-09 16:31:59 +02:00 |
|
Bilal Catic
|
44a2303877
|
Merge branch 'add-year-selector-for-member-practice-summary-report' into 'master'
Add year selection for report; fetch report for selected year
See merge request saburly/psihologija!34
|
2019-08-09 07:42:04 +00:00 |
|
Bilal Catic
|
ecbacfd92d
|
Add year selection for report; fetch report for selected year
|
2019-08-09 00:05:17 +02:00 |
|
Bilal Catic
|
7a3d49dee7
|
Merge branch 'fix-change-charge-bugs' into 'master'
Fix change charge bugs
See merge request saburly/psihologija!33
|
2019-08-08 12:20:36 +00:00 |
|
Bilal Catic
|
2ff584c20b
|
make booking change charge under time flexible with env variable
|
2019-08-08 14:18:59 +02:00 |
|
Bilal Catic
|
7fbb1d9dee
|
change cancellation fee from double booking fee to booking fee
|
2019-08-08 13:18:37 +02:00 |
|
Bilal Catic
|
6805b17c85
|
fix incident explanation
|
2019-08-08 11:55:01 +02:00 |
|
Bilal Catic
|
0057b8ac01
|
remove charge type tag, except cancellation tag
|
2019-08-08 11:52:19 +02:00 |
|
Bilal Catic
|
b8ec3e3a36
|
Merge branch 'add-member-practice-summary-report' into 'master'
Add member practice summary report
See merge request saburly/psihologija!32
|
2019-08-07 23:57:44 +00:00 |
|
Bilal Catic
|
3f16ec5949
|
generate practice summary report; send report to frontend
|
2019-08-08 01:55:00 +02:00 |
|
Bilal Catic
|
12523fde5b
|
install excel4node package
|
2019-08-05 14:24:32 +02:00 |
|
Bilal Catic
|
72d06f53f5
|
add structure for fetching member practice summary from backend
|
2019-08-05 12:06:18 +02:00 |
|
Bilal Catic
|
df1266c51c
|
add member practice summary report page
|
2019-08-05 11:42:49 +02:00 |
|
Bilal Catic
|
05c3a947c3
|
rename old >practice summary< to >specific member incidents report<
|
2019-08-05 11:09:46 +02:00 |
|
Bilal Catic
|
cf820d650f
|
Merge branch 'fix-fees-formatting' into 'master'
Fix fees formatting
See merge request saburly/psihologija!31
|
2019-07-31 12:22:33 +00:00 |
|
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 |
|