5470 Commits

Author	SHA1	Message	Date
Cillian O'Ruanaidh	4e6d64c0a1	Let people choose which payment methods are available to customers on order cycles	2022-10-21 17:21:31 +01:00
jibees	da851079f4	Merge pull request #9776 from abdellani/product-creation-minor-improvements ... Product creation minor improvements	2022-10-20 17:30:47 +02:00
Filipe	d5c3edc8fa	Merge pull request #9749 from drummer83/master ... Fix layout of 'Create a new product' button in dashboard overview	2022-10-17 13:45:37 +01:00
Mohamed ABDELLANI	6a8c7b15dc	fix product category errors message in the form	2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI	955492bfdd	show the error message when the variant unit is not selected	2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI	0000faab91	render the error message when the unit value is not set	2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI	e3f157ebdd	remove empty option from unit size	2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI	f8af84d9d4	remove red start from tax category form	2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI	bddbb36813	remove red star from supplier	2022-10-14 03:26:40 +01:00
Maikel	d33cdd1327	Merge pull request #9706 from jibees/9625-create-a-component-to-display-hide-columns-for-report ... Create a component to display/hide columns for report	2022-10-13 10:05:27 +11:00
Rachel Arnould	617a417dc2	Merge pull request #9506 from binarygit/remove-angular-from-payment-methods ... Remove angular from payment methods	2022-10-11 13:13:26 +02:00
Jean-Baptiste Bellet	0f9ebfe34a	Use the MultipleCheckedSelectComponent	2022-10-11 10:05:06 +02:00
AthiraKadampatta	b2c778794d	9726 Remove safe navigation operator and simplify call to attachment file name	2022-10-10 16:52:02 +02:00
AthiraKadampatta	f40b569a4a	9726 Use active storage filename instead of attachment_file_name of paperclip	2022-10-10 16:52:02 +02:00
Maikel	82e38d7b91	Merge pull request #9526 from jibees/6730-use-a-date-range-picker ... Admin, List of Orders & Orders Bulk Management pages: use a date range picker	2022-10-10 13:59:37 +11:00
Maikel	5894246474	Merge pull request #9682 from binarygit/picked_up_email ... Send picked up emails when orders are picked up	2022-10-10 13:15:24 +11:00
Jean-Baptiste Bellet	e076e23064	Do not use ng-change on endDate but instead watch both start and end date	2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet	6ec3e7ee0c	Only send event change on valid range (ie. both start and end date) ... + do not refresh data on start date change but only on end date change	2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet	eec117e769	Implements daterangepicker for /admin/orders/bulk_management ... + update specs as well	2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet	73f55ae776	Implements daterangepicker for /admin/orders ... + update specs as well	2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet	8942d3d17b	Clear date on custom event flatpickr_clear	2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet	5c83a3277e	Replace datetimepicker by flatpickr stimulus controller	2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet	6b7030a6a8	Don't use directive, but the flatpickr stimulusjs controller	2022-10-08 16:36:26 +02:00
binarygit	01c477f2cb	Remove angular from Payment Methods	2022-10-08 14:20:54 +02:00
binarygit	44db511e66	Send a picked up email (rather than shipped email) when orders are picked up by customers	2022-10-08 12:31:26 +02:00
Jean-Baptiste Bellet	8b89c901ef	Do not display "Admin and Handling" ie. fees total	2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet	72df2867d4	Remove admin_and_handling merging ... + update specs as well	2022-10-08 10:00:57 +02:00
Konrad	52c6f5a222	Fix layout of 'Create a new product' button in dashboard overview	2022-10-07 12:37:45 +02:00
Maikel	a43d31a9d5	Merge pull request #9711 from dacook/translation-cleanup ... Translation cleanup	2022-10-06 09:51:28 +11:00
David Cook	0fc8c719fe	Scope Enterprise side menu translations ... And removed some now-unused global translations, yay! I searched for these in the codebase, eg with regex: /\bt[\( ]["':]shop_preferences/	2022-10-04 19:39:29 +02:00
David Cook	4c3e20d25a	Scope Enterprise form legend translations	2022-10-04 19:39:29 +02:00
David Cook	13d95ecf1d	Scope Enterprise Group side menu translations ... With it's own lazy scope, we no longer need to define labels separately.	2022-10-04 19:39:29 +02:00
David Cook	7803e5d4ff	Scope Enterprise Group form legend translations ... Using lazy-lookup builtin scopes, instead of sharing the global translations, as per our guidelines.	2022-10-04 19:39:29 +02:00
David Cook	2e2ff25ef7	DRY up code ... Slightly. If we upgrade to Ruby 3.1 with hash value omission, this would be neater. If we could set a scope in the controller (https://stackoverflow.com/questions/6137960/rails-i18n-default-scope) it would be even neater.	2022-10-04 19:39:29 +02:00
binarygit	25ae10dbe8	Create bulk orders cancellation feature	2022-10-04 16:57:31 +02:00
Filipe	4b279d28dd	Merge pull request #9262 from cillian/order-cycle-shipping-methods ... Let people customise which shipping methods are available to customers on order cycles	2022-09-30 14:36:37 +01:00
Filipe	f7d21406a1	Merge pull request #9702 from ashwini-seshadri/master ... Fix for new subscription dialog	2022-09-30 13:32:42 +01:00
Cillian O'Ruanaidh	7e40ad39cb	Bring back select all checkboxes on order cycle checkout options form.	2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh	a53a3259a8	Connect DistributorShippingMethods to OrderCycles instead of Spree::ShippingMethods ... Before if a shipping method was shared between multiple distributors it could only be disabled/enabled on that order cycle for all the distributors which have that shipping method e.g. you couldn't select that shipping method for one distributor but disable it for another.	2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh	65ee9e1486	Implement new design with shipping and payment methods on different rows instead of same one, the select all checkboxes still need to be added back later ... This is the new design from https://github.com/openfoodfoundation/openfoodnetwork/pull/9262#issuecomment-1206673689	2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh	a73b608f8a	Remove 'shared' shipping method sections from order cycle checkout options form, any shared shipping methods are to be displayed for each distributor e.g. if they belong to multiple distributors they will be displayed multiple times	2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh	4b0b4ad991	Revert "Use a more simple layout on the order cycle checkout options form" ... This reverts commit 0dddaa6c2b9f1925adca6ff8deac8181691ae119.	2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh	8e47949260	Check 'Select all' checkboxes on page load if all its checkboxes are checked ... This means the code to set the initial value in the view template isn't needed.	2022-09-30 13:13:39 +01:00
Maikel Linke	195f1e1237	Make "Select all" translatable	2022-09-30 13:13:39 +01:00
Maikel Linke	26d5ea6cdc	Remove unused input name	2022-09-30 13:13:39 +01:00
Maikel Linke	c5bb2f52e1	Check "Select all" to start with ... Reflect the state of the shipping method checkboxes.	2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh	87431c188e	Use ShippingMethod :frontend method and drop :backend to avoid ClassLength Rubocop error	2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh	0673f9a5ae	Use a more simple layout on the order cycle checkout options form ... Before there was a row for each distributor and a 'shared' row for shipping methods which were shared among more than one distributor. This layout displays a single list of shipping methods with the distributor or distributors it belongs to beside it as suggested by @lin-d-hop	2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh	8cb2767f9a	The no shipping/payment method warnings on order cycle checkout options looks better left aligned	2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh	1a70cc0c4c	Don't display no shipping/payment method warnings on order cycle checkout options if the distributor has some that are shared with other distributors	2022-09-30 13:13:39 +01:00