Filipe
a8114e42a7
Merge pull request #13381 from rioug/add-feature-flag-inventory
...
Add feature flag to enable inventory
2025-07-21 17:59:54 +01:00
Ahmed Ejaz
e6b9373570
Refactor line items search to improve security and maintainability
...
Moves search field configuration from frontend to backend to prevent potential security issues with exposing internal field names. The change also improves maintainability by centralizing search logic in the controller.
Adds conditional logic to use name_alias for non-admin users when searching distributor names, enhancing data access control.
2025-07-13 18:07:14 +05:00
Gaetan Craig-Riou
b7f969eed9
Move the inventory feature check to ScopeVariantToHub
...
Per review, the check is done on the same enterprise as the one use to
initialize ScopeVariantToHub. So it makes sense to move the actual
feature check to ScopeVariantToHub#scope
2025-07-09 13:43:12 +10:00
Gaetan Craig-Riou
6937a133ae
Move inventory enabled check to OpenFoodNetwork::ScopeVariantToHub
2025-07-09 11:35:26 +10:00
Gaetan Craig-Riou
29a24b7305
Scope variant to hub only when inventory enabled
2025-07-09 11:35:26 +10:00
Gaetan Craig-Riou
b19b987ed0
Remove variant rule type when inventory disabled
2025-07-09 11:35:26 +10:00
Gaetan Craig-Riou
f30b899569
Disable inventory option for product import
2025-07-09 11:35:26 +10:00
Filipe
93ac10bb75
Merge pull request #13262 from cillian/remove-angular-on-enterprise-images-and-white-label-sections
...
Remove Angular from the Settings > Images section
2025-05-16 20:03:55 +01:00
Konrad
c657e31d07
Merge pull request #13318 from dacook/fix-13315
...
Prevent error on inventory page when logged out
2025-05-16 20:23:17 +02:00
David Cook
82f94e3969
Ensure user is loaded before loading data
2025-05-13 15:12:16 +10:00
Gaetan Craig-Riou
0ca3dca675
Per review, extract tags options from template
...
Now it also scope the tags to the available variant, ie the logged in
user will only see only tag that was used by them.
2025-05-05 14:56:50 +10:00
Gaetan Craig-Riou
e7aae5a03c
Add tag search
...
First minimal implementation with a basic filter UI. Only support search
by any of the selected tags
2025-05-05 14:54:55 +10:00
Cillian O'Ruanaidh
65efd3b66c
Render confirm remove image modal outside of form so a simple :button_to can be used instead of submitting via Stimulus controller.
2025-05-02 13:07:31 +01:00
Cillian O'Ruanaidh
a9a4156251
Remove Angular and Stimulus Reflex from the Settings > Images section
2025-05-02 13:07:31 +01:00
Carlos Chitty
d0c687650e
Autocorrect Style/HashEachMethods offenses
2025-04-29 15:16:34 -04:00
Carlos Chitty
63168086e7
Autocorrect Style/HashConversion offenses
2025-04-29 14:27:31 -04:00
piyush828-design
5e890bb361
Merge branch 'master' into pagy_upgrade
2025-04-24 17:46:39 +05:30
David Cook
e1c6709472
Merge pull request #13251 from cyrillefr/FixRailsLexicallyScopedActionFilterPartI
...
Adresses Rails/LexicallyScoped offenses
2025-04-22 11:26:11 +10:00
Filipe
3236cbb0b8
Merge pull request #13191 from mkllnk/dfc-reset
...
Reset stock for absent products in DFC catalog
2025-04-20 21:34:49 +01:00
piyush828-design
3202d0ea81
fixed test failure
2025-04-16 18:24:32 +05:30
cyrillefr
5c3db6cab8
Removes unused action from filter in controller
2025-04-08 14:04:37 +02:00
Trésor Bireke
5e7f0f8a1a
Merge branch 'master' into tb-rescue-not-found-error-for-enterprise
2025-04-01 01:10:17 +02:00
Tresor11
507705a4eb
Update method name to require
...
This commit updates the method name to be called required_enterprise
since we only expect it to raise an error when the enterprise is not found.
2025-03-31 22:28:38 +03:00
Maikel Linke
9e3ff412f9
Simplify controller
2025-03-27 13:36:48 +11:00
Maikel Linke
48e3b5b05e
Move more reset variant code for re-use
2025-03-27 13:36:48 +11:00
Maikel Linke
c43bd0c24b
Move variant reset code to shared service
2025-03-27 13:36:48 +11:00
Maikel Linke
e35a29cc29
Remember local stock of backordered products
...
When retail variants are mapped to wholesale variants, we usually have a
some leftover stock at the end of an order cycle. For example, we
backordered a slab of 12 cans of tomatoes but our customers bought only
9 of those. Then we have 3 left for the next order cycle.
Even when the product is not available for backorder with the supplier,
we still want to sell off our leftover stock, the three cans of tomatoes
in our example.
And it might be that the product will come back in the future.
2025-03-27 13:36:48 +11:00
Maikel Linke
2a81d26ef1
Simplify complex method
2025-03-27 13:36:48 +11:00
Maikel Linke
c60718feea
List absent products in import preview
2025-03-27 13:36:48 +11:00
Maikel
a2e68e1f3c
Explain stock reset further
...
Co-authored-by: David Cook <david@redcliffs.net >
2025-03-27 13:36:48 +11:00
Maikel Linke
a6c08fe2ad
Reset stock for absent products in DFC catalog
2025-03-27 13:36:47 +11:00
Tresor11
5b3bae85ca
Rescue Not Found Error for Enterprise for admin
...
Currently when an admin tries to edit an no-existing enterprise, a
NoMethodError is raised.
This commit adds a set_enterprise setter method to the
enterprises controller that sets the @enterprise instance variable to
have the same value as the enterprise object defined in the the edit
method; this method also rescues the NotFound error in case
the enterprise is not found and redirects the user to the enterprises
index page with a error message.
2025-03-22 00:35:27 +03:00
Maikel Linke
f9322ac71b
Style: simplify controller method
2025-03-03 12:23:58 +11:00
Maikel Linke
7f8581fd9f
DRY controller methods which became too long
2025-03-03 12:23:58 +11:00
Maikel Linke
9d5ce0ede5
Remove surrounding whitespace from pasted DFC URL
2025-03-03 12:23:58 +11:00
Maikel Linke
b6153fc155
Rescue from invalid DFC catalog URLs
...
This mistake should be dealt with differently but I wanted to make sure
that a really invalid URL is handled well, too.
2025-03-03 12:23:58 +11:00
Maikel
462886447a
Merge pull request #13126 from mkllnk/oidc-error
...
Direct people to refresh OIDC connection when needed
2025-02-24 15:45:48 +11:00
Maikel Linke
fbdc6c9bd0
Split growing supplied product builder
2025-02-18 13:08:46 +11:00
Maikel Linke
61b54e922a
Remove impossible error rescue
...
This block got duplicated in a previous PR.
2025-02-18 12:20:01 +11:00
Maikel Linke
ffe4084b7f
Link to OIDC settings from error message
...
The colour of the link is really bad though.
2025-02-18 12:15:13 +11:00
Maikel Linke
bb503e12a3
Direct people to refresh OIDC connection
...
Not the best UX but the easiest next step to implement. Next we should:
* Include link in error message instead of redirecting straight there.
Otherwise users may feel disoriented.
* Provide a custom error message?
2025-02-18 12:14:12 +11:00
David Cook
71782de83a
Apply suggestion from code review
...
Co-authored-by: Maikel <maikel@email.org.au >
2025-02-10 10:35:59 +11:00
David Cook
9f7000009d
Only import selected products
2025-02-06 17:10:01 +11:00
David Cook
447ff3cffd
Show list of products to import
...
If there's a matching product in OFN already, a link will appear.
2025-02-06 16:28:15 +11:00
David Cook
c3b23a9fba
Move import to new action
...
Making way for a review step.
2025-02-06 13:50:26 +11:00
Maikel
229ee7028c
Merge pull request #13064 from mkllnk/negative-stock
...
Don't show stock for on-demand inventory items
2025-01-21 11:05:50 +11:00
Filipe
3c1dd10219
Merge pull request #13047 from mkllnk/spree-roles
...
Clarify that our only user role is "admin" and simplify code
2025-01-16 18:06:49 -06:00
Maikel Linke
a3ec3e74ae
Hide stock level of on-demand inventory items
...
We changed to tracking stock of on-demand items to be able to place
backorders. This is mostly hidden in the app but was still visible on
the inventory page. Now we are hiding that here, too.
2025-01-09 10:06:04 +11:00
Maikel Linke
faad7fa95c
Move wholesale calculation for re-use
2025-01-07 11:03:36 +11:00
Maikel Linke
ddaeff7c53
Use DfcCatalog in offer broker
2025-01-07 11:03:34 +11:00
