senaduka/old-psihologija
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
250 Commits 3 Branches 0 Tags
cd79a47462c90114eb4e04e93e69a5853124f901
Commit Graph

250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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