6779 Commits

Author	SHA1	Message	Date
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
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
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
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
Ahmed Ejaz	5a13aa1c8a	Add phone and email fields to customer order summary in ProducerMailer	2025-06-30 09:19:38 +02: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	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
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
Konrad	d7c39fcab7	Merge pull request #13297 from filipefurtad0/fix_#13264_BOM ... Fixes bad display from Producer name on BOM page	2025-05-23 18:56:36 +02:00
Konrad	60914ac8cc	Merge pull request #13326 from mcmpp/instance_configuration_options_inline ... Change the layout for instance configuration options	2025-05-19 15:28:40 +02: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	6432eceee5	Merge pull request #13313 from cyrillefr/FilterSelectionListNotDisplayingFullNames ... Fixes dotted shipping method names bad display in select (filters)	2025-05-16 19:58:13 +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
Mikel Cordovilla	f767437f5a	Display instance config checkboxes inline	2025-05-15 11:46:04 +02:00
Mikel Cordovilla	559a85e4f2	In the instance configuration some of the options displayed as block instead of inline	2025-05-14 15:36:55 +02: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
cyrillefr	e61d951dcf	Requested changes - translation useless ... - also useless in specs	2025-05-12 14:46:27 +02:00
Cillian O'Ruanaidh	119218b2b5	Don't try to render image preview if image is corrupt on S3 and its URL can be generated	2025-05-10 12:35:40 +01:00
cyrillefr	36cada0510	Fixes dotted shipping method names bad display in select	2025-05-09 10:26:49 +02:00
Filipe	674f88162e	Merge pull request #13291 from slothmock/fix-#11967+testing ... Fix #11967 - limit variant unit name input	2025-05-08 22:39:20 +01:00
Gaetan Craig-Riou	b82bd6c0dc	Per rebview, add missing aria-label translation	2025-05-07 15:18:54 +10:00
Ashish Gaur	475cfdc8f0	Show cannot add item to shipped order in the Add products section	2025-05-05 20:03:47 +05:30
Ashish Gaur	42e2d3cdd5	13221 - Don't allow shipped orders to be editable	2025-05-05 20:03:47 +05:30
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	8c1c51cb6d	Put tag filter behind feature flag	2025-05-05 14:54:55 +10:00
Gaetan Craig-Riou	19fdfbaccb	Style the select tag filter	2025-05-05 14:54:55 +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
Filipe	846cb4dd89	Merge pull request #13252 from rioug/13159-add-tag-variant ... [Variant tags] Add variant tag on Bulk Edit Product screen	2025-05-03 17:34:51 +01:00
filipefurtad0	44e02b76f9	Adds the ng-bind html parameter to the producer column	2025-05-03 16:58:00 +01: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
Jordan 'slothmock' Mock	0be87314df	Fix #11967 - limit variant unit name input to 20 characters	2025-05-01 23:45:41 +01:00
Jordan 'slothmock' Mock	35198cebcb	Fix #11967 - limit variant unit name input to 20 characters	2025-05-01 23:33:07 +01:00
Gaetan Craig-Riou	da8675826e	Per review, remove :variant_tag context	2025-04-30 14:56:31 +10:00
Filipe	d20ed5c757	Merge pull request #13275 from slothmock/fix-#13264 ... Fix #13264 - missing 'ng-bind-html'	2025-04-29 18:45:15 +01:00
Filipe	69bb78e39c	Merge pull request #13213 from chahmedejaz/task/13128-add-order-number-to-notify-producer-email ... Add order number to notify producer emails and make customer code available for everyone	2025-04-29 18:22:06 +01:00
Ahmed Ejaz	6f9b5e2c54	fix specs ... - add a new class .line-items in the orders-summary to better differentiate the line-items summary vs customer-details. This css class is not defined, just .customer-order for customer details. It's only used to make a differentiation in the specs - use the updated `parsed_email` memoized helper method for mail body content	2025-04-28 15:11:54 +05:00
Ahmed Ejaz	d9c15cf414	update locale to use lazy loading	2025-04-28 15:11:54 +05:00
Ahmed Ejaz	57c30591bc	13128: add order number in OC report ... - Make Customer Code independant of Customer Names setting	2025-04-28 15:11:52 +05:00
piyush828-design	0bb6860343	Merge branch 'master' into pagy_upgrade	2025-04-28 11:23:44 +05:30
David Cook	e900c95213	Merge pull request #13276 from filipefurtad0/pagy_pagination_spec ... Adds coverage to pagination (pagy bump)	2025-04-28 13:18:58 +10:00
piyush828-design	5e890bb361	Merge branch 'master' into pagy_upgrade	2025-04-24 17:46:39 +05:30
Jordan Mock	3bb14fbfdb	Merge branch 'master' into fix-#13264	2025-04-24 13:13:37 +01:00