rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-15 00:24:09 +01:00
Code Issues Releases Activity
6,630 Commits 15 Branches 274 Tags 83 MiB
82d2f99b77
Commit Graph

795 Commits

Author SHA1 Message Date
Sylvain
faa880f9f6 CAD lists of types and extensions are now ordered alphabetically 2021-05-24 17:33:32 +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
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
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
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
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
Sylvain
30c1c91590 factorize payment form props 2021-04-28 16:41:15 +02:00
Sylvain
dbdedadf8c fix price computation in front-end 2021-04-28 16:22:22 +02:00
Sylvain
3dc686840c front adaptation to cartItems 
fix payzen customer cart creation
TODO: refactor the payOnSite modals
 2021-04-27 17:18:20 +02:00
Sylvain
a2d870f680 migrate wall-info to use cartitems 2021-04-26 11:46:14 +02:00
Sylvain
6b8f7da98c migrate js clients to new architecture 2021-04-26 11:41:02 +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
e456ddc7c9 WIP: refactor the price computation system 2021-04-22 19:24:08 +02:00
Sylvain
26dfbef5e1 WIP: refactor models to use payment_gateway_objects 2021-04-21 17:38:06 +02:00
Sylvain
434ec9c205 refactored Invoices to get rid of stripe references 2021-04-20 17:22:53 +02:00
Sylvain
1bbb8c3965 move the architecture from stripe-only to gateway-generic 2021-04-15 17:01:52 +02:00
Sylvain
ddd1ac52d6 save reservation|subscription to db after payment 2021-04-14 17:56:10 +02:00
Sylvain
07ea6e8c69 renamed SUPERADMIN_EMAIL to ADMINSYS_EMAIL 
The previous was too much subject to confusions
 2021-04-14 15:04:41 +02:00
Sylvain
4e512dda45 validate the payment server side 2021-04-13 17:16:05 +02:00
Sylvain
dbbf6b5f63 fix KryptonConfig 2021-04-13 11:33:15 +02:00
Sylvain
c0afe9419e consolidated the payzen process with types 2021-04-13 11:30:30 +02:00
Sylvain
dca2651fb3 process payements with payzen 2021-04-12 17:37:09 +02:00
Sylvain
ef7dcd37d8 retreive the formToken from PZ API 2021-04-12 12:16:12 +02:00
Sylvain
b3720d7f47 direct the stripe endpoints to /api/stripe 2021-04-12 10:48:30 +02:00
Sylvain
fd5c3a87ce rename /api/payment to /api/stripe 
other payment gateways will have their own separate endpoints
 2021-04-12 10:45:41 +02:00
Sylvain
f232e586ce payment endpoint is specific to stripe 2021-04-12 10:44:20 +02:00
Sylvain
954a35f006 refactor api files 2021-04-12 10:42:54 +02:00
Sylvain
23032c405b WIP: create the formToken server-side 2021-04-09 17:17:58 +02:00
Sylvain
fe5c4e6233 integrate the payzen form widget into the modal 
Also: do not fetch the api from unmounted components
 2021-04-09 12:09:54 +02:00
Sylvain
5e2c50a85f PaymentModal : automatically determines the payment modal to used based on the configured payment gateway 2021-04-09 09:03:59 +02:00
Sylvain
4d0dc808e8 move stripe & payzen components folders into payment/ 2021-04-09 08:47:34 +02:00
Sylvain
b5ab9fbc79 rename PaymentModal to AbstractPaymentModal 2021-04-09 08:40:46 +02:00
Sylvain
4f3a47ae04 move payment modal from /base to /payment 2021-04-09 08:39:03 +02:00
Sylvain
fb2abcc382 integrate payzen logo and other fixes 2021-04-08 17:11:48 +02:00
Sylvain
d70d0dcf7a stripe modal -> generic payment modal 2021-04-08 15:21:24 +02:00
Sylvain
d091c44c11 fix: This object has been frozen and should not be mutated 2021-04-08 11:09:33 +02:00
Sylvain
6da577d4ae reorganized react components 2021-04-08 10:46:09 +02:00
Sylvain
a55dd4dc71 display errors in fab-input 2021-04-08 10:00:19 +02:00
Sylvain
4a344ac9e3 reorganized react components 2021-04-08 09:35:09 +02:00
Sylvain
eea390bdd4 workaround for project rejection 2021-04-07 17:42:15 +02:00
Sylvain
635e8d3356 use HtmlTranslate component 2021-04-07 16:25:14 +02:00
Sylvain
67d0ce24b4 set payzen currency 
also: refactored the comments in the react components to fit high quality
 2021-04-07 16:21:12 +02:00
