Bilal Catic
|
c30fb1adf6
|
synchronize incidents detection and save incidents to the DB
|
2019-12-02 20:57:46 +01:00 |
|
Bilal Catic
|
fb959491d9
|
Merge branch 'implement-silent-fees-delete' into 'master'
add silent option to Delete fees request
See merge request saburly/psihologija!70
|
2019-11-26 12:18:04 +00:00 |
|
Bilal Catic
|
b1aad87601
|
add silent option to Delete fees request
|
2019-11-26 13:17:28 +01:00 |
|
Bilal Catic
|
9494fa48c5
|
Merge branch 'change-unscheduled-use-charge-time-limits' into 'master'
allow first time segment length for unscheduled use to be configurable
See merge request saburly/psihologija!69
|
2019-11-22 19:23:21 +00:00 |
|
Bilal Catic
|
93d46c231e
|
allow first time segment length for unscheduled use to be configurable
|
2019-11-22 20:22:44 +01:00 |
|
Bilal Catic
|
1436f0fdab
|
Merge branch 'change-fees-formatting' into 'master'
change fees formatting
See merge request saburly/psihologija!68
|
2019-11-22 07:59:09 +00:00 |
|
Bilal Catic
|
7c8a5e954e
|
change fees formatting
|
2019-11-22 08:58:36 +01:00 |
|
Bilal Catic
|
bc4db56e54
|
Merge branch 'allow-deleting-incident-fees' into 'master'
fix "Delete fee" on Member Incidents Report screen
See merge request saburly/psihologija!67
|
2019-11-21 14:16:28 +00:00 |
|
Bilal Catic
|
06a40e98e9
|
fix "Delete fee" on Member Incidents Report screen
|
2019-11-21 15:13:37 +01:00 |
|
Bilal Catic
|
d4a949aaf0
|
Merge branch 'allow-deleting-incident-fees' into 'master'
Allow deleting incident fees
See merge request saburly/psihologija!66
|
2019-11-21 13:36:59 +00:00 |
|
Bilal Catic
|
fa4e574d6e
|
remove obsolete logging
|
2019-11-21 14:34:50 +01:00 |
|
Bilal Catic
|
445a635300
|
split fees into specific categories and send delete request
|
2019-11-21 14:32:52 +01:00 |
|
Bilal Catic
|
d1d67c346a
|
add checkbox option to the incident tables
|
2019-11-21 09:21:21 +01:00 |
|
Bilal Catic
|
37abb86961
|
add and implement action to send "delete fees" request
|
2019-11-21 07:13:30 +01:00 |
|
Bilal Catic
|
8a3db0d481
|
add deleteFees route and implement logic
|
2019-11-21 07:12:50 +01:00 |
|
Bilal Catic
|
3d051766b1
|
fetch only non-deleted unlocked/unscheduled incidents
|
2019-11-20 15:26:20 +01:00 |
|
Bilal Catic
|
d4f823ff72
|
add deleted field to the unlocked/unscheduled incidents table and model
|
2019-11-20 14:53:53 +01:00 |
|
Bilal Catic
|
015c29f992
|
Merge branch 'add-door-unlock-lock-time-column-in-incidents-table' into 'master'
Add door unlock lock time column in incidents table
See merge request saburly/psihologija!65
|
2019-11-20 12:50:56 +00:00 |
|
Bilal Catic
|
cd79a47462
|
set main container width configurable
|
2019-11-20 13:46:41 +01:00 |
|
Bilal Catic
|
c0c4c1f4a1
|
add door unlock/lock time column to the incidents table
|
2019-11-20 13:46:12 +01:00 |
|
Bilal Catic
|
eff96f9e5e
|
fix mapping screen crash when office/resource is unknown
|
2019-11-20 13:45:54 +01:00 |
|
Bilal Catic
|
fcb71a3f00
|
Merge branch 'change-fees-formatting' into 'master'
fix fee formatting issues
See merge request saburly/psihologija!64
|
2019-11-20 11:28:30 +00:00 |
|
Bilal Catic
|
136cad8bbd
|
fix fee formatting issues
|
2019-11-20 12:27:42 +01:00 |
|
Senad Uka
|
4ea9d37915
|
Date range for sending fees
|
2019-10-28 20:42:18 +01:00 |
|
Bilal Catic
|
9ac1f57396
|
apply weekend rate to the reservation if applicable
|
2019-10-28 20:02:57 +01:00 |
|
Bilal Catic
|
4946b051c5
|
Merge branch 'fix-name-compare' into 'master'
compare only part of the name
See merge request saburly/psihologija!63
|
2019-10-07 13:42:24 +00:00 |
|
Bilal Catic
|
0d9c6ce67e
|
compare only part of the name
|
2019-10-07 15:41:46 +02:00 |
|
Bilal Catic
|
c1110f3678
|
Merge branch 'fix-manually-booking-fee-delete' into 'master'
delete reservations removed from ORD
See merge request saburly/psihologija!62
|
2019-10-07 13:17:26 +00:00 |
|
Bilal Catic
|
8ac69f1497
|
delete reservations removed from ORD
|
2019-10-07 15:16:09 +02:00 |
|
Bilal Catic
|
639ba6b8cb
|
fix practice summary report
|
2019-10-07 09:55:00 +02:00 |
|
Bilal Catic
|
aa8931f91a
|
fix discount date
|
2019-10-04 19:51:39 +02:00 |
|
Bilal Catic
|
ef932ed36b
|
add discount on first day of the month
|
2019-10-04 19:41:51 +02:00 |
|
Bilal Catic
|
5a07b74ae2
|
Merge branch 'improve-error-handling-for-addFees' into 'master'
Improve error handling for add fees
See merge request saburly/psihologija!61
|
2019-10-04 14:57:58 +00:00 |
|
Bilal Catic
|
7f65a6784f
|
Add logging in addFees steps
|
2019-10-04 16:55:43 +02:00 |
|
Bilal Catic
|
fc662b73a6
|
Add logging in addFees steps
|
2019-10-04 16:54:12 +02:00 |
|
Bilal Catic
|
ca55bf83af
|
load resource price if booking price is zero
|
2019-10-03 10:39:16 +02:00 |
|
Bilal Catic
|
bc6b7b7268
|
remove NaN bug for incident charge fee
|
2019-10-02 23:23:06 +02:00 |
|
Bilal Catic
|
5202e05325
|
Merge branch 'fix-wrong-date-on-fees' into 'master'
Fix wrong date on fees
See merge request saburly/psihologija!60
|
2019-09-11 10:27:04 +00:00 |
|
Bilal Catic
|
0a4da1b18f
|
fix dates in fees description
|
2019-09-11 12:26:08 +02:00 |
|
Bilal Catic
|
dc0a335eb9
|
fix hourly rate value
|
2019-09-11 12:25:46 +02:00 |
|
Bilal Catic
|
cd77159ea2
|
fix charging reservation changes
|
2019-09-11 12:25:25 +02:00 |
|
Bilal Catic
|
75524f530a
|
Merge branch 'add-env-variable-to-control-sending-fees-to-ORD' into 'master'
Add env variable to control sending fees to ord
See merge request saburly/psihologija!59
|
2019-09-10 04:58:17 +00:00 |
|
Bilal Catic
|
45cb255283
|
Display error message if sending fees fails
|
2019-09-10 06:56:21 +02:00 |
|
Bilal Catic
|
75201dea6d
|
Control sending fees via ENV variable
|
2019-09-10 06:56:02 +02:00 |
|
Bilal Catic
|
1e2eadba6c
|
Merge branch 'disable-sending-fees-for-current-and-future-months' into 'master'
Disable sending fees for current and future months
See merge request saburly/psihologija!58
|
2019-09-06 05:54:45 +00:00 |
|
Bilal Catic
|
392c7f33c3
|
disable adding fees for current or month in future
|
2019-09-06 07:43:51 +02:00 |
|
Bilal Catic
|
ddd375d4ce
|
disable sending fees for current or month in future
|
2019-09-06 07:25:03 +02:00 |
|
Bilal Catic
|
b8d5830071
|
Merge branch 'skip-custom-fees-with-defined-prefix-when-deleting' into 'master'
Skip custom fees with defined prefix when deleting
See merge request saburly/psihologija!57
|
2019-09-05 08:51:28 +00:00 |
|
Bilal Catic
|
a3a5e7c244
|
detect and skip fees with custom prefixes when deleting
|
2019-09-05 10:04:07 +02:00 |
|
Bilal Catic
|
50cd3f56b0
|
filter empty prefixes
|
2019-09-05 09:41:54 +02:00 |
|