raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,026 Commits 18 Branches 452 Tags
693b9bd171aaa409af94e018aaafc8a3dd03fe82
Commit Graph

16056 Commits

Author SHA1 Message Date
Filipe
89033579bd Merge pull request #12328 from dacook/buu/remove-stimulus-reflex 
[BUU] Remove Stimulus Reflex from Products screen
 2024-04-10 21:59:59 +01:00
Konrad
b3dd51d6ac Merge pull request #12324 from chahmedejaz/task/12314-fix-rubocop-rails-helper-instance-variable 
Fix Rubocop Rails/HelperInstanceVariable
 2024-04-10 20:17:06 +02:00
David Cook
1425d524b9 Fix product filtering 
Merges change from fb09a7f1e6
 2024-04-10 15:17:56 +01:00
David Cook
97d13597b0 Fix intermittent bug 
Dunno why, but this recently started occuring for me in dev and test. Browser update?
 2024-04-10 15:17:56 +01:00
David Cook
15790d3d8e Only register event listeners when needed 
Otherwise there could be over 200 listeners on a page.
 2024-04-10 15:17:56 +01:00
David Cook
54d0dfb141 Prevent duplicate products in search results 
Dunno why, but the product was appearing once for each variant.
 2024-04-10 15:17:56 +01:00
David Cook
c4b7b76e64 Avoid pagination when editing errored products 2024-04-10 15:17:56 +01:00
David Cook
fd8be37a62 Use shared page controls on products screen 
This has an auto submit and can potentially work with Turbo, like on the Orders screen.
 2024-04-10 15:17:56 +01:00
David Cook
0fc3d39106 Ensure pagination is retained when saving or discarding 
But we have more work to do.
 2024-04-10 15:17:56 +01:00
David Cook
2c71f7f1ed Discard changes by reloading the page 
Now there's a popup asking to confirm, which I think is worth keeping!
 2024-04-10 15:17:56 +01:00
David Cook
8696e05e66 Move index and bulk_update actions to good ol' HTTP requests 
We've found that we just can't rely in StimulusReflex (and the underlying WebSockets stack) to guarantee a response to a request.
Because of this, there was intermittent issues when the server was overloaded with large requests, and the response never arrived, leaving an infinite loader, and a poor user wondering if anything was still happening.
 2024-04-10 15:17:56 +01:00
David Cook
dadabcf8ad Prettify 2024-04-10 15:17:56 +01:00
David Cook
d904c2a494 Don't warn when submitting form 2024-04-10 15:17:56 +01:00
Konrad
e88335a923 Merge pull request #12303 from arunguleria/12295-translation-fixes-on-return-authorizaton 
12295-Translation fixes for return authorization status
 2024-04-10 14:10:08 +02:00
David Cook
ade4e855dc Merge pull request #12341 from mkllnk/connected-app-url 
Make URL to connect app translatable
 2024-04-10 10:36:49 +10:00
Maikel Linke
e00156a8d4 Make URL to connect app translatable 
Instance managers can now change the URL in Transifex to use their own
API endpoint.
 2024-04-05 14:57:13 +11:00
cyrillefr
84747ea064 Fix Rails::NegateInclude issues 
- cop class: RuboCop::Cop::Rails::NegateInclude
 -  replaced !array.include?(2) by array.exclude?(2)
 2024-04-04 14:42:42 +02:00
Gaetan Craig-Riou
52bc88bbd8 Merge pull request #11369 from Matt-Yorkley/product-taxon 
[Product Refactor] Primary Taxon
 2024-04-03 10:31:49 +11:00
Ana Nunes da Silva
eedbaaff6e Fix duplicate branch in Spree::Preferences::Preferable private method 
:string, :text and :password cases have the same value
 2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
5fde1cc7cd Fix duplicate branch in Spree::Preference#value method 
:string, :text and :password cases have the same value
 2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
3e796da8ff Fix duplicate branch Spree::Calculator 2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
8bee48df6d Fix duplicate branch in Enterprise#category method 
non_producer_sells_any and non_producer_sells_own have the same category
 2024-04-02 10:20:17 +01:00