Sylvain
df7893f65f open modal to edit the keys of the payment gateway 2021-04-07 11:36:04 +02:00
Sylvain
36871a0b34 improved display 2021-04-06 18:00:13 +02:00
Sylvain
667f6f6229 show recapitulative of payzen settings 2021-04-06 17:47:47 +02:00
Sylvain
422acdd162 safely configure and test payzen keys 2021-04-02 17:16:27 +02:00
Sylvain
98bb9d082c fix fab-input and payzen-keys-form 2021-04-02 16:02:50 +02:00
Sylvain
30830b56fd PayZen REST API wrapper ruby + live test keys while configuring 2021-04-01 18:20:26 +02:00
Sylvain
69352c07df validate payzen paramaters in the form 2021-03-31 17:58:09 +02:00
Sylvain
54c1a3cfd9 payzen keys configuration form 2021-03-31 16:03:51 +02:00
Sylvain
1d42fa8781 typos 2021-03-30 16:57:09 +02:00
Sylvain
83cfa710e1 enable online payments 2021-03-30 16:54:43 +02:00
Sylvain
c25e54a6af save & retreive stripe settings 2021-03-30 15:56:36 +02:00
Sylvain
720328ee92 stripe keys form w/ live keys validation 2021-03-30 11:26:47 +02:00
Sylvain
5aacd6695c Merge branch 'dev' into payzen 2021-03-30 09:22:47 +02:00
Sylvain
10dd5d2cca [bug] create a training availability with calendar in month view result in wrong dates 2021-03-29 16:05:53 +02:00
Sylvain
abd6ecabc3 WIP: fab-input component 2021-03-24 17:31:50 +01:00
Sylvain
b5e0572a6b fix devise modal 2021-03-24 15:51:02 +01:00
Sylvain
78b007a9ec [bug] unable to add a new authorized file type for project's CAD files 2021-03-24 15:39:18 +01:00
Sylvain
5b854ea831 Merge branch 'dev' into payzen 2021-03-24 14:34:24 +01:00
Sylvain
7099f1f317 address required 
- Ability to set the address as a mandatory field
- The address is new requested when creating an account
- The profile completion page is less fuzzy for people landing on it without enabled SSO
 2021-03-23 11:49:05 +01:00
Sylvain
f535be5b05 WIP: address_required 2021-03-22 18:02:56 +01:00
Sylvain
a5b3728f8c [bug] various fixes on accouting exports 
- accounting exports may ignore some invoices for the first and last days
- file caching for accounring exports is not used
 2021-03-22 17:42:54 +01:00
Sylvain
b19c78c756 [bug] select all plans for slot restriction 
When using the 'select all' button, to restrict an availbility to subscribers, all plans are selected, even those disabled
 2021-03-22 10:36:41 +01:00
