6764 Commits

Author	SHA1	Message	Date
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
Jordan 'sloth' Mock	b56411145c	Incorrect place for origianl fix. Thanks to Blane W for pointint out the correct line.	2025-04-24 13:05:40 +01:00
piyush828-design	6f2f8e9542	fixed users page breaking	2025-04-24 12:49:47 +05:30
filipefurtad0	c8a91a9d44	Fixes deprecation on trailing hashes for sort_link ... Running the spec was pointing to the following deprecation - Passing two trailing hashes to is deprecated, merge the trailing hashes into a single one. (called at /home/ffurtado/openfoodnetwork/app/views/spree/admin/users/index.html.haml:16)	2025-04-23 19:45:06 +01:00
Gaetan Craig-Riou	3585499fba	Move tag list input to a component	2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou	352203747a	Add tag styling	2025-04-22 13:41:01 +10:00
Gaetan Craig-Riou	87a80d3efe	Add Tags collumn ... Currently display the list of tags, no fancy UI. Updating works	2025-04-22 13:41:01 +10:00
Konrad	f63552ca38	Deletes remaining text versions of emails ... This is in preparation for advancing the white labelling feature of emails and adding more specs in that regard Related discussion on Slack: https://openfoodnetwork.slack.com/archives/C2GQ45KNU/p1722902361401869?thread_ts=1721485724.245519&cid=C2GQ45KNU	2025-04-21 20:11:50 +02:00
Filipe	d2fa2e612c	Merge pull request #13113 from chahmedejaz/task/13031-allow-producers-to-edit-orders ... Allow producer to edit their products on hubs' orders	2025-04-21 11:28:36 +01:00
Ahmed Ejaz	7642c54667	remove the disabled button	2025-04-21 03:38:06 +05: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
piyush828-design	e76b001348	Upgrade pagy version to latest	2025-04-16 17:46:31 +05:30
Ahmed Ejaz	4e2198cd4f	hide shipping icons from suppliers	2025-04-13 21:35:55 +05:00
Ahmed Ejaz	bf6934db94	add specs	2025-04-13 21:35:55 +05:00
Ahmed Ejaz	bc3917ebc1	incorporate show_customer_names_to_suppliers setting	2025-04-13 21:35:55 +05:00