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 |
|
Bilal Catic
|
63b8e64459
|
add ENV variable and load to the system to use custom prefixes
|
2019-09-05 09:31:35 +02:00 |
|
Bilal Catic
|
0704e8d1e1
|
Merge branch 'fix-double-charge' into 'master'
skip adding invoiced fees
See merge request saburly/psihologija!56
|
2019-09-04 16:12:53 +00:00 |
|
Bilal Catic
|
ea327e9bec
|
skip adding invoiced fees
|
2019-09-04 18:12:11 +02:00 |
|
Bilal Catic
|
15a89f9da6
|
Merge branch 'additional-formatting-requests' into 'master'
Additional formatting requests
See merge request saburly/psihologija!55
|
2019-09-03 07:59:10 +00:00 |
|
Bilal Catic
|
1b421d651c
|
reformat fee descriptions
|
2019-09-03 09:58:23 +02:00 |
|
Bilal Catic
|
fe54f2ecbd
|
reformat incident explanations
|
2019-09-03 08:48:11 +02:00 |
|
Bilal Catic
|
38f0f03736
|
remove square brackets from membership plan name before comparing
|
2019-09-02 23:28:31 +02:00 |
|
Bilal Catic
|
1509559825
|
add ORD API URL as ENV variable
|
2019-08-31 14:14:53 +02:00 |
|
Bilal Catic
|
33267c7e4f
|
use sendfile instead of sendFile
|
2019-08-31 14:03:23 +02:00 |
|
Bilal Catic
|
0c049b846c
|
Merge branch 'fix-sending-fees-to-ORD-bug' into 'master'
Fix sending fees to ord bug
See merge request saburly/psihologija!54
|
2019-08-31 00:19:00 +00:00 |
|
Bilal Catic
|
d55131e1f2
|
select all members when sending fees to the ORD if memberIds is empty
|
2019-08-31 02:12:12 +02:00 |
|
Bilal Catic
|
b7067a8eb6
|
send empty array if sending fees to the ORD for all members
|
2019-08-31 01:15:59 +02:00 |
|
Bilal Catic
|
ec5d2abb66
|
use sendFile instead of depreciated sendfile
|
2019-08-31 00:40:02 +02:00 |
|
Bilal Catic
|
fc1ab154cf
|
Merge branch 'fix-OAUTH-bug' into 'master'
Fix oauth bug
See merge request saburly/psihologija!53
|
2019-08-30 22:38:42 +00:00 |
|
Bilal Catic
|
c7288e169c
|
create custom API instance for OAUTH token request
|
2019-08-31 00:36:36 +02:00 |
|
Bilal Catic
|
0812bf386b
|
remove console.log
|
2019-08-31 00:35:50 +02:00 |
|
Bilal Catic
|
1b5b1599b5
|
Merge branch 'change-API-auth-to-oauth' into 'master'
Change api auth to oauth
See merge request saburly/psihologija!52
|
2019-08-30 22:08:16 +00:00 |
|
Bilal Catic
|
d24913689d
|
obtain valid token on every API request
|
2019-08-31 00:06:01 +02:00 |
|
Bilal Catic
|
333733099b
|
add cron service to obtain oauth token and store it to the DB
|
2019-08-30 23:19:04 +02:00 |
|
Bilal Catic
|
4bf6d5f55d
|
Merge branch 'reformat-reservation-fee-description' into 'master'
Reformat reservation fee description
See merge request saburly/psihologija!51
|
2019-08-30 09:05:39 +00:00 |
|
Bilal Catic
|
fe6963b2cd
|
add loading indicator to the member selection dropdown
|
2019-08-30 11:04:55 +02:00 |
|
Bilal Catic
|
831cb43a92
|
change reservation fee description
|
2019-08-30 10:58:14 +02:00 |
|
Bilal Catic
|
a9668cae71
|
Merge branch 'change-home-page-content' into 'master'
Change home page content
See merge request saburly/psihologija!50
|
2019-08-30 08:23:05 +00:00 |
|
Bilal Catic
|
db4cb95e77
|
add error message output for deleting fees action
|
2019-08-28 21:14:05 +02:00 |
|
Bilal Catic
|
181e4b2cea
|
add key for the home page links
|
2019-08-28 21:13:49 +02:00 |
|
Bilal Catic
|
f947370efb
|
change title of the web page
|
2019-08-28 21:13:33 +02:00 |
|
Bilal Catic
|
f38d9bc5f7
|
Merge branch 'change-home-page-content' into 'master'
Change home page content
See merge request saburly/psihologija!49
|
2019-08-28 11:56:18 +00:00 |
|
Bilal Catic
|
6f1645a479
|
change home page
|
2019-08-28 13:55:49 +02:00 |
|
Bilal Catic
|
485c95a929
|
change mapping page title
|
2019-08-28 13:20:48 +02:00 |
|
Bilal Catic
|
3e4b672b49
|
Merge branch 'add-office-room-mapping-control-page' into 'master'
Add office room mapping control page
See merge request saburly/psihologija!48
|
2019-08-28 10:45:27 +00:00 |
|
Bilal Catic
|
9878b5e6b4
|
implement mapping update
|
2019-08-28 12:44:47 +02:00 |
|
Bilal Catic
|
4999b1323f
|
add mappings page; implement delete mapping function
|
2019-08-28 10:19:28 +02:00 |
|