Sylvain
be464a8a61 WIP: migrate stripe keys form to react 2021-03-10 17:15:36 +01:00
Sylvain
18465ee8e9 select gateway modal 2021-03-10 16:46:18 +01:00
Sylvain
141f4f31b1 Merge branch 'dev' into payzen 2021-03-10 15:23:56 +01:00
Sylvain
9d747db095 Ability to disable the trainings module 2021-03-10 13:25:53 +01:00
Sylvain
cd30e0d8d8 [bug] statistics: select machines as default tab if subscriptions is disabled 2021-03-09 12:39:25 +01:00
Sylvain
3d5484918c eslint controllers/admin/statistics.js 2021-03-09 11:41:24 +01:00
Sylvain
6817adc82d Merge branch 'dev' into payzen 2021-03-08 15:50:06 +01:00
Sylvain
5527512b05 Show remaining training credits in the dashboard 2021-03-08 15:17:58 +01:00
Sylvain
2d70a4d07e Do not close login modal when clicking on the backdrop 2021-03-08 14:21:58 +01:00
Sylvain
10fbea9289 Allow writing short rich descriptions for each subscription plan 2021-03-08 14:09:11 +01:00
Sylvain
a74c5d4c95 WIP: plan description 2021-03-03 17:21:11 +01:00
Sylvain
3ea06826ad WIP: select gateway 2021-03-03 15:28:56 +01:00
Sylvain
c9cea041dd updated links to user's guide 2021-02-22 19:26:38 +01:00
Sylvain
c478ade85c fix admin operations on subscriptions w/ schedules 2021-02-10 17:24:03 +01:00
Sylvain
fa686187cd admin can subscribe in member/edit w/ schedule 2021-02-10 15:43:53 +01:00
Sylvain
b48a2738ec prevent allowing payment schedules w/ plans < 1 month 2021-02-10 14:19:14 +01:00
Sylvain
8417c91e6a features tour for payment schedules management interface 2021-02-10 10:58:45 +01:00
Sylvain
9609d96fc3 adjust payment schedule table to usage by admins & members 2021-02-10 10:03:04 +01:00
Sylvain
16bb4bc76d WIP: payment schedules dashboard 2021-02-09 17:18:33 +01:00
Sylvain
f3ad59d33a fix cancel schedule 2021-02-09 16:26:09 +01:00
Sylvain
ff0c69fc58 stripe card update + cancel subscription 2021-02-09 15:44:56 +01:00
Sylvain
b0ef9e097d WIP: stripe update card 2021-02-09 12:09:26 +01:00
Sylvain
0e7226c85c handle stripe requires_action 2021-02-08 15:28:47 +01:00
Sylvain
58af40b8b9 enlight api for cashing checks 2021-02-08 08:56:01 +01:00
Sylvain
b5cdea513d confirm check cashing api 2021-02-04 17:51:16 +01:00
Sylvain
d54846c349 UI to confirm check cashing 2021-02-04 17:00:02 +01:00
Sylvain
d22d011a10 show more results for the payment schedules interface 2021-02-04 15:47:11 +01:00
Sylvain
163976b988 WIP: error handling for card payments on later deadlines 2021-01-27 17:24:10 +01:00
Sylvain
8d08100166 WIP: schedules management inerface 2021-01-27 13:59:41 +01:00
Sylvain
39c3164b47 WIP: admin interface to manage payment schedules 2021-01-26 17:31:11 +01:00
Sylvain
5e06de508d interface to filter list of schedules 2021-01-26 11:37:05 +01:00
Sylvain
def0778a4d basic inteface to retrieve payment schedules 2021-01-25 17:42:30 +01:00
Sylvain
728ae4310c improved testing of payment schedules + some fixes 
TODO: fix the test
rails test test/integration/reservations/create_test.rb
Reservations::CreateTest#test_user_reserves_a_machine_and_renew_a_subscription_with_payment_schedule_and_coupon_and_wallet [test/integration/reservations/create_test.rb:841]
Minitest::Assertion: Expected: "stripe"
  Actual: nil
 2020-12-30 18:43:33 +01:00
