rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-30 11:24:21 +01:00
Code Issues Releases Activity
4,806 Commits 15 Branches 273 Tags 82 MiB
336a4b789c
Commit Graph

368 Commits

Author SHA1 Message Date
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
39a7e23881 Improved style of public plans page 2021-03-22 13:13:51 +01:00
Sylvain
ef32532cf5 Links created using medium editor opens in new tabs 2021-03-22 11:32:04 +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
ab3ac05aa3 Allow inserting hyperlinks in customized info messages 2021-03-03 15:33:03 +01:00
Sylvain
3ea06826ad WIP: select gateway 2021-03-03 15:28:56 +01:00
Sylvain
544b00e8a7 [bug] do not display "powered by disqus" if Disqus is disabled 2021-03-02 17:03:03 +01:00
Sylvain
9ed1bbcad8 updated changelog 2021-02-24 08:56:37 +01:00
Sylvain
c9cea041dd updated links to user's guide 2021-02-22 19:26:38 +01:00
Sylvain
9d667ef54f allow managers to view/manage schedules 2021-02-22 16:18:08 +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
d767cf5f85 improve style of plans presentation 2021-02-09 16:40:04 +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
d891690ab8 Default texts for the login modal 2020-12-30 15:37:15 +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
7833b0924b add other cart items to the first schedule 2020-11-05 14:55:06 +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
187cb9f06d replace modules.* by .modules.* for more secure access 2020-11-02 13:36:17 +01:00
Sylvain
d4ce5b7dd0 [bug] warning message overflow in credit wallet modal 2020-11-02 13:22:32 +01:00
Sylvain
7776fe13d6 [bug] unable to access embedded plan views 2020-11-02 13:18:31 +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
106d8be4c8 Merge branch 'dev' into monthly-payment 2020-10-28 12:11:49 +01:00
Sylvain
1699bbf143 [bug] theme primary color is ignored on links 2020-10-28 12:10:25 +01:00
Sylvain
44525f9bad Merge branch 'dev' into monthly-payment 2020-10-28 09:53:28 +01:00
Sylvain
84fc81e618 Display a message when no plans are available 2020-10-28 09:53:11 +01:00
Sylvain
85a1cc99cf Merge branch 'dev' into monthly-payment 2020-10-28 08:54:09 +01:00
Sylvain
79b49778a4 [bug] public cards presenting the plans in the public area, have bogus style 2020-10-28 08:52:42 +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
dc844bb10c Enlarged privacy policy display and edition zones 2020-10-26 16:52:05 +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
01524da0ab [bug] unable to display details about a closed period 2020-10-23 12:09:36 +02:00
Sylvain
c87adde6f6 [bug] unable to set libraries locales to their default values (en-us) 2020-10-23 11:53:18 +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
c5ee1ac120 fix translation 2020-10-20 10:01:27 +02:00
Sylvain
f9f21c1496 fix missing fontAwesome icons 2020-10-20 09:53:05 +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
353ca1f291 remove uneffective erb comments 2020-10-19 15:30:07 +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
585f01b671 compile angular-ui-tour from the sources 2020-10-07 16:37:01 +02:00
Sylvain
c30e096e53 fix loading ui-tour with webpack 2020-10-07 10:25:27 +02:00
Sylvain
6d00d03f8e replace method raw by html_safe 
https://stackoverflow.com/questions/19633877/undefined-method-raw-for-controller-for-rails-4
 2020-10-06 12:44:05 +02:00
Sylvain
c1564d5eae Merge branch 'webpacker' into dev 2020-10-05 17:52:46 +02:00
Sylvain
4f5f54a66a moved locales files into the main application pack 2020-10-05 17:42:49 +02:00
Sylvain
512411eb04 fix angular-bootstrap-switch 2020-10-05 17:22:59 +02:00
Sylvain
be9dfe4ff5 fix angular-ui-tour templates url 2020-10-05 15:34:41 +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
495a4686d5 load fullcalendar locale 2020-09-30 11:37:55 +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
8cc0d30ee9 fix fontawesome left arrows 2020-09-29 14:35:42 +02:00
Sylvain
fe88f3ba0f fix fontawesome with holder.js 2020-09-29 14:27:49 +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
e68397d0c5 Updated bootstrap-switch to 3.4.0 2020-09-28 16:30:07 +02:00
Sylvain
253fb21940 updated jquery-minicolors to 2.3.5 2020-09-28 14:51:45 +02:00
Sylvain
39ff1269a3 fix path for template _plan.html 2020-09-23 16:42:43 +02:00
Sylvain
562fb5d8d7 fix requiring templates from ngtemplate-loader 2020-09-22 16:04:42 +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
2ef7c06cb2 updated fontawesome to v5 + fix load fonts with webpack 2020-09-22 11:28:42 +02:00
Sylvain
5764233c67 fix stylesheets compilation with webpack 2020-09-22 09:45:18 +02:00
Sylvain
f3be8961cf fix 404 for no_avatar.png 2020-09-21 15:53:02 +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
d43516f6fe fixes [:ctrlreg] The controller with the name '...' is not registered 2020-09-21 13:23:28 +02:00
Sylvain
b2bbbf5c79 renamed router.js without erb extension 2020-09-21 09:40:00 +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
0cf1b535cd updated summernote 2020-09-15 17:01:47 +02:00
Sylvain
39682e24e4 fix locales with webpack 2020-09-15 15:00:05 +02:00
Sylvain
b760c10414 fix sass for webpack 2020-09-15 12:57:54 +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
85a51e1b46 removed useless erb extensions 2020-09-09 15:42:05 +02:00
Sylvain
6e5713438f remove useless references to asset_pack_path or equivalents 2020-09-09 15:28:35 +02:00
Sylvain
44ca50b4e1 load template and erb with webpack 2020-09-09 11:54:49 +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