1370 Commits

Author	SHA1	Message	Date
luisramos0	e573a3fc2b	The main menu is now translatable and configurable using Content configuration and translations. Added 7 menu entries to the translations file (each with text and url) and 7 content configuration points to enable/disable these. The mobile menu icons can also be configured.	2018-08-31 11:23:11 +10:00
luisramos0	910297572e	Removed unnecessary currency from CartService constructor, using order.currency instead	2018-08-23 12:40:18 +01:00
luisramos0	c7b202f932	Fixed CodeClimate warnings on services/cart_services.rb	2018-08-23 12:39:58 +01:00
luisramos0	05bfc098ff	/controllers/spree/order_populator_decorator (with a class_eval) is now /services/CartService with no dependency to Spree::OrderPopulator.	2018-08-23 12:39:55 +01:00
luisramos0	6caa361354	Moved Spree::OrderController.populate to new CartController. ... This was done to make order populate independent of Spree::OrdersController	2018-08-23 12:37:52 +01:00
Maikel	4417a8f156	Merge pull request #2539 from luisramos0/delete_dead_cart ... removed Cart route, controller, model and specs: dead code	2018-08-22 17:35:58 +10:00
luisramos0	91e57cb893	Removed Cart table, its dependency on spree orders table and removed some more dead code related to this	2018-08-15 23:29:28 +01:00
luisramos0	ccd5147b11	Added angular templates route and controller to serve angular templates from the server, instead of precompiled assets. This was used to fix a problem with the cookies policy page template that was using a Spree configuration	2018-08-14 10:01:48 +10:00
luisramos0	ca35c59e52	Moved the footer TOS URL from the content settings to the new section legal settings in the global settings	2018-08-14 10:01:48 +10:00
luisramos0	92f9cbd00a	Added new cookies banner (with link to cookie policy page and the accept cookies button)	2018-08-14 10:01:48 +10:00
luisramos0	0b9061df28	removed Cart route, controller, model and specs: dead code	2018-08-11 22:17:12 +01:00
luisramos0	3b1bd53d3a	Added basic integration with Matomo ... Added matomo script and added a new matomo settings menu entry under configuration. Improved organization of en.yml by grouping configuration screens.	2018-08-10 16:12:58 +10:00
Matt-Yorkley	c8397024e4	Streamline Product Import UX flow	2018-08-03 14:33:35 +10:00
Maikel Linke	2ceb969925	Style recently merged code ... We enabled more Rubocop checks and code that was merged around the same time, didn't comply with the new checks.	2018-07-26 10:52:56 +10:00
Matt-Yorkley	c4af50e95c	Add sidebar to Import index page	2018-07-15 23:12:26 +01:00
Matt-Yorkley	f344b7893d	Remove Product Import guide page	2018-07-15 20:49:55 +01:00
Rob Harrington	21c3f7d21c	Remove unrequired #cards and #addresses actions from Admin::CustomerController	2018-07-05 19:26:12 +10:00
Rob Harrington	e0d46aa105	Add new serializer to allow search for customer addresses	2018-07-05 19:26:12 +10:00
Rob Harrington	cf8ca1f8c1	Add show action to Admin::CustomersController	2018-07-05 19:26:11 +10:00
Maikel	eb9064f5be	Merge pull request #2383 from frank-west-iii/issue-2271-prepend-load ... Fix NoMethodError in order cycles index	2018-06-27 09:12:18 +10:00
Maikel	3f334855d1	Merge pull request #2360 from oeoeaio/faster-stats ... Rewrite user stat query for improved performance of homepage	2018-06-26 17:58:23 +10:00
Maikel	e9fad741e6	Merge pull request #2387 from Matt-Yorkley/embedded_referrers ... Embedded response headers	2018-06-26 17:57:48 +10:00
Rob Harrington	ddb9ae1140	Load all shops that a user is associated with as a customer ... Regardless of the presence of an order	2018-06-24 16:28:47 +10:00
Rob Harrington	ffa8a8c7d6	Create Api::BaseController to allow use of ActiveModelSerializers ... Also add index action to Api::CustomersController	2018-06-22 15:39:47 +10:00
Rob Harrington	6e76fd8164	Add Api::CustomersController with update action	2018-06-22 15:39:46 +10:00
Rob Harrington	cf9f8edcce	Allow html requests for OrderCycleController#update ... This is still used from the Advanced Settings page, to update the order_cycle	2018-06-22 09:46:08 +10:00
Rob Harrington	25525ae30b	Move applicator calls to OrderCycleForm	2018-06-22 09:46:08 +10:00
Rob Harrington	d9830749f1	Extract schedule syncing logic into OrderCycleForm	2018-06-22 09:46:08 +10:00
Rob Harrington	ab9c06837b	Add basic OrderCycleForm to handle create/update logic	2018-06-22 09:46:08 +10:00
Rob Harrington	3f5b6be5b6	Remove unnecessary respond_to blocks from OrderCyclesController	2018-06-22 09:46:08 +10:00
Matt-Yorkley	172fa168ea	Change layout attribute to method with question mark	2018-06-21 15:19:40 +01:00
Maikel	3399eba428	Merge pull request #2367 from frank-west-iii/issue-2297-edit-product-cancel ... Move product bulk edit to product index route	2018-06-20 17:53:57 +10:00
Rob Harrington	7af11da901	Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer	2018-06-20 13:06:06 +10:00
Rob Harrington	d5b1041481	Preload subscription counts for serialization in order cycle collection actions	2018-06-20 13:06:06 +10:00
Maikel Linke	bbe21b7804	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into issue-2297-edit-product-cancel	2018-06-20 10:31:17 +10:00
Matt-Yorkley	ff0e0d9f3d	Move logic from ApplicationController to service and improve clarity	2018-06-20 01:28:35 +01:00
Matt-Yorkley	e73b378201	Adjust embedded response headers	2018-06-20 01:28:35 +01:00
Pau Pérez Fabregat	20c25cd030	Merge pull request #2368 from Matt-Yorkley/uk/admin_orders ... Uk/admin orders	2018-06-19 11:00:35 +02:00
Frank West	8324b00999	Renames product bulk edit action to index ... When a user hit cancel while editing a product it took them to the spree products index page instead of the bulk edit page. The button was part of a shared view for all resources so changing it's actions were not readily available. It was suggested that instead of carrying our own separate controller action we could just override the index action of the products controller with the bulk edit functionality instead. This has the advantage of removing some overrides and allows us to not add additional overrides in the future.	2018-06-19 17:51:23 +10:00
Pau Pérez Fabregat	b1bccb07f2	Merge pull request #2369 from coopdevs/product-import-for-superadmins-only ... Show product import's UI only to superadmins	2018-06-19 09:23:58 +02:00
Frank West	f2e1caabff	Fix NoMethodError in order cycles index ... When a user's session has timed out and they try to load new data on the order cycles page by changing filters, the application throws a `NoMethodError` because we are prepending the load data method before checking the user's session. We can fix this by removing the prepend on this action.	2018-06-18 06:36:55 -07:00
Maikel Linke	67c2574b0b	Show report search instructions ... Solves: https://github.com/openfoodfoundation/openfoodnetwork/issues/2356	2018-06-18 11:08:58 +10:00
Maikel Linke	7a2218fe26	Style the reports controller	2018-06-18 11:08:58 +10:00
Maikel Linke	66567fd9e6	Unify report table rendering ... There is a lot of code duplication in the report views and we would like to change that code. So we move it into one file first.	2018-06-18 11:08:58 +10:00
Maikel Linke	561a73e911	Pass on redirect path instead of URL ... Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/2376 The checkout doesn't deal with absolute URLs since fc2cc09ea5.	2018-06-14 16:49:52 +10:00
Pau Perez	78e59d059a	Show product import's UI only to superadmins ... We still need to iterate on its implementation and it's too early to make it publicly available.	2018-06-11 19:50:53 +02:00
Matt-Yorkley	7bef474efd	Admin Order guest checkout status	2018-06-09 02:43:42 +01:00
Rob Harrington	1327b9dc2c	Add update method to CreditCardsController	2018-06-08 15:30:07 +10:00
Rob Harrington	4fa09639cb	Rewrite user stat query for improved performance of homepage	2018-06-06 16:27:23 +10:00
Maikel	9d2c1976e0	Merge pull request #2343 from mkllnk/2212-remove-report-default-filters ... 2212 remove report default filters	2018-06-06 12:19:47 +10:00