Sylvain
dc00df4afc fix stripe subscription w/ coupon + wallet 2020-12-30 12:19:33 +01:00
Sylvain
f4f1464826 fix wallet-info component to use cartItems 2020-12-29 17:32:00 +01:00
Sylvain
1f873979f3 architecture documentation 2020-12-29 13:13:48 +01:00
Sylvain
abe1619392 fix book reservation+subscription 2020-12-29 11:27:59 +01:00
Sylvain
feeed2f450 fix take a reservation + subscription 
FIXME:
ActionView::Template::Error (undefined method `iso8601' for nil:NilClass)
Callstack:
  app/views/api/reservations/show.json.jbuilder:40:in `_app_views_api_reservations_show_json_jbuilder'
  app/controllers/api/payments_controller.rb:91:in `confirm_payment_schedule'
 2020-12-28 18:30:27 +01:00
Sylvain
f661428db2 better error handling in stripe::subscription creation process 2020-12-23 15:29:56 +01:00
Sylvain
bbf88846dd refactored Invoice & PaymentSchedule to use inheritance 2020-12-22 14:43:08 +01:00
Sylvain
609d19e5d1 refactored subscription process + renew (update) subscription/ offre free days 2020-12-21 16:12:34 +01:00
Sylvain
e0ac9d1ac3 Eslint the frontend members controllers 2020-12-21 14:26:38 +01:00
Sylvain
c3c881d2a8 process the schedule to the stripe subscription 
- only for subscriptions for now
- TODO: reservations (see app/services/reservations/reserv.rb:13)
 2020-12-09 16:47:51 +01:00
Sylvain
a20be8ecb2 display legal agreement 2020-12-09 12:51:06 +01:00
Sylvain
66c205d0ed API error handling 2020-12-09 11:35:49 +01:00
Sylvain
8e8fc9b682 validate reservation/subscription after payment schedule creation 2020-12-08 17:30:33 +01:00
Sylvain
1d64c517c9 create stripe's paymentIntent 
associate the paymentMethod (the card) with the customer (the user)
for futur usages in subscriptions
 2020-12-08 12:26:03 +01:00
Sylvain
b6240c5046 handle after payment method was created 2020-12-07 17:13:05 +01:00
Sylvain
96b1cfcbc7 handle successfull stripe payment 2020-12-07 13:49:11 +01:00
Sylvain
1e43dc9518 show indicator while the payment is pending 2020-12-07 12:58:15 +01:00
Sylvain
0d0bf473af see TODOs (stripe-modal.tsx, machines.js.erb) 2020-12-02 17:28:14 +01:00
Sylvain
5941446a72 fixes for card payment 2020-12-02 14:28:41 +01:00
Sylvain
6c39191efa allow payment with stripe-modal react component 2020-12-02 10:06:18 +01:00
Sylvain
4ca2299776 WIP: using <stripe-modal> in cart directive 2020-12-01 17:55:23 +01:00
Sylvain
9813c5d27b style payment modal 2020-11-30 16:52:55 +01:00
Sylvain
f5709ef60e get stripe payment method 2020-11-25 17:13:45 +01:00
Sylvain
7d0abebc22 WIP: stripe modal 2020-11-24 16:26:18 +01:00
Sylvain
1e5f7ea1fd WIP: refactor stripe payment modal to react + do not user angular in react component (use Intl instead) 2020-11-24 13:26:15 +01:00
Sylvain
b88c1009db WIP: create react component to collect card data 2020-11-23 17:36:33 +01:00
Sylvain
34a9084501 pass payment method to the ruby service 2020-11-23 11:48:44 +01:00
Sylvain
6abee0cea0 define payment method before validating schedule 2020-11-18 16:01:05 +01:00
Sylvain
a56112a47f using stripe api 2020-11-17 16:23:55 +01:00
Sylvain
678af0de1f using stripe api + improved ui + ui to configure schedules reference 
TODO: as an admin, I can select if payment_method = (stripe || local)
 2020-11-16 16:37:40 +01:00
Sylvain
b5504d2342 create stripe subscription with all data 2020-11-12 16:44:55 +01:00
Sylvain
9d2dc65958 pay reservation only from cart 2020-11-10 11:57:45 +01:00
Sylvain
a321771040 user consent about payment schedule 2020-11-10 09:51:13 +01:00
Sylvain
2ab7f3bdb9 handle only subscription process in cart 2020-11-10 08:54:52 +01:00
Sylvain
789c6a28fe handle subscription creation only from the cart 2020-11-09 16:54:20 +01:00
Sylvain
2af6c8b9cc style fix 2020-11-09 15:22:22 +01:00
Sylvain
0c456b153e use FabModal component to display ful schedule 2020-11-09 15:17:38 +01:00
Sylvain
0fe4f13110 component to display the payment schedule 2020-11-05 17:32:37 +01:00
Sylvain
0e503e734e select-schedule component 2020-11-05 15:30:25 +01:00
Sylvain
2fc9fd4028 show subscription summary in cart payment modal 2020-11-05 09:57:38 +01:00
Sylvain
b0afa02f1d use cart directive on the plan subscription page 
+ fix payment schedule compute
+ fix price for monthly-payments plans in plan-card
+ TODO: valid_reservation_modal.html
+ TODO: Stripe processing
 2020-11-04 16:22:31 +01:00
Sylvain
21bd1312bc compute payment schedule + basic display 2020-11-03 16:50:11 +01:00
Sylvain
506d9dd5fb typo 2020-11-02 16:50:23 +01:00
Sylvain
f2c81a634a using the <plan-card> component in embedded plans view 2020-11-02 13:37:58 +01:00
Sylvain
7084e88d2d display monthly price for compatible plans 2020-11-02 12:29:08 +01:00
Sylvain
465fe8e913 show link to pdf in component 2020-11-02 11:16:13 +01:00
Sylvain
408531d13a use i18next instead of angular-translate for react components 2020-11-02 11:07:08 +01:00
Sylvain
4f877ab05d react coponent: plan-card + extracted scss from stylesheet.rb into themes/ 2020-10-29 15:53:29 +01:00
Sylvain
f5687f1120 WIP: refactoring of plan card 2020-10-28 17:02:22 +01:00
Sylvain
2b014304ce WIP: plan card 2020-10-28 14:23:27 +01:00
Sylvain
571a273ea2 using typescript for all components 2020-10-28 13:35:31 +01:00
Sylvain
5f93e6d3be plan creation: set if it allows monthly payments 2020-10-27 13:06:37 +01:00
Sylvain
a72473f0b6 added typescript + hmr 2020-10-27 09:41:16 +01:00
Sylvain
c3139307bc [bug] in the settings area, boolean switches are always shown as false 2020-10-26 16:38:17 +01:00
Sylvain
a2d885f447 [bug] members cannot view available trainings slots 2020-10-23 13:08:52 +02:00
Sylvain
c7a8668fd6 architecture changes to allow including React.js components into the application 2020-10-21 15:07:01 +02:00
Sylvain
24e6736f51 fix change space/machine reservation 2020-10-20 14:53:00 +02:00
Sylvain
61d3fcdb0a webpack fixes 
- add missing annotation for esFactory
- removed unused  dependency for diacritics service
- removed google_plus from social networks: not relevant anymore
- eslinted services syntax
 2020-10-19 15:49:17 +02:00
Sylvain
2bbbe8c7d2 change configuration of auto-ngtemplate-loader to use absolute path 2020-10-19 14:40:18 +02:00
Sylvain
875c7a6df8 WIP: correct angualrJS templates path for production build 
see: https://github.com/WearyMonkey/ngtemplate-loader
 2020-10-12 09:00:22 +02:00
Sylvain
c1564d5eae Merge branch 'webpacker' into dev 2020-10-05 17:52:46 +02:00
Sylvain
512411eb04 fix angular-bootstrap-switch 2020-10-05 17:22:59 +02:00
Sylvain
6fa9347c75 fix training reservation calendar 2020-10-05 12:54:37 +02:00
Sylvain
d701260fae fix spaces reservation calendar 2020-10-05 12:12:22 +02:00
Sylvain
5a0185dd48 fix machine reservation calendar 2020-09-30 16:32:01 +02:00
Sylvain
f6183dbafb fix public calendar filter 2020-09-30 11:59:50 +02:00
Sylvain
c0a46e5bf1 fix public calendar 2020-09-30 11:45:44 +02:00
Sylvain
8ee91ef7d5 fixes fullCalendar for admin agenda 2020-09-30 11:23:42 +02:00
Sylvain
5caceec57b WIP: debug fullcalendar with webpack 
see https://stackoverflow.com/questions/44220534/uncaught-typeerror-cannot-read-property-hastime-of-undefined
 2020-09-29 16:22:34 +02:00
Sylvain
62e45dc998 Updated fullCalendar to 2.9.1 
+ fix using moment-timezone with webpack
 2020-09-28 17:33:18 +02:00
Sylvain
a398ba8b8e fix loading angular-ui-tour templates + use templateUrl instead of template:require() 2020-09-22 14:46:13 +02:00
Sylvain
4e4ab9c4c2 load angular templates with webpack 2020-09-22 14:20:47 +02:00
Sylvain
31d1071f87 revert real usage of templateUrl 2020-09-21 15:11:39 +02:00
Sylvain
9b6e5408f9 refactor usage of html templates in JS to make it compatible with webpack html-loader 2020-09-21 14:50:28 +02:00
Sylvain
e70ecc2670 eslint router 2020-09-21 13:23:42 +02:00
Sylvain
734ed09464 removed useless ERB extensions 
Must speed-up webpack compilation process
 2020-09-21 09:27:55 +02:00
Sylvain
45d60952b7 [WIP] fix webpack dependencies with global variables 
Using:
- expose-loader
- exports-loader
- import-loader
- https://medium.com/@drgenejones/using-webpack-with-legacy-angular-spas-exposing-global-variables-to-child-modules-599e32f373c9
 2020-09-16 16:54:56 +02:00
Sylvain
ad2ca33c6f export Application (shimming) 2020-09-16 15:38:07 +02:00
Sylvain
72d79e8e31 fix erb+nonJS loaders 2020-09-16 14:12:45 +02:00
Sylvain
ec8fe3bf28 fixes import of JS dependencies 2020-09-14 16:08:49 +02:00
Sylvain
4e076c32ee using bootsrap-sass + erb fixes 2020-09-09 16:26:51 +02:00
Sylvain
6e5713438f remove useless references to asset_pack_path or equivalents 2020-09-09 15:28:35 +02:00
Sylvain
e37e368e90 updated links to html assets to use webpacker 2020-09-09 08:45:48 +02:00
Sylvain
75aa90070c moved javascript from sprocket to webpacker 2020-09-09 08:45:02 +02:00