1090 Commits

Author	SHA1	Message	Date
Matt-Yorkley	fa94392fb6	Fix deprecated syntax for live() function	2021-08-12 12:09:55 +01:00
Jean-Baptiste Bellet	434f9600b7	Enterprise fee must be linked with an enterprise ... Add 2 validation / errorproof options: - Add rails validation on `enterprise_id` on enterprise_fee model - Do not add a blank option on the select: ie. user can select a blank enterprise in the form Update tests as well	2021-07-27 15:39:40 +02:00
Andy Brett	a93eef38c0	Merge pull request #7923 from vishaldeepak/tooltip-order-cycle-subscription ... Tooltip added for 'New Schedule' and 'New Order Cycle'	2021-07-19 19:32:09 -07:00
Nihal Mohammed	3793585c38	Revert changes made in #7307	2021-07-16 00:28:40 +05:30
Matt-Yorkley	4187380225	Customise partial used for showing pagination links	2021-07-14 13:17:33 +01:00
vishaldeepak	b70ba7085a	Tooltip added for 'New Schedule' and 'New Order Cycle' in Order Cycles tab of admin	2021-07-14 15:15:12 +05:30
Guido Oliveira	9bc41cf04f	Add translations to shopfront sorting placeholders	2021-07-07 14:39:10 -03:00
Andy Brett	46cd05c54a	Merge pull request #7712 from guidoDutra/1861-enable-shopfront-sorting-by-producer ... Enable sorting by producer in shopfront	2021-07-06 09:27:42 -07:00
Pau Pérez Fabregat	f6e0b9af0e	Merge pull request #7646 from apricot12/advanced_settings_button_OC_edits ... Add advanced settings button to incoming and outgoing pages in OC cyc…	2021-07-01 15:37:16 +02:00
Nihal Mohammed	18282a6f73	Add advanced settings button to incoming and outgoing pages in OC cycle edit	2021-06-30 09:50:38 -07:00
Nihal Mohammed	c335ec3b29	# This is a combination of 5 commits.tree d6d4f31283e42c44c9c4d116567ce7b1a99a13ab ... parent b680697af6 author Nihal Mohammed <mnihal64@outlook.com> 1621004464 +0530 committer Nihal Mohammed <mnihal64@outlook.com> 1621022463 +0530 # This is a combination of 4 commits. # This is the 1st commit message: Add advanced settings button to incoming and outgoing pages in OC cycle edit # This is the commit message #2: Remove extra header text # This is the commit message #3: Moved repeating code blocks to partial # This is the commit message #4: Refactored code # This is the commit message #5: Delete _advanced_settings_hidden.html.haml	2021-06-30 09:50:38 -07:00
Cillian O'Ruanaidh	2bb406fe6a	Don't show the Notifications setting for profile only enterprises in the Users settings section ... If a enterprise has only set up a profile they won't be getting any order notification emails so showing this setting could be confusing. #1797	2021-06-30 09:48:08 -07:00
Guido Oliveira	baca89c575	allow select producers for ordering	2021-06-16 15:02:27 -03:00
Guido Oliveira	c5471fc25c	enable ordering shopfront by producer id	2021-06-16 15:02:27 -03:00
Maikel Linke	e3be519b25	Style TOS page to be usable ... It's not pretty but only used by instance managers, very rarely.	2021-06-09 14:06:54 +10:00
Maikel Linke	51ad8f8065	Remove old UI to edit Terms of service ... It's now completely replaced by file uploads on a separate page.	2021-06-09 14:06:54 +10:00
Maikel Linke	3b3ba70670	Safeguard deletion of ToS with alert	2021-06-09 14:06:54 +10:00
Maikel Linke	690118c2bd	Add delete method to terms of service files	2021-06-09 14:06:54 +10:00
Maikel Linke	abe76ccf0f	Add upload of Terms of Service files ... Admins can upload files and view the most recent (current) one.	2021-06-09 14:06:54 +10:00
Maikel Linke	ed4f61acd7	Add title to TOS config page	2021-06-09 14:06:53 +10:00
Maikel Linke	007b8cd888	Add new admin page for TOS files ... Just the basic Rails setup without any functionality yet.	2021-06-09 14:06:53 +10:00
Andy Brett	7df2915fbd	add DefaultCountry service	2021-05-18 12:44:53 -07:00
Cillian O'Ruanaidh	c41476423b	Merge latest master into julesemmac/6584-map-location-confirm and resolve conflict in api/enterprises_controller.rb	2021-04-22 19:43:49 +01:00
Jean-Baptiste Bellet	ddb63dff8a	Add name of the customers into subscriptions table ... - Thus, we can filter subscriptions by customer email	2021-04-20 16:09:48 +02:00
Maikel Linke	0980b81742	Raise errors in specs with missing translations ... The previous mechanism didn't seem to work and newer Rails versions have an easier config for this now. Also fixing all i18n errors which were now failing specs.	2021-03-30 17:08:17 +11:00
Cillian O'Ruanaidh	4e1eefa877	Extract location map from registration form into its own partial, also add missing new lines	2021-03-19 21:43:29 +00:00
Cillian O'Ruanaidh	f20cea7e4f	Allow people to set enterprise latitude/longitude manually or automatically. ... This for new changes to the enterprise registration/signup flow where a map will be displayed when people are filling in their address. On this map people can check the geocoder has geocoded their address correctly and if not they can manually adjust their latitude/longitude on the map. But currently every time someone changes their address in the Admin > Enterprise > Address section the address would automatically be geocoded so this could overwrite the latitude/longitude that was set during sign up. To prevent the latitude/longitude from being overwritten this add's a checkbox which people need to explicity click if they want their address to be automatically geocoded, otherwise it will just use the manually configured latitude/longitude. Note this new feature which allows people to select their location on a map during registration only works with Google maps so far. So if an instance is using Open Street Map this change also adds support for passing a :use_geocoder parameter to the Api::EnterprisesController during registration so that the address will be geocoded on the backend without the use of a map.	2021-03-19 21:43:29 +00:00
julesemmac	971971803e	Improving user discover on ofn map ... The context for this update is here: https://community.openfoodnetwork.org/t/improving-user-discovery-on-ofn-map/2013 Also with rebasing help from Maikel Linke <mkllnk@web.de>	2021-03-19 21:43:29 +00:00
Jean-Baptiste Bellet	ce0d33caa6	Add needed class to be displayed as datetimepicker input ... - + Remplace `ng-disabled` by `ng-if` as its correctly handled by flatpickr/altInput combo.	2021-02-19 15:37:12 +01:00
Jean-Baptiste Bellet	ef42653fee	Use all available space ... Don't need to put the table into a `.seven.columns.alpha.omega` div: use the maximum available space.	2021-02-04 12:53:12 +01:00
Jean-Baptiste Bellet	502ef8f6f2	Use as many space as available ... Each row is sixteen long, use all space (five + eleven = sixteen)	2021-02-04 12:52:07 +01:00
Jean-Baptiste Bellet	b7e23a7401	user "columns" system to display 3 items on same line	2021-02-01 14:15:50 +01:00
Jean-Baptiste Bellet	9b1c0e6806	avoid inserting div in the columns grid system ... it break the css selectors (as :first-child, ...) fixe: #6747	2021-01-27 15:05:48 +01:00
Jean-Baptiste Bellet	c5edd74d05	remove useless wrapper and align items (both right and left) ... Fixe: #6747	2021-01-27 15:04:45 +01:00
Matt-Yorkley	398b4a09a1	Improve enterprise fees calculator fields	2021-01-27 11:38:01 +00:00
Matt-Yorkley	b5ab6cbf69	Improve button spacing in enterprises submenu	2021-01-27 11:38:01 +00:00
Matt-Yorkley	e762c1d02f	Adjust buttons layout on enterprise shipping and payment methods page	2021-01-27 11:38:01 +00:00
Matt-Yorkley	f72cd6222f	Adjust variant columns in inventory pages	2021-01-27 11:38:01 +00:00
Matt-Yorkley	539ff228e0	Adjust form layout on order cycle edit form (simple view)	2021-01-27 11:38:01 +00:00
Matt-Yorkley	d40ec2d63c	Adjust order cycle edit form layout	2021-01-27 11:38:01 +00:00
Matt-Yorkley	d886b1dcea	Tweak some styles and layout classes	2021-01-27 11:38:01 +00:00
Andy Brett	e31d566f7f	Merge pull request #6283 from luisramos0/sets ... Move sets out of app/models to app/services/sets	2021-01-20 19:22:15 -08:00
Luis Ramos	5d6d7f7ad0	Adapt enterprise fees code and specs to new namespace of Sets::EnterpriseFeeSet	2021-01-14 09:41:07 +00:00
Luis Ramos	96a351ad0e	Adapt usage of Sets to their new location	2021-01-14 09:41:07 +00:00
Jean-Baptiste Bellet	8399b82bfd	rename component to spinner ... A name for a "thing" rather a state	2021-01-11 16:49:56 +01:00
Jean-Baptiste Bellet	e34050f7cb	add wrapper to show/hide loading spinner	2021-01-11 16:23:22 +01:00
Jean-Baptiste Bellet	b02b36b8e8	replace code by reusable component	2021-01-11 11:18:34 +01:00
Matt-Yorkley	0af20e48b0	Add missing translation key for enterprise taxon ordering	2020-10-31 19:17:19 +00:00
Luis Ramos	3b682bc47f	Add warning when uploading a file	2020-10-30 15:09:13 +00:00
Luis Ramos	be35f97622	Add tooltip icon to terms and conditions	2020-10-30 15:09:13 +00:00