Du Peng
50276f5b41
(feat) VAT for store's product and Accounting code/label
2022-09-09 09:31:00 +02:00
Du Peng
8d414a3172
(feat) admin can set offer for product in cart
2022-09-08 15:10:56 +02:00
Du Peng
6d2239bc15
(fix) cant pay order with coupon
2022-09-07 17:24:14 +02:00
Du Peng
79182fb8c1
Merge branch 'product_store-store' into product-store
2022-09-07 15:00:27 +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
Du Peng
e86b143c5e
(quality) refactroing find or create service
2022-09-06 18:17:11 +02:00
Sylvain
80825a2113
(bug) unable to build stats
...
NoMethodError: undefined method `project_id' for #<Hash>
app/services/statistics/concerns/projects_concern.rb:50:in `project_info_stat'
2022-09-05 16:53:56 +02:00
Sylvain
b7af29c1a8
(bug) unable to build stats
...
NoMethodError: undefined method `date' for #<Hash>
app/services/statistics/builders/projects_builder_service.rb:12:in `block in build'
2022-09-05 16:29:01 +02:00
Sylvain
9a9aaf6889
(bug) unable to build stats
...
NoMethodError: undefined method `project_info' for Statistics::FetcherService:Class
app/services/statistics/fetcher_service.rb:179:in `block in projects_list'
2022-09-05 15:15:35 +02:00
Sylvain
b9c02742a1
(bug) unable to generate statistics
2022-08-29 17:34:09 +02:00
Du Peng
631d5889c0
refactoring create cart service
2022-08-28 23:23:58 +02:00
Du Peng
c80198603e
set customer of cart dont save before payment
2022-08-27 18:01:25 +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
e3dfe4935a
set default value of order_item_id in update_stock
2022-08-26 14:08:20 +02:00
Du Peng
8d52768031
set operator_profile_id after payment
2022-08-26 14:07:18 +02:00
Du Peng
5030f5e1bc
fix bug: user cant pay order by wallet
2022-08-26 13:37:23 +02:00
Du Peng
49aa54193d
rename operator id to operator_profile_id in order
2022-08-26 11:55:35 +02:00
Du Peng
7c59d44785
add payment method in order after payment
2022-08-26 11:24:42 +02:00
Du Peng
939927fb73
add wallet transaction id to order
2022-08-26 11:19:09 +02:00
Du Peng
8059512f19
add order item id to product stock movement for sold
2022-08-26 11:06:09 +02:00
Du Peng
97ee15cf78
rename order amount to total
2022-08-26 10:46:30 +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
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
Du Peng
1b605b3265
fix bug: product amount cannot update
2022-08-04 14:02:19 +02:00
Du Peng
d690db8b6f
reset product_category_id to nil if product_category is removed
2022-08-03 10:18:00 +02:00
Du Peng
1e3e7854b2
Product model/controller
2022-08-03 10:16:36 +02:00
Du Peng
432b60ca9a
store product category create/list/update/delete
2022-08-03 10:16:08 +02:00
Nicolas Florentin
1d6a59dd67
improvement: add complexity check of the user password
2022-07-29 17:37:42 +02:00
Sylvain
3f84c2dfa1
(bug) ics description not using new methdod
2022-07-27 13:58:52 +02:00
Sylvain
be5b6af3f1
Merge pull request #375 from Guichaguri/feat/add-admin-member-usernames
...
Add username column to the member list
2022-07-27 09:32:45 +02:00
Sylvain
bb7eec924c
Usage of the rails logger instead of printing to standard output
2022-07-26 17:27:33 +02:00
Sylvain
07757e6adb
(bug) Erroneous "cancelation failed" message if elasticsearch was disabled
2022-07-26 15:08:59 +02:00
Guilherme Chaguri
026a09194a
Improve filter and sorting to include the users prefix
2022-07-21 13:21:06 -03:00
Sylvain
e0944746a9
(bug) unable to cancel a machine reservation + unable to update member profile
2022-07-20 11:52:38 +02:00
Sylvain
c4d959570f
code linting
2022-07-19 17:32:55 +02:00
Sylvain
b243800f5a
(bug) As admin, unable to create a new member ( #374 )
2022-07-19 16:29:28 +02:00
Sylvain
e9a7b609bb
(bug) Unable to change the group of a user
2022-07-19 16:08:24 +02:00
Sylvain
c710af04b7
(bug) slot title must only contains name of the requested resource
2022-07-19 15:56:21 +02:00
Sylvain
06ee1acea5
(bug) fix slot reservation is considered full
2022-07-19 15:40:28 +02:00
Sylvain
d26e2ae313
(bug) fix various issues due to slots behavior refactoring
2022-07-19 11:32:12 +02:00
Sylvain
e955ecc6f8
(bug) create slots when occurences is nil
2022-07-18 17:27:40 +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
783e86d9cc
(bug) fix slots creation
2022-07-18 17:18:00 +02:00
Sylvain
b2fd2e1b48
build all slots at reservation creation time
2022-07-18 17:18:00 +02:00
Guilherme Chaguri
d63b8d0dfa
Add username column to the member list
2022-07-14 16:11:44 -03:00
Sylvain
4fe7226959
(bug) unable to import a new account from an SSO provider
2022-07-06 15:37:47 +02:00
Sylvain
bcbd3bfb58
(bug) invalid users are reported in search
2022-06-29 15:35:17 +02:00
Sylvain
d03a34b894
(bug) unable to update the user profile after toggling the organization switch twice
2022-06-22 17:14:19 +02:00
Sylvain
61080a5188
(feat) feature the first event
2022-06-14 17:50:04 +02:00
Du Peng
ef5d603065
Fix a bug: admins are shown in select member for reservation by admin
2022-06-03 12:05:55 +02:00
Du Peng
4d3fe6aa2a
Fix a bug: if multi VAT no value is filled in, the general rate can't apply
2022-06-01 12:41:19 +02:00
Sylvain
838dbc85af
(bug) admins can collaborate on projects
2022-05-30 13:59:01 +02:00
Sylvain
31b4089bd2
(bug) OIDC scopes
2022-05-30 12:56:22 +02:00
Du Peng
cecf8126e0
Fix bug: Unable to create plans for all group
2022-05-17 17:38:00 +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
302c55755e
(ui) admin edit user: use new user-profile-form component
2022-05-10 10:23:43 +02:00
Sylvain
18a80a225c
(bug) define uid field in openid connect configuration
2022-05-04 12:36:31 +02:00
Sylvain
b3848596bf
(bug) unable to create openid connect provider from the interface
2022-05-04 12:36:31 +02:00
Du Peng
b1e8b64ecc
Auto sync projects to OpenLab if set openlab_app_id and openlab_app_secret
2022-04-20 17:43:38 +02:00
Du Peng
9b0c5948cf
Updated generate invoice reference method
2022-04-11 19:01:08 +02:00
Du Peng
60e9ccd7ce
Fix a bug: unable to show deleted user in reservation slot
2022-04-05 16:44:55 +02:00
Du Peng
a6c230145b
Optimise sql query, avoid to N+1
2022-04-01 16:31:46 +02:00
Sylvain
1b21453adc
(bug) fix generate statistics
2022-03-23 17:27:04 +01:00
Sylvain
6e97336005
(bug) fix building stats
...
ActiveRecord::EagerLoadPolymorphicError: Cannot eagerly load the polymorphic association :object
2022-03-23 16:56:27 +01:00
Sylvain
3f935adeb2
(bug) unable to generate subscription statistics
...
Can't join 'InvoiceItem' to association named 'subscription'
2022-03-23 16:13:42 +01:00
Sylvain
ee97b93a49
(style) replace Setting.find_by(name... by Setting.get
2022-03-23 13:30:55 +01: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
c8753d108a
(bug) fix errors due to sidekiq upgrade
...
- NoMethodError: undefined method 'delay' for UsersMailer:Class
- Removed open_api_calls_count_tracings fixtures due to the removal of the related table
2022-03-22 17:58:52 +01:00
Sylvain
a46e3ae783
(bug) prepaid-packs without expiration date do not work
2022-01-18 17:12:19 +01:00
Sylvain
634da414f8
(feat) When a payment schedule is in error or canceled, ability to re-enable it with another payment method
2022-01-17 12:38:53 +01:00
Sylvain
d8568f47ad
(bug) if a specialized VAT rate was defined when the VAT was disabled, the resulting VAT rate is wrong
2022-01-12 14:57:56 +01:00
Sylvain
a91610f530
Optimized multiple DB queries
2022-01-11 16:04:14 +01:00
Nicolas Florentin
217f2f3a3c
bug fix: xlsx export are not corrupted anymore
2022-01-06 13:43:51 +01:00
Sylvain
f3f15a2b9d
Ability to cancel a payement schedule from the interface
2022-01-03 17:13:35 +01:00
Sylvain
00b9bce587
export collected VAT by rate
2021-12-29 17:00:54 +01:00
Sylvain
16242d2127
frontend invoice configuration page uses multiVAT
2021-12-29 12:08:50 +01:00
Sylvain
9286738b69
add comments in complex VAT history function
2021-12-29 10:57:59 +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
0868cee6d9
fix bug: multi VAT setting no exsit
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
Vincent
934ac309a1
Merge branch 'dev' into 'spaces_multiprices'
...
# Conflicts:
# CHANGELOG.md
2021-12-22 14:29:56 +00:00
Sylvain
61f432914c
optimize payment schedules list loading
2021-12-21 17:27:51 +01:00
Sylvain
d6b30875a4
compute the price based on custom durations
2021-12-20 17:08:14 +01:00
Sylvain
1a672b0644
stave start date in subscription schedule
2021-10-18 15:19:58 +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
315e899540
[WIP] fix tests
2021-10-14 18:20:10 +02:00
Sylvain
336a4b789c
proceed with payment on subscription renewal
2021-10-13 17:39:39 +02:00
