1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-15 00:24:09 +01:00
Commit Graph

139 Commits

Author SHA1 Message Date
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
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
565002a124 WIP: migrate machines list to react 2021-06-16 18:10:29 +02:00
Sylvain
99792e8610 WIP: migrate machine card to react 2021-06-15 17:34:12 +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
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
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
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
68f64cfc5c update the card for payment schedules 2021-06-04 18:26:20 +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
bf3dcd874b display payment confirmation error messages in frontend 2021-05-28 10:22:02 +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
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
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
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
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
23e38238c8 fix payment on site modal in case of payment schedule 2021-04-28 17:25:42 +02:00
Sylvain
30c1c91590 factorize payment form props 2021-04-28 16:41:15 +02:00
Sylvain
a2d870f680 migrate wall-info to use cartitems 2021-04-26 11:46:14 +02:00
Sylvain
bc6ef8ef50 WIP: move backend code base to new architecture
- from stripe only to payment gateway abstract
- from reservation params style to unified cart_items

TODO: fix not passing tests,
subscriptions/renew_as_admin_test.rb fails because InvoiceItem(9).amount = nil
2021-04-23 17:54:59 +02:00
Sylvain
ddd1ac52d6 save reservation|subscription to db after payment 2021-04-14 17:56:10 +02:00