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

477 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
b5ab52dd64 bug fix stripe 3D payment 2021-07-09 17:54:25 +02:00
Sylvain
e150e13227 [bug] cookies modal buttons are too small 2021-07-02 14:26:35 +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
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
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
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
2b0130c6be Merge branch 'dev' into prepaid 2021-06-21 11:36:31 +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
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
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
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
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
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
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
c5db9e36ba fix udpate stripe keys modal 2021-06-09 16:49:36 +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
Sylvain
4ca16c2688 associate plan w/ category 2021-06-08 17:26:40 +02:00
Sylvain
ae039cdd0c ordering categories 2021-06-08 17:00:52 +02:00
Sylvain
e1e446ab3f API+ interface to CRUD plan categories 2021-06-08 16:43:43 +02:00
Sylvain
3f044513e9 [bug] cannot select the recurrence end date on Safari or Internet Explorer 2021-06-08 10:25:20 +02:00
Sylvain
b54239eee9 removes unused import 2021-06-07 09:20:40 +02:00
Sylvain
68f64cfc5c update the card for payment schedules 2021-06-04 18:26:20 +02:00
Sylvain
ea774e2080 wait for the first payzen transaction + fix initial amount 2021-06-03 14:28:52 +02:00
Sylvain
dc0a75e52d verify each deadlines on payzen for payment schedules 2021-06-03 12:22:37 +02:00
Sylvain
4e109f7edb retrieve gateway objects with multiple ids 2021-06-03 09:48:21 +02:00
Sylvain
87cd41794e WIP: payzen subscription 
TODO: retreive the payzen subscription from PayZen::Item
 2021-06-02 20:07:53 +02:00
Sylvain
431ea28448 WIP: payzen recurring payments 2021-06-01 12:20:02 +02:00
Sylvain
d6a6d34105 display correct gateway name in payment schedule confirmation modal 2021-06-01 11:24:43 +02:00
Sylvain
81bc22c494 front-end adaptation for interacting with new object[] API 
Also: [bug] handle not onnected users on subscription page
- fix showing an error message when no gateway is selected
 2021-06-01 11:01:38 +02:00
Sylvain
d942d46632 WIP: migration to object[] 
TODO: fix running tests, fix front-end
 2021-05-28 17:34:20 +02:00
Sylvain
bf3dcd874b display payment confirmation error messages in frontend 2021-05-28 10:22:02 +02:00
Sylvain
16df7f9506 fix data migrations + update test fixtures 2021-05-27 11:31:07 +02:00
Sylvain
b938232c19 Merge branch 'dev' into payzen 2021-05-25 14:06:30 +02:00
Sylvain
4fe3a204b8 fixes for upgrade to dart-sass 2021-05-25 11:31:22 +02:00
Sylvain
faa880f9f6 CAD lists of types and extensions are now ordered alphabetically 2021-05-24 17:33:32 +02:00
Sylvain
c3f7f04ec2 [bug] html syntax error result in unable to compile the assets 2021-05-24 17:14:01 +02:00
Sylvain
ecf80b0591 ability to set invoices as erroneous 2021-05-24 16:34:27 +02:00
Sylvain
c7a59c8cb7 WIP: refactoring to singularize the booking process 
We need to achieve only one process for all booking, not one for subscription, one for reservations, etc.
Moreover we must store one object per invoice_item/payment_schedule_object and stop using Invoice.invoiced or PaymentSchedule.scheduled
 2021-05-21 18:25:18 +02:00
Sylvain
da3eb4f8bd [bug] typo in allow/prevent booking overlapping slots 2021-05-21 17:18:22 +02:00
Sylvain
66f81a975e WIP: array of items 
Migration from cart_items:{reservation:{}, subscription:{}, ...}
to cart_items:{items:[{reservation:{}, ...}], ...}
 2021-05-19 18:12:52 +02:00
Sylvain
dd1d05cc3a set payzen public key as invalid if the field is empty 2021-05-19 09:34:31 +02:00
Sylvain
c6bc9f1c15 handle gateway keys invalidation 2021-05-18 16:42:30 +02:00
Sylvain
28c868587b prevent fteched settings to set react components as uncontrolled 2021-05-18 16:31:19 +02:00
Sylvain
9355256909 refresh payzen keys after initial setting 2021-05-18 15:56:22 +02:00
Sylvain
6b99b00d5e handle no key in payzen keys form 2021-05-18 13:50:27 +02:00
Sylvain
4826db7cf0 [bug] typo in allow/prevent booking overlapping slots 2021-05-18 10:52:59 +02:00
Sylvain
5adf15df91 syntax improvements 2021-05-18 09:40:35 +02:00
Sylvain
04b3bfe3c5 update components to match new architecture after merge from dev 2021-05-17 17:09:11 +02:00
Sylvain
6bcd9f6fef Merge branch 'dev' into payzen 2021-05-17 15:07:41 +02:00
Sylvain
c8c2300dd2 [bug] unable to change the slots durations for a new availability 2021-05-14 15:03:30 +02:00
Sylvain
1c4f46f935 [bug] responsiveness of the about page title 2021-05-14 14:55:14 +02:00
Sylvain
bf9a91b479 [bug] about page on small devices 2021-05-14 14:29:36 +02:00
Sylvain
436db80ccf Increased the width of the input field for the prices of the events 
This is especially useful for currencies like FCFA that have large numbers and large currency symbol
 2021-05-12 15:16:10 +02:00
Sylvain
d8656d56ec allow remove all themes for an event 2021-05-12 15:05:16 +02:00
Sylvain
2a63daffb5 display all themes for the events 2021-05-12 15:00:19 +02:00
Sylvain
2a7a7fd614 [bug] the event themes are not kept when editing the event again 2021-05-12 14:54:56 +02:00
Sylvain
e3187460ea create payment schedules on payzen 
Also: make generic the creation of products on remote gateway
Also: make generic the call to gateway specific actions
 2021-04-30 16:07:19 +02:00
Sylvain
5f47624d4e WIP: create payment schedule w/ payzen 2021-04-29 17:10:02 +02:00
Sylvain
aaf36dcc0a reserve events w/ payzen 
we cannot use the <cart> directive because the layout is too much different
 2021-04-29 16:29:35 +02:00
Sylvain
ee1cdb417e WIP: move events reservation to use the cart directive 2021-04-28 17:26:07 +02:00
Sylvain
23e38238c8 fix payment on site modal in case of payment schedule 2021-04-28 17:25:42 +02:00