Bilal Catic
|
bdf6030d43
|
skip manually added fees when deleting fees from ORD
|
2019-08-27 09:42:39 +02:00 |
|
Bilal Catic
|
3271849b11
|
Merge branch 'add-member-name-to-the-fee-description' into 'master'
add member name to the fee description if member is not part of the company
See merge request saburly/psihologija!46
|
2019-08-27 07:02:45 +00:00 |
|
Bilal Catic
|
52af9913fa
|
add member name to the fee description if member is not part of the company
|
2019-08-27 09:01:55 +02:00 |
|
Bilal Catic
|
72262c7cd8
|
Merge branch 'change-membership-fee-name' into 'master'
update membership fee name for specific memberships
See merge request saburly/psihologija!45
|
2019-08-27 06:24:50 +00:00 |
|
Bilal Catic
|
8e3f970037
|
update membership fee name for specific memberships
|
2019-08-27 08:23:54 +02:00 |
|
Bilal Catic
|
4a84e46530
|
Merge branch 'change-fees-formatting-again' into 'master'
change fees name format
See merge request saburly/psihologija!44
|
2019-08-26 12:32:34 +00:00 |
|
Bilal Catic
|
85b844cd59
|
change fees name format
|
2019-08-26 14:32:00 +02:00 |
|
Bilal Catic
|
9b7b2dcb90
|
Merge branch 'fix-bulk-fees-delete' into 'master'
implement bulk delete fees
See merge request saburly/psihologija!43
|
2019-08-26 11:41:13 +00:00 |
|
Bilal Catic
|
f8fac23980
|
implement bulk delete fees
|
2019-08-26 13:40:17 +02:00 |
|
Bilal Catic
|
8307164959
|
Merge branch 'change-date-range-selection-to-month-selection' into 'master'
Change date range selection to month selection
See merge request saburly/psihologija!42
|
2019-08-26 07:30:04 +00:00 |
|
Bilal Catic
|
6a178f9a34
|
implement month and year selection instead of date range
|
2019-08-26 09:28:07 +02:00 |
|
Bilal Catic
|
5db509c8a4
|
add label for the member selector component
|
2019-08-26 06:37:18 +02:00 |
|
Bilal Catic
|
95b0ccd111
|
Rename date range selector component to the month selector
|
2019-08-26 06:36:57 +02:00 |
|
Bilal Catic
|
8c239d5391
|
Merge branch 'change-fee-description' into 'master'
change incident fee name format and add weekday name
See merge request saburly/psihologija!41
|
2019-08-25 16:20:31 +00:00 |
|
Bilal Catic
|
47ff1d86cc
|
change incident fee name format and add weekday name
|
2019-08-25 18:18:44 +02:00 |
|
Bilal Catic
|
be34803ceb
|
Merge branch 'fix-booking-change-charges' into 'master'
Fix booking change charges
See merge request saburly/psihologija!40
|
2019-08-24 07:28:13 +00:00 |
|
Bilal Catic
|
9c855692b7
|
remove incidents if new duration is longer than initial duration
|
2019-08-24 09:26:52 +02:00 |
|
Bilal Catic
|
934ffa90a7
|
add migration; insert 'deleted' column in booking change incidents table
|
2019-08-22 11:14:35 +02:00 |
|
Bilal Catic
|
1bb87cb476
|
fix unhandled promise warning when new booking is detected
|
2019-08-22 02:28:11 +02:00 |
|
Bilal Catic
|
69ebf36bb1
|
add comment for possible future improvement
|
2019-08-21 06:49:12 +02:00 |
|
Bilal Catic
|
27cbe1f51c
|
fix non-returning promise warning
|
2019-08-21 06:45:43 +02:00 |
|
Bilal Catic
|
5a0426cc12
|
Merge branch 'fix-working-with-ORD-fees' into 'master'
do not remove invoiced fees
See merge request saburly/psihologija!39
|
2019-08-16 13:47:52 +00:00 |
|
Bilal Catic
|
fa89256b0c
|
do not remove invoiced fees
|
2019-08-16 15:39:52 +02:00 |
|
Bilal Catic
|
81bbb2f843
|
Merge branch 'fix-discount-support' into 'master'
Fix discount support
See merge request saburly/psihologija!38
|
2019-08-15 10:23:10 +00:00 |
|
Bilal Catic
|
ed9a3bf949
|
include overuse / unscheduled use in discount
|
2019-08-15 10:00:09 +02:00 |
|
Bilal Catic
|
930915cb95
|
reuse incidents data to calculate discount
|
2019-08-14 21:58:57 +02:00 |
|
Bilal Catic
|
7ce3f8c398
|
Merge branch 'fix-discount-support' into 'master'
Fix discount support
See merge request saburly/psihologija!37
|
2019-08-14 12:36:11 +00:00 |
|
Bilal Catic
|
8a80321fe3
|
skip adding null fees if there is no discount
|
2019-08-14 12:27:02 +02:00 |
|
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 |
|