Ahmed Ejaz
3f39d94bd3
Remove conditional rendering for previous page icon in pagination
2025-07-27 07:21:10 +05:00
Ahmed Ejaz
1426b6eeb7
Remove legacy admin styles in favor of v3 styling
...
Completes migration to the new admin v3 styling system by:
- Removing conditional stylesheet inclusion in admin head
- Deleting all legacy admin style files and components
- Making admin-style-v3 the default and only stylesheet
This change reduces maintenance overhead and simplifies the admin styling codebase by removing the old styling system that was being conditionally loaded based on feature flags.
2025-07-27 07:02:53 +05:00
Ahmed Ejaz
188b2eb754
Simplify pagination next button by removing conditional icon rendering
2025-07-27 06:44:02 +05:00
Ahmed Ejaz
6e055ddbdf
Remove icon parameters from admin navigation tabs for simplification
2025-07-27 06:32:44 +05:00
Ahmed Ejaz
025fc784a8
Refactor products_return_to_url method to remove url_filters parameter and simplify usage in views
2025-07-27 06:26:12 +05:00
Ahmed Ejaz
fefd0239e6
Remove unused product image controller and directive; delete product image update route
2025-07-27 06:15:14 +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
Ahmed Ejaz
44cbe55c96
Update product routes and views for consistency and clarity
2025-07-27 05:25:50 +05:00
Filipe
56d3ac247d
Merge pull request #13426 from cyrillefr/AlignPriceColumnTextToTheLeft
...
Align Cart Price column texts to the left
2025-07-24 22:51:36 +01:00
Maikel Linke
667b49b7f1
Show hub address for pickup only when feature enabled
2025-07-24 15:24:32 +10:00
Maikel Linke
fcd6897240
Prepare delivery details partial for conditional display
2025-07-24 13:30:40 +10:00
Maikel Linke
c23c773942
Simplify view code
2025-07-24 13:30:39 +10: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
Gaetan Craig-Riou
6ba80f57b3
Disable Choose products from when inventory disabled
2025-07-21 13:47:28 +10:00
Gaetan Craig-Riou
d90200fb3f
Disable Coordinator inventory when inventory is off
2025-07-21 11:41:30 +10:00
cyrillefr
08114b495a
Align Cart Price column texts to the left
2025-07-17 14:17:57 +02:00
cyrillefr
8011449ce7
Adding a spec with one single tag
...
- need to add ids to ru the spec
2025-07-14 18:15:01 +02: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
Ahmed Ejaz
ec44947b37
Add special handling for admin users in order permissions
...
Modifies order and line item permission logic to give admin users full access to all orders and line items, bypassing the regular complex joins queries to get orders editable by producers. These complex joins are needed for regular users but for user admins we need to return all orders.
2025-07-13 05:34:55 +05:00
Gaetan Craig-Riou
aeefe841bf
Merge pull request #13403 from chitty/cch/image_variant_url_for
...
Do not try to generate a URL for unpersisted blobs in development/test environment
2025-07-09 14:15:07 +10: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
8829f6ad03
Only scope variant when inventory is enabled
2025-07-09 11:35:26 +10:00
Gaetan Craig-Riou
6212cd4d07
Only add variant override permission if inventory enabled
...
The permission shoul not be needed if inventory is disabled, but it will
prevent importing into the inventory if somehow we try to import into
inventory with inventory disabled.
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
dc84d32028
Disable link to inventory related settings for enterprise
...
Metrics/CyclomaticComplexity is disabled on `enterprise_side_menu_items`
because even though there is a lot of branching it's still readable
2025-07-09 11:35:26 +10:00
Gaetan Craig-Riou
82c99891eb
Only scope with variant override when inventory enabled
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
Filipe
affb5d7281
Merge pull request #13338 from chahmedejaz/task/13287-add-producer-seller-ability-to-edit-orders
...
Allow producer who are also seller to edit their products on hubs' orders
2025-07-04 14:26:39 +01:00
cyrillefr
be0894653a
Fixes Save button does not enable when removing only tag in OC
2025-06-30 12:41:41 +02:00
Ahmed Ejaz
5a13aa1c8a
Add phone and email fields to customer order summary in ProducerMailer
2025-06-30 09:19:38 +02:00
Ahmed Ejaz
838e88a502
Refactor display_value_for_producer method to use Spree::Ability for supplier edit permissions
2025-06-29 19:41:41 +05:00
Ahmed Ejaz
7725fae992
Refactor order cycle and order management abilities to improve producer edit permissions
2025-06-29 19:13:31 +05:00
Carlos Chitty
b43fa55a7b
Do not try to generate a URL for unpersisted blobs in development/test environment
...
Explicitly raise an error in `image_variant_url_for` if an Active Storage variant's blob is not persisted.
This addresses `ArgumentError`/`URI::InvalidURIError` in Rails 7.1, which occurs when attempting to generate a URL for an unsaved Active Storage blob. By raising, we ensure existing error handling in calling methods (e.g., `Spree::Image#url`) can provide graceful fallbacks (default image URLs).
This should only affect test and development environments where blobs may not be immediately persisted. Tests in `SuppliedProductImporter` have been updated to reflect this behavior.
References:
- Suggestion: https://github.com/openfoodfoundation/openfoodnetwork/pull/13232#discussion_r2071116581
- Example of failing test due to this: https://github.com/openfoodfoundation/openfoodnetwork/actions/runs/14739687958/job/41374346184?pr=13232
- Related: https://github.com/rails/rails/issues/50234
2025-06-27 15:05:52 -04: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
020d90b957
Enhance line item management abilities by consolidating permissions for Spree::Order
2025-06-21 16:19:31 +05:00
Ahmed Ejaz
ade35f2fa2
Fixes specs and update code respectively
2025-06-21 16:19:31 +05:00
Ahmed Ejaz
cd01a27bdd
Add distributor_name_alias to searchable attributes and implement ransacker for filtering line items
2025-06-21 16:19:31 +05:00
Ahmed Ejaz
2f9c856645
Refactors order and line item permissions logic
...
Simplifies permission checking by:
- Extracting common managed/coordinated orders logic into separate method
- Combining producer-editable and managed/coordinated order clauses
- Merging producer and admin line item permission checks into single query
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
Ahmed Ejaz
a37e08c2fd
Refactor order management permissions for producers
...
Introduces granular permissions control for producers editing orders:
- Adds new :edit_as_producer_only permission for suppliers
- Refactors ability checks to clearly separate producer vs admin/distributor access
- Updates order views to properly restrict actions based on user role
- Prevents admins from being restricted by producer-only edit mode
2025-06-21 16:16:58 +05:00
Filipe
6ccc588113
Merge pull request #13342 from chitty/cch/refactor-unit-price
...
refactor: move unit price formatting logic out of model into helper
2025-06-19 16:19:03 +01:00
Carlos Chitty
37bf3f495f
Refactor preference access to use define_method instead of method_missing
...
Replaces dynamic method handling with explicit getters and setters to
avoid recursion issues and improve clarity.
2025-06-18 13:59:46 -04:00
Carlos Chitty
f909bb2c30
Add respond_to_missing? to classes defining method_missing to improve respond_to? behavior
2025-06-18 13:59:42 -04:00
Carlos Chitty
3dcc4428fa
Fix escaped HTML in unit price by marking output as html_safe
2025-06-16 12:53:41 +01:00
Carlos Chitty
2fe49b2070
Instantiate UnitPrice only once in app/models/spree/line_item.rb
...
Co-authored-by: Maikel <maikel@email.org.au >
2025-06-16 12:53:41 +01:00
Carlos Chitty
85e4f749f9
refactor: move unit price formatting logic out of model into helper
...
Solves Psych::DisallowedClass errors
Example: https://github.com/openfoodfoundation/openfoodnetwork/actions/runs/14739687958/job/41374343627?pr=13232
unit_price returns object with amount and unit, as mentioned in https://github.com/openfoodfoundation/openfoodnetwork/pull/6905\#discussion_r578401368
2025-06-16 12:53:41 +01:00
Jari Huttunen
287cd74b33
Merge branch 'openfoodfoundation:master' into Add-Finnish-to-Flatpickr
2025-06-07 23:44:11 +03:00
