rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-10 21:24:20 +01:00
Code Issues Releases Activity
5,618 Commits 15 Branches 273 Tags 82 MiB
51960782ee
Commit Graph

2267 Commits

Author SHA1 Message Date
Sylvain
634da414f8 (feat) When a payment schedule is in error or canceled, ability to re-enable it with another payment method 2022-01-17 12:38:53 +01:00
Sylvain
d8f27f0b1a reactored payment-schedules-table to extract buttons to payment-schedule-item-actions 2022-01-17 10:51:27 +01:00
Sylvain
a189190a8e wip: refactor payment schedule table 2022-01-12 17:17:07 +01:00
Sylvain
036f9df35f Specilized VAT rate cannot be defined unless the VAT is enabled and saved 2022-01-12 15:30:54 +01:00
Sylvain
cb6a3a00b6 (bug) the switch to enable/disable the VAT does not reflect the current state of the VAT 2022-01-12 15:17:08 +01:00
Sylvain
9f7c77144a (bug) unable to rebuild the PDF for invoices without subscriptions 2022-01-12 14:58:57 +01:00
Sylvain
d8568f47ad (bug) if a specialized VAT rate was defined when the VAT was disabled, the resulting VAT rate is wrong 2022-01-12 14:57:56 +01:00
Sylvain
4dd5bca55c wip: refactor the payment schedule table to extract the item actions into a separate component 2022-01-11 18:41:04 +01:00
vincent
d54068446a Display hours for extended prices duration 2022-01-11 17:54:38 +01:00
Sylvain
a38d3e31b1 use explicit payment method for check in paymentSchedules and do not include the payment method in the footprint 2022-01-11 16:15:43 +01:00
Sylvain
a91610f530 Optimized multiple DB queries 2022-01-11 16:04:14 +01:00
Sylvain
051b56b72f send notifications on payment schedules error/canceled by gateway 2022-01-11 12:37:06 +01:00
Sylvain
af62a8446e fix wrong file names 2022-01-11 11:32:02 +01:00
Sylvain
8a149bb947 (bug) some links redirect to the home page instead of triggering the requested action 2022-01-11 11:03:27 +01:00
Sylvain
849b41d4ed Merge remote-tracking branch 'origin/wip-demo-update' into dev 2022-01-10 15:56:28 +01:00
vincent
f15907c405 Merge branch 'dev' into wip-demo-update 2022-01-07 08:23:34 +01:00
Nicolas Florentin
217f2f3a3c bug fix: xlsx export are not corrupted anymore 2022-01-06 13:43:51 +01:00
Sylvain
f647ebd9e0 When a payment schedule was canceled by the payment gateway, inform the user in the interface 
TODO: send an in-system notification and an email notification
+ refactor payzen/service and stripe/service to extract notification sending
+ send notifications on state=error
+ in the interface: open a modal dialog to allow the admin to choose an action (cancel/continue by check/continue by transfer)
+ refactor the payment-schedule-tables.ts to extact the item-line logic (the component is getting too big)
 2022-01-05 17:16:25 +01:00
Sylvain
9922812111 Ability to select "bank transfer" as the payment mean for a payment schedule 2022-01-05 15:58:33 +01:00
Sylvain
d7ccbdbb52 [bug] do not load Stripe if no keys were defined 2022-01-05 11:31:27 +01:00
Sylvain
e1256ec551 Ability to disable public account creation 2022-01-04 15:27:58 +01:00
Sylvain
9e742cd1b6 Ability to create slots in the past 2022-01-04 10:28:43 +01:00
Sylvain
f3f15a2b9d Ability to cancel a payement schedule from the interface 2022-01-03 17:13:35 +01:00
Sylvain
effe5c7ba9 optimized the load time of the payment schedules list 
From now, we no longer retrieve the client_secret directly from the API/list but from a specialized component which ask API/get_item.
This highly decrease the laod time needed to fetch API/list
 2022-01-03 11:24:08 +01:00
