rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-04 15:24:23 +01:00
Code Issues Releases Activity
4,836 Commits 15 Branches 273 Tags 82 MiB
b1245a5248
Commit Graph

2042 Commits

Author SHA1 Message Date
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
Sylvain
f91ee24639 [bug] the training validation modal shows cancelled trainings 2021-06-15 10:18:14 +02:00
Sylvain
72be638869 [bug] unable to select no category in plan creation/edition after a category selection 
Also: Display the category in the plans list instead of the plan type
 2021-06-15 09:22:41 +02:00
Sylvain
569be57a1f [bug] a message tells that creating a new plan fails, but it worked 2021-06-14 16:53:52 +02:00
Sylvain
27ac345588 remove reference to stripe in user creation workflow 2021-06-14 15:14:14 +02:00
Sylvain
ec301ba07e [bug] unable to list user's payment schedules in the dashboard 2021-06-14 14:40:54 +02:00
Sylvain
645efa37f4 [bug] unable to book an event 2021-06-14 14:22:23 +02:00
Sylvain
0c72cde67b [bug] unable to process stripe payments with 3DS authentication 
>
> Backported from v4.7.13:
> 9b90ff0482
 2021-06-11 16:14:30 +02:00
Sylvain
7ba2d58f50 update VCR to 6.0.0 
Also: - updated cassettes
- Automated stripe secrets filtering in cassettes
- Improved display when no plan-categories exists
 2021-06-11 14:29:30 +02:00
Sylvain
817db8b5eb do not display empty categories titles 2021-06-10 16:17:10 +02:00
Sylvain
e184bf3d3c filter plans y duration 2021-06-10 14:06:53 +02:00
Sylvain
4580bfc7d7 allow user to filter plans by groups 2021-06-10 12:52:14 +02:00
Sylvain
854db568bf Ability to configure the prefix of the payment-schedules' files 2021-06-10 12:04:00 +02:00
Sylvain
71775378e8 include payment schedules in accounting archives 2021-06-10 11:36:32 +02:00
Sylvain
a416f8c7ae transactional bulk update + better error handling while configuring the payment gateway 2021-06-10 10:39:42 +02:00
Sylvain
ef69cab179 Merge branch 'hotfix' into dev 2021-06-09 19:40:07 +02:00
Sylvain
f82adc8133 [bug] unable to process stripe payments 2021-06-09 19:24:56 +02:00
Sylvain
4368851151 [bug] do not allow users to register with an invalid email address 2021-06-09 19:10:31 +02:00
Sylvain
13fae70277 test payzen endpoints 2021-06-09 18:48:51 +02:00
Sylvain
c5db9e36ba fix udpate stripe keys modal 2021-06-09 16:49:36 +02:00
Sylvain
1f07f4c2fb fix data migration 2021-06-09 16:42:06 +02:00
Sylvain
57a370bf56 use PlansList component in embedded form 2021-06-09 16:15:23 +02:00
Sylvain
003dd4ce78 refresh plans list after subscription or controlled member changed 2021-06-09 15:46:02 +02:00
Sylvain
05882b3743 display list of plans grouped by category 2021-06-09 13:03:58 +02:00
Sylvain
b83a9e44d6 fix edition of plan's category 2021-06-09 09:47:56 +02:00
Sylvain
08ad436351 split plan-catageories management into separate components 2021-06-09 09:24:39 +02:00