Du Peng
ab800a519f
store cart
2022-08-19 20:03:09 +02:00
Du Peng
16288ae2bd
fablab store page
2022-08-16 19:47:27 +02:00
Guilherme Chaguri
9b44492971
(bug) Fix user reference for admin check
...
Fix user variable reference when verifying whether the user is an administrator
2022-08-16 11:02:25 -03:00
Du Peng
1cef45e3d7
add product stock mouvements
2022-08-08 18:04:14 +02:00
Du Peng
fc4fd78843
product files and images upload
2022-08-03 10:25:36 +02:00
Du Peng
00f811645a
add products relation in product's category
2022-08-03 10:18:00 +02:00
Du Peng
5e1436eda4
create/edit product form
2022-08-03 10:18:00 +02:00
Du Peng
1e3e7854b2
Product model/controller
2022-08-03 10:16:36 +02:00
Du Peng
4ce68f33a8
change top position of product category to 0
2022-08-03 10:16:12 +02:00
Du Peng
432b60ca9a
store product category create/list/update/delete
2022-08-03 10:16:08 +02:00
Du Peng
d399a085ee
Merge branch 'improves-password-complexity-check-2pxghn4' into dev
2022-08-01 19:32:29 +02:00
Nicolas Florentin
1d6a59dd67
improvement: add complexity check of the user password
2022-07-29 17:37:42 +02:00
Nicolas Florentin
9bc2d4f96c
improves file validation, validation is now based on content of the file in addition of the validation of the extension
2022-07-27 17:14:15 +02:00
Sylvain
3f84c2dfa1
(bug) ics description not using new methdod
2022-07-27 13:58:52 +02:00
Sylvain
445e63b44c
(feature) Improved attached ICS file texts, in reservations emails
2022-07-27 12:04:23 +02:00
Sylvain
7fa9414527
Merge pull request #377 from Guichaguri/fix/ignore-empty-from-sso
...
(bug) Fix SSO data being overridden when it is empty and the user can change it
2022-07-27 10:08:00 +02:00
Sylvain
a4649603c0
Merge pull request #376 from Guichaguri/fix/admin-group-overriden
...
(bug) Fix admin group being replaced in SSO authentication
2022-07-27 10:04:30 +02:00
Sylvain
98b1919de2
Make the username column optionnal ( #375 )
2022-07-27 09:59:23 +02:00
Sylvain
56b254dffc
print an error if the current invoice does not have a main_item
2022-07-26 17:38:33 +02:00
Sylvain
bb7eec924c
Usage of the rails logger instead of printing to standard output
2022-07-26 17:27:33 +02:00
Sylvain
7432bb848e
(bug) unable to reserve a machine slot when another machine was already reserved on the same slot
2022-07-25 16:41:48 +02:00
Guilherme Chaguri
fda93cb7df
Fix SSO properties not updating
2022-07-20 16:28:17 -03:00
Sylvain
2705b9f6bd
(bug) unable to reserve if user's subscription plan is disabled
2022-07-20 17:46:09 +02:00
Sylvain
29b9399ca3
(bug) unable to reserve event
2022-07-20 15:54:04 +02:00
Sylvain
2bd84e623a
(bug) missing translations
2022-07-20 15:27:01 +02:00
Sylvain
0d072291c7
(bug) 2 people can book the same machine slot
...
Also: fix reservation change behavior
2022-07-20 11:22:00 +02:00
Sylvain
6a8c441e85
public calendar endpoint refactoring & testing
2022-07-18 17:19:33 +02:00
Sylvain
b68e47a0ea
refactor shopping_cart/reservation
...
Previsouly, the reservation was expecting parameters like:
slots_attributes: [{start_at: date, end_at: date, availability_id: number}]
Now, the reservation is expecting simpler parameters like:
slots_reservations_attributes:[{slot_id: number}]
2022-07-18 17:18:01 +02:00
Sylvain
37b24a8d2f
refactor slots model
2022-07-18 17:18:01 +02:00
Sylvain
5012912edd
(wip) refactoring Availabilities::AvailabilitiesService and Availabilities::StatusService
2022-07-18 17:18:01 +02:00
Sylvain
8be2425275
(wip) refactoring slots to be unique per availability time-slot
2022-07-18 17:18:00 +02:00
Guilherme Chaguri
27d71dcffd
(bug) Fix SSO data being overridden when it is empty and the user can change it
2022-07-14 17:55:36 -03:00
Guilherme Chaguri
6423255116
(bug) Fix admin group being replaced in SSO authentication
2022-07-14 17:03:22 -03:00
Sylvain
bec2e8a514
(bug) Gender, Address and Birthday are not mapped properly from SSO ( #365 )
2022-07-06 15:56:57 +02:00
Sylvain
eb1c54d8f3
updated diagrams
2022-07-04 10:48:42 +02:00
Du Peng
a0d158974b
fix bug: validator of reservation can't find if slot has reserved by reservable type
2022-06-29 19:58:53 +02:00
Sylvain
6ce762f778
(bug) unable to reserve a space
2022-06-29 15:34:47 +02:00
Sylvain
0510a5f3a3
(bug) when an empty data was retured by the SSO, unable to edit it
2022-06-27 12:51:38 +02:00
Sylvain
46b2ba1f54
(bug) when email was mapped from SSO but provided as empty string -> unable to merge account
2022-06-27 12:06:25 +02:00
Sylvain
48e1cf782f
(bug) unable to edit an event
2022-06-15 09:42:39 +02:00
Du Peng
ac16eca60f
fix conflict
2022-06-07 16:57:02 +02:00
Du Peng
c24aad00c4
check shopping cart items is valid before pay online
2022-06-07 16:55:29 +02:00
Sylvain
0e16374956
(bug) unable to compile the assets when OIDC is enabled but the scopes were not set
2022-06-06 10:15:19 +02:00
Sylvain
2172c102c9
(bug) use arrays for OIDC scopes in front and DB.
...
Send the scope as a string separated with spaces to the OIDC provider.
2022-06-01 09:27:49 +02:00
Du Peng
41d931aba0
Fix a bug: Missing of description of PlanCategory migration
2022-05-17 16:45:17 +02:00
Du Peng
3e34b3c7a7
add user validation required setting, user proof of identity upload and organization custom field
2022-05-11 16:57:44 +02:00
Sylvain
e45872956c
(ui) Option to prevent users from changing their group
2022-05-11 15:45:49 +02:00
Sylvain
ac1d518ddc
(ui) option to disable the machines module
2022-05-11 11:54:00 +02:00
Sylvain
fbb9367cd1
(notif) ICS file attached to the reservation notification emails
2022-05-11 10:44:57 +02:00
Sylvain
7da62bb513
(back) generate ICS file for a reservation
2022-05-10 16:48:58 +02:00
Sylvain
040858ac1f
(ui) refactored profile-completion screen to use more accurate messages
2022-05-09 14:58:26 +02:00
Sylvain
9b22286327
Merge remote-tracking branch 'origin/socials-refacto' into profile-form
2022-05-04 15:53:22 +02:00
Sylvain
6ec6a8c4c9
(api) save which data is really mapped from the sso
2022-05-04 14:05:36 +02:00
Sylvain
b3848596bf
(bug) unable to create openid connect provider from the interface
2022-05-04 12:36:31 +02:00
Sylvain
07578b5826
(ui)(api) configure data mapping for openid
2022-05-04 12:28:48 +02:00
Sylvain
c85281b29f
(api) automatically configure the openID response_type
2022-05-04 12:28:48 +02:00
Sylvain
6c46e5ec81
(api) automatically configure some openID parameters: redirect_uri, display, response_mode
2022-05-04 12:28:48 +02:00
Sylvain
5013484104
(ui) add profile edition url for openid
2022-05-04 12:28:31 +02:00
Sylvain
3ff416cf8a
(ui) openid connect configuration interface
2022-05-04 12:28:31 +02:00
Sylvain
f9e5e7f2a8
(ui) display authorization callback url directly in interface
2022-05-04 12:28:29 +02:00
Sylvain
3b0262c153
(bug) validate oauth2 providers have User.uid mapped
2022-05-04 12:27:48 +02:00
Sylvain
70803ee41b
(api) validate auth providers data
...
+ remove legacy code
2022-05-04 12:27:48 +02:00
Sylvain
d751939ee9
WIP: front-end form for openid configuration
2022-05-04 12:17:21 +02:00
Sylvain
7b1403dac9
(db) distringuish between oid client configuration and client_auth_method
2022-05-04 12:16:38 +02:00
Sylvain
9ead3b5e8d
(db) add profile_url to OpenIdConnectProvider
2022-05-04 12:16:38 +02:00
Sylvain
8471311b7b
(authentication) configure devise/omniauth to use the OpenIdConnect configuration
2022-05-04 12:16:38 +02:00
Sylvain
b4e53d2039
(db) table to save OpenID connect configuration
...
Also refactored OAuth2Mapping to allow usage with any types of providers
2022-05-04 12:16:38 +02:00
vincent
d2ed4d4bd8
Rename variables
2022-05-04 10:26:22 +02:00
vincent
5024037ce6
(wip) fab-socials
2022-05-04 10:25:15 +02:00
Nicolas Florentin
5e5822c89f
Fix a bug: edge case of birthday in the future in seeds.rb, we should use Date.current instead of DateTime.current since birthday is a date (see https://github.com/sleede/fab-manager/issues/344 )
2022-05-04 08:50:10 +02:00
Sylvain
6f80025adb
(api) save which data is really mapped from the sso
2022-04-25 15:45:11 +02:00
Sylvain
1960c7139f
(ui)(api) configure data mapping for openid
2022-04-20 14:12:22 +02:00
Sylvain
007c97969d
(api) automatically configure the openID response_type
2022-04-19 17:39:42 +02:00
Sylvain
9665368755
(api) automatically configure some openID parameters: redirect_uri, display, response_mode
2022-04-19 16:55:48 +02:00
Du Peng
2a71b3e78d
Fix a bug: unable to show projets whom user take part in
2022-04-15 13:20:50 +02:00
Sylvain
658ef20bc8
(ui) add profile edition url for openid
2022-04-13 16:23:13 +02:00
Sylvain
0e35616710
(ui) openid connect configuration interface
2022-04-13 15:50:33 +02:00
Sylvain
c3f7249242
(ui) display authorization callback url directly in interface
2022-04-12 16:34:44 +02:00
Sylvain
9191e1f9cd
(bug) validate oauth2 providers have User.uid mapped
2022-04-12 10:25:48 +02:00
Sylvain
d2c90f4066
(api) validate auth providers data
...
+ remove legacy code
2022-04-11 17:27:56 +02:00
Sylvain
f68c8a492e
WIP: front-end form for openid configuration
2022-04-04 16:25:17 +02:00
Sylvain
08ce18d93f
(db) distringuish between oid client configuration and client_auth_method
2022-04-04 16:24:27 +02:00
Sylvain
d4be62d0b8
(db) add profile_url to OpenIdConnectProvider
2022-04-04 16:24:27 +02:00
Sylvain
bd68c5e7e8
(authentication) configure devise/omniauth to use the OpenIdConnect configuration
2022-04-04 16:24:27 +02:00
Sylvain
8495e2a7a0
(db) table to save OpenID connect configuration
...
Also refactored OAuth2Mapping to allow usage with any types of providers
2022-04-04 16:24:27 +02:00
Du Peng
58f4ea4c15
Fix a bug: unable to set user's invoicing profile names and email if active address required in create user form
2022-03-29 17:08:35 +02:00
Sylvain
2fcda8a0ce
(feature) Prepaid-packs purchases are exported to the accounting CSV file
2022-03-23 13:14:34 +01:00
Sylvain
51a2bed16c
(bug) prepaid-packs purchases are reported as subscriptions in the statistics
2022-03-23 12:35:02 +01:00
Sylvain
f4395c88b9
(feat) google analytics V4
2022-03-22 11:27:18 +01:00
Sylvain
36d85c0cf7
(bug) unable to delete an administrator who had closed an accounting period
2022-03-16 17:10:27 +01:00
Nicolas Florentin
e37cde2f0d
removes dead code about OpenAPI (open_api_calls_count_tracings)
2022-02-25 15:39:56 +01:00
Sylvain
a46e3ae783
(bug) prepaid-packs without expiration date do not work
2022-01-18 17:12:19 +01:00
Sylvain
e4a0798b8a
(bug) statistics not built
...
for instances with plans created before v4.3.3, the StatisticType.key does not match Plan.duration because of a behavior change in rails framework. (v4.3.3 introduces a framework upgrade)
2022-01-18 14:01:34 +01:00
Sylvain
193ee4ffe9
(bug) case-sensitive emails
...
- for sso code sending
- for adminsys configuration
2022-01-18 12:00:23 +01:00
Sylvain
67850a6f9f
(feat) optional sso debug logs according to SSO_DEBUG env var
2022-01-17 15:24:07 +01:00
Sylvain
c031f099a5
Merge branch 'oauth2' into dev
2022-01-17 12:46:07 +01:00
Sylvain
9f7c77144a
(bug) unable to rebuild the PDF for invoices without subscriptions
2022-01-12 14:58:57 +01:00
Sylvain
a38d3e31b1
use explicit payment method for check in paymentSchedules and do not include the payment method in the footprint
2022-01-11 16:15:43 +01:00
Sylvain
a91610f530
Optimized multiple DB queries
2022-01-11 16:04:14 +01:00
Sylvain
051b56b72f
send notifications on payment schedules error/canceled by gateway
2022-01-11 12:37:06 +01:00
Sylvain
9922812111
Ability to select "bank transfer" as the payment mean for a payment schedule
2022-01-05 15:58:33 +01:00
Sylvain
e1256ec551
Ability to disable public account creation
2022-01-04 15:27:58 +01:00
Sylvain
effe5c7ba9
optimized the load time of the payment schedules list
...
From now, we no longer retrieve the client_secret directly from the API/list but from a specialized component which ask API/get_item.
This highly decrease the laod time needed to fetch API/list
2022-01-03 11:24:08 +01:00
Sylvain
b00bf958cc
[bug] extended_prices_in_same_day apply the extended prices to each days
2021-12-29 22:07:28 +01:00
Sylvain
00b9bce587
export collected VAT by rate
2021-12-29 17:00:54 +01:00
Sylvain
44853930ed
WIP: improve VatHistoryService
2021-12-28 19:42:04 +01:00
Du Peng
d52b8bde06
fix bug: accounting period export
2021-12-28 13:45:29 +01:00
Du Peng
c5211e98e3
generate invoice with multi vat
2021-12-28 13:45:28 +01:00
Du Peng
5e8c90458b
vat history service receive invoice item param
2021-12-28 13:45:28 +01:00
Sylvain
fe96e01b7f
refactor spaces/extended_prices code architecture to match the FM style guide
2021-12-28 11:25:10 +01:00
vincent
c3cbc26a1e
Merge branch 'spaces_multiprices_front' into spaces_multiprices
2021-12-21 17:14:22 +01:00
vincent
bd781a14e9
Add extended price
2021-12-21 17:13:40 +01:00
Sylvain
ffb0f3e19e
ability to limit extended prices to slots in the same day
2021-12-21 16:32:02 +01:00
Sylvain
2d807e6c94
improved slot price calculation
2021-12-21 15:30:08 +01:00
Sylvain
2b834045ef
improve price calculation
2021-12-21 11:14:09 +01:00
Sylvain
90b1e98938
fix unable to link address from sso
2021-12-21 10:42:59 +01:00
Sylvain
d6b30875a4
compute the price based on custom durations
2021-12-20 17:08:14 +01:00
Sylvain
5ebc1017d2
save prices duration in db
2021-12-20 15:47:57 +01:00
Sylvain
3fb9850786
[bug] unable to bind sso to Profile.bithday or Profile.gender
2021-12-20 14:07:25 +01:00
Sylvain
587beb01ab
fix user import from sso
...
A bug was introduced by detailed debug logs
2021-12-20 13:41:40 +01:00
Sylvain
0f57e1081f
[bug] unable to create a plan
2021-11-10 17:06:21 +01:00
Sylvain
1103c7757b
added debug logs
2021-11-10 13:03:12 +01:00
Sylvain
840c536c75
Ability to configure data sources for preventing booking on overlapping slots
2021-10-22 14:50:02 +02:00
Sylvain
36086f93df
[WIP] ability to select categories of slots for computing overlapping slots
2021-10-21 18:09:36 +02:00
Sylvain
a51dec9c72
removed ourdated comment
2021-10-21 15:11:47 +02:00
Sylvain
bbf512f674
validate birthday in past
2021-10-21 09:29:29 +02:00
Sylvain
e9740ebf69
validate birth date must be in the past
2021-10-20 17:31:30 +02:00
Sylvain
f250f58317
fix subscription renewal tests
2021-10-18 11:47:28 +02:00
Sylvain
4c56dffc04
remove deprecated code and endpoints
2021-10-18 10:15:48 +02:00
Sylvain
fd39eaf2f1
fix renew subscription API
...
TODO:
- remove old endpoints
- bug in UI (start date invalid)
- fix tests
- payzen
2021-10-15 17:31:01 +02:00
Sylvain
3349cc3a2d
fix test on paymentSchedules
2021-10-15 11:55:30 +02:00
Sylvain
315e899540
[WIP] fix tests
2021-10-14 18:20:10 +02:00
Sylvain
17a0baac7e
refactored free subscription extending
2021-10-12 14:07:35 +02:00
Sylvain
2b088ff035
Merge branch 'extend_subscription' into dev
2021-10-07 18:04:38 +02:00
Sylvain
676f921d66
fix some errors about stp subscription refacto + improved error handling
2021-10-07 17:07:46 +02:00
Sylvain
3663f8ab86
full stripe subscription code refacto
...
TODO: test
2021-10-06 17:09:35 +02:00
Du Peng
a9f431a6a2
fix bug: offer and extends subscription
2021-10-06 08:56:16 +02:00
Du Peng
235fd2e58a
Merge branch 'buy_pack_for_plan_option' into dev
2021-09-21 18:01:54 +02:00
Du Peng
1c54e54c17
use plant.base_name instands of plan.name
2021-09-21 18:00:48 +02:00
Du Peng
f2dd1bbcd2
add an option Subscription valid for purchase and use of a prepaid pack
2021-09-20 19:43:05 +02:00
Du Peng
5d8a1367a6
update test
2021-09-13 14:25:30 +02:00
Du Peng
6b763cc1c9
improve code for stripe subscription payment
2021-09-10 15:19:04 +02:00
Du Peng
2973dec6a7
rewrite payment schedule workflow by stripe
2021-09-08 18:57:10 +02:00
Sylvain
920a97f40f
fix computing reservation price
2021-07-02 15:45:52 +02:00
Sylvain
02870659e0
[bug] prepaid hours not used if bought slot is longer than remaining prepaid time
2021-07-02 12:39:34 +02:00
Sylvain
6c326c7209
compute price according to prepaid hours
...
Also: handle prepaid hours decreasing when used
2021-06-30 10:53:05 +02:00
Sylvain
9c6a7df0bf
WIP: compute price including prepaid packs
2021-06-29 16:56:40 +02:00
Sylvain
baf41588d3
packs summary component
2021-06-29 11:14:36 +02:00
Sylvain
1aad4891c1
buy prepaid-pack a hours from modal
2021-06-28 18:17:11 +02:00
Sylvain
4126e05d4a
Merge branch 'dev' into prepaid
2021-06-28 09:58:07 +02:00