Sylvain
b00bf958cc [bug] extended_prices_in_same_day apply the extended prices to each days 2021-12-29 22:07:28 +01:00
Sylvain
00b9bce587 export collected VAT by rate 2021-12-29 17:00:54 +01:00
Sylvain
16242d2127 frontend invoice configuration page uses multiVAT 2021-12-29 12:08:50 +01:00
Sylvain
9286738b69 add comments in complex VAT history function 2021-12-29 10:57:59 +01:00
Sylvain
44853930ed WIP: improve VatHistoryService 2021-12-28 19:42:04 +01:00
Du Peng
d52b8bde06 fix bug: accounting period export 2021-12-28 13:45:29 +01:00
Du Peng
0868cee6d9 fix bug: multi VAT setting no exsit 2021-12-28 13:45:29 +01:00
Du Peng
6019767a3b update multi VAT 2021-12-28 13:45:29 +01:00
Du Peng
c5211e98e3 generate invoice with multi vat 2021-12-28 13:45:28 +01:00
Du Peng
5e8c90458b vat history service receive invoice item param 2021-12-28 13:45:28 +01:00
Sylvain
fe96e01b7f refactor spaces/extended_prices code architecture to match the FM style guide 2021-12-28 11:25:10 +01:00
Sylvain
db4230def1 Revert "Fix classes names" 
This reverts commit c394b3a275.
 2021-12-28 09:47:44 +01:00
vincent
c394b3a275 Fix classes names 2021-12-22 17:25:02 +01:00
Vincent
934ac309a1 Merge branch 'dev' into 'spaces_multiprices' 
# Conflicts:
#   CHANGELOG.md
 2021-12-22 14:29:56 +00:00
Sylvain
b864ba66da Apply 22 suggestion(s) to 6 file(s) 2021-12-22 14:07:48 +00:00
Sylvain
5be06babd7 Apply 1 suggestion(s) to 1 file(s) 2021-12-22 13:51:26 +00:00
vincent
fc83b4d9c3 Create [pricing] sub folders 2021-12-21 20:13:55 +01:00
vincent
0d34bffa6d Merge branch 'spaces_multiprices_front' into spaces_multiprices 2021-12-21 18:06:25 +01:00
vincent
1d38d6ae50 fix + new icon 2021-12-21 18:02:39 +01:00
Sylvain
61f432914c optimize payment schedules list loading 2021-12-21 17:27:51 +01:00
vincent
c3cbc26a1e Merge branch 'spaces_multiprices_front' into spaces_multiprices 2021-12-21 17:14:22 +01:00
vincent
bd781a14e9 Add extended price 2021-12-21 17:13:40 +01:00
Sylvain
ffb0f3e19e ability to limit extended prices to slots in the same day 2021-12-21 16:32:02 +01:00
Sylvain
2d807e6c94 improved slot price calculation 2021-12-21 15:30:08 +01:00
vincent
af4acc895c Merge branch 'spaces_multiprices' into spaces_multiprices_front 2021-12-21 15:24:20 +01:00
vincent
d6a4675209 wip 2021-12-21 14:37:38 +01:00
Sylvain
6091cec82e api endpoint to create prices 2021-12-21 14:18:03 +01:00
Sylvain
9173bdbcb4 [bug] fix duplicates email on case sensitive matches 2021-12-21 11:20:44 +01:00
Sylvain
2b834045ef improve price calculation 2021-12-21 11:14:09 +01:00
Sylvain
90b1e98938 fix unable to link address from sso 2021-12-21 10:42:59 +01:00
Sylvain
6dc2e8e41e modelise space object from API in TS 2021-12-21 09:51:40 +01:00
vincent
f8798e28b5 Convert [spaces] to React 2021-12-20 19:12:01 +01:00
Sylvain
4a8fa65e5f workaround pending for UI 2021-12-20 17:19:43 +01:00
Sylvain
d6b30875a4 compute the price based on custom durations 2021-12-20 17:08:14 +01:00
Sylvain
5ebc1017d2 save prices duration in db 2021-12-20 15:47:57 +01:00
Sylvain
94c4be3e61 remove useless code 2021-12-20 15:25:49 +01:00
Sylvain
3fb9850786 [bug] unable to bind sso to Profile.bithday or Profile.gender 2021-12-20 14:07:25 +01:00
Sylvain
587beb01ab fix user import from sso 
A bug was introduced by detailed debug logs
 2021-12-20 13:41:40 +01:00
