Commit Graph

Select branches

Hide Pull Requests

delete-fees-in-chunks

fix-how-lock-entry-is-matched

master

#1

#10

#11

#12

#13

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#9

Mono Color

• a3a5e7c244 detect and skip fees with custom prefixes when deleting Bilal Catic 2019-09-05 10:04:07 +02:00
• 50cd3f56b0 filter empty prefixes Bilal Catic 2019-09-05 09:41:54 +02:00
• 63b8e64459 add ENV variable and load to the system to use custom prefixes Bilal Catic 2019-09-05 09:31:35 +02:00
• 0704e8d1e1 Merge branch 'fix-double-charge' into 'master' Bilal Catic 2019-09-04 16:12:53 +00:00
• ea327e9bec skip adding invoiced fees Bilal Catic 2019-09-04 18:12:11 +02:00
• 15a89f9da6 Merge branch 'additional-formatting-requests' into 'master' Bilal Catic 2019-09-03 07:59:10 +00:00
• 1b421d651c reformat fee descriptions Bilal Catic 2019-09-03 09:58:23 +02:00
• fe54f2ecbd reformat incident explanations Bilal Catic 2019-09-03 08:48:11 +02:00
• 38f0f03736 remove square brackets from membership plan name before comparing Bilal Catic 2019-09-02 23:28:31 +02:00
• 1509559825 add ORD API URL as ENV variable Bilal Catic 2019-08-31 14:14:53 +02:00
• 33267c7e4f use sendfile instead of sendFile Bilal Catic 2019-08-31 14:03:23 +02:00
• 0c049b846c Merge branch 'fix-sending-fees-to-ORD-bug' into 'master' Bilal Catic 2019-08-31 00:19:00 +00:00
• d55131e1f2 select all members when sending fees to the ORD if memberIds is empty Bilal Catic 2019-08-31 02:12:12 +02:00
• b7067a8eb6 send empty array if sending fees to the ORD for all members Bilal Catic 2019-08-31 01:15:59 +02:00
• ec5d2abb66 use sendFile instead of depreciated sendfile Bilal Catic 2019-08-31 00:13:29 +02:00
• fc1ab154cf Merge branch 'fix-OAUTH-bug' into 'master' Bilal Catic 2019-08-30 22:38:42 +00:00
• c7288e169c create custom API instance for OAUTH token request Bilal Catic 2019-08-31 00:36:36 +02:00
• 0812bf386b remove console.log Bilal Catic 2019-08-31 00:35:50 +02:00
• 1b5b1599b5 Merge branch 'change-API-auth-to-oauth' into 'master' Bilal Catic 2019-08-30 22:08:16 +00:00
• d24913689d obtain valid token on every API request Bilal Catic 2019-08-31 00:06:01 +02:00
• 333733099b add cron service to obtain oauth token and store it to the DB Bilal Catic 2019-08-30 23:19:04 +02:00
• 4bf6d5f55d Merge branch 'reformat-reservation-fee-description' into 'master' Bilal Catic 2019-08-30 09:05:39 +00:00
• fe6963b2cd add loading indicator to the member selection dropdown Bilal Catic 2019-08-30 11:04:55 +02:00
• 831cb43a92 change reservation fee description Bilal Catic 2019-08-30 10:58:14 +02:00
• a9668cae71 Merge branch 'change-home-page-content' into 'master' Bilal Catic 2019-08-30 08:23:05 +00:00
• db4cb95e77 add error message output for deleting fees action Bilal Catic 2019-08-28 21:14:05 +02:00
• 181e4b2cea add key for the home page links Bilal Catic 2019-08-28 21:13:49 +02:00
• f947370efb change title of the web page Bilal Catic 2019-08-28 21:13:33 +02:00
• f38d9bc5f7 Merge branch 'change-home-page-content' into 'master' Bilal Catic 2019-08-28 11:56:18 +00:00
• 6f1645a479 change home page Bilal Catic 2019-08-28 13:55:49 +02:00
• 485c95a929 change mapping page title Bilal Catic 2019-08-28 13:20:48 +02:00
• 3e4b672b49 Merge branch 'add-office-room-mapping-control-page' into 'master' Bilal Catic 2019-08-28 10:45:27 +00:00
• 9878b5e6b4 implement mapping update Bilal Catic 2019-08-28 12:44:47 +02:00
• 4999b1323f add mappings page; implement delete mapping function Bilal Catic 2019-08-28 10:19:28 +02:00
• 94f0bcc748 add delete mapping route, controller and implementation Bilal Catic 2019-08-28 09:30:19 +02:00
• 8128247a74 Merge branch 'do-not-remove-manually-added-fees' into 'master' Bilal Catic 2019-08-27 07:43:10 +00:00
• bdf6030d43 skip manually added fees when deleting fees from ORD Bilal Catic 2019-08-27 09:42:39 +02:00
• 3271849b11 Merge branch 'add-member-name-to-the-fee-description' into 'master' Bilal Catic 2019-08-27 07:02:45 +00:00
• 52af9913fa add member name to the fee description if member is not part of the company Bilal Catic 2019-08-27 09:01:55 +02:00
• 72262c7cd8 Merge branch 'change-membership-fee-name' into 'master' Bilal Catic 2019-08-27 06:24:50 +00:00
• 8e3f970037 update membership fee name for specific memberships Bilal Catic 2019-08-27 08:23:54 +02:00
• 4a84e46530 Merge branch 'change-fees-formatting-again' into 'master' Bilal Catic 2019-08-26 12:32:34 +00:00
• 85b844cd59 change fees name format Bilal Catic 2019-08-26 14:32:00 +02:00
• 9b7b2dcb90 Merge branch 'fix-bulk-fees-delete' into 'master' Bilal Catic 2019-08-26 11:41:13 +00:00
• f8fac23980 implement bulk delete fees Bilal Catic 2019-08-26 13:40:17 +02:00
• 8307164959 Merge branch 'change-date-range-selection-to-month-selection' into 'master' Bilal Catic 2019-08-26 07:30:04 +00:00
• 6a178f9a34 implement month and year selection instead of date range Bilal Catic 2019-08-26 09:28:07 +02:00
• 5db509c8a4 add label for the member selector component Bilal Catic 2019-08-26 06:37:18 +02:00
• 95b0ccd111 Rename date range selector component to the month selector Bilal Catic 2019-08-26 06:36:57 +02:00
• 8c239d5391 Merge branch 'change-fee-description' into 'master' Bilal Catic 2019-08-25 16:20:31 +00:00
• 47ff1d86cc change incident fee name format and add weekday name Bilal Catic 2019-08-25 18:18:44 +02:00
• be34803ceb Merge branch 'fix-booking-change-charges' into 'master' Bilal Catic 2019-08-24 07:28:13 +00:00
• 9c855692b7 remove incidents if new duration is longer than initial duration Bilal Catic 2019-08-24 09:26:52 +02:00
• 934ffa90a7 add migration; insert 'deleted' column in booking change incidents table Bilal Catic 2019-08-22 11:14:35 +02:00
• 1bb87cb476 fix unhandled promise warning when new booking is detected Bilal Catic 2019-08-22 02:28:11 +02:00
• 69ebf36bb1 add comment for possible future improvement Bilal Catic 2019-08-21 06:49:12 +02:00
• 27cbe1f51c fix non-returning promise warning Bilal Catic 2019-08-21 06:45:43 +02:00
• 5a0426cc12 Merge branch 'fix-working-with-ORD-fees' into 'master' Bilal Catic 2019-08-16 13:47:52 +00:00
• fa89256b0c do not remove invoiced fees Bilal Catic 2019-08-16 15:39:52 +02:00
• 81bbb2f843 Merge branch 'fix-discount-support' into 'master' Bilal Catic 2019-08-15 10:23:10 +00:00
• ed9a3bf949 include overuse / unscheduled use in discount Bilal Catic 2019-08-15 10:00:09 +02:00
• 930915cb95 reuse incidents data to calculate discount Bilal Catic 2019-08-14 21:58:32 +02:00
• 7ce3f8c398 Merge branch 'fix-discount-support' into 'master' Bilal Catic 2019-08-14 12:36:11 +00:00
• 8a80321fe3 skip adding null fees if there is no discount Bilal Catic 2019-08-14 12:27:02 +02:00
• dd4d909b5d add plan name filter for discount Bilal Catic 2019-08-14 12:02:04 +02:00
• 3403b8e9c4 Merge branch 'fix-discount-support' into 'master' Bilal Catic 2019-08-14 06:36:32 +00:00
• 418cfc6549 fix bug with date of discount Bilal Catic 2019-08-14 08:35:04 +02:00
• 0bf41ab0bf Merge branch 'add-discount-support' into 'master' Bilal Catic 2019-08-13 13:38:20 +00:00
• 876297b698 add negative fee for discount Bilal Catic 2019-08-13 15:36:14 +02:00
• 832c0f8eeb refactor function for getting all bookings to allow more filters Bilal Catic 2019-08-09 16:31:59 +02:00
• 44a2303877 Merge branch 'add-year-selector-for-member-practice-summary-report' into 'master' Bilal Catic 2019-08-09 07:42:04 +00:00
• ecbacfd92d Add year selection for report; fetch report for selected year Bilal Catic 2019-08-09 00:05:17 +02:00
• 7a3d49dee7 Merge branch 'fix-change-charge-bugs' into 'master' Bilal Catic 2019-08-08 12:20:36 +00:00
• 2ff584c20b make booking change charge under time flexible with env variable Bilal Catic 2019-08-08 14:18:59 +02:00
• 7fbb1d9dee change cancellation fee from double booking fee to booking fee Bilal Catic 2019-08-08 13:18:37 +02:00
• 6805b17c85 fix incident explanation Bilal Catic 2019-08-08 11:55:01 +02:00
• 0057b8ac01 remove charge type tag, except cancellation tag Bilal Catic 2019-08-08 11:52:19 +02:00
• b8ec3e3a36 Merge branch 'add-member-practice-summary-report' into 'master' Bilal Catic 2019-08-07 23:57:44 +00:00
• 3f16ec5949 generate practice summary report; send report to frontend Bilal Catic 2019-08-08 01:55:00 +02:00
• 12523fde5b install excel4node package Bilal Catic 2019-08-05 14:24:32 +02:00
• 72d06f53f5 add structure for fetching member practice summary from backend Bilal Catic 2019-08-05 12:06:18 +02:00
• df1266c51c add member practice summary report page Bilal Catic 2019-08-05 11:42:49 +02:00
• 05c3a947c3 rename old >practice summary< to >specific member incidents report< Bilal Catic 2019-08-05 11:09:46 +02:00
• cf820d650f Merge branch 'fix-fees-formatting' into 'master' Bilal Catic 2019-07-31 12:22:33 +00:00
• 582b249243 remove obsolete code Bilal Catic 2019-07-31 14:21:51 +02:00
• 398a35f0c8 fix price and quantity in fee post request Bilal Catic 2019-07-31 14:17:30 +02:00
• 0c6d481a69 fix fees formatting Bilal Catic 2019-07-31 13:55:02 +02:00
• db78a1eb69 Merge branch 'fix-undetected-booking-changes' into 'master' Bilal Catic 2019-07-31 08:07:11 +00:00
• b07c375d83 remove label and cost explanation from booking fees Bilal Catic 2019-07-30 23:04:29 +02:00
• 3ccb80ad75 detect cancellation of newly created booking Bilal Catic 2019-07-30 22:28:06 +02:00
• 095231c8a2 Merge branch 'speed-up-upload-process' into 'master' Bilal Catic 2019-07-25 12:41:34 +00:00
• 8053093c0a prevent locking upload response; show processing status on upload screen Bilal Catic 2019-07-25 14:40:33 +02:00
• 7f3030960e Merge branch 'create-database-connections-pool' into 'master' Bilal Catic 2019-07-25 04:29:44 +00:00
• 54ae3e4ef5 make dlock screen waiting for incident calculation to finish Bilal Catic 2019-07-25 06:28:26 +02:00
• 2b271196a0 add pool option to the config Bilal Catic 2019-07-25 06:27:22 +02:00
• 26458d9957 add pool option to the config Bilal Catic 2019-07-25 06:27:02 +02:00
• 601f924e4f Merge branch 'implement-invoice-integration' into 'master' Bilal Catic 2019-07-25 01:02:44 +00:00
• 84befa07ae add loading while adding fees to ORD Bilal Catic 2019-07-25 03:01:09 +02:00
• a5221da2f1 fix incidents date Bilal Catic 2019-07-25 02:36:38 +02:00
• 71e034b6c2 invoice integration Bilal Catic 2019-07-25 02:00:27 +02:00