Nihal Mohammed
3793585c38
Revert changes made in #7307
2021-07-16 00:28:40 +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
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
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
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
e762c1d02f
Adjust buttons layout on enterprise shipping and payment methods page
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
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
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
Luis Ramos
ca79270ba3
Show T&Cs warning when uploading a new file
2020-10-30 15:09:13 +00:00
Luis Ramos
2cf7b1b36c
Make label translatable
2020-10-30 15:09:13 +00:00
Luis Ramos
f7c07f492c
Make TCs file input onoy accept pdf files
2020-10-30 15:09:13 +00:00
Luis Ramos
9f17e4fd8f
Add upload timestamp to TCs upload form in enterprise business details
2020-10-30 15:09:13 +00:00
Luis Ramos
c980d22826
Make TCs link open in a new tab in the backoffice
2020-10-30 15:09:13 +00:00
Luis Ramos
a3e9226878
Add option to remove existing terms and conditions file
2020-08-31 17:40:34 +01:00
Luis Ramos
0974c4b2ac
Move enterprise images translations to the correct place using lazylookup on the server and to main js: namespace for js translations
2020-08-31 17:40:34 +01:00
Luis Ramos
aedc12e0e3
Add top padding to terms file upload input in enterprises form
2020-08-31 17:40:34 +01:00
Luis Ramos
1a734aacf8
Allow user to upload terms and conditions PDF file to an enterprise
2020-08-31 17:40:34 +01:00
Matt-Yorkley
23bb72faa6
Add Enterprise shop preference to allow customer names in reports
2020-08-14 20:48:32 +01:00
Matt-Yorkley
add38bf550
Use #image_path helper correctly
...
Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image_path("home/banner.jpg")`
2020-06-16 18:25:13 +02:00
Luis Ramos
a6ea79d3a5
Add warning message to enterprise ship methods list and ship method edit page
2020-05-21 10:47:22 +01:00
Maikel Linke
325c427219
Remove style from pasted HTML in editor
2020-02-24 11:22:47 +11:00
luisramos0
55bb328d48
Prefix all calls to root_url with main_app
2019-12-28 18:46:50 +00:00
François Turbelin
912483660f
Put the uid under the permalink
2019-07-04 09:51:32 +02:00
François Turbelin
d12a7c2c76
Apply last suggestions
2019-07-04 09:43:35 +02:00
François Turbelin
5ce2af454e
Clean id field
2019-07-03 23:00:36 +02:00
François Turbelin
97a401a307
Display enterprise ID in profile
2019-07-03 18:10:59 +02:00
luisramos0
d8a7f60f40
Make subs radio button visible to all managers
2019-06-11 17:21:13 +01:00
Rob Harrington
cc55f59b00
Update tag_rules_spec to work with Selenium
2019-01-16 16:21:30 +00:00
albarnaz
5d515712ed
Fix for instagram links ( #2849 )
...
* Add new attribute instagram_placeholder to local yml
* Add placeholder to instagram link input
* Add migration to fix wrong instagram links
* Add new attribute facebook_placeholder to local yml
* Add placeholder to facebook link input
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
* Change each for find_each in migration
* Add new attribute instagram_placeholder to local yml
* Add migration to fix wrong instagram links
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
2018-12-21 14:42:28 +11:00
Maikel
beedd933e9
Merge pull request #2512 from kristinalim/feature-remove_enterprise_images
...
Support removal of enterprise logo and promo image
2018-09-14 15:07:24 +10:00
Kristina Lim
02a909c1b1
Do not use image_tag for enterprise image previews
...
If Rails config.assets.compile is false and config.assets.digest is
true, which is the case for staging and production, image_tag fails when
the image file is not found.
We do not need sprockets to ensure presence of the image file for these
tags, because the correct SRC values are assigned through the JS.
Inserting HTML should be sufficient.
2018-09-08 23:23:49 +08:00
Kristina Lim
368612cad6
Allow removal of enterprise logo and promo image
2018-09-04 02:08:25 +08:00
Maikel Linke
d1f7828432
Fix pending spec
...
The link from the enterprise page was missing the enterprise id. So the
bulk edit page for fees was showing fees for all enterprises.
2018-08-30 14:50:41 +10:00
Maikel Linke
0174b84254
Remove old deactivated code
2018-08-30 14:50:41 +10:00
Kristina Lim
28792fc895
Add tests for adding/updating enterprise images
2018-08-26 03:58:19 +08:00
luisramos0
b8f1571282
added directive to make links open in new tab by default in textangular text areas in enterprise description, enterprise group description and in shopfront open and closed messages
2018-06-19 16:53:21 +01:00
Rob Harrington
dabef16606
Use ofn-select2 directive for country and state selectors on enterprise forms
2018-06-19 10:34:02 +10:00
luisramos0
d1019fcc5e
changed the country and state selectors to angular on enterprises admin (new and edit screens) so that states are dynamically updated when country is changed
2018-06-19 10:34:02 +10:00
Rob Harrington
184bf9ce36
Allow super admin users to enable subscriptions for enterprises
2018-05-30 09:42:03 +10:00
Matt-Yorkley
cd4268d219
Add manager dropdown UX
2018-04-23 12:55:49 +10:00
Pau Pérez Fabregat
13115d4a2d
Merge branch 'master' into email/manager_invite
2018-03-23 12:56:10 +01:00