Sylvain
3a787ea2a0 support for JSONPath syntax in oAuth2 mapping 2021-12-20 13:40:55 +01:00
vincent
163e56d2f2 Add minor style adjustments for the demo 2021-12-03 18:25:25 +01:00
vincent
54cb9ab152 fix images' size and ratio 2021-11-24 18:47:07 +01:00
Sylvain
b74570c778 refactor reserve-button component 
we use "user" everywhere, this is more logical and this may fix an unreproductible issue with prepaid packs
 2021-11-22 14:13:39 +01:00
Sylvain
0f57e1081f [bug] unable to create a plan 2021-11-10 17:06:21 +01:00
Sylvain
1103c7757b added debug logs 2021-11-10 13:03:12 +01:00
Sylvain
4e574e513f show detailed error message in case user was notsaved 2021-11-09 09:43:30 +01:00
Sylvain
9be0dcddd2 [bug] 3DS confirmation is not asked when an admin is subscribing a user through a payment schedule using PayZen 2021-10-22 17:53:02 +02:00
Sylvain
f273372682 fix function call 2021-10-22 15:55:48 +02:00
Sylvain
4a59f6faed [bug] invalid text shown when a member confirms a free cart 2021-10-22 15:43:33 +02:00
Sylvain
ca603f85af fix uninitialized constant PayZen::Service 2021-10-22 15:12:25 +02:00
Sylvain
ab53042f21 fix undefined variable sameTimeReservations 2021-10-22 14:59:57 +02:00
Sylvain
840c536c75 Ability to configure data sources for preventing booking on overlapping slots 2021-10-22 14:50:02 +02:00
Sylvain
36086f93df [WIP] ability to select categories of slots for computing overlapping slots 2021-10-21 18:09:36 +02:00
Sylvain
a51dec9c72 removed ourdated comment 2021-10-21 15:11:47 +02:00
Sylvain
9c55b9d61f [bug] incorrect behavior for the setting 'email confirmation required' 
- when enabled: the user was still logged-in in the backend (F5 and he was logged in the frontend)
- when disabled: the user was not logged in the frontend and received a message to confirm his/her email
 2021-10-21 15:07:18 +02:00
Sylvain
7ffcd68fb7 [bug] canceled training reservation in admin/edit member 2021-10-21 10:31:21 +02:00
Sylvain
bbf512f674 validate birthday in past 2021-10-21 09:29:29 +02:00
Sylvain
e9740ebf69 validate birth date must be in the past 2021-10-20 17:31:30 +02:00
Sylvain
2d61dac9cc refactored admin takes subscription for a member 2021-10-19 12:24:41 +02:00
Sylvain
6ec7ecca9a [WIP] create subscription modal 2021-10-18 17:15:06 +02:00
Sylvain
4b41b29b9d fix using payzen with scheduled subscriptions 2021-10-18 16:34:56 +02:00
Sylvain
1a672b0644 stave start date in subscription schedule 2021-10-18 15:19:58 +02:00
Sylvain
d0eebddcee [bug] payzen amount for non 2-decimals currencies 2021-10-18 12:14:51 +02:00
Sylvain
f250f58317 fix subscription renewal tests 2021-10-18 11:47:28 +02:00
Sylvain
a373ea03fc show good start date in payment schedule ui 2021-10-18 10:34:24 +02:00
Sylvain
4c56dffc04 remove deprecated code and endpoints 2021-10-18 10:15:48 +02:00
Sylvain
fd39eaf2f1 fix renew subscription API 
TODO:
- remove old endpoints
- bug in UI (start date invalid)
- fix tests
- payzen
 2021-10-15 17:31:01 +02:00
