1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-28 09:24:24 +01:00
Commit Graph

47 Commits

Author SHA1 Message Date
Du Peng
fb2b762015 Merge branch 'spaces-machines-tree' into dev 2023-09-11 09:54:08 +02:00
Nicolas Florentin
bdc5729141 (feat) space associate machines 2023-08-24 14:41:29 +02:00
Nicolas Florentin
043ff6d47e wip 2023-07-20 16:55:22 +02:00
Sylvain
01df96dc20 (security) upgrade to rails 6 2023-03-22 10:58:22 +01:00
Sylvain
779dd070b7 (bug) undefined local variable or method 'reservation_deadline'
(quality) linted code
2023-03-20 11:44:04 +01:00
Sylvain
a24fe8cd71 Merge branch 'feature/each-reservation-deadlines' of https://github.com/Guichaguri/fab-manager into Guichaguri-feature/each-reservation-deadlines 2023-03-20 10:19:29 +01:00
Sylvain
328529809d (bug) plan visibility is not applied
(bug) plan limit error message
(quality) improved error message
(ui) plan visibility cannot be under 7
2023-03-16 12:02:08 +01:00
Guilherme Chaguri
27a946b7d3 Fix syntax error 2023-03-15 16:48:13 -03:00
Guilherme Chaguri
855df4b552 Fix merge conflicts with dev 2023-03-15 16:26:45 -03:00
Sylvain
6089e636e4 (feat) limit machine visibility per plan 2023-03-15 14:17:06 +01:00
Sylvain
0ac99e3b6b (quality) improved error message 2023-03-14 11:54:41 +01:00
Sylvain
8504864c20 (feat) limit reservation depending on current suscription 2023-03-14 11:15:40 +01:00
Sylvain
c3d6206dba (quality) typed CartItem::Reservation 2023-03-13 14:19:52 +01:00
Guilherme Chaguri
1aa9b2fe39 Added reservation deadlines for each type of reservation 2023-03-01 17:44:01 -03:00
Sylvain
986a663c40 (feat) places cache for slots 2023-02-15 10:29:54 +01:00
Sylvain
473aedbdcb (feat) add reservations in cart/order 2023-02-15 10:29:53 +01:00
Sylvain
cdc7dc963d (i18n) translate new errors 2023-02-15 10:29:51 +01:00
Sylvain
48a44ff4f3 (feat) create cart items from the api 2023-02-15 10:29:50 +01:00
Sylvain
42d830b4f8 (feat) save cart items in db 2023-02-15 10:29:46 +01:00
Sylvain
8d43db2579 (feat) Report subsription mismatch with user's group 2023-01-04 12:08:37 +01:00
Sylvain
8ce1ceb345 (quality) translate validation messages 2023-01-04 11:12:02 +01:00
Sylvain
e139067954 (feat) prevent generate invoices at 0 2022-12-23 14:14:42 +01:00
Guilherme Chaguri
9b2e1909d9 Allow last minute reservations by admins 2022-12-16 10:48:56 -03:00
Guilherme Chaguri
dea9663f37 Added reservation deadline parameter 2022-11-29 17:02:01 -03:00
Sylvain
a3190115ab (bug) invoice rounding error using coupons 2022-10-27 16:04:21 +02:00
Sylvain
2705b9f6bd (bug) unable to reserve if user's subscription plan is disabled 2022-07-20 17:46:09 +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
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
Du Peng
c24aad00c4 check shopping cart items is valid before pay online 2022-06-07 16:55:29 +02: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
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
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
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
d0011a10f0 check for slots restricted to subscribers at cart level 2021-05-31 15:39:56 +02:00
Sylvain
c7a59c8cb7 WIP: refactoring to singularize the booking process
We need to achieve only one process for all booking, not one for subscription, one for reservations, etc.
Moreover we must store one object per invoice_item/payment_schedule_object and stop using Invoice.invoiced or PaymentSchedule.scheduled
2021-05-21 18:25:18 +02:00
Sylvain
66f81a975e WIP: array of items
Migration from cart_items:{reservation:{}, subscription:{}, ...}
to cart_items:{items:[{reservation:{}, ...}], ...}
2021-05-19 18:12:52 +02:00
Sylvain
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