David Rodríguez
4c6d894bc0
Bump RuboCop to 1.86.6
...
There were a few changes needed:
* Plugins are now specified through `plugin:` config keyword.
* All plugin gems need to be specified explicitly in Gemfile since they
are no longer dependencies of plugins already specified explicitly.
* All plugin gems need to be updated in other to use the new APIs.
* One cop was renamed.
* New offenses safe to correct were corrected directly with `bundle exec
rubocop -a`.
* New offenses unsafe to correct were added to the TODO configuration
with `bundle exec rubocop --auto-gen-config --auto-gen-only-exclude
--exclude-limit 1400 --no-auto-gen-timestamp`.
2025-10-27 11:30:33 +01:00
Rachel Arnould
c4c266246c
Merge pull request #13507 from rioug/tag-rules-remove-angular
...
[Variant Tags] Remove angular from tag rule admin page
2025-10-15 23:16:05 +02:00
Maikel Linke
7a12e7426f
Pass actors instead of AR associations to Flipper
...
Apparently they removed support for checking collections of actors.
2025-10-14 13:32:51 +11:00
Maikel Linke
9460d17417
Publish DFC endpoints as JSON
2025-10-10 16:18:22 +11:00
Gareth Rogers
f414e04dea
Merge branch 'master' into add-report-name-and-details
2025-10-01 09:54:51 -04:00
Filipe
ef4d3ec138
Merge pull request #13506 from chahmedejaz/task/13505-remove-stripe-redirect-monkey-patch
...
Remove Stripe redirect monkeypatch and ensure reliable checkout flow
2025-10-01 13:03:58 +01:00
Gareth Rogers
0a9eb173ea
Add report name and details to CSV files
2025-10-01 13:59:43 +10:00
Filipe
ff2e0f4d45
Merge pull request #13533 from chahmedejaz/task/13435-sort-products-by-on-hand-amount
...
Sort product list by 'on hand' amount
2025-09-29 15:07:00 +01:00
Gaetan Craig-Riou
ab65b2d745
Per review, fix various syntax/misspell
2025-09-24 10:46:37 +10:00
Gaetan Craig-Riou
646ba18b8a
Fix bug, load tag rule types when update errors
2025-09-24 10:40:43 +10:00
Gaetan Craig-Riou
8bd631fbb7
Clean up tag rule form component template
...
Consolidate everything in one template and move visibility options to
the component.
2025-09-24 10:40:43 +10:00
Gaetan Craig-Riou
75325e2935
Consolidate modal to add rule into a component
2025-09-24 10:40:43 +10:00
Gaetan Craig-Riou
7e48007d09
Add new tag group and add rule to tag group
2025-09-24 10:40:43 +10:00
Gaetan Craig-Riou
6790cad089
Add deleting tag rule
...
TagRuleController is now a subclass of Spree::Admin::BaseController
because Admin::ResourceController did not play well with turbo_stream.
And to be honest we did not need all the functionality provided by the
ResourceController
2025-09-24 10:38:53 +10:00
Gaetan Craig-Riou
7087d1b290
Add default tag rule
...
I tried to leverage turbo as much as possible
2025-09-24 10:38:53 +10:00
Ahmed Ejaz
a18fd54916
Simplify redirect logic in PaymentsController
2025-09-22 11:54:20 +05:00
Ahmed Ejaz
626b802ea7
add redirect_auth_url column and replace cvv_response_message for redirection
...
- Added redirect_auth_url column to spree_payments table
- Updated payment redirection logic to use redirect_auth_url instead of cvv_response_message
- Cleans up old monkeypatch usage and improves Stripe checkout reliability
2025-09-22 11:54:20 +05:00
Ahmed Ejaz
49dbe1d039
Refactor comments for clarity in product sorting concerns
2025-09-15 02:15:03 +05:00
Ahmed Ejaz
c326aa6b23
Add comprehensive specs for sorting functionality
2025-09-15 01:59:40 +05:00
Ahmed Ejaz
da843d1ba1
Add sorting by stock levels using ransacker and update locale for 'on_hand' header
2025-09-13 01:11:21 +05:00
Gaetan Craig-Riou
66041061fb
Redeem VINE voucher before redirecting to payment url
...
When using paypal, we need to redeem the voucher before redirecting to
the payment gateway url, otherwise the voucher will never get redeemed.
2025-08-11 16:28:04 +10:00
Carlos Chitty
a2f263e081
User Rails.env.local?
...
https://github.com/rails/rails/pull/46786
Solves rubocop failure in rails 7.1 bump branch https://github.com/openfoodfoundation/openfoodnetwork/actions/runs/14739687970/job/41374340281?pr=13232
2025-08-07 17:44:52 +02:00
Ahmed Ejaz
75b2fe1dd4
revert API removals
2025-08-01 01:48:21 +05:00
Ahmed Ejaz
df4cf4b768
Fix specs
2025-07-27 07:58:04 +05:00
Ahmed Ejaz
0fa67c69fd
Remove bulk product update functionality
...
Removes the bulk product update feature and its associated components:
- Removes Angular-based bulk product editing controller and views
- Deletes bulk product API endpoints and related controller actions
- Removes product cloning and variant deletion functionality
- Removes associated JavaScript tests and specs
This appears to be part of a larger effort to modernize/simplify the product management interface, removing legacy Angular-based bulk editing in favor of a different approach.
2025-07-27 06:03:14 +05:00
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
Gaetan Craig-Riou
cd8b7cd239
First step disable inventory
2025-07-09 11:35:26 +10:00
Ahmed Ejaz
765ce68c11
Add order_id to order controller, variant autocomplete, and search parameters for improved order management
2025-06-21 16:19:31 +05:00
Ahmed Ejaz
8e8878e43a
Add search_variants_as parameter to variant search functionality
2025-06-21 16:19:31 +05:00
Maikel Linke
ef22269324
Clarify voucher code not found can mean fully redeemed
2025-05-29 14:18:32 +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
Filipe
3efa2832de
Merge pull request #13257 from ashishp91/13221-make-shipped-orders-uneditable
...
13221 - Don't allow shipped orders to be editable
2025-05-15 19:23:33 +01:00
Filipe
371d0fbf79
Merge pull request #13281 from rioug/13172-search-by-tags
...
[Variant tags] Search products by tags
2025-05-14 07:38:59 +01:00
David Cook
82f94e3969
Ensure user is loaded before loading data
2025-05-13 15:12:16 +10:00
Ashish Gaur
71949701ac
Merge branch 'master' into 13221-make-shipped-orders-uneditable
2025-05-08 21:56:46 +05:30
cyrillefr
55ad9429db
Fixes variable number naming offenses in spree module
2025-05-08 09:24:28 +02:00
Maikel
bc3f847a9d
Merge pull request #13299 from cyrillefr/FixRubocopNamingMethodParameterName
...
Fixes NamingMethodParameterName rubocop offense
2025-05-08 10:34:50 +10:00
Ashish Gaur
5fc3fe03ee
13221 Add spec for checking flash error is shown when editing a shipped order
2025-05-05 20:37:59 +05:30
Ashish Gaur
8d96411741
13221 Fix rubocop issues
2025-05-05 20:03:47 +05:30
Ashish Gaur
c533111509
13221 Don't allow shipped orders to process update request
2025-05-05 20:03:47 +05:30
cyrillefr
f6df412355
Fixes NamingMethodParameterName rubocop offense
2025-05-05 10:39:15 +02: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