Sylvain
3349cc3a2d fix test on paymentSchedules 2021-10-15 11:55:30 +02:00
Sylvain
315e899540 [WIP] fix tests 2021-10-14 18:20:10 +02:00
Sylvain
336a4b789c proceed with payment on subscription renewal 2021-10-13 17:39:39 +02:00
Sylvain
6cd91d0291 [WIP] refactor renew subscription modal 2021-10-12 17:29:35 +02:00
Sylvain
17a0baac7e refactored free subscription extending 2021-10-12 14:07:35 +02:00
Sylvain
70f0e21543 move free extend modal to react 2021-10-11 18:50:53 +02:00
Sylvain
e646eb8cb5 extend subscription UI 2021-10-08 19:14:47 +02:00
Sylvain
2b088ff035 Merge branch 'extend_subscription' into dev 2021-10-07 18:04:38 +02:00
Sylvain
676f921d66 fix some errors about stp subscription refacto + improved error handling 2021-10-07 17:07:46 +02:00
Sylvain
a3f680964c handle stripe errors while local payments 2021-10-07 16:43:51 +02:00
Sylvain
3663f8ab86 full stripe subscription code refacto 
TODO: test
 2021-10-06 17:09:35 +02:00
Sylvain
d494b012d4 [ongoing] refactoring stripe subscription 2021-10-06 09:42:58 +02:00
Sylvain
8b811a1b3e improved syntax 2021-10-06 08:56:16 +02:00
Du Peng
a9f431a6a2 fix bug: offer and extends subscription 2021-10-06 08:56:16 +02:00
Sylvain
3769afe431 Merge branch 'editor_xss_vulnerability' into dev 2021-10-04 09:31:34 +02:00
Ismaël Sebbane
2c0b981c90 [machines-edit-view] Replaced a href link by button because more semantically correct + it actually redirects to the homepage (unwanted behaviour) 2021-09-22 19:01:10 +02:00
Du Peng
132ccebde7 fix syntax error for theme style 2021-09-22 13:27:12 +02:00
Ismaël Sebbane
caa66f26ab Chained selectors .profile-top and about-picture to share the background image using the profile image file option 2021-09-22 13:23:12 +02:00
Du Peng
235fd2e58a Merge branch 'buy_pack_for_plan_option' into dev 2021-09-21 18:01:54 +02:00
Du Peng
2c78ab9cee fix bug: book overlapping slot setting labal error 2021-09-21 18:01:47 +02:00
Du Peng
1c54e54c17 use plant.base_name instands of plan.name 2021-09-21 18:00:48 +02:00
Du Peng
f2dd1bbcd2 add an option Subscription valid for purchase and use of a prepaid pack 2021-09-20 19:43:05 +02:00
Du Peng
5d8a1367a6 update test 2021-09-13 14:25:30 +02:00
Du Peng
f4ed3ca391 fix bug: admin takes a subscription with a payment schedule by stipe 2021-09-10 18:32:39 +02:00
Du Peng
65ba3a686b disable monthly payment for 1 month of subscription 2021-09-10 15:34:49 +02:00
Du Peng
6b763cc1c9 improve code for stripe subscription payment 2021-09-10 15:19:04 +02:00
Du Peng
c9f20ddc03 fix bug: plans page show an error if admin dont create any plans 2021-09-09 18:46:23 +02:00
Du Peng
334d8ce055 check event event_theme_ids if exist 2021-09-09 18:25:26 +02:00
Du Peng
2f7325fee4 fix bug: statistics dont show in nav menu after login 2021-09-09 17:36:04 +02:00
Du Peng
238d7af1ee disable monthly payment if interval count == 1 2021-09-08 19:21:44 +02:00
Du Peng
2973dec6a7 rewrite payment schedule workflow by stripe 2021-09-08 18:57:10 +02:00
Du Peng
a910e8999b fix bug: editor xss vulerability, disable code view in new/edit project 2021-08-31 11:30:23 +02:00
Du Peng
a2a32ef3c6 fix bug: error in plans list page 2021-08-24 11:01:21 +02:00
Du Peng
d3bc26794c fix bug: cant generate avoir for wallet 2021-08-06 11:12:22 +02:00
Du Peng
51ec220a3e fix manager cant reserve training for user 2021-08-06 11:12:14 +02:00
Du Peng
1fdf3d35b5 adjuste packs pricing popover position 2021-08-03 17:03:03 +02:00
Du Peng
524b2c97bb fix bug: statistic service cant run 2021-08-02 17:10:20 +02:00
Du Peng
b5ab52dd64 bug fix stripe 3D payment 2021-07-09 17:54:25 +02:00
Sylvain
920a97f40f fix computing reservation price 2021-07-02 15:45:52 +02:00
Sylvain
95d8f1d204 [bug] do not include fully used packs in user's packs 2021-07-02 14:27:30 +02:00
Sylvain
e150e13227 [bug] cookies modal buttons are too small 2021-07-02 14:26:35 +02:00
Sylvain
28c707bcc5 [bug] missing invoice watermark for norwegian 2021-07-02 12:54:13 +02:00
Sylvain
02870659e0 [bug] prepaid hours not used if bought slot is longer than remaining prepaid time 2021-07-02 12:39:34 +02:00
Sylvain
f6889fbfda linted TSX files 2021-07-01 12:34:10 +02:00
Sylvain
54c933523d linted TS files 2021-07-01 12:04:48 +02:00
Sylvain
a6043fe81e linted JS files 2021-07-01 11:23:58 +02:00
Sylvain
520d3e0a74 remove warning duplicate constant declaration 2021-07-01 10:05:04 +02:00
Sylvain
fb3bbacaf0 handle no packs available for the customer 2021-06-30 16:58:16 +02:00
Sylvain
19717d1351 use localPaymentModal in cart directive 2021-06-30 16:35:25 +02:00
Sylvain
d43f719038 buy packs using local payment 2021-06-30 15:32:10 +02:00
Sylvain
6c326c7209 compute price according to prepaid hours 
Also: handle prepaid hours decreasing when used
 2021-06-30 10:53:05 +02:00