Ana Nunes da Silva
eaf32226a4 Fix duplicate branches in Spree::Admin::BaseHelper 
:string case already handled by the else case
 2024-04-02 10:20:17 +01:00
Gaetan Craig-Riou
484c037c38 Fix duplication coming from a rebase error 2024-04-02 10:18:47 +11:00
Gaetan Craig-Riou
100239c4e6 Fix #bulk_product duplicate 
Remove duplicate when a product has mutiple variant in the same category
(taxon)
 2024-04-02 09:59:16 +11:00
Gaetan Craig-Riou
678fa37df9 Fix duplication issue 
When a product had mutiple variant assigned to the same category it
should only return the product one
 2024-04-02 09:57:36 +11:00
Gaetan Craig-Riou
8c05838080 Move the category to the variant row 2024-04-02 09:57:36 +11:00
Matt-Yorkley
a55931c081 Reinstate sorting by arbitrary list of product categories 2024-04-02 09:42:43 +11:00
Matt-Yorkley
2743a8183d Disable sorting by user-defined product category order 2024-04-02 09:33:34 +11:00
Matt-Yorkley
3f2a5786bd Apply taxon from sibling variant if none is provided on variant creation 2024-04-02 09:27:37 +11:00
Matt-Yorkley
02abe5cc06 Remove dead code related to multiple product taxons 2024-04-02 09:27:37 +11:00
Matt-Yorkley
fb09a7f1e6 Fix product filtering 2024-04-02 09:27:37 +11:00
Matt-Yorkley
78495d0ace Drop unnecessary params filtering 2024-04-02 09:27:37 +11:00
Matt-Yorkley
6025491f94 Update product serializer 2024-04-02 09:27:37 +11:00
Matt-Yorkley
c5ec7e361b Update product import 2024-04-02 09:27:36 +11:00
Matt-Yorkley
d4dd3cc708 Update products v3 table 2024-04-02 09:27:36 +11:00
Matt-Yorkley
6b3e33f607 Update Taxon associations and joins 2024-04-02 09:27:36 +11:00
Matt-Yorkley
3b715875ad Update taxon association 2024-04-02 09:27:36 +11:00
Matt-Yorkley
65731f6c52 Update serializers and views for admin products index 2024-04-02 09:27:36 +11:00
Matt-Yorkley
2707c3137a Apply taxon to new variant when creating a new product 2024-04-02 09:27:36 +11:00
Matt-Yorkley
b30944471d Update admin forms 2024-04-02 09:27:36 +11:00
Matt-Yorkley
2ef266390d Move primary taxon to variant 2024-04-02 09:27:36 +11:00
Ahmed Ejaz
7b4b7c5f45 12314 - Fix specs for orders helper 2024-04-01 21:51:46 +05:00
Ahmed Ejaz
05f373f541 12314 - add order parameter in OrdersHelper methods 2024-04-01 06:41:41 +05:00
Ahmed Ejaz
4ba6afa665 12314 - fix Rails/HelperInstanceVariable error 
- InjectionHelper
- OrdersHelper
 2024-04-01 02:19:14 +05:00
Ahmed Ejaz
ac1595e718 12314 - remove shared distributor partial 
- this was only used in the enterprise show view
- the above view was deleted here 4f2389e257
- by removing this, we can remove distributor_link_class method
- it will also fix the rubocop error
 2024-03-31 18:08:22 +05:00
Ahmed Ejaz
3bb44cfe6d 12314 - fix order helper rubocop errors 
- remove the direct access of @order instance variable
- add an attr_reader for order and use it instead
 2024-03-31 17:07:00 +05:00
David Cook
b9b2c876cc Ensure value always shows 
Even thought it's not valid (you can't save items with an empty name), it's disconcerting when the value suddenly disappears from view.
 2024-03-27 20:20:20 +11:00
David Cook
99121943a7 Fix bug 
I missed a bit in a refactor, and it wasn't covered by the spec.
 2024-03-27 20:20:20 +11:00
David Cook
b2881bb169 Add JS specs 
Converted using  https://www.codeconvert.ai/coffeescript-to-javascript-converter
With plenty of manual fixes required too..
 2024-03-27 20:20:20 +11:00