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 |
|
Bilal Catic
|
94f0bcc748
|
add delete mapping route, controller and implementation
|
2019-08-28 09:30:19 +02:00 |
|
Bilal Catic
|
8128247a74
|
Merge branch 'do-not-remove-manually-added-fees' into 'master'
skip manually added fees when deleting fees from ORD
See merge request saburly/psihologija!47
|
2019-08-27 07:43:10 +00:00 |
|
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 |
|