Sylvain
20bd3931d4 [bug] public list of plans fails to render if a group has no plans 2021-06-30 09:18:06 +02:00
Sylvain
9c6a7df0bf WIP: compute price including prepaid packs 2021-06-29 16:56:40 +02:00
Sylvain
3a741e79e6 [bug] return to the home page when clicking ⟵ on machines/show 2021-06-29 16:24:37 +02:00
Sylvain
10aaf0042c integration of packs-summary 2021-06-29 15:59:57 +02:00
Sylvain
baf41588d3 packs summary component 2021-06-29 11:14:36 +02:00
Sylvain
f56b8eae75 admin can configure renew threshold 2021-06-29 09:07:11 +02:00
Sylvain
1aad4891c1 buy prepaid-pack a hours from modal 2021-06-28 18:17:11 +02:00
Sylvain
91d2316280 [bug] two empty categories in the plan creation form 2021-06-28 16:53:39 +02:00
Sylvain
bbb1aca4fb display validity for each pack 2021-06-28 12:24:31 +02:00
Sylvain
86de1f6253 styled packs 2021-06-28 11:49:51 +02:00
Sylvain
4e030300cb [bug] unable to filter by multiple user IDs in OpenAPI 
Also: tests for OpenAPI user trainings
 2021-06-28 10:17:26 +02:00
Sylvain
4126e05d4a Merge branch 'dev' into prepaid 2021-06-28 09:58:07 +02:00
Sylvain
66ba8e565c Full test coverage of the OpenAPI 
Also: fix related bugs
 2021-06-28 09:50:37 +02:00
Sylvain
f16cbc44ff WIP: buy pack modal 2021-06-25 17:24:34 +02:00
Sylvain
99bd00949e fix handling after internal login 2021-06-25 11:10:17 +02:00
Sylvain
c0211cd002 fix handling of external login process 2021-06-25 11:03:01 +02:00
Sylvain
26f98f30f6 edit pack modal 2021-06-25 09:56:39 +02:00
Sylvain
5d3391cd44 move new pack to a separate component 2021-06-25 09:28:05 +02:00
Sylvain
0345d22582 delete & disable packs 2021-06-24 17:59:05 +02:00
Sylvain
1a65b97653 Merge branch 'dev' into prepaid 2021-06-24 17:15:17 +02:00
Sylvain
07017e4a49 [bug] stripe subscription generation fails if the user already has a subscription 2021-06-24 16:52:47 +02:00
Sylvain
4c313d180b [bug] unable to open some modals when the logo was undefined 2021-06-24 12:40:41 +02:00
Sylvain
522df1ccd7 [bug] most OpenAPI endpoints were dysfunctional 2021-06-24 12:36:16 +02:00
Sylvain
1f8fd47317 pack creation and listing 2021-06-23 17:00:15 +02:00
Sylvain
f81e0910c2 packs popover 2021-06-23 11:33:42 +02:00
Sylvain
8cc4811794 edit machines pricings 2021-06-22 17:56:13 +02:00
Sylvain
d7ba83f6a0 WIP: migrate machine pricing edition interface to react 2021-06-22 11:13:44 +02:00
Sylvain
d54f30e048 WIP: interface to configure packs 2021-06-21 17:39:48 +02:00
Sylvain
7ac60f6ef3 data architecture of prepaid-packs 2021-06-21 14:58:49 +02:00
Sylvain
a61a2e96d8 [bug] unable to export members list (#287) 2021-06-21 12:08:23 +02:00
Sylvain
2b0130c6be Merge branch 'dev' into prepaid 2021-06-21 11:36:31 +02:00
Sylvain
e8c5c49bd0 handle sync old coupons on stripe 2021-06-21 10:50:37 +02:00
Sylvain
427ba1a74b [bug] unable to sync coupons on stripe 2021-06-21 10:45:13 +02:00
Sylvain
4ee9121d5f [bug] unable to sync coupons on stripe 2021-06-21 10:10:55 +02:00
Sylvain
263b69dc8b [bug] deleting a coupon displays an error message 2021-06-18 17:40:06 +02:00
Sylvain
33e45fd536 [bug] ignored coupon when booking an event with card payment 2021-06-18 17:19:24 +02:00
Sylvain
5a0e7e9374 fix training requred modal when no user logged 2021-06-18 16:42:52 +02:00
Sylvain
870de2b421 reserve machine button in show machine page 2021-06-18 16:40:39 +02:00
Sylvain
fcdc357f89 required training modal 2021-06-18 16:05:36 +02:00
Sylvain
4ecdf431d5 fix pending traning modal 2021-06-18 12:47:04 +02:00
Sylvain
f9a8453b70 fixes in machines galery: 
- display a placeholder when no picture
- display an opacity filter when machine is disabled
- filtering by enabled/disabled
- text in pending training modal
 2021-06-18 11:51:26 +02:00
Sylvain
962f9bc26f WIP: pending training modal 2021-06-17 17:26:35 +02:00
Sylvain
db242e1f27 fix button style 2021-06-17 17:10:48 +02:00
Sylvain
bff5415a1e refactor API services to use only static methods 
Also: separate reserve-button component
 2021-06-17 17:09:10 +02:00
Sylvain
67ed329dd7 add button to open reservations 2021-06-17 11:56:00 +02:00
Sylvain
4aa3fdff0e filter machines by status 2021-06-17 10:25:13 +02:00
Sylvain
80d206fc99 responsively styled the machines list 2021-06-17 09:48:29 +02:00
Sylvain
de3ab3b6d0 organize sass files 2021-06-17 09:08:15 +02:00
Sylvain
565002a124 WIP: migrate machines list to react 2021-06-16 18:10:29 +02:00
Sylvain
f5126084b9 [bug] unable to sync coupons on stripe 2021-06-16 15:48:45 +02:00
Sylvain
f88e53708d [bug] invalid link to the user's manual 2021-06-16 14:58:32 +02:00
Sylvain
21a593edf0 [bug] can't see the dates for the next booked training session 2021-06-16 14:48:24 +02:00
Sylvain
7fa89c826a [bug] can't see the dates for the next booked training session 2021-06-16 14:46:47 +02:00
Sylvain
3f08845503 [bug] unable to book a free event 2021-06-16 11:45:11 +02:00
Sylvain
7c65a52fbe [bug] unable to book a free event 2021-06-16 11:44:53 +02:00
Sylvain
2a616125c1 [bug] unable to sync users on stripe if one of them have an invalid email address 2021-06-16 10:34:07 +02:00
Sylvain
5215f20899 [bug] unable to sync users on stripe if one of them have an invalid email address 2021-06-16 10:33:52 +02:00
Sylvain
99792e8610 WIP: migrate machine card to react 2021-06-15 17:34:12 +02:00
Sylvain
11579fede4 ability to disable the public agenda 2021-06-15 11:57:43 +02:00