4351 Commits

Author	SHA1	Message	Date
Pau Pérez Fabregat	bc8a10c6a0	Merge pull request #5541 from luisramos0/has_variants ... Delete dead code related to products without variants	2020-06-11 15:18:13 +02:00
Pau Pérez Fabregat	01a9b33fc9	Merge pull request #5482 from rmklaus12/5094-new-order-translation ... created partial for order page title to resolve French translation of…	2020-06-11 13:23:28 +02:00
Luis Ramos	ccf6cbb003	Merge pull request #5483 from rmklaus12/5281-missing-translation-ordercreation ... Changed translation syntax to normal t() call and lazy lookup.	2020-06-10 23:00:44 +01:00
Luis Ramos	13a4a3edbe	Merge pull request #5532 from luchiago/fix-admin-config-separator-withou-highlight ... Fix admin config separator without highlight	2020-06-10 23:00:30 +01:00
Luis Ramos	21746e72ce	Merge pull request #5484 from rmklaus12/5336-errormsg-translation ... Added translation keys to error messages partial and en.yml file to a…	2020-06-10 23:00:07 +01:00
Luis Ramos	1e248c1848	Merge pull request #5354 from jeduardo824/enhancement/5277-be-able-to-filter-orders-according-to-shipping-method ... Enhancement/5277 be able to filter orders according to shipping method	2020-06-10 20:50:06 +01:00
Steve Roberts	f8673fb575	Moved tag manager instructions to be directly below the field	2020-06-10 15:06:53 +10:00
Steve Roberts	5fcc0dcd14	Add configuration to enable matomo tag manager ... - Update embed codes and allow both scripts concurrently - Add lines around blocks - Update MTM copy based on PR feedback - checked cookies unchanged	2020-06-09 10:21:11 +10:00
Robin Klaus	d5d6fbc01d	created partial for order page title to resolve French translation of new order	2020-06-05 11:27:51 +10:00
Luis Ramos	3a20de1465	Merge pull request #5398 from cillian/open-street-map ... Add support for using Open Street Map on the Map and Group pages.	2020-06-04 17:01:25 +01:00
Luis Ramos	12000d2d44	Merge pull request #5425 from luisramos0/pay_method_warning ... Add warning to payment method edit page	2020-06-03 21:03:56 +01:00
Robin Klaus	f4a64e89c2	Added translation keys to error messages partial and en.yml file to add translation to error messages	2020-06-02 15:41:01 +10:00
Luis Ramos	072da7316e	Remove views code that tests for the existence of product variants ... A product always has the standard variant, the only case where a product will not have variants is immediatly after creation and before being saved	2020-06-01 14:09:14 +01:00
Matt-Yorkley	8e57f9d929	Adjust shared map partial	2020-05-31 19:21:20 +02:00
Cillian O'Ruanaidh	deafe32354	Add support for using Open Street Map on the Map and Group pages. ... The map is displayed using https://leafletjs.com/ To enable Open Street Map go to the Admin -> Configuration -> Content section and click 'Open Street Map Enabled'. The 'Open Street Map Provider Name' setting can be used to configure different tile providers thanks to the Leaflet-providers extension (https://github.com/leaflet-extras/leaflet-providers) Some tile providers require an API key, this can provided in JSON format e.g. '{ apiKey: 123 }' in the 'Open Street Map Provider Options' setting. Each tile provider has their own usage policy so this should be checked before enabling Open Street Map. The search field for the Open Street Map works differently than searching on Google Maps. It matches producers by their name or address because it was easier to implement instead of matching place names all over the world.	2020-05-31 18:42:55 +02:00
Lucas Hiago	528db54f36	Correct controller name for matching	2020-05-29 22:24:41 -03:00
Lucas Hiago	19ef66f3ad	Change mail method config route	2020-05-29 21:51:57 -03:00
Matt-Yorkley	c73defa8a1	Merge pull request #5494 from Matt-Yorkley/group-maps-fix ... Fix group maps	2020-05-29 12:05:55 +02:00
Luis Ramos	bec798c6c9	Bring some spree translations to ofn in payment methods pages	2020-05-28 19:51:23 +01:00
Luis Ramos	fe6bcb5093	Add de-activation warning to payment methods edit page	2020-05-28 19:50:58 +01:00
Luis Ramos	26f1dfb080	Move payment_method display field translations to OFN and adapt them to changes on same field in shipping method	2020-05-28 19:50:58 +01:00
Luis Ramos	83edfbd1dd	Merge pull request #5266 from luchiago/improve-order-cancellation-email ... Improve order cancellation email	2020-05-28 19:48:26 +01:00
Pau Pérez Fabregat	127e48e579	Merge pull request #5413 from luisramos0/edit_orders_mobile ... Show order edit link on mobile instead of the cancel link	2020-05-27 08:51:41 +02:00
Pau Pérez Fabregat	4d3ae8fa53	Merge pull request #5439 from coopdevs/fix-misplaced-paragraph ... [mobile ux] Fix misplaced paragraph in shop tab	2020-05-27 08:51:13 +02:00
Robin Klaus	50a63139e3	Changed translation syntax to normal t() call and lazy lookup.	2020-05-26 15:14:26 +10:00
Matt-Yorkley	8095371304	Ensure OpenStreetMap credits are aways shown with map and fix credits positioning for /groups page map display	2020-05-25 14:12:12 +02:00
Matt-Yorkley	a3660dfe37	Extract repeated map code to new partial	2020-05-25 14:04:11 +02:00
Matt-Yorkley	e03005ed56	Fix maps and tidy up groups map code	2020-05-25 13:52:56 +02:00
Luis Ramos	cb0aefd29c	Make display on attribute available for managers to change, not just super admins	2020-05-25 11:21:53 +01:00
Pau Pérez Fabregat	da88399ca6	Merge pull request #5411 from Matt-Yorkley/orders-closed-fullwidth ... Fix closed shop message not displaying full-width	2020-05-22 19:32:08 +02:00
Pau Pérez Fabregat	f1dbad1007	Merge pull request #5466 from Matt-Yorkley/shop-search-fix ... Fix search bar in /shops and /groups	2020-05-22 18:40:27 +02:00
Luis Ramos	9a71ffc093	Merge pull request #5438 from Matt-Yorkley/cart-stock-ux ... Cart stock UX	2020-05-22 14:21:16 +01:00
Pau Perez	be9fbae300	Fix misplaced paragraph in shop tab ... By wrapping message within 12-cols container, keeping consistency with the other shop tabs.	2020-05-22 12:37:07 +02:00
Luis Ramos	b7c601abcd	Merge pull request #5424 from luisramos0/ship_method_warning ... Add warning to enterprise Shipping Method list and to Shipping method edit page	2020-05-22 11:24:12 +01:00
Robin Klaus	53c0bcbd0b	Changed translation syntax to normal t() call and lazy lookup.	2020-05-22 13:22:57 +10:00
Luis Ramos	2ae34d8df3	Merge pull request #5355 from jeduardo824/enhancement/make-shop-names-links-on-transactions-page ... change shop name to be link to shop on transactions page	2020-05-21 10:56:19 +01: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
Luis Ramos	cf0ad179a1	Move hubs_sidebar to the last 4 columns at the top of the page	2020-05-21 10:45:58 +01:00
Maikel	da55956a6e	Merge pull request #5392 from luisramos0/ship_method_bo ... Make "backoffice only" ship methods work and remove option "frontoffice only"	2020-05-21 10:16:15 +10:00
Matt-Yorkley	3df2d4721b	Fix search bar in /shops and /groups	2020-05-19 14:00:20 +02:00
Lucas Hiago	ba30f55e70	Add fullwidth for table selector	2020-05-18 22:53:46 -03:00
Eduardo	473b4c63c4	add Shipping Method filter to admin/orders page	2020-05-18 18:46:43 -03:00
Matt-Yorkley	fe27c8466e	Add feature specs for full cart page stock correction process	2020-05-18 14:51:11 +02:00
Matt-Yorkley	63e4430ea4	Update cart page links to be disabled when changes are required and form is unsaved ... See: https://stackoverflow.com/questions/23425254/enable-disable-anchor-tags-using-angularjs	2020-05-18 14:51:08 +02:00
Robin Klaus	438c0ecde9	delete extra lines	2020-05-16 20:12:54 +10:00
Robin Klaus	ba8ecf19ac	Added input code to two additional pages to cover shop tab search boxes	2020-05-16 12:56:06 +10:00
Lucas Hiago	98cbe5762a	Remove unused css property from image in cancel email	2020-05-15 10:59:56 -03:00
Lucas Hiago	0caa91d057	Remove second table of cancel email instructions style	2020-05-15 10:59:56 -03:00
Lucas Hiago	f72da4abe4	Add refund message in order cancel mail	2020-05-15 10:59:56 -03:00
Lucas Hiago	42012d6482	Add new order sumary in order cancel mail	2020-05-15 10:59:55 -03:00