9623 Commits

Author	SHA1	Message	Date
Cillian O'Ruanaidh	e6fa296d03	Remove spinjs-rails dependency and use spinning-circles.svg instead. ... For https://github.com/openfoodfoundation/openfoodnetwork/issues/3491 The spinjs-rails gem provides a CSS3 a spinning activity indicator. This commit removes the gem so we don't have to keep the gem up-to-date and uses the spinning-circles.svg which is used already in other places. The spinjs spinner can be seen when viewing or editing taxonomies in /admin/taxonomies. It is loaded from the .ajaxStart call in app/assets/javascripts/admin/spree/progress.coffee To test or restyle this spinner you can change the display property of the #progress element in app/assets/stylesheets/admin/components/progress.scss to 'block'.	2020-05-29 18:04:49 +01: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
Pau Pérez Fabregat	c0ad992352	Merge pull request #5465 from luisramos0/rename_accessible_by ... [Rails 4.1] Rename order_cycle.accessible_by to remove name clash with active record	2020-05-29 12:04:19 +02:00
Luis Ramos	bb8401a0fc	Merge pull request #5444 from luisramos0/dead_js_code ... Remove some dead JS code related to admin sub menus	2020-05-28 19:54:42 +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
Luis Ramos	7313e3c096	Merge pull request #5501 from luisramos0/grumpy_cat_take_2 ... Enterprises Controller: reset_distributor must be called before any call to memoized current_distributor	2020-05-26 23:06:59 +01:00
Luis Ramos	4026e072d5	Break OrderCartReset in two steps so that memoized method current_customer (that uses memoized current_distributor) is called after reset_distributor	2020-05-26 11:13:16 +01: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	a5b4c5316c	Merge pull request #5458 from Matt-Yorkley/oc-form-ui-bug ... Fix display issue on order cycle edit form	2020-05-22 19:31:41 +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
Pau Pérez Fabregat	17e77df14f	Merge pull request #5451 from Matt-Yorkley/oc-selector-fix ... Fix tab-buttons element overlapping order cycle selector	2020-05-22 18:39:10 +02:00
Pau Pérez Fabregat	3f593d6246	Merge pull request #5440 from luisramos0/grumpy_cat ... Fix Grumpy Cat on shop page (cart with items from a closed OC)	2020-05-22 18:38:41 +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
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
Luis Ramos	76b721b663	Merge pull request #5457 from Matt-Yorkley/cart-fix ... Fix cart fields sharing same scope	2020-05-19 19:31:49 +01:00
Matt-Yorkley	3df2d4721b	Fix search bar in /shops and /groups	2020-05-19 14:00:20 +02:00
Luis Ramos	758d7c82f7	Rename order_cycle.accessible_by to remove name clash with active record	2020-05-19 12:21:13 +01:00
Matt-Yorkley	4a837e8c07	Fix display issue on order cycle form ... Some of the form elements on the first OC edit page were covered up by the save bar in some cases. this ensures they are always visible and clickable.	2020-05-19 11:56:41 +02:00
Matt-Yorkley	05e6f5792d	Fix cart fields sharing same scope ... All cart page quantity fields were displaying a single max quantity instead of a different value for each one.	2020-05-19 10:23:12 +02:00
Lucas Hiago	ba30f55e70	Add fullwidth for table selector	2020-05-18 22:53:46 -03:00
Matt-Yorkley	e3c337ef7e	Fix mixed error display issue	2020-05-18 16:41:57 +02:00
Matt-Yorkley	d70174becc	Use fresh scope for each quantity field	2020-05-18 16:28:07 +02:00
Matt-Yorkley	f9f76f9082	Move reused available stock logic to service	2020-05-18 16:19:49 +02:00
Matt-Yorkley	111e700799	Update invalid input feedback	2020-05-18 16:14:14 +02:00
Matt-Yorkley	f7b4717f29	Improve validation code	2020-05-18 14:51:11 +02: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
Matt-Yorkley	5dd801b432	Fix tab-buttons element overlapping order cycle selector	2020-05-18 14:27:05 +02:00
Luis Ramos	ea8157a5c6	Merge pull request #5304 from dacook/5299-orders-filter-several-tags ... 5299 Impossible to filter orders with several tags	2020-05-18 11:25:54 +01:00
Luis Ramos	37350fcbb0	Add table name to condition so it doesnt cause trouble in the future if mixed with other tables in the same query	2020-05-18 10:55:03 +01:00
Luis Ramos	6c81c19f00	Remove dead code	2020-05-16 14:19:25 +01: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
Luis Ramos	1c749a8029	Extract order_cycle_not_listed? method and rename order_cycles to listed_order_cycles	2020-05-15 19:36:59 +01:00
Luis Ramos	a438317d69	Extract order_cart_reset service from enterprises_controller	2020-05-15 19:30:00 +01:00
Luis Ramos	35824c7aa1	Rename restartCheckout to order_checkout_restart to make it follow service naming convention	2020-05-15 19:29:37 +01:00
Luis Ramos	ba585064e1	Rename ResetOrderService to OrderCompletionReset to follow new service naming convention and also to make it more specific to completed orders	2020-05-15 19:29:37 +01:00
Luis Ramos	21d1a7bc04	Remove dead code	2020-05-15 19:29:37 +01:00
Luis Ramos	6827ce5c7f	Refactor order.set_order_cycle, return early and remove indentation	2020-05-15 19:29:37 +01:00