rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-05 20:46:14 +01:00
Code Issues Releases Activity
6,636 Commits 15 Branches 274 Tags 82 MiB
f784a4d8a0
Commit Graph

2786 Commits

Author SHA1 Message Date
Sylvain
6af425d272 fix Avoir mode by card 2021-06-07 09:18:11 +02:00
Sylvain
68f64cfc5c update the card for payment schedules 2021-06-04 18:26:20 +02:00
Sylvain
89adcf1a9d WIP: pay item 2021-06-03 16:25:42 +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
209bde9f28 refreshed all footprints in fixtures, all tests passing 2021-05-31 17:14:42 +02:00
Sylvain
28e41de9ad task to reset the stripe payment methods in test mode 2021-05-31 16:15:57 +02:00
Sylvain
d0011a10f0 check for slots restricted to subscribers at cart level 2021-05-31 15:39:56 +02:00
Sylvain
55b0e25ee9 generate footprints in a reproductible way 2021-05-31 12:53:28 +02:00
Sylvain
36e173fb43 test presence of footprint debug data 2021-05-31 12:19:28 +02:00
Sylvain
db58ee28c0 migration to object[] 
TODO: fix invoices checksums
 2021-05-31 11:52:53 +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
6cd74ac33e remove references to PaymentSchedule.scheduled 2021-05-27 16:11:23 +02:00
Sylvain
5f5ec8dbb6 remove references to Invoice.invoiced 2021-05-27 15:58:55 +02:00
Sylvain
13f50c0e33 remove references to WalletService.transactable 2021-05-27 13:43:54 +02:00
Sylvain
16df7f9506 fix data migrations + update test fixtures 2021-05-27 11:31:07 +02:00
Sylvain
c79078c8e1 Merge branch 'dev' into payzen 2021-05-26 14:00:51 +02:00
Sylvain
413bb57c38 [bug] zero-decimal currencies w/ stripe 2021-05-26 13:38:16 +02:00
Sylvain
6b90e73195 migrate database to object[] to store multiple boughts items 2021-05-25 17:28:35 +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
b151802923 WIP: fix invoices without invoiced_id 
TODO: fix datetime parsing
 2021-05-21 18:21:24 +02:00
Sylvain
da3eb4f8bd [bug] typo in allow/prevent booking overlapping slots 2021-05-21 17:18:22 +02:00
Sylvain
b255abaf55 [bug] reservation of slots restricted to subscribers leads to invoices without invoiced_id 
This bug was introduced with v4.7.0 and appends when the restriction is manually overridden by an admin/moderator
 2021-05-21 16:46:41 +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
1f9a7ba6cc fix debugging footprints 2021-05-17 17:04:52 +02:00
Sylvain
6bcd9f6fef Merge branch 'dev' into payzen 2021-05-17 15:07:41 +02:00
Sylvain
bf2407467b [bug] unable to sort invoices by date 
This is a workaround. The real issue is that some invoices does not have the invoiced_id data for Reservation. This is likely due to the fact that invoices are created and saved before the reservation is saved (so they don't have an ID).

@see app/services/reservations/reserve.rb#34
 2021-05-17 12:34:12 +02:00
Sylvain
0992999a32 [bug] some invoices does not have the name of the user 2021-05-14 17:07:38 +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
82260d8c62 [bug] invalid currency in notifications for locales with region 2021-05-14 11:57:52 +02:00
Sylvain
7ac119d4cf [bug] invoices are not generated in test/development if the configured locale is composed 
Eg. If locale is fr-CA, it was crashing. If locale was only fr, is was working.
Now, composed locales print the watermark using the base locale and
hour_minute format is fetched from the base locale
 2021-05-12 17:23:42 +02:00
Sylvain
ff40c98dcb [bug] missing german watermark 2021-05-12 16:55:25 +02:00
Sylvain
390f62fd41 [bug] the count of successfully updated events was not correct 2021-05-12 15:53:32 +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
Sylvain
30c1c91590 factorize payment form props 2021-04-28 16:41:15 +02:00
Sylvain
f9b47cf1f4 fix payment on site modal 2021-04-28 16:29:04 +02:00
Sylvain
dbdedadf8c fix price computation in front-end 2021-04-28 16:22:22 +02:00
Sylvain
953224f1f7 remove top margin on first group 2021-04-28 16:17:56 +02:00
Sylvain
3b2f17d6d8 improved style of subscription page titles 2021-04-28 15:43:36 +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
e75259734c fix test Subscriptions::CreateAsAdminTest 
user_id must be read from [:cart_items][:customer_id]
 2021-04-27 13:51:23 +02:00
Sylvain
1bf091081b fix test Reservations::CreateAsAdminTest 
create subscription from POST api/reservation if the parameter subscription.plan_id is provided
+ cart_items are not wrapped in a reservation object
 2021-04-26 18:27:35 +02:00
Sylvain
d5f7bd7abd fix test Reservations::CreateTest 
create subscription w/ the reservation if applicable
+ refactor payments_controller to factorize the on_*_success codes
 2021-04-26 17:42:03 +02:00
Sylvain
da372cf8ad fix test Events::AsUserTest 
the event price calculalation was using a variable not reinitialized
 2021-04-26 16:38:00 +02:00
Sylvain
53e9a1c4f2 fix running test create_as_admin_test 
- do not create an empty payment gateway object if not needed
 2021-04-26 12:00:07 +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
b9e8c8867c fix running test renew_as_admin_test 2021-04-26 11:40:26 +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
94cbcd3236 refactor to use the new price computation system based on ShoppingCart 2021-04-23 12:52:06 +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
a897d37b2d improved footprint debug process 2021-04-16 16:03:10 +02:00
Sylvain
4ffd357841 WIP: migrate stripe ids in DB 2021-04-16 12:25:48 +02:00
Sylvain
343b2f7d23 refactor code related to archiving 2021-04-16 10:34:02 +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
4d3ead310d do not run StripeWorker tasks is the gateway is not enabled 2021-04-14 12:18:37 +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
4245747072 include payzen frontend libs if enabled 2021-04-07 17:17:17 +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
94c4d318e1 fix top-margin 2021-04-06 18:05:08 +02:00
Sylvain
0cca08984f use flex-start 2021-04-06 18:00:55 +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
63c81b82c1 Merge branch 'dev' into payzen 2021-04-06 15:03:27 +02:00
Sylvain
3483e1355c updated openlab + handle missing dev instance 2021-04-06 14:58:12 +02:00
Sylvain
e06f3beeab [bug] notification not sent 
notification sent to the project author when a collaborator has confirmed his participation
 2021-04-06 14:16:03 +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
e38228ae7e prevent notification crash on nil reservation 2021-03-29 10:19:37 +02:00
Sylvain
818e9e99fc [bug] unable to update a coupon 2021-03-29 10:19:06 +02:00
Sylvain
c50e69b351 Enforced validation on required input fields 2021-03-24 18:24:03 +01: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
1749dea0e2 fix tests 2021-03-23 12:32:59 +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
e9185bd402 [bug] recurring availabilities are not restricted to subscribers 2021-03-22 10:43:45 +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
8bc040ae8b show group in email notif on account creation 2021-03-09 11:34:39 +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
19055c4f78 Use the primary color to display plans' price in the public view 2021-03-08 14:14:14 +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
f9e775ac35 [bug] do not send notifications each hour for payment schedules deadlines 2021-03-03 09:09:17 +01:00
Sylvain
544b00e8a7 [bug] do not display "powered by disqus" if Disqus is disabled 2021-03-02 17:03:03 +01:00
Sylvain
120c9144bb [security] restrict allowed keys when creating/updating credits 2021-02-24 11:11:18 +01:00
Sylvain
9ed1bbcad8 updated changelog 2021-02-24 08:56:37 +01:00
Sylvain
d7056f0adc fix footprints checking for payment schedule items 2021-02-23 14:04:42 +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
305e462011 on stripe subscription renew: cancel subscription after the last deadline 2021-02-22 11:28:52 +01:00
Sylvain
0b3a02a05d handle errors in PaymentScheduleItemWorker 2021-02-22 11:27:29 +01:00
Sylvain
2ef4e52885 use File.join to concat path 2021-02-22 10:19:44 +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
ecb23c02b9 fix extend susbcription w/ payment schedule 2021-02-10 13:32:13 +01:00
Sylvain
44030793ee fix schedulable plans border color, in casemate theme 2021-02-10 11:56:45 +01:00
Sylvain
1cc727de6b fix schedulable plans border color, in casemate theme + typo 2021-02-10 11:50:12 +01:00
Sylvain
8468a3c6de rake task to regenerate payment schedules PDF files 2021-02-10 11:40:23 +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
d1584604b3 fix a rounding error with coupons 2021-02-08 15:42:45 +01:00
Sylvain
0e7226c85c handle stripe requires_action 2021-02-08 15:28:47 +01:00
Sylvain
38ac55c35f [bug] no notifications for refunds generated on wallet credit 2021-02-08 13:50:49 +01:00
Sylvain
76ebb3ccb4 run the PaymentScheduleItemWorker more ofter and tell the users that they ahev only 24h to fix the payment 2021-02-08 10:05:54 +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
eddf23622d Merge branch 'dev' into monthly-payment 2021-02-02 17:17:15 +01:00
Sylvain
588b8050db [bug] when an event is modified, the member's reservations does not reflect the new event date 2021-02-02 15:52:55 +01:00
Sylvain
1c22d3a62a keep backward compatible openapi errors 2021-02-02 11:28:31 +01:00
Sylvain
30e9f6febf OpenAPI endpoints to create/update/show/delete machines 2021-02-01 17:43:15 +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
01a0612a4b fix create invoice for each due date 2021-01-25 14:37:07 +01:00
Sylvain
26636254bd generate the invoices for each schedule item and notify if something goes wrong 2021-01-25 13:05:27 +01:00
Sylvain
ecdec70755 WIP: generate invoices for each payment schedule item 2021-01-20 17:00:23 +01:00
Sylvain
8adb569891 fix payment schedule total 2021-01-20 13:47:29 +01:00
Sylvain
e5439901d6 fix generate payment schedule pdf + send by mail 
TODO: total amount does not match with sum of all lines
- generate invoices for each PS-item
- interface to access the payment schedules
 2021-01-19 16:47:51 +01:00
Sylvain
12e99f4c9c generate payment schedule pdf 2021-01-04 18:12:44 +01:00
Sylvain
37af665991 save subcription id in payment schedule item 2021-01-04 17:03:44 +01:00
Sylvain
8b13ae45ac all tests passing 2021-01-04 16:26:52 +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
b8319a5124 handle percent coupons w/ stripe subscriptions 2020-12-30 10:17:39 +01:00
Sylvain
fba5f57a1c handle wallet transaction w/ stripe subscription 2020-12-29 18:55:00 +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
3e4892d3a5 WIP: creating payment schedule workers 
see TODO in app/workers/payment_schedule*
 2020-12-23 16:56:19 +01:00
Sylvain
65277800e2 fix creation subcription on stripe 2020-12-23 16:25:24 +01:00
Sylvain
f661428db2 better error handling in stripe::subscription creation process 2020-12-23 15:29:56 +01:00
Sylvain
32b0222da5 save payment schedules PDF to a persistant volume storage 2020-12-22 16:39:37 +01:00
Sylvain
bbf88846dd refactored Invoice & PaymentSchedule to use inheritance 2020-12-22 14:43:08 +01:00
Sylvain
6fa9780ad5 refactor chainable/footprint protected models to use inheritance 2020-12-22 09:53:41 +01:00
Sylvain
d3a41903cd WIP: exclude invoice_id from footprint in payment_schedule_item 2020-12-21 17:37:58 +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
a4131e4d5c fixed new reservation process 2020-12-21 12:02:59 +01:00
Sylvain
40c78974b8 refactoring of reservation:pay_and_save 
TODO: debug with tests,
refactor subscription:pay_and_save on the same template
 2020-12-16 18:33:43 +01:00
Sylvain
ccff463165 test subscription with schedule by user 2020-12-15 15:48:13 +01:00
Sylvain
908ccf5bab handle reservations+subscription w/ schedule 
integration testing for payment schedule
debug reservation process
 2020-12-14 17:42:23 +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
d3d2434654 fix CHANGELOG + fix modal links colors 2020-11-17 09:15:27 +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
881f8d3efb [bug] unable to create a coupon on stripe 2020-11-16 14:24:36 +01:00
Sylvain
b5504d2342 create stripe subscription with all data 2020-11-12 16:44:55 +01:00
Sylvain
ed5b90cbdc add stp_product_id to all items that can be scheduled 2020-11-12 12:14:51 +01:00
Sylvain
78847bdb4b WIP: create subscription on stripe 2020-11-10 17:02:21 +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
7d37174b51 [bug] when a cash coupon was used, an invalid amount is shown in the statistics 2020-11-04 15:53:40 +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
14091f547e parse multiple scss files for theme 2020-10-29 16:11:19 +01:00
Sylvain
6eebd61e3c [bug] unable to build homepage custom stylesheet 2020-10-29 15:58:24 +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
ddd2b252ab fix caret color 2020-10-28 10:27:59 +01:00
Sylvain
ccd3e93428 fix about link color 2020-10-28 10:03:04 +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
bf76157703 Initialize new plans with default prices for machines & spaces 2020-10-28 09:24:31 +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
a9cc0b391b save products and prices to stripe for each plans 2020-10-27 16:46:38 +01:00
Sylvain
6be51feeb2 save stp_price_id for each plan 2020-10-27 16:03:20 +01:00
Sylvain
840be2c6c0 renamed RepaymentSchedule to PaymentSchedule 2020-10-27 16:02:41 +01:00
Sylvain
5f93e6d3be plan creation: set if it allows monthly payments 2020-10-27 13:06:37 +01:00
Sylvain
52f3bd956f database structure for payment schedule 2020-10-27 11:32:20 +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
2227a59275 [bug] unable to rename a group containing users 2020-10-20 15:52:14 +02:00
Sylvain
b5a4e724e8 [bug] email notification after reservation update have wrong previous date (#234) 2020-10-20 15:14:11 +02:00
Sylvain
24e6736f51 fix change space/machine reservation 2020-10-20 14:53:00 +02:00
Sylvain
9187132682 fix placeholder logo in notification mailer 2020-10-20 10:18:27 +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
57b76d156b Alert before cancelling a reservation that credits will be lost 2020-09-29 12:03:13 +02:00
Sylvain
13bc5334cc ability to configure until when the events are shown on the home page 2020-09-29 09:39:32 +02:00
Sylvain
30b3a794d3 [bug] managers cannot see passed events 2020-09-29 08:40:07 +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
26f26c02bb [bug] removed unexpected character in coupon form 2020-09-23 15:37:32 +02:00
Sylvain
8945dbfb39 [bug] unable to create a subscription plan for only one group 2020-09-23 15:28:20 +02:00
Sylvain
8f25c54402 [bug] user's manual URL is not up-to-date 2020-09-23 10:54:45 +02:00
Sylvain
8b823b3d67 [bug] slots duration is not shown when looking at a new availability 2020-09-23 10:20:51 +02:00
Sylvain
36d8c76ad7 [bug] wallet tab is not shown in members dashboard 2020-09-23 10:13:41 +02:00
Sylvain
a8811afba3 [bug] unable to search for projects (#230) 2020-09-23 09:32:42 +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
cd1abb15e8 enable splitchunk 2020-09-09 08:51:53 +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
Sylvain
9ee8b3a6ef migrate from asset pipeline to webpacker 
- migrated images
- ongoing stylesheets migration
 2020-09-08 16:53:45 +02:00
Sylvain
9efab4e3a1 migrate to webpack 
https://mariochavez.io/desarrollo/2020/05/19/from-the-asset-pipeline-to-webpack.html
 2020-09-07 15:52:05 +02:00
Sylvain
2083ce6778 [bug] unable to pay by card for events reservation (#229) 
The setting online_payment_module was not requested by the router before loading the page, so it was always evaluated to false= online payment disabled
 2020-08-31 17:39:50 +02:00
Sylvain
d708f0a3e7 [bug] unable to search for projects on OpenLab 2020-08-24 16:19:03 +02:00
Sylvain
190e815f73 [bug] unable to export subscriptions 2020-07-22 12:33:35 +02:00
Sylvain
19fb816d36 Enhanced rake task to create fixtures for test cases 2020-07-22 09:45:20 +02:00
Sylvain
14b0b2ac30 class documentation 2020-07-21 19:28:30 +02:00
Sylvain
7bf06ff23e debug footprints 2020-07-21 19:25:21 +02:00
Sylvain
d9be51b01b [admin form] show if phone is required 2020-07-21 18:04:20 +02:00
Sylvain
e5cef6e6bf [bug] unable to export reservations 2020-07-21 17:25:19 +02:00
Sylvain
956d865e4f [bug] unable to set stripe public key in production 2020-07-01 17:57:33 +02:00
Sylvain
a83a42c70c [bug] Health API is broken if ElasticSearch is not present 2020-07-01 15:13:44 +02:00
Sylvain
5eae1c74a8 [bug] Unable to access the invoices section if the stripe key was not set or incorrect 2020-07-01 12:15:45 +02:00
Sylvain
e644e4894a using unaccent to build project search index + updated doc 2020-06-30 15:58:39 +02:00
Sylvain
cce70d33a9 fix GA host configuration + updated doc about default_host 2020-06-29 16:53:13 +02:00
Sylvain
5f0a9ed572 remove dead code 2020-06-29 15:12:32 +02:00
Sylvain
e95b270433 multiples fixes 
- improved project search
- fix db schema (sql)
- improved doc
- removed es_language_analyzer var (deprecated)
 2020-06-24 17:22:38 +02:00
Sylvain
8137418904 improved test for accounting periods 2020-06-24 15:25:17 +02:00
Sylvain
e288f66997 use search index to speed up projects searches 2020-06-23 17:06:59 +02:00
Sylvain
23338eb36d refactored project search using service 2020-06-23 15:45:38 +02:00
Sylvain
7140571d63 filter & search projets from postgres 2020-06-23 11:19:20 +02:00
Sylvain
1a6cd356bf WIP: using postgres for full-text search in projects 2020-06-22 16:28:05 +02:00
Sylvain
d83e3a8d26 using gem pg_search 2020-06-22 11:25:35 +02:00
Sylvain
7af6f18973 source for building search engine 2020-06-17 16:56:10 +02:00
Sylvain
a164ec402d poc using tsvector 2020-06-17 16:49:38 +02:00
Sylvain
40dd39304e enable/disable statistics module fomr the UI 2020-06-17 12:20:51 +02:00
Sylvain
28781a7bf4 fix default duration for new training session 2020-06-16 15:23:54 +02:00
Sylvain
933ce5df71 [bug] summary of create training availability shows incorrect alert about slot splitting 2020-06-16 14:29:18 +02:00
Sylvain
5e8aeb928c fix refactoring issue in /api/open_api_clients 2020-06-15 17:07:28 +02:00
Sylvain
b790bc01e7 fix access to /admin/invoices for managers 2020-06-15 16:56:43 +02:00
Sylvain
be9ee9d25d complete features-tour for invoices page 2020-06-15 15:56:55 +02:00
Sylvain
dbbf306bf2 complete features-tour for projects page 2020-06-15 15:43:28 +02:00
Sylvain
6af5f51ff2 complete features-tour for settings page 2020-06-15 15:32:30 +02:00
Sylvain
24155bc009 ability to lock settings from the env vars 2020-06-15 13:20:48 +02:00
Sylvain
42872ab107 configure wallet from UI 2020-06-15 12:44:43 +02:00
Sylvain
f46c78a476 read email_confirmation_required from the UI 2020-06-15 11:57:13 +02:00
Sylvain
48bcf0b838 configure invoices prefix from the DB 2020-06-15 10:58:15 +02:00
Sylvain
b66cb5d334 WIP: set invoice_prefix from the UI 2020-06-10 17:35:54 +02:00
Sylvain
2d0e201cb7 fix send notification after members sync 2020-06-10 16:45:48 +02:00
Sylvain
78518e17fb read stripe_currency from the UI 
We prevent the currency from being changed if any stripe payment was made, because a stripe user cannot made pay with different currencies. If we try to charge a user with a different currency than the currency he used for a previous payment, this will fail; so we must prevent this case
 2020-06-10 16:37:11 +02:00
Sylvain
401cf6b7ec fix stripe public key from payment modal 2020-06-10 11:58:42 +02:00
Sylvain
4b8504f531 fix tests 2020-06-10 11:52:54 +02:00
Sylvain
82d6677cff read stripe_api_key from db 2020-06-10 11:33:03 +02:00
Sylvain
88208627c9 read stripe_public_key from the db 2020-06-10 11:02:30 +02:00
Sylvain
3596e9a7a7 fix Stripe::RateLimitError 2020-06-09 19:03:01 +02:00
Sylvain
9ff0a06029 many sidekiq fixes 2020-06-09 18:51:57 +02:00
Sylvain
dbda82ac9b notify after members sync on stripe 2020-06-09 15:06:46 +02:00
Sylvain
a70668f52a sync members on stripe after keys update 2020-06-09 14:27:18 +02:00
Sylvain
d5939a9de5 set the stripe keys from the UI 2020-06-09 13:09:31 +02:00
Sylvain
593c38e9de update settings whitelist 2020-06-08 17:45:43 +02:00
Sylvain
06b5da9df8 configure online payment from the UI 2020-06-08 17:42:59 +02:00
Sylvain
b44a8da73b set openlab_default from the UI 2020-06-08 16:15:44 +02:00
Sylvain
f78eb10c75 use openlab_app_secret from db w/ openlab_ruby gem 2020-06-08 15:17:56 +02:00
Sylvain
88f2fb3749 secure the settings API (read) + read the openlab settings from the db 2020-06-08 15:08:07 +02:00
Sylvain
db8de18bd4 set openlab-projects id & secret from the UI 2020-06-08 11:38:49 +02:00
Sylvain
6af3f12917 use the db settings to validate mime types & extensions + fix texts + force lowercase 2020-06-03 17:56:39 +02:00
Sylvain
8f32eb92db interface to manage file extensions & mime types 2020-06-03 17:39:32 +02:00
Sylvain
5c152412db test mime type of a file 
use marcel to test mime types
updated mimemagic
 2020-06-03 16:25:13 +02:00
Sylvain
743f3e510a WIP: Test the mime type of a file 2020-06-03 15:33:04 +02:00
Sylvain
a5e1b77ce4 check the file content with mimemagic for project CAD files 2020-06-03 12:28:04 +02:00
Sylvain
2082f1e11c fix avatar refresh on update 2020-06-03 10:21:13 +02:00
Sylvain
ebe602ad1c WIP: enforce mime type checking for uploads 2020-06-02 19:18:57 +02:00
Sylvain
45013be950 configure default_host & default_protocol from env 
reverts 478a6c40 (partially) & b2434864
 2020-06-02 18:29:24 +02:00
Sylvain
1a38a8750b updated carrierware + validate file upload in front 2020-06-02 17:57:24 +02:00
Sylvain
ee3868cb90 improve layout for settings 2020-06-02 12:14:57 +02:00
Sylvain
075b642cc8 remove useless & broken item_url(...) methods 2020-06-02 11:37:24 +02:00
Sylvain
86336e3619 fix app unable to start 
message:
no connection pool with 'primary' found postgres
 2020-06-02 10:25:52 +02:00
Sylvain
9a0f36c245 configure disqus_shortname from the UI 2020-06-01 18:31:43 +02:00
Sylvain
59cb17789c rename section project_elements to projects 2020-06-01 17:52:39 +02:00
Sylvain
cc3ed864d0 move templates from project_elements to projects 2020-06-01 17:52:20 +02:00
Sylvain
478a6c409d define default_protocol & default_host from the UI + fix email_from + various minor fixes 2020-06-01 17:32:32 +02:00
Sylvain
0617e4cd26 configure default_mail_from from the UI 2020-06-01 12:15:16 +02:00
Sylvain
434c211ccf configure the features tour display mode from the UI 2020-05-27 18:49:53 +02:00
Sylvain
243809f167 select-setting directive 2020-05-27 17:07:55 +02:00
Sylvain
0d211e2e31 configure google recaptcha from UI 2020-05-27 16:35:30 +02:00
Sylvain
c3846e7080 configure twitter analytics from the UI 2020-05-27 15:39:39 +02:00
Sylvain
628a0f3bc3 configure facebook_app_id from the UI 2020-05-27 12:29:51 +02:00
Sylvain
fc13263a89 refactor to use text-setting 2020-05-27 11:30:50 +02:00
Sylvain
78bd037694 text-setting directive 2020-05-27 11:18:26 +02:00
Sylvain
2d628d8826 disable the invoicing module from the UI config panel 2020-05-26 18:07:07 +02:00
Sylvain
537743a740 configure the plans module from the admin UI 2020-05-26 15:39:28 +02:00
Sylvain
6cc6bba7ce refactored app to gather spaces module status from the settings 2020-05-26 13:59:40 +02:00
Sylvain
fd93093f0d UI to configure the spaces module 2020-05-26 10:53:49 +02:00
Sylvain
acefc325f6 configure events_in_calendar form the UI panel 2020-05-25 17:36:53 +02:00
Sylvain
57ceeec2e7 refactored settings/reservations/confidentiality section 2020-05-25 17:05:54 +02:00
Sylvain
01017f3012 fix setting.get for boolean 2020-05-25 16:47:06 +02:00
Sylvain
98c63e8327 [bug] managers do not see the name of the user who reserved a slot 2020-05-25 16:35:21 +02:00
Sylvain
2b0eb47730 reorganized settings/reservations 2020-05-25 16:10:40 +02:00
Sylvain
3135abcee6 retrieve phone_required directly from the api 2020-05-25 16:02:40 +02:00
Sylvain
ed287884de retrieve book_overlapping_slots directly from the api 2020-05-25 15:28:06 +02:00
Sylvain
54d9b348e0 retrieve slot_duration directly from the api, in the front-end 2020-05-25 15:16:40 +02:00
Sylvain
ba4c39ca99 use slot duration from the db setting 2020-05-25 12:55:01 +02:00
Sylvain
a63340188b configure default slot duration from settings panel 2020-05-25 12:55:01 +02:00
Sylvain
1ad0720711 number-setting directive + refactored admin/settings to use new directive 2020-05-25 12:55:01 +02:00
Sylvain
cb2ad950b5 update setting in memory after save 2020-05-25 12:55:01 +02:00
Sylvain
af45f5bbcd refactored settings to use boolean-setting directive 2020-05-25 12:55:01 +02:00
Sylvain
906564e5e5 boolean-setting directive + eslint on .js.erb + refactored book_overlapping_slots using the new directive 2020-05-25 12:55:01 +02:00
Sylvain
e625f8c7f7 reorganized home directives 2020-05-25 12:55:01 +02:00
Sylvain
ddce7f516a configuration of book concurrent slots through the settings interface 2020-05-25 12:55:00 +02:00
Sylvain
419605e551 configuration of google analytics tracking ID through the settings interface 2020-05-25 12:55:00 +02:00
Sylvain
4841027216 interface to collect the google analytics ID 2020-05-25 12:55:00 +02:00
Sylvain
701d18d501 Improved display of the icons alerting about an outdated version 2020-05-25 12:54:58 +02:00
Sylvain
13bcd9a1f8 use phoneRequired from settings instead of env 2020-05-25 12:54:19 +02:00
Sylvain
f80eb230ca refactored code to use Setting.get 2020-05-25 12:54:19 +02:00
Sylvain
654d4b1cb4 setting: phone_required 2020-05-25 12:54:19 +02:00
Sylvain
bf57587301 [bug] recurrent availabilities do not keep the custom duration 2020-05-25 11:03:31 +02:00
Sylvain
18e2b032ae fix import users from csv 2020-05-19 11:45:51 +02:00
Sylvain
c9670c9d1d [bug] openAPI clients interface has a bugged behavior when creating/editing a client 2020-05-18 18:09:13 +02:00
Sylvain
2b95c043e3 Removed dependency to has_secure_token to fix warnings about already initialized constant 2020-05-18 17:45:01 +02:00
Sylvain
6c1a500ffa add the url of our website into the endpoint 2020-05-18 17:10:04 +02:00
Sylvain
fdc2f60ff5 [bug] when a new account is created through the sign-up modal, the role is not reported in the StatisticProfile (#196) 
Also: if a member was deleted the /api/members/mapping will raise an error
 2020-05-18 16:23:53 +02:00
Joel Shprentz
dc2ae51b07
Add missing ? to create? method name. 2020-05-15 17:36:43 -04:00
Sylvain
ca7a50bacc [bug] admin's members list shows the same members multiple times 2020-05-13 10:59:16 +02:00
Sylvain
7e1edef8a0 [bug] when an admin logs on the subscription page, his view is broken 
Also: Prevent admins from leaving their dedicated group
 2020-05-13 08:37:49 +02:00
Sylvain
22e936dda5 refactored notification_mailer for possible bug 
undefined method _t for Class:0x...
 2020-05-12 20:30:30 +02:00
Sylvain
c5bbcf9381 [bug] prevent VersionCheckWorker from polluting the sidekiq stack in development 2020-05-12 16:21:06 +02:00
Sylvain
37901e4153 [bug] users promoted to the administrator role are not in the admin group 2020-05-12 15:30:57 +02:00
Sylvain
8ea36b8a89 [bug] the subscription page is not available 2020-05-12 15:16:26 +02:00
Sylvain
14c8cbbf57 typos 2020-05-11 17:17:37 +02:00
Sylvain
9f8fb1a95c fix tests + fix price.compute flor slots 2020-05-11 13:52:27 +02:00
Sylvain
1fdea63828 correct some errors due to Price.compute refactoring 2020-05-11 10:56:23 +02:00
Sylvain
06502cde33 [bug] accounting periods totals are wrong for periods closed after 2019-08-01 2020-05-11 10:10:52 +02:00
Sylvain
4f43dc1407 [bug] do not show disabled groups and plans during availability creation 2020-05-06 17:38:10 +02:00
Sylvain
0a336f14e4 updated messages about prices 2020-05-06 16:55:26 +02:00
Sylvain
5f7287cec7 Ask for confirmation before booking a slot for a member without the required tag 2020-05-06 15:32:40 +02:00
Sylvain
47a0fca481 show all availabilities to managers 2020-05-06 12:56:12 +02:00
Sylvain
be23cf27c3 use Price.compute to generate invoice items 2020-05-06 12:43:47 +02:00
Sylvain
19de8ca319 fix: manager can offer slot to other users 2020-05-06 09:58:15 +02:00
Sylvain
e6f8a34aa4 [ongoing] compute per based on a hourly rate 2020-05-05 17:56:47 +02:00
Sylvain
34935cbc35 decrease higher limit for black text on primary color 2020-05-05 16:20:44 +02:00
Sylvain
6d0ed0bfb5 info box for current availabity in admin calendar 2020-05-05 16:19:46 +02:00
Sylvain
ee3dea3f55 fix if logger is not debug 2020-05-05 12:39:42 +02:00
Sylvain
0609f444b0 corrected ProjectIndexerWorker 2020-05-05 12:37:13 +02:00
Sylvain
7ec7fd0d0d fix notify_user_role_update 2020-05-05 11:59:52 +02:00
Sylvain
2d8df2c1cd Ability to promote a user to a higher role (member > manager > admin) 2020-05-05 11:28:04 +02:00
Sylvain
d8a289e825 fixes change role API 2020-05-04 18:34:26 +02:00
Sylvain
06a5bff084 [ongoing] change user role 2020-05-04 18:32:25 +02:00
Sylvain
3319e68526 Auto-adjusts text colors based on the selected theme colors 2020-05-04 13:20:57 +02:00
Sylvain
29e7ac2f08 [bug] background image of the profile is not shown and wrong menu hover color 2020-05-04 12:10:13 +02:00
Sylvain
7640704568 fix payment method on invoices operated by a manager 2020-05-04 11:36:06 +02:00
Sylvain
881cc97e8d The invoices list displays the operator in case of offline payment 2020-05-04 10:56:27 +02:00
Sylvain
2592844ad0 allow manager to create projects 2020-04-29 18:21:06 +02:00
Sylvain
b97ff2ec5b improved feature tour for managers 2020-04-29 16:30:39 +02:00
Sylvain
6aa7ba89e8 manager's notifications 2020-04-29 15:34:30 +02:00
Sylvain
ff9636e12f help tour for managers 2020-04-29 15:20:39 +02:00
Sylvain
59a20d71bd corrected the documentation about BOOK_SLOT_AT_SAME_TIME 
Also: [ongoing] help for managers
 2020-04-29 12:57:17 +02:00
Sylvain
68fd322398 managers: edit user/edit subscription 2020-04-29 11:11:57 +02:00
Sylvain
35ce577651 [bug] subscription page shows the groups without any active plans 
[bug] cart price inconsistently updated after a subscription
[feature] plans page for managers
 2020-04-29 10:57:32 +02:00
Sylvain
05479e043c [ongoing] plans interface for managers 2020-04-28 18:11:25 +02:00
Sylvain
81a18704ed [bug] plan edition does not show the associated group 2020-04-28 18:10:12 +02:00
Sylvain
abcf17d1e6 invoices interface for managers 2020-04-28 16:49:05 +02:00
Sylvain
6a8746b110 [bug] updating a setting without any changes triggers an error 
Also:
- Invoices interface for managers
- Refactoring of admin/invoices template: split into multiple files
 2020-04-28 16:35:54 +02:00
Sylvain
18895b6a85 manager can create memebrs & credit wallets 2020-04-28 15:34:17 +02:00
Sylvain
e4f5a0f833 restricted manager view on users 2020-04-28 13:20:12 +02:00
Sylvain
3e177b5177 managers events views 2020-04-28 12:48:03 +02:00
Sylvain
e56fba1c03 [bug] Free entry label for events without reservation 2020-04-28 11:21:04 +02:00
Sylvain
2da644ecd5 [bug] unable to delete an unreserved event 2020-04-28 10:05:28 +02:00
Sylvain
3624bee057 {bug] unable to create events or trainings that are not multiples of SLOT_DURATION 2020-04-28 09:45:12 +02:00
Sylvain
570672c5db [bug] unable to change group if the previous was deactivated 2020-04-28 09:21:33 +02:00
Sylvain
102709246f basic access to members management for managers 2020-04-27 17:48:13 +02:00
Sylvain
8c610ea336 [managers] trainings management 2020-04-27 17:28:11 +02:00
Sylvain
d376aa400c book slot at same time for managers 2020-04-27 16:44:56 +02:00
Sylvain
69c8d7c678 manager can change existing reservations 2020-04-27 12:58:55 +02:00
Sylvain
5312c13d3f [manager] manage agenda + book machines for himself&others 2020-04-27 12:12:29 +02:00
Sylvain
c45c92e86a basic manager menu 2020-04-22 12:31:44 +02:00
Sylvain
c30ae8179e fix groups and tags in manager creation + helpers to get users w/ role partner|manager 2020-04-22 10:46:46 +02:00
Sylvain
e1a8646e5f inteface to add/remove/edit managers 2020-04-22 10:09:16 +02:00
Sylvain
2ca5c8c50f managers interface 2020-04-21 17:24:22 +02:00
Sylvain
f88472eeb3 Interface to manage partners 2020-04-21 16:47:35 +02:00
Sylvain
d717ed704c adjust nb of slots per availability 2020-04-21 15:20:33 +02:00
Sylvain
ff75a96ecc Ability to define, per availability, a custom duration for the reservation slots 2020-04-15 18:08:02 +02:00
Sylvain
ac1fa424b5 move version API to POST 2020-04-14 11:39:26 +02:00
Sylvain
92398c6d8d Allow removing contacts from the about page + defaut locales 2020-04-08 16:32:22 +02:00
Sylvain
5f6c293046 fixes in-context translation + fixes migration 20160704095606 2020-04-08 15:55:08 +02:00
Sylvain
de9c224a92 improved version check 
- use referer from client when available
- save uuid returned by hub
- send uuid to hub on version check
- check the version on each startup to prevent wrong sync
- also: do not save a setting on API update if it has not changed
 2020-04-07 17:53:19 +02:00
Sylvain
a4cd6e4dc7 [bug] unable to access health endpoint 2020-04-07 15:19:41 +02:00
Sylvain
6f4052f295 [bug] invalid link to upgrade procedure 2020-04-07 15:02:14 +02:00
Sylvain
1a20f8b41b typo 2020-04-07 14:52:13 +02:00
Sylvain
44e726bc54 [bug] in-context translation is loading invalid locale for MessageFormat 2020-04-07 14:39:31 +02:00
Sylvain
f24d94b979 set correct invoicing_profile_id for refund invoice during wallet credit 2020-04-01 17:58:32 +02:00
Sylvain
3917d6042c [bug] no statistics for subscriptions (#196) 
+ [bug] issing translation for subscriptions statistics > duration
 2020-04-01 17:25:55 +02:00
Sylvain
0b81f957ef fix testing assets with rails 5 2020-04-01 12:51:46 +02:00
Sylvain
705bedc25c [bug] crediting a wallet w/ refund invoice prevent statistics generation (#196) 2020-04-01 12:51:18 +02:00
Sylvain
34a59eabe6 upgrade to new assets pipeline api 2020-03-31 17:36:00 +02:00
Sylvain
570f61c5df [bug] report error on invalid encoding in members import 2020-03-31 16:53:30 +02:00
Sylvain
6dc7a7edd9 [bug] unable to export accounting data to ACD 2020-03-31 15:39:05 +02:00
Sylvain
f9e18ca580 removed dependency to discoutinued protected_attributes + fixed auth_provider 2020-03-30 16:17:32 +02:00
Sylvain
3dc8d66c63 remove dead code of WebhooksController 2020-03-30 15:29:48 +02:00
Sylvain
02c1014412 class documentation 2020-03-30 11:33:12 +02:00
Sylvain
d33c6c0d30 documented all models until StatisticField + fixes halting callback chains via returning false + improved some code 2020-03-25 17:45:53 +01:00
Sylvain
68b8827499 removed unused PlanImage 2020-03-25 16:49:13 +01:00
Sylvain
3d34fd7261 Removed MESSAGEFORMAT_LOCALE as it is now handled by make-plural 2020-03-25 12:35:09 +01:00
Sylvain
6b66d601e1 inherit models from ApplicationRecord 2020-03-25 12:35:09 +01:00
Sylvain
467c6351b1 fix deprecated sass extend 2020-03-25 12:35:08 +01:00
Sylvain
2bbce711d9 fix stylesheet view 2020-03-25 12:35:08 +01:00
Sylvain
9069139bc4 fix accounting archive generation 2020-03-25 12:35:08 +01:00
Sylvain
36adddad53 Syntax improvements in scss files 2020-03-25 12:35:08 +01:00
Sylvain
df8ff77597 fix migrations for rails 5 + use maildev instead of mailcatcher + fix tests script 2020-03-25 12:35:08 +01:00
Du Peng
b3313d3e75 update rails to 5.1.7 2020-03-25 12:35:07 +01:00
Du Peng
9ca9425ef4 update to rails 5.0.7.2 2020-03-25 12:35:07 +01:00
Sylvain
85ab715b89 [bug] invalid translation keys in closing accounting period interface 2020-03-24 16:59:36 +01:00
Sylvain
a1af1a78b0 do not embed dev deps in docker build + updated eslint 2020-03-23 16:15:06 +01:00
Sylvain
0b341af1ed [bug] unable to create new availabilities if SLOT_DURATION is not defined 2020-03-11 11:31:06 +01:00
Sylvain
9e7822f34a Improved contextual help with a modal dialog 2020-03-11 10:26:53 +01:00
Sylvain
e44499d7ee fixed some translations 2020-03-11 10:04:32 +01:00
Sylvain
2c1dbd4d82 [ongoing] help modal 2020-03-10 16:38:29 +01:00
Sylvain
86ae46e4c3 Display user's manual when help is asked, if no tour is available 2020-03-04 17:53:43 +01:00
Sylvain
21c3084bb8 [bug] spaces item is not at the correct position in the admin navigation menu 2020-03-04 14:44:19 +01:00
Sylvain
5301a237ca Change style and pluralize the text of the slot division alert in new availability assistant 2020-03-04 14:42:00 +01:00
Sylvain
f058947c42 [bug] in the user's menu, two links to the personal wallet 2020-03-04 14:33:19 +01:00
Sylvain
0fdce5d1f2 [bug] in feature tours, next and previous arrows may be broken on some systems 2020-03-04 14:29:11 +01:00
Sylvain
978c44f55f fix an issue: shift in subscription end date when over DST 2020-03-04 11:43:12 +01:00
Sylvain
8a1518dabc prevent admin from changing group + add info about configuring groups first 2020-03-03 11:59:17 +01:00
Sylvain
f5955b74d2 reposition tour modals to prevent screen overflow 
also: fix issue on tour completed
+ fix issue on statistics when no plans created
+ info area on statistics when no plans created
 2020-03-03 11:20:17 +01:00
Sylvain
d0be17073b [bug#169] first day of week is ignored in agendas 2020-03-02 17:22:15 +01:00
Sylvain
b645e5efe5 fixed: remove restrincting plan message 2020-03-02 16:59:04 +01:00
Sylvain
5765e3d2e4 move availability options to new step + wording 2020-03-02 16:52:54 +01:00
Sylvain
a44bf85014 Merge branch 'slot_is_only_subscriptions' into dev 2020-03-02 16:27:26 +01:00
Sylvain
4ad8a836f9 removed unneeded returns 2020-03-02 16:20:50 +01:00
Sylvain
07b21f5094 Merge branch 'book_slot_at_same_time' into dev 2020-03-02 15:52:05 +01:00
Sylvain
11ccaa73b6 Merge remote-tracking branch 'origin/disable_wallet_option' into dev 2020-03-02 15:47:14 +01:00
Sylvain
147a78de96 Merge branch 'tour' into dev 2020-03-02 15:39:45 +01:00
Sylvain
6748a1aca1 [bug] with Firefox browser, the texts in date inputs are shifted to the bottom 2020-03-02 11:46:56 +01:00
Sylvain
f1928c0d4c refactor the home tour to start after the render 2020-03-02 11:40:00 +01:00
Sylvain
5186d6b22c behavior of FEATURE_TOUR_DISPLAY 2020-03-02 11:17:28 +01:00
Sylvain
9ce9079ef9 auto-start home tour after login + reorganizer tour to comply with new menu 2020-03-02 10:32:51 +01:00
Sylvain
1a7d7258d8 [bug] in some cases, bogus admin notification on profile completed 2020-03-02 10:20:10 +01:00
Sylvain
29eb248029 [bug] unable to select a group in profile completion screen 2020-03-02 09:59:35 +01:00
Sylvain
63bdd85657 [bug] datepicker does not work in profile completion screen 2020-03-02 09:49:16 +01:00
Sylvain
02aafcb78b fix missing translations 2020-03-02 09:43:42 +01:00
Sylvain
676da06ef1 left menu spacers style 2020-03-02 09:13:00 +01:00
Sylvain
4e72cd16a1 harmonized Fab-manager typo 2020-03-02 08:59:43 +01:00
Sylvain
38b196feb8 rearrange main menu 2020-02-26 18:05:09 +01:00
Sylvain
fc5b935495 helpers between reservables screens 2020-02-26 17:30:27 +01:00
Sylvain
a62e31090e tours wording 2020-02-26 16:49:29 +01:00
Sylvain
6835d71197 fix missing translation 2020-02-26 16:07:01 +01:00
Sylvain
c111fca980 alert about slots division on availability creation 2020-02-26 15:58:41 +01:00
Sylvain
0ea7e774d3 wording in training & calendar tours + label on ical button 2020-02-26 15:48:42 +01:00
Sylvain
7143801641 start help tour by clicking on help in user menu 
also: tour descriptions of home page items
 2020-02-26 15:13:58 +01:00
Sylvain
d71a1b7cbd improve settings/privacy tab 2020-02-26 12:20:33 +01:00
Sylvain
6b63483fcc fix an issue with the health endpoint 2020-02-26 12:00:51 +01:00
Sylvain
e1d346591f rewrited some steps of the home tour 2020-02-26 11:44:49 +01:00
Sylvain
d833f6d812 harmonize Fab-manager trademark syntax 2020-02-26 10:19:43 +01:00
Sylvain
222590ae5e tour step modal: increase width + align buttons 2020-02-26 09:37:21 +01:00
Sylvain
4db219b204 [ongoing] FEATURE_TOUR_DISPLAY 2020-02-25 18:02:41 +01:00
Sylvain
cf8fb0659b open-api tour 2020-02-25 11:47:30 +01:00
Sylvain
9f9656caa4 settings tour 2020-02-25 11:40:01 +01:00
Sylvain
a56f6c4e18 statistics tour 2020-02-25 11:06:03 +01:00
Sylvain
31dce73f14 project elements tour 2020-02-25 10:47:16 +01:00
Sylvain
9589efa312 fix scroll issues on tours 2020-02-25 10:11:18 +01:00
Sylvain
64e41910ec trainings tour: change tab on tracking step 
invoices tour: do not show listing steps if invoicing is disabled
+ typo
 2020-02-25 09:48:55 +01:00
Sylvain
e6f2e60997 spaces tour 2020-02-24 16:57:41 +01:00
Sylvain
76c1b69b7a machines tour 2020-02-24 16:51:03 +01:00
Sylvain
c13ba85230 events tour 2020-02-24 16:21:12 +01:00
Sylvain
42e2c8bafa do not display spaces tab help if space module is disabled 2020-02-24 15:04:17 +01:00
Sylvain
f8f1dde14a pricing tour 2020-02-24 15:02:45 +01:00
Sylvain
a1a96b9c03 fix handle invoices tour with F1 2020-02-24 11:56:13 +01:00
Sylvain
807a9596a8 invoices tour 2020-02-24 11:55:13 +01:00
Sylvain
9f68375ae9 admin calendar tour 2020-02-24 10:33:27 +01:00
Sylvain
32d5af9b87 fix tours collision on F1 2020-02-24 10:05:03 +01:00
Sylvain
496e926abd fix members tour if no member 2020-02-19 14:39:45 +01:00
Sylvain
bc63465a84 members tour 2020-02-19 14:30:56 +01:00
Sylvain
906decb620 [ongoing] members tour 2020-02-19 13:00:38 +01:00
Sylvain
3d788579f1 set active tab depending on tour step 2020-02-19 12:21:24 +01:00
Sylvain
fd62062533 Updated angular-ui-bootstrap from v1.1 to v1.2 2020-02-19 12:07:42 +01:00
Sylvain
0948ef4381 Updated angular-ui-bootstrap from v0.14 to v1.1 2020-02-19 11:34:38 +01:00
Sylvain
05a29a54b3 trainings tour 2020-02-19 10:22:32 +01:00
Sylvain
0d9f79976d [ongoing] trainings tour 2020-02-18 17:53:53 +01:00
Sylvain
16ed2fa73a isolate welcome tour 2020-02-18 17:39:47 +01:00
Sylvain
5b46edd748 welcome tour + save completed tours in database 2020-02-18 17:36:45 +01:00
Sylvain
d869948cd0 fix translations mapping 2020-02-18 15:52:37 +01:00
Sylvain
40f41aeef5 fix translations mapping 2020-02-18 15:52:28 +01:00
Sylvain
4c919824ba fix unmapped translations in signup modal 2020-02-18 10:17:07 +01:00
Sylvain
11a2dde776 fix notifications over tour 2020-02-17 18:57:05 +01:00
Du Peng
908275d171 add disable wallet option 2020-02-12 18:15:44 +01:00
Sylvain
fd471be40a angular-ui-tour: fixed positionning problem + some more steps in the tour + centering the welcome message 2020-02-12 17:18:11 +01:00
Du Peng
7242eb32f8 allow admin reserve a slot at the same time 2020-02-12 14:54:06 +01:00
Du Peng
b559d10b87 improve slot is only subscription 2020-02-12 12:58:17 +01:00
Sylvain
71290420bb ui-tour 3 steps 2020-02-11 15:49:43 +01:00
Sylvain
528877bc76 poc features-tour 2020-02-11 15:49:43 +01:00
Sylvain
b7dda83060 Merge branch 'edit_event_recurrent' into dev 2020-02-11 15:43:29 +01:00
Sylvain
db26533d94 alert on date change 2020-02-11 15:42:43 +01:00
Du Peng
870a092a81 Merge branch 'slot_is_only_subscriptions' of git.sleede.com:projets/fab-manager into slot_is_only_subscriptions 2020-02-11 13:22:28 +01:00
Du Peng
096a658bac add a validator to check reservation's slot is or not restrict for subscriptions 2020-02-11 13:22:20 +01:00
Du Peng
760109de05 fix bug: cant reserve formation slot 2020-02-11 13:21:25 +01:00
Sylvain
372d7f936b typos & syntax 2020-02-11 11:46:40 +01:00
Sylvain
54bcc392f3 typo and syntax 2020-02-11 10:48:29 +01:00
Du Peng
d9676b604c remove debug info 2020-02-10 11:53:20 +01:00
Du Peng
427725f927 fix bug: select plans error 2020-02-10 11:52:57 +01:00
Sylvain
ea9607521b translation issue on event reservation 2020-02-10 11:09:54 +01:00
Sylvain
aecbaa7f04 translation issue on event reservation 2020-02-10 11:09:22 +01:00
Du Peng
74cc69d1bd Ability to configure reservation slot restrict for plans 2020-02-07 17:37:00 +01:00
Du Peng
7c86adde4b Ability to configure allowing or preventing member book a machine/formation/event slot if he already have a reservation the same day at the same time 2020-02-05 16:53:47 +01:00
Du Peng
c3965b28cf remove rebocop disable 2020-02-03 10:53:54 +01:00
Du Peng
05073d5a28 fix bug for update event recurrent 2020-01-30 12:03:50 +01:00
Sylvain
fd0f49f132 rubocop: ruby syntax 2020-01-29 17:50:06 +01:00
Sylvain
5b97ef03a9 rubocop: ruby syntax 2020-01-29 17:49:05 +01:00
Sylvain
b1a98d3574 improved texts 2020-01-29 17:44:17 +01:00
Du Peng
35d9bec8a5 update event recurrent 2020-01-29 17:20:19 +01:00
Du Peng
de02bb1c72 update all attributes of event 2020-01-28 18:34:32 +01:00
Sylvain
81a42e5935 customize home page : full texts 2020-01-28 10:12:29 +01:00
Sylvain
8d8c9a8af5 fix double insertion of widgets button in home page editor 2020-01-28 09:24:55 +01:00
Sylvain
49b3a54afb allow display widgets multiple times on home page 2020-01-28 09:21:39 +01:00
Du Peng
b1419271e6 edit event recurrent in progress 2020-01-27 18:21:46 +01:00
Sylvain
656a603d6c customize home page css 2020-01-27 17:10:29 +01:00
Sylvain
37c90b1d54 ruby syntax 2020-01-22 14:34:45 +01:00
Sylvain
34a3286870 fix homepage layout 2020-01-22 14:16:35 +01:00
Sylvain
898a18ed46 display customized home page html 2020-01-22 13:25:22 +01:00
Sylvain
75c49c06f2 move homepage components to standalone directives 
- events
 2020-01-22 12:52:51 +01:00
Sylvain
89e146d419 [ongoing] move homepage components to standalone directives 
- twitter
- members
 2020-01-22 12:43:08 +01:00
Sylvain
fd1778b465 renamed twitter template file 2020-01-22 12:24:45 +01:00
Sylvain
1968ba601d [ongoing] move homepage components to standalone directives 2020-01-22 12:23:51 +01:00
Sylvain
b85c7ac00b admin set its customized html template for the home page & can reset it to factory value 2020-01-22 11:53:40 +01:00
Sylvain
b1e6154cc9 POC for custom home page 2020-01-21 18:03:15 +01:00
Sylvain
15ab3c1305 Ability to customize the title of the link to the about page 2020-01-21 16:16:12 +01:00
Sylvain
45e4b5c4bc Create machine availabilities: select all/none in a click 2020-01-21 12:09:24 +01:00
Sylvain
97660924cb fix typo and wording 2020-01-21 11:16:49 +01:00
Sylvain
146ba97766 Merge remote-tracking branch 'origin/reserve_slots_passed' into dev 2020-01-21 11:01:48 +01:00
Sylvain
57e5da61de remove unused helper 2020-01-21 11:01:23 +01:00
Du Peng
3c26c6d4bd disable add plan with reserve slot in the past 2020-01-20 16:17:10 +01:00
Du Peng
0143c3d495 allow admin reserve machine/space in the past time 2020-01-20 16:17:10 +01:00
Sylvain
c214ae3beb Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2020-01-15 12:49:07 +01:00
Sylvain
7929d3b198 detailled view of collected data in fabanalytics 2020-01-15 12:48:55 +01:00
Du Peng
fe387cbe3c Merge branch 'twitter' into dev 2020-01-15 12:40:01 +01:00
Du Peng
db29673a4c remove twitter api for get latest tweet 2020-01-15 12:34:51 +01:00
Du Peng
900d84f3c6 get latest twitter by twitter search without twitter api 2020-01-15 12:04:07 +01:00
Sylvain
059096c2dd privacy option for fab-analytics 2020-01-15 10:46:04 +01:00
Sylvain
a67b2ff29c do not show version modal if system if up-to-date 2020-01-14 18:03:57 +01:00
Sylvain
774060d9ab FORCE_VERSION_CHECK for dev env + do not save hub public key if duplicate 2020-01-14 17:59:30 +01:00
Sylvain
19502c8231 fix display version on home page 2020-01-14 17:39:13 +01:00
Sylvain
1f3d9cf88d display upgrade infos directly on the interface 2020-01-14 17:12:36 +01:00
Sylvain
a564ec62b5 updated version check worker 2020-01-14 16:16:31 +01:00
Sylvain
bb48a13f83 health endpoint & automated version check 2020-01-14 14:33:00 +01:00
Sylvain
64764e5498 check version on hub & [ongoing] health endpoint 2020-01-13 17:05:53 +01:00
Sylvain
54be21729b batch delete periodic events 2020-01-07 17:18:49 +01:00
Sylvain
1c4f144b8d Merge branch 'members-filters' into dev 2020-01-07 10:44:55 +01:00
Sylvain
f778ee9016 fix syntax + add missing translations 2020-01-07 10:44:29 +01:00
Sylvain
3c3e806a29 Merge branch 'user-confirmation' into dev 2020-01-07 10:34:25 +01:00
Sylvain
b6ee4e92a4 change falsy value + updated changelog 2020-01-07 10:34:12 +01:00
Sylvain
6d0cc201c4 remove: send abuse with ENTER 2020-01-06 17:08:50 +01:00
Nicolas Florentin
9cc090e4bc typo 2019-12-30 13:48:40 +01:00
Nicolas Florentin
60e063a15b fix currentUser value after successfull sign up when confirmation is needed, plus improves translations 2019-12-30 13:45:25 +01:00
Nicolas Florentin
6550428f72 fix AUthService factory, isAuthenticated was called from scope and not from the factory itself 2019-12-30 13:44:24 +01:00
Nicolas Florentin
0b899fe183 Merge branch 'dev' into user-confirmation 2019-12-30 09:36:43 +01:00
Sylvain
3412d9e35c fix checking enable_in_context_translation 2019-12-23 13:49:46 +01:00
Sylvain
f05547e46e change ach pluralization location 2019-12-23 11:29:02 +01:00
Sylvain
40e8b60a0a add ach pluralization fonction for messageFormat 2019-12-23 10:28:12 +01:00
Nicolas Florentin
62c979cfc0 members filters, translations for other languages are still needed 2019-12-20 15:47:42 +01:00
Nicolas Florentin
518511ab3b Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2019-12-19 12:06:54 +01:00
Nicolas Florentin
7ea3e5ce32 fix translation key path app.public.projects_list.the_fablab_projects 2019-12-19 12:06:45 +01:00
Sylvain
bcd0e6833d integrate crowdin in-context translation code 2019-12-18 16:50:16 +01:00
Nicolas Florentin
0a3a6d034a env variable USER_CONFIRMATION_NEEDED_TO_SIGN_IN can force user to confirm his account to sign in 2019-12-18 16:02:47 +01:00
Sylvain
14c3abb449 refactoring i18n keys: trainings + modals + various missings 2019-12-18 13:04:38 +01:00
Sylvain
1124159f2e refactoring i18n keys: projects 2019-12-18 11:08:14 +01:00
Sylvain
a8e8ffa1d4 refactoring i18n keys: export stats 2019-12-17 18:09:36 +01:00
Sylvain
a7b423b151 refactoring i18n keys - admin 2019-12-17 18:06:56 +01:00
Sylvain
88c48e4e69 [ongoing] refactoring i18n keys - admin 2019-12-17 12:40:36 +01:00
Sylvain
d21f616283 [ongoing] refactoring i18n keys 2019-12-16 16:54:40 +01:00
Sylvain
c565d9ff2b unified front-end i18n interpolations syntax to messageformat 2019-12-16 10:16:11 +01:00
Sylvain
0c11f61010 Prevent event reservation in the past 2019-12-10 12:16:26 +01:00
Sylvain
6aa3c0caeb Notify all admins on the creation of a refund invoice 2019-12-09 11:55:31 +01:00
Sylvain
510c802ab1 messages variations depending on slot duration 2019-12-09 10:27:50 +01:00
Sylvain
f50e45d2de rake task to sync users with stripe 2019-12-03 16:32:59 +01:00
Sylvain
60755a2c2a Merge remote-tracking branch 'origin/fix-time-now' into dev 2019-12-03 15:51:22 +01:00
Sylvain
11e74c6859 Merge branch 'ics' into dev 2019-12-03 15:30:28 +01:00
Sylvain
64fe68b2b0 icalendar source sync: create/update/delete ical events 2019-12-03 12:16:07 +01:00
Sylvain
538b5cef78 add/remove ical imports in public agenda 
also: a little of refacftoring in CalendarController
 2019-12-03 11:27:20 +01:00
Sylvain
32e7fc3900 confirm delete icalendar imports + fix display + add translations 2019-12-03 10:48:53 +01:00
Sylvain
d93ce15a47 external calendars legend 2019-12-03 10:23:19 +01:00
Sylvain
122ff54cd8 fix colors in ics imports 2019-12-03 10:17:29 +01:00
Sylvain
5215d0643d Merge branch 'ics' of git.sleede.com:projets/fab-manager into ics 2019-12-03 09:56:37 +01:00
Sylvain
22be9f6a08 display external calendars list in public calendar + pull availabilities 2019-12-02 16:49:20 +01:00
Sylvain
cca6b14f58 import events asyncronously from icalendar 2019-12-02 15:53:24 +01:00
Nicolas Florentin
db41e846dd uses DateTime#current instead of Time.now in tests 2019-12-02 15:29:05 +01:00
Nicolas Florentin
b17bcfde86 comment model slot.rb 2019-12-02 12:39:20 +01:00
Nicolas Florentin
6ff6c71060 rm dead code Slot#can_be_modified? 2019-12-02 12:32:52 +01:00
Sylvain
55d2c88134 delete & sync ical sources 2019-12-02 12:19:30 +01:00
Nicolas Florentin
77cf8c8218 replaces almost all Time.now by DateTime.current 2019-12-02 11:57:25 +01:00
Sylvain
36eba99808 [bug] report errors on admin creation 2019-12-02 10:39:42 +01:00
Sylvain
f72ae98109 do not show title if calendar is configured to hide them 2019-11-27 17:50:38 +01:00
Sylvain
85d17d62f3 fix events endpoint 2019-11-27 17:44:01 +01:00
Sylvain
97d93cd622 added a name to imported calendar 2019-11-27 17:39:19 +01:00
Sylvain
baf8cfb487 iCalendar server api & db model 2019-11-27 17:05:19 +01:00
Sylvain
9e2134c9cf ics sources configuration interface 2019-11-27 16:17:42 +01:00
Sylvain
bb777227d6 display events of external ics in calendar 2019-11-27 13:59:56 +01:00
Sylvain
a9b1eabb2c [poc] show google agenda events in the public calendar 2019-11-27 13:51:23 +01:00
Sylvain
90b3564138 admin calendar: surround select item by shadow-box 2019-11-27 12:31:32 +01:00
Sylvain
91008b3df1 improved calendar legend 2019-11-27 11:52:37 +01:00
Sylvain
eb3c78a61d [poc] show google agenda events in the public calendar 2019-11-26 13:44:43 +01:00
Sylvain
48b811d2b5 Added freeCAD files as default allowed extensions 
also: refactored some ruby code
 2019-11-25 16:12:23 +01:00
Sylvain
68b17cbe9a Ability to show the scheduled events in the admin calendar 2019-11-25 14:49:39 +01:00
Sylvain
563de29b9d Calendar management: improved legend style 2019-11-25 11:59:34 +01:00
Sylvain
1182822d8b show correct seats nb in canceled reservation 2019-11-25 10:45:54 +01:00
Sylvain
bbd613f2a5 compute right nb of free seats for event reservation 
also: copy nb_total_places to n+1 instances when creating recurrent
availabilities
 2019-11-25 10:30:12 +01:00
Sylvain
ce366beaa2 display that an event reservation was canceled 
also: fixed transtions files
 2019-11-21 11:15:05 +01:00
Sylvain
cabe2e5604 update free places after cancel event reservation 2019-11-20 17:06:42 +01:00
Sylvain
b725a5a071 Merge branch 'cancel' into dev 2019-11-20 10:27:56 +01:00
Sylvain
37d6c84cc6 [bug] unable to remove training picture 
also: removed some invalid href=# in the templates
 2019-11-19 15:18:00 +01:00
Sylvain
ad928bd4e6 ability to set phone number optional or required 
also: show stars on required fields in new admin form
 2019-11-19 11:44:32 +01:00
Sylvain
9ec736e6b5 delete recursive slots 2019-11-18 17:29:51 +01:00
Sylvain
26738563bd create reccursive events 2019-11-18 11:50:20 +01:00
Sylvain
a60a39ff9e [ongoing] create multiple availabilities according to UI 2019-11-13 12:13:22 +01:00
Sylvain
0d740c95a9 recapitulative screen 2019-11-13 10:59:10 +01:00
Sylvain
22251e6516 summary screen 
TODO: eventModal.html.erb:167
 2019-11-12 16:28:10 +01:00
Sylvain
2cccbd3486 recurrence UI 2019-11-12 14:25:28 +01:00
Sylvain
96a2f6e426 create availablities with slots duration ne 60 2019-10-30 15:09:44 +01:00
Sylvain
cdc30e0da2 configure the slots duration with an environment variable 2019-10-29 16:52:52 +01:00
Nicolas Florentin
12b9155b43 try to fix edge cases of VatHistoryService, related to issue #156 2019-10-29 15:20:25 +01:00
Sylvain
1ed3eba129 [feature] export last connection date to members.xlsx 2019-10-29 11:09:17 +01:00
Sylvain
f94d8feba6 [feature] admin can delete an user 2019-10-29 09:59:21 +01:00
Sylvain
35fb991cdb Improved user experience in defining slots in the calendar management 2019-10-23 17:48:31 +02:00
Sylvain
d7aed3fa1f Improved notification email to the member when a rolling subscription is taken 2019-10-23 11:43:42 +02:00
Sylvain
58821555fe Ability to set the default view in project gallery: openLab or local 2019-10-22 14:42:45 +02:00
Sylvain
d48e5602ce [bug] admins can't edit members projects 2019-10-22 14:42:35 +02:00
Sylvain
fdcec06345 CVE-2019-16892 + #49 
- updated rubyzip to fix a security issue
- updated axlsx and file writing method as a possible fix for #49
 2019-10-21 16:11:49 +02:00
Sylvain
528e6f5e55 admin invoices interface: default selected tab depending on FABLAB_WITHOUT_INVOICES value 2019-10-21 15:24:27 +02:00
Sylvain
e8930924e4 [bug] do not display each days in invoices for multiple days event reservation 2019-10-16 16:11:37 +02:00
Sylvain
9e1e23f268 [bug] unauthorized user can see the edit project form 2019-10-16 15:21:50 +02:00
Sylvain
ab5ee0f2d8 [bug] invoices list is not shown by default in 'manage invoices' section 2019-10-14 10:59:56 +02:00
Sylvain
bc36b78719 [bug] public calendar won't show anything if the current date range include a reserved space availability (#151) 2019-10-14 10:38:13 +02:00
Sylvain
2897eec723 various bugfixes 
- in profile_complete form, the user's group is not selected by default
- missing asterisks on some required fields in profile_complete form
- renamed default DatabaseProvider from Fablab to FabManager
 2019-10-09 14:41:32 +02:00
Sylvain
7dbfbc4868 fix typo 2019-10-07 17:12:49 +02:00
Sylvain
38847844fb display label on all rows in accounting export 2019-10-07 14:02:47 +02:00
Sylvain
19a125bd67 [bug] accounting export: on subscription + reservation invoice, the subscription item is exported twice 2019-10-07 12:08:08 +02:00
Sylvain
86f4c132b0 Merge branch 'cve-2015-9284' into dev 2019-10-02 16:08:40 +02:00
Sylvain
5fcf9968cb Updated Omniauth & Omniauth-oauth2 + fixed oauth2 callback url 2019-10-02 16:06:27 +02:00
Sylvain
927479733b migrated links to /users/auth from GET to POST 
see https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284 for more info
 2019-10-02 14:37:47 +02:00
Sylvain
2cc7fb0e44 accounting export: display lable on all lignes 2019-10-02 10:25:06 +02:00
Sylvain
35b069a4db added gem omniauth-rails_csrf_protection + [ongoing] moving from GET /users/auth/... to POST 2019-10-01 17:14:16 +02:00
Sylvain
877506b26a [bug] unable to dissociate the last machine from a formation 2019-10-01 15:27:59 +02:00
Sylvain
29d6a1daa4 Merge branch 'uvsq' into dev 2019-10-01 14:32:58 +02:00
Sylvain
a7a929ddbc integration unit test for imports + fixed import result colors in UI + fixed test fixtures 2019-10-01 14:32:30 +02:00
Sylvain
193e81e711 Merge branch 'uvsq' into dev 2019-09-30 15:34:21 +02:00
Sylvain
0d3cc0fe40 [feature] Ability to disable invoices generation and interfaces 2019-09-30 15:29:20 +02:00
Sylvain
8bd1d72fdf improved results page 2019-09-30 12:49:50 +02:00
Sylvain
ba3161589c update users through CSV import 2019-09-30 12:19:33 +02:00
Sylvain
ff5de97c92 import new users from CSV and view results in app 
TODO:
 - update users though CSV
 2019-09-26 17:05:57 +02:00
Sylvain
4deaf1f75a [ongoing] import members from csv 2019-09-25 16:37:42 +02:00
Sylvain
a532efd198 upload csv file to the server through the API and save it on the disk 2019-09-24 17:42:50 +02:00
Sylvain
ede53ad761 [feature] Ability to set project's CAO attachement maximum upload size 2019-09-24 16:40:38 +02:00
Sylvain
ad1b7baa05 import members interface 2019-09-24 15:21:18 +02:00
Sylvain
8eda1e673f Merge remote-tracking branch 'origin/hotfixes' into dev 2019-09-24 14:43:14 +02:00
Sylvain
e7bb41f38d [ongoing] import users from csv file: admin inteface 2019-09-24 12:21:19 +02:00
Sylvain
f75633e64e [bug] create a plan does not set its name 2019-09-24 11:41:07 +02:00
Sylvain
588010ac0b [feature] Optional reCaptcha checkbox in sign-up form 2019-09-23 17:46:46 +02:00
Nicolas Florentin
c49db3b512 fix api/reservations#index find statistic_profile_id from the user_id because user_id is not a column of reservations table anymore 2019-09-20 15:23:53 +02:00
Nicolas Florentin
22d4d3a78a method date_range, test on all_day was never truthy 2019-09-20 15:03:49 +02:00
Nicolas Florentin
401df4cb77 delay_for does not exist anymore in sidekiq 5 2019-09-20 15:01:27 +02:00
Sylvain
de1cc2013a [bug] after disabling a group, its associated plans are hidden from the interface 
+ validate server-side that there's no more user in the group to disable
 2019-09-19 15:34:21 +02:00
Sylvain
668eb43959 [bug] in case of unexpected server error during stripe payment process, the confirm button is not unlocked 2019-09-19 15:00:27 +02:00
Sylvain
a7dc3b2431 factorized invoice reference & order number code 2019-09-19 14:59:22 +02:00
Sylvain
2d6f5c3e81 wallet client line in accounting export + factorized accountingExportService 2019-09-19 13:57:33 +02:00
Sylvain
7d26932f6c configure accounting codes & labels for wallet clients and other means clients 2019-09-19 11:51:14 +02:00
Sylvain
c76563f22f wallet label in accounting export 2019-09-19 11:25:12 +02:00
Sylvain
f81a2e4343 wallet credit in accounting export 2019-09-19 11:10:26 +02:00
Sylvain
c905d3fbc5 use correct VAT infos in accounting export 2019-09-18 17:25:53 +02:00
Sylvain
cd2c8488c2 Compute the VAT per item in each invoices, instead of globally 2019-09-18 17:14:59 +02:00
Sylvain
02c7cb801f factorized footprint computation 2019-09-18 15:09:14 +02:00
Sylvain
276a99c068 improved VAT history service + display dates when VAT was enabled in invoice configuration panel + do not render vat row in accouting export if vat was disabled 2019-09-18 13:28:53 +02:00
Sylvain
46c3497c85 ventilate coupon codes on items 2019-09-17 17:39:05 +02:00
Sylvain
30e7ce8377 [bug] invoices with total = 0, are marked as paid on site even if paid by card 2019-09-17 15:16:11 +02:00
Sylvain
1fa36d4029 renamed avoir_mode to payment_method 2019-09-17 14:48:06 +02:00
Sylvain
aef4cc49f2 fixes accounting codes setting + improved error handling 2019-09-17 13:00:25 +02:00
Sylvain
3348539fdf export labels: user name + reference + summary, only on client line. Also: handling new export parameters (decimal separator, label length, export zeros) 2019-09-17 12:35:34 +02:00
Sylvain
f06bdaaf21 provide additional settings to export api 2019-09-16 16:31:16 +02:00
Sylvain
02d28e0b8c improved accounting codes settings page (1 click saves all) + improved export file name 2019-09-16 14:39:47 +02:00
Sylvain
224b0d6dee Merge branch 'sca' into dev 2019-09-12 12:53:56 +02:00
Sylvain
9d2e17d5d6 [bug] once a reservation was made, the reminder of the paid price is always 0 if a coupon was used 2019-09-12 12:25:13 +02:00
Sylvain
52afb6ef07 [bug] extend a current subscription for a member, does not reset his credits 2019-09-12 11:37:03 +02:00
Sylvain
53e02622b9 [bug] disabled groups still appears as available in sign-up modal 2019-09-12 11:14:04 +02:00
Nicolas Florentin
3c486e4b93 [Bug] unable to create the first user because role member was missing 2019-09-11 17:11:43 +02:00
Sylvain
539eb08b89 ability to disable the online payments through an env var 2019-09-11 17:08:00 +02:00
Sylvain
d977838d52 fix tests according to changes for stripe SCA 2019-09-11 16:20:47 +02:00
Sylvain
78e6392f60 do not display invoice update logs in test mode + updated reservations fixtures w/o stp_invoice_id column + helper script to run tests 2019-09-11 14:29:35 +02:00
Sylvain
9fc3c7f61c [bug] Wallet credit inputs does not allow to put zeros at the end of the decimal part of the amount 2019-09-11 13:05:10 +02:00
Sylvain
3320ee103b Log changes in Invoices or InvoiceItems records for better handling of accounting certification issues 2019-09-11 12:22:14 +02:00
Sylvain
f60d19fa27 allow reservations & subscriptions at price of zero 2019-09-11 11:51:04 +02:00
Sylvain
75f483a7a6 compute subscription price server-side for payments 2019-09-11 10:31:22 +02:00
Sylvain
ac0489a496 [bug] wallet usage is noted on subscription invoices even if wallet was not used + use payment confirm API for subscriptions only (sca) 2019-09-10 17:57:46 +02:00
Sylvain
4d0ac9b3ca using stp_payment_intent_id instead of stp_invoice_id on new invoices 2019-09-10 16:45:45 +02:00
Sylvain
5a75db394c [bug] Users with role 'member' cannot download their invoices 2019-09-10 14:46:07 +02:00
Sylvain
04f17d44d8 handle sca in js frontend 2019-09-10 12:46:02 +02:00
Sylvain
a96050a2e9 refactor payment process for sca 2019-09-10 11:46:14 +02:00
Sylvain
e9e27663cd quick coding rules checking with rubocop 2019-09-09 18:04:31 +02:00
Nicolas Florentin
e94cf46fa4 ongoing work on sca stripe 2019-09-09 17:37:54 +02:00
Nicolas Florentin
f1958a300b [Bug] unable to create the first user because role member was missing 2019-09-09 14:34:00 +02:00
Sylvain
510533e080 handle 2nd confirmation on server + display confirmation modal on the client 2019-09-05 17:17:51 +02:00
Sylvain
12447698f8 collect card details on the client & create a paymentIntent on the server 2019-09-05 16:17:02 +02:00
Sylvain
a0961314a4 [ongoing] upgrade stripe gem & api version to allow SCA 2019-09-05 11:03:22 +02:00
Sylvain
967f539ad9 [ongoing] update to stripe-js:v3 to use strong customer authentication 2019-09-04 17:20:18 +02:00
Sylvain
bebb3354fb [bug] (#140) VAT rate is erronous in invoices 2019-08-14 10:56:30 +02:00
Sylvain
92d79bc9c7 [bug] (#140) VAT rate is erronous in invoices 2019-08-14 10:54:23 +02:00
Sylvain
13d3197069 prevent existance of unwanted separators + truncate labels 2019-08-01 14:58:10 +02:00
Sylvain
15f858ba9c Merge branch 'acd' into dev 2019-08-01 13:07:05 +02:00
Sylvain
35c31b96ea fix vat history usage in invoice test + fix sidekiq delay extension 2019-08-01 11:50:03 +02:00
Sylvain
61c1d09ac8 [bug] use vat history while regenerating invoices 2019-08-01 11:29:45 +02:00
Sylvain
38ab06840e consider vat history in accounting export + [bug] use vat history while regenerating invoices 2019-08-01 11:26:40 +02:00
Sylvain
acacd9a19e fixed accounting codes interface + fixed csv generation 2019-08-01 10:24:34 +02:00
Sylvain
26c98394ac fixed export service 2019-08-01 09:49:09 +02:00
Sylvain
e32825675c [ongoing] fixing accounting export service 2019-07-31 16:52:11 +02:00
Sylvain
12d8c65fa2 async generation of export and download cached csv using hidden iframe 2019-07-31 15:47:02 +02:00
Sylvain
fa6a54a422 export notifications 2019-07-31 12:37:31 +02:00
Sylvain
a7f68b59dd connect the export modal to the api 2019-07-31 12:00:52 +02:00
Sylvain
22d84e86f5 export modal 2019-07-31 11:10:10 +02:00
Sylvain
a9ea4057f3 interface to customize accounting codes and labels 2019-07-30 16:06:35 +02:00
Sylvain
f772bc3509 api endpoint and worker to export accounting data 2019-07-30 11:43:51 +02:00
Sylvain
82ad69d386 handle avoirs 2019-07-30 10:27:47 +02:00
Sylvain
ab295f064d service to export invoices into a given period to CSV lines for an accounting sofware 2019-07-29 17:51:53 +02:00
Sylvain
3d3be70e29 [bug] newly generated refund is displayed as broken 2019-07-29 12:25:46 +02:00
Sylvain
5e8697de18 fix invoices list API 2019-07-29 12:19:54 +02:00
Sylvain
a778b1063a enhance ruby syntax 2019-07-29 12:17:57 +02:00
Sylvain
0714878bca [bug] unable to generate a refund 2019-07-29 12:07:22 +02:00
Sylvain
1be7bda603 [security] updated sidekiq to fix 3 security vulnerabilities 2019-07-29 11:34:59 +02:00
Sylvain
26c8d402e1 removed dependency to jquery-ui 2019-07-17 15:30:19 +02:00
Sylvain
12fcfee71e [bug] unable to export reservations or subscriptions to excel 2019-07-10 12:25:08 +02:00
Sylvain
38d3ddd48a [bug] export members list to excel is broken 2019-07-10 11:27:45 +02:00
Sylvain
b77fde2506 [bug] OpenlabWorker is crashing with message undefined method profile for StatisticProfile 2019-07-10 10:58:51 +02:00
Sylvain
1253af5377 Prevent invalid invoice logo from crashing the InvoiceWorker 2019-07-10 10:54:35 +02:00
Sylvain
ca61e4e08e [bug] SubscriptionExpireWorker cannot run due to wrong expiration column in SQL query 2019-07-10 10:52:29 +02:00
Sylvain
ddbb492ace [bug] abuses reports are not notified to admins 2019-06-26 12:55:38 +02:00
Sylvain
85f4182b2f [bug] projects RSS feed fails to render 2019-06-24 11:03:40 +02:00
Sylvain
50373b6609 [bug] cookie consent modal is not shown 2019-06-17 14:57:11 +02:00
Sylvain
2d92df3ebb do not delete the user if superadmin + fix text alert 2019-06-17 11:12:05 +02:00
Sylvain
b0b2e8d3a9 use an async worker to notify users about policy update 2019-06-17 10:01:59 +02:00
Sylvain
5cd977b4dd ruby syntax + may fix #132? 2019-06-13 16:53:36 +02:00
Sylvain
f3c433883d [bug] canceled reservation are not removed from statistics (fix #133) 2019-06-13 16:29:12 +02:00
Sylvain
84c90cdef3 ignore cookies modal if GA is disabled 2019-06-13 14:00:43 +02:00
Sylvain
f69703f0a0 allow user to change his choice about cookies 2019-06-13 12:52:56 +02:00
Sylvain
249e59bb2a get user consent about cookies 2019-06-13 11:28:55 +02:00
Sylvain
7fc03af6bc [ongoing] cookies consent modal 2019-06-12 16:53:37 +02:00
Sylvain
6e5cc2a4c4 typo and syntax 2019-06-12 16:31:45 +02:00
Sylvain
d0cd5a90d2 handle deleted users in notifications 2019-06-12 15:49:35 +02:00
Sylvain
ddce997e12 display data collection purpose on each input field + fix notifications on deleted user 2019-06-12 15:34:03 +02:00
Sylvain
0e18defe53 handle deleted user in statistics 2019-06-12 12:40:43 +02:00
Sylvain
a53c6e80e7 move invoice->operator to invoicing_profile + minor fixes to handle user deletion 2019-06-12 12:22:38 +02:00
Sylvain
86ded2b8d2 [ongoing] fixes for invoices pdf files 2019-06-11 16:56:11 +02:00
Sylvain
37b9e3da60 link statistic profile to invoices 2019-06-11 10:02:48 +02:00
Sylvain
818d1357a9 save user cration date in statistic_profile 2019-06-06 16:54:09 +02:00
Sylvain
cfd33c3a52 migrate projects to statistic_profile 2019-06-06 16:34:53 +02:00
Sylvain
35da65b686 change statistic_service to use statistic_profile + use raw sql in migrations 2019-06-06 13:58:49 +02:00
Sylvain
fe2a6f7120 migrate trainings to statistic_profile and adjust code 2019-06-06 12:00:21 +02:00
Sylvain
0a5e373730 models linking 2019-06-05 16:21:39 +02:00
Sylvain
f0c5b0eb09 init StatisticProfileTraining 2019-06-05 16:17:56 +02:00
Sylvain
6f87873b2c fix init member group when created from signup modal 2019-06-05 16:09:11 +02:00
Sylvain
5c57bcc7c6 defer member search in admin panel to optimize requesting 2019-06-05 15:35:27 +02:00
Sylvain
660a8abe8b fix statistic_profile 2019-06-05 12:24:01 +02:00
Sylvain
17fbd6b465 multiple fixes related to statistic_profile & invoicing_profile + fix users list while sorting by subscription 2019-06-05 12:11:51 +02:00
Sylvain
bd796bc588 fix SubscriptionsController - all tests passing 2019-06-05 07:58:49 +02:00
Sylvain
9fd6ea08b9 fix SubscriptionGroupValidator 2019-06-05 07:52:02 +02:00
Sylvain
4c033614ae [ongoing] migrate subscriptions & reservations to statistic_profile 2019-06-04 16:50:23 +02:00
Sylvain
52992ac9d5 move gender & birthday to statistic_profile 2019-06-04 13:33:00 +02:00
Sylvain
42e73e4315 [ongoing] statistic profile 2019-06-03 17:25:04 +02:00
Sylvain
9ef2f142bd link HistoryValue to InvoicingProfile + improved invoices tests 2019-06-03 16:51:43 +02:00
Sylvain
7ed97ef35a link wallet & its transactions to invoicingprofile 2019-06-03 16:00:09 +02:00
Sylvain
6011f27268 finish moving organization & address to invoiving profile: fix create & edit user 2019-06-03 12:06:01 +02:00
Sylvain
a211ad39ff moving organization & address to invoicingProfile + refactored doc about postgre 2019-05-29 14:28:14 +02:00
Sylvain
142e07f3c9 update code to use invoicingprofile 2019-05-29 12:01:24 +02:00
Sylvain
ffbca98276 [ongoing] fix api to use the invoicing_profile 2019-05-28 16:49:36 +02:00
Sylvain
83d3fd83b3 [bug] close period reminder is sent too early 2019-05-27 16:09:27 +02:00
Sylvain
3945b760b5 [ongoing] attach invoices to invoicingProfile instead of user 2019-05-27 13:03:44 +02:00
Sylvain
5231e464fe fix invoicingProfile schema + migration script 2019-05-27 13:00:05 +02:00
Sylvain
70bc3d5732 put invoicing data into separate table 2019-05-27 13:00:05 +02:00
Sylvain
0c51f25f7f Merge branch 'hotfix' into dev 2019-05-27 12:50:19 +02:00
Sylvain
5d32756928 [bug] updating a setting does not chain new values 2019-05-27 11:21:29 +02:00
Sylvain
6f2483a51f [bug] when generating an Avoir at a previous date, the resulting checksum may be invalid 2019-05-27 11:11:21 +02:00
Sylvain
b423d9fce7 add link to interface in abuse report mail 2019-05-21 12:38:07 +02:00
Sylvain
9c2598d405 ability to delete processed reports 2019-05-21 12:24:45 +02:00
Sylvain
dfb0ea12f0 style component 2019-05-21 11:57:44 +02:00
Sylvain
7bbea22e76 display reports in interface 2019-05-21 11:49:50 +02:00
Sylvain
630809b91f moved abuses panel to admin zone + fix loading template 2019-05-21 11:16:12 +02:00
Sylvain
dd4b6e2cb1 [ongoing] abuses management interface 2019-05-09 18:27:19 +02:00
Sylvain
10a87eb4cb refactored project list translations 2019-05-09 16:09:20 +02:00
Sylvain
3394413747 fixed syntax 2019-05-07 15:56:23 +02:00
Sylvain
26b901ebb5 [bug#131] Availabilities export report an erroneous number of reservations for machine availabilities 2019-05-07 12:24:51 +02:00
Sylvain
4dfe02bebf improved ruby syntax to match coding rules in some services 2019-04-25 15:09:37 +02:00
Sylvain
21c7484396 notify admin about notifications sent 2019-04-25 12:04:16 +02:00