Du Peng
29b92475bb
(feat) Ability to filter uniq slots reserved in admin calendar
2023-01-02 19:20:02 +01:00
Sylvain
051f182839
(bug) clear date in suscription extend free days
2022-12-27 17:15:49 +01:00
Sylvain
e020c592ec
(bug) rebuild accounting when invoices(0).disabled
2022-12-27 14:39:26 +01:00
Sylvain
898ce07509
(merge) Merge branch 'staging' into dev
2022-12-27 12:20:18 +01:00
Sylvain
f8904dfb9c
(feat) customize VAT name
2022-12-27 12:13:24 +01:00
Sylvain
574974c239
(merge) Merge branch 'machine_category' into staging
2022-12-27 10:59:36 +01:00
Sylvain
e139067954
(feat) prevent generate invoices at 0
2022-12-23 14:14:42 +01:00
Sylvain
137b9f3c1b
(feat) improved security when changing password
2022-12-22 11:07:14 +01:00
Sylvain
b552e5e626
(feat) rename client accounts to financial
2022-12-21 14:14:37 +01:00
Sylvain
40dd3f11b8
(api) accounting: invoice.payment_details.payment_mean
2022-12-21 14:14:36 +01:00
Sylvain
4d7e09c98d
(feat) multiple accounting journals
2022-12-21 14:14:36 +01:00
Sylvain
31ba4d3486
(api) accounting: payment details
2022-12-21 14:14:35 +01:00
Sylvain
90dc38ed10
(feat) move external id to InvoicingProfile
2022-12-21 14:14:34 +01:00
Sylvain
b7838db648
(feat) clean accounting lines async before rebuilding
2022-12-21 14:14:33 +01:00
Sylvain
293ea37293
(quality) lint Profile model
2022-12-21 14:14:32 +01:00
Sylvain
fdddb545d9
(feat) OpenAPI/users: gender, organization, address
2022-12-21 14:14:31 +01:00
Sylvain
4b84963d7f
(feat) optional external id
2022-12-21 14:14:29 +01:00
Sylvain
2cf18c277c
(bug) create recurrent event
...
Also: (test) test trainings API
Also: (test) test create recurrent event
2022-12-21 14:12:16 +01:00
Sylvain
523529228c
(bug) callback renamed by error
2022-12-21 14:12:14 +01:00
Sylvain
749f848034
(feat) rebuild accounting lines on updates
2022-12-21 14:12:13 +01:00
Sylvain
af3def0e2e
(feat) save the accounting data in DB
...
Previously, the accounting data were built on demand,
extracting the data from the invoices on-the-fly.
This is intended to be used only once in a while, so there was
no performance issue with that.
Now, we want those data to be accessed from the OpenAPI,
so building them on-the-fly would be very much
intensive and resouces heavy. So we build them each nights
using a scheduled worker and save them in the database
2022-12-21 14:11:40 +01:00
Sylvain
bec610458c
(bug) do not create plans for disabled groups
...
Also: (bug) unable to create plan without partner
(bug) unable to set plan price to a decimal number
(bug) unable to create a plan without toggling the partner switch
(quality) linted PlansService
2022-12-21 14:05:16 +01:00
Sylvain
be8ae01ba4
(ui) refactor plan form
...
Also: add advanced accounting to plans
2022-12-21 14:05:16 +01:00
Sylvain
4a9cbbb227
(feat) advanced accounting for products
2022-12-21 14:05:15 +01:00
Sylvain
7868f31a58
(feat) advanced accounting parameters
...
for: machines, spaces, trainings, events
2022-12-21 14:05:15 +01:00
Du Peng
f47440c85a
(feat) add machine category
2022-12-20 18:45:53 +01:00
Guilherme Chaguri
9b2e1909d9
Allow last minute reservations by admins
2022-12-16 10:48:56 -03:00
Sylvain
14b5c40ec8
Merge branch 'feature/reservation-deadlines' of https://github.com/Guichaguri/fab-manager into Guichaguri-feature/reservation-deadlines
2022-12-14 11:30:54 +01:00
Du Peng
3224daf791
(bug) unable to credit wallet amount
2022-12-12 16:25:29 +01:00
Sylvain
7b30086a34
(bug) unable to set amount to 4.85
2022-12-01 15:43:16 +01:00
Guilherme Chaguri
dea9663f37
Added reservation deadline parameter
2022-11-29 17:02:01 -03:00
Du Peng
fe0af02ba8
(bug) unable set a main image of product and remove an image of product
2022-11-22 16:31:34 +01:00
Sylvain
509dd0eb5f
(feat) soft destroy machines/spaces
2022-11-22 14:17:25 +01:00
Sylvain
c284190253
(quality) lint HistoryValue
2022-11-17 11:47:47 +01:00
Sylvain
25606a2642
(bug) unable to merge an SSO account with an existing account
2022-11-15 15:12:08 +01:00
Sylvain
46e042fd38
(bug) test on invoice items was not idempotent
2022-10-28 10:25:10 +02:00
Sylvain
a3190115ab
(bug) invoice rounding error using coupons
2022-10-27 16:04:21 +02:00
Sylvain
fc2b52c2ca
(bug) invalid accounting export for store orders
2022-10-26 14:32:19 +02:00
Du Peng
6d448e0af2
(merge) merge dev and product-store
2022-10-26 09:37:31 +02:00
Sylvain
744b811b62
(feat) remove admins group: allow admins to reserve
2022-10-25 11:57:26 +02:00
Sylvain
f9f60cba17
(wip) allow admin to reserve for himself
2022-10-24 17:39:16 +02:00
vincent
b3d9c6b3bf
(i18n) update
2022-10-24 12:10:42 +02:00
Sylvain
fdac8168ef
(quality) refactored SingleSignOnConcern to match rubocop rules
2022-10-24 11:43:30 +02:00
Sylvain
e5fc418ecf
Merge branch 'fix/sso-admin-group-id' of https://github.com/Guichaguri/fab-manager into Guichaguri-fix/sso-admin-group-id
2022-10-24 10:53:06 +02:00
Du Peng
c48956be10
(bug) unable apply a coupon if this coupon has used by an user removed
2022-10-19 11:38:17 +02:00
Du Peng
62a62ec1eb
(bug) fix cannot debit prepaid pack after reservation of machine
2022-10-14 17:00:38 +02:00
Du Peng
5de91acf88
(bug) fix save empty product image and is_main cannot set to new image after remove old main image
2022-10-13 12:38:54 +02:00
Sylvain
11c8b25357
(feat) hide the store to members/visitors
2022-10-12 16:48:39 +02:00
Sylvain
f80aec1ef2
(merge) Merge branch 'product-store_stats' into product-store
2022-10-12 14:20:38 +02:00
Sylvain
0016f248d8
(feat) report store orders in the stats
2022-10-12 11:42:15 +02:00
Sylvain
d9e8d0e40d
(wip) report store statistics in UI
2022-10-11 17:23:45 +02:00
Du Peng
7700737cf3
(bug) fix cannot remove product if it has the relation with machines
2022-10-11 16:40:45 +02:00
Sylvain
6df9724527
(quality) disable Rails/RedundantPresenceValidationOnBelongsTo
...
This setting was disabled in config/application.rb:
`config.active_record.belongs_to_required_by_default = false`,
so we must configure the linter accordingly.
Also: linting some little bit of code
2022-10-11 11:44:08 +02:00
Sylvain
da11a592e8
(quality) lint wallet transaction
2022-10-11 10:59:48 +02:00
Sylvain
b4f3f7f737
(wip) building stats to ES
2022-10-10 17:42:25 +02:00
Sylvain
8dd4463a14
(feat) alert on low stock threshold
2022-10-05 15:51:33 +02:00
vincent
60c8102c39
(bug) fix product categories position after dnd
2022-10-04 18:03:18 +02:00
Sylvain
e51592061a
(feat) count products in categories
2022-10-03 15:56:46 +02:00
Sylvain
a260f88555
(feat) store withdrawal instructions
2022-10-03 15:24:01 +02:00
Sylvain
f61e784ace
(feat) prevent show product in store if price not set
2022-09-27 15:58:59 +02:00
Sylvain
d6fbd90c7c
(feat) ability to disable the store
2022-09-27 11:14:27 +02:00
Guilherme Chaguri
75796074da
(Bug) Fix admin users groups being overriden by SSO group_id
2022-09-26 14:23:29 -03:00
Sylvain
a41e5a93e5
(feat) products filtering for admin view
2022-09-20 15:30:44 +02:00
Du Peng
ded9b4a1e8
(bug) product slug isn't unique
2022-09-19 19:31:43 +02:00
Du Peng
1aa058f3d6
(feat) allow product price = 0
2022-09-19 19:27:11 +02:00
Du Peng
cbed318c3f
(feat) refund an order by admin
2022-09-16 18:31:20 +02:00
Du Peng
96a0f10747
(feat) add delivered state to order
2022-09-16 17:54:41 +02:00
Du Peng
010718d53e
(merge) store manage the orders by admin
2022-09-16 11:45:58 +02:00
Du Peng
f015e23a85
(wip) change order state by admin
2022-09-15 20:19:19 +02:00
Du Peng
b87355bc5a
(feat) orders filter by admin
2022-09-14 19:54:24 +02:00
Sylvain
c4baf89c54
(merge) Merge branch 'product-store_stocks' into product-store
2022-09-14 15:15:47 +02:00
Du Peng
522b559ced
(feat) add payment status to order
2022-09-13 18:43:37 +02:00
Sylvain
feabded2a0
(feat) update the stock total
2022-09-13 15:01:55 +02:00
Du Peng
dbe4570c30
(feat) client can show orders in dashbaord
2022-09-12 19:44:13 +02:00
Du Peng
185589407f
(feat) order invoice
2022-09-09 16:35:49 +02:00
Du Peng
2840c93823
(bug) fix invoice reference
2022-09-09 10:43:44 +02:00
Du Peng
50276f5b41
(feat) VAT for store's product and Accounting code/label
2022-09-09 09:31:00 +02:00
Sylvain
c968f7b1aa
(feat) stock management: create/show
2022-09-08 17:51:48 +02:00
Du Peng
79182fb8c1
Merge branch 'product_store-store' into product-store
2022-09-07 15:00:27 +02:00
Du Peng
4387c05200
Merge branch 'product_store' into product_store-store
2022-09-06 20:06:59 +02:00
Du Peng
29a84acf2e
Merge branch 'product_store-payment' into product_store-store
2022-09-06 19:22:22 +02:00
Du Peng
fd97d23208
(feat) set order reference after create order
2022-09-06 19:16:29 +02:00
Du Peng
59d2b8c990
(feat) order reference
2022-09-06 19:12:06 +02:00
Sylvain
b52a59fb42
improved comments
2022-09-06 17:01:20 +02:00
Sylvain
b9c02742a1
(bug) unable to generate statistics
2022-08-29 17:34:09 +02:00
Du Peng
981cffa27d
pay cart with coupon code
2022-08-26 20:10:21 +02:00
Du Peng
3a669109b5
order extends to payment document
2022-08-26 15:56:20 +02:00
Du Peng
453954e2b9
save payment gateway object after pay an order
2022-08-26 15:30:51 +02:00
Du Peng
49aa54193d
rename operator id to operator_profile_id in order
2022-08-26 11:55:35 +02:00
Du Peng
939927fb73
add wallet transaction id to order
2022-08-26 11:19:09 +02:00
Du Peng
8a8ce607b7
check product is valid and in stock before payment
2022-08-25 11:46:14 +02:00
Du Peng
193c21a583
payment of cart by stripe/payzen/local
2022-08-25 08:52:17 +02:00
Du Peng
f62244fcdb
add product stock mouvements
2022-08-23 16:02:17 +02:00
Du Peng
0773e5bc82
product files and images upload
2022-08-23 16:02:14 +02:00
Du Peng
19e3921dc4
add products relation in product's category
2022-08-23 16:02:08 +02:00
Du Peng
272cbf165c
create/edit product form
2022-08-23 16:02:08 +02:00
Du Peng
69e2b3e111
Product model/controller
2022-08-23 16:02:07 +02:00
Du Peng
b53efc9850
change top position of product category to 0
2022-08-23 16:02:07 +02:00
Du Peng
4396bb0ca0
store product category create/list/update/delete
2022-08-23 16:01:59 +02:00
Du Peng
cfd21adb60
cart button
2022-08-20 18:47:15 +02:00
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
