8510 Commits

Author	SHA1	Message	Date
luisramos0	cc342387cc	Make all calls to content_for use dash not equals when setting content_for	2019-10-23 12:42:29 +01:00
luisramos0	6715f872e3	Merge duplicated product_sub_menu partials and make all references point to the one located in the spree folder (we keep this one because we still have some views in spree backend referencing this partial	2019-10-23 12:26:18 +01:00
Luis Ramos	02c0b89fa0	Merge pull request #4345 from Matt-Yorkley/shopfront_pagination ... Shopfront pagination	2019-10-21 16:02:12 +01:00
Luis Ramos	c9e23154d8	Merge pull request #4352 from tkusuki/fix-translation-in-enterprise-welcome-email ... Add missing translation in non English enterprise welcome email	2019-10-21 11:41:53 +01:00
Matt-Yorkley	7b0c55e15a	Ensure producer properties are included in properties results	2019-10-18 21:15:13 +01:00
Matt-Yorkley	cbe2477d04	Fix property filters and improve test coverage	2019-10-18 21:15:13 +01:00
Matt-Yorkley	c730958fe4	Restrict search params passed to ProductsRenderer	2019-10-18 21:15:13 +01:00
Matt-Yorkley	37e5e1923c	Improve filter buttons UX	2019-10-18 21:15:13 +01:00
Matt-Yorkley	542c1bf684	#slice :params in controller and rename to :args in service context	2019-10-18 21:15:13 +01:00
Matt-Yorkley	6433d69d02	Add comments on scoping ProductsRenderer results	2019-10-18 21:15:13 +01:00
Matt-Yorkley	bf8c632fce	Refactor ProductsCtrl request params	2019-10-18 21:15:13 +01:00
Matt-Yorkley	b3c89a9d6c	Move OpenFoodNetwork::ProductsRenderer (lib) to ProductsRenderer (service) and refactor	2019-10-18 21:15:13 +01:00
Matt-Yorkley	573a69477f	Fix filters not updating on OC change	2019-10-18 21:15:13 +01:00
Matt-Yorkley	c6ce516129	Fix prices not updating with new exchange fees when changing OC	2019-10-18 21:15:13 +01:00
Matt-Yorkley	2539b84b33	Fix product.meta_keywords not searchable	2019-10-18 21:15:13 +01:00
Matt-Yorkley	c54cff10d4	Adjust API endpoint params	2019-10-18 21:15:13 +01:00
Matt-Yorkley	ab330e882e	Remove product cache	2019-10-18 21:15:11 +01:00
Luis Ramos	ad247e2116	Merge pull request #4268 from luisramos0/add_order_endpoint ... Add api/orders/{order_number} API endpoint	2019-10-16 21:22:27 +01:00
Luis Ramos	d7223c508a	Merge pull request #4289 from luisramos0/spree_be_config_general ... Move general_settings, mail_methods and image_settings from spree_backend to OFN	2019-10-16 12:08:36 +01:00
Luis Ramos	35d76ac991	Merge pull request #4298 from luisramos0/variant_edit ... Make unit description visible in the variant edit page even for products which variant_unit is items	2019-10-13 19:54:41 +01:00
Matt-Yorkley	da7456e6e0	Remove old shop/products route, action, and spec	2019-10-09 17:27:00 +01:00
Matt-Yorkley	f134cd9473	Extract tag_rule filtering into separate service	2019-10-09 17:26:58 +01:00
Dan Ingenthron	bdcadf9fc6	Update changes to reflect new non-Spree shipping method controller	2019-10-08 18:37:16 -05:00
Dan Ingenthron	9b7139fd45	Add default shipping category during object creation; revert forms	2019-10-08 18:37:16 -05:00
Dan Ingenthron	dbf34da87b	Rubocop fixes	2019-10-08 18:37:16 -05:00
Dan Ingenthron	89873a2640	Add and auto-check default category in shipping method create	2019-10-08 18:37:15 -05:00
Dan Ingenthron	b4be2cc2d4	Add default shipping category service and update create product form	2019-10-08 18:37:15 -05:00
Dan Ingenthron	592a53b6f5	Remove blank option from shipping category dropdown	2019-10-08 18:37:15 -05:00
Matt-Yorkley	e96252f2ed	Add tag_rules logic to main query before pagination	2019-10-08 10:11:24 +01:00
Matt-Yorkley	06e1f56ae9	Extract filter list fetching into a separate endpoint	2019-10-08 10:11:24 +01:00
Matt-Yorkley	fe0de98821	Add pagination in Angular and views	2019-10-08 10:11:22 +01:00
Thais Kusuki	d997b8f5ee	Change translations from enterprise_mailer to lazy lookup	2019-10-07 23:29:11 -03:00
luisramos0	95bc8fa984	Remove logic from OrderCycleDistributedProducts related to obsolete master variants in OCs, this is a condition that will never happen now since we ensure products always have a standard variants ... A migration will be added as well to clean up any very old master variants available in order cycles	2019-10-07 14:53:44 +01:00
Luis Ramos	54c44c33eb	Merge pull request #4324 from Matt-Yorkley/reports_memoize ... Reports memoization	2019-10-07 13:20:03 +01:00
Thais Kusuki	797a3ad091	Add missing translation in non English enterprise welcome email	2019-10-05 12:50:12 -03:00
Matt-Yorkley	a1a5c3b7fe	Add new Angular OrderCycleResource	2019-10-04 10:38:41 +01:00
Matt-Yorkley	bc826f73a1	Add temporary placeholder for API endpoint	2019-10-03 18:11:40 +01:00
Luis Ramos	96428c11c6	Merge pull request #4334 from Matt-Yorkley/products_renderer ... Products renderer	2019-10-03 13:47:04 +01:00
Luis Ramos	c15660da0e	Merge pull request #4269 from luisramos0/spree_be_config ... Move shipping_methods and shipping categories from spree_backend to OFN	2019-10-03 13:45:17 +01:00
luisramos0	30aa31252b	Fix simple rubocop issues in helpers	2019-10-02 21:26:09 +01:00
luisramos0	b83d74a609	Bring general_settings_helper from spree_backend	2019-10-02 21:26:09 +01:00
luisramos0	42e3f2f2f4	Convert spree/admin/mail_methods from erb to haml	2019-10-02 21:25:23 +01:00
luisramos0	96737da128	Add spree_backend mail methods views that are missing in ofn	2019-10-02 21:25:23 +01:00
luisramos0	7f9f0d840c	Merge decorators into controllers and remove decorators	2019-10-02 21:25:23 +01:00
luisramos0	686840e262	Fix basic rubocop issues in recently added controllers from spree_backend	2019-10-02 21:25:23 +01:00
luisramos0	2377b833ee	Bring general settings and image settings controllers that are overrides in ofn to ofn so we can merge them with their decorators in a second step	2019-10-02 21:25:23 +01:00
luisramos0	3f3c33bce6	Fix basic rubocop issues in newly added controller	2019-10-02 21:25:23 +01:00
luisramos0	e35eff95bb	Add mail_methods controller from spree_backend related to config	2019-10-02 21:25:23 +01:00
Luis Ramos	4540b32d3a	Merge branch 'master' into spree_be_config_taxons	2019-10-02 15:35:15 +01:00
Luis Ramos	14047c620a	Merge branch 'master' into spree_be_config_tax	2019-10-02 15:31:25 +01:00