8456 Commits

Author	SHA1	Message	Date
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
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
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
Luis Ramos	2be1c231f7	Merge pull request #4290 from luisramos0/spree_be_config_zones ... Move zones, countries and states from spree_backend to OFN	2019-10-02 14:30:59 +01:00
Luis Ramos	3f7aff4b8b	Merge pull request #4305 from luisramos0/new_product_translations ... Make translations in new product page relative and specific to the page	2019-10-01 22:38:49 +01:00
Matt-Yorkley	cc11d4e5f0	Remove unused user parameter from OrdersAndFulfillmentsReport	2019-10-01 15:59:51 +01:00
Matt-Yorkley	112adb11db	Pass permissions object into OrdersAndFulfillMentsReport	2019-10-01 15:51:43 +01:00
Matt-Yorkley	c038b485b1	Rename service and methods to remove use of "shop" term	2019-10-01 14:43:47 +01:00
Luis Ramos	19eb93012c	Merge pull request #4326 from kristinalim/feature/4310-remove_shipments_count ... 4310 Do not count order shipments in Order#shipping_method	2019-10-01 11:17:42 +01:00
Luis Ramos	c4d298d732	Merge branch 'master' into remove_deprecations	2019-10-01 10:57:10 +01:00
Pau Pérez Fabregat	c2f8803d72	Merge pull request #4297 from luisramos0/inv_levels ... Remove all usages of Spree Config track_inventory_levels	2019-10-01 10:35:20 +02:00
Luis Ramos	d162e8c087	Merge pull request #4300 from daningenthron/daningenthron/add-a-new-card ... Translation: "Add new credit card"	2019-09-30 13:27:25 +01:00
Luis Ramos	75a56c2be5	Merge pull request #4293 from jasonk357/4031-change-user-email-alert ... Improve user email change flash alert message	2019-09-30 13:19:40 +01:00
Luis Ramos	07a5963554	Merge pull request #4311 from mkllnk/rails3-deprecations ... Replace deprecated validates_presence_of	2019-09-30 13:19:25 +01:00
Luis Ramos	ef35db6db2	Merge pull request #4296 from luisramos0/subs_line_items ... Make subscription line items handle soft deleted variants	2019-09-30 13:07:10 +01:00
Matt-Yorkley	032741c54f	Refactor ProductsRenderer variants queries ... This removes another N+1 and allows pagination applied to the inital query to also affect the returned variants	2019-09-29 17:41:58 +01:00
Matt-Yorkley	d5e90c3c6c	Extract #load_products logic into a new service	2019-09-29 00:10:47 +01:00
Matt-Yorkley	7e7429446d	Remove deprecation warnings from VariantStock methods	2019-09-27 17:28:16 +01:00
Matt-Yorkley	cecebb82f4	Move distributed products relation out from OrderCycleDistributedProducts	2019-09-27 17:25:50 +01:00
Pau Pérez Fabregat	49665ae360	Merge pull request #4167 from luisramos0/last_dedeface ... Move app_wrapper deface to spree/layouts/admin view	2019-09-27 09:21:28 +02:00
Kristina Lim	721a0d3a98	Do not count order shipments in Order#shipping_method	2019-09-26 11:01:06 +08:00
JASON KNOEPFLER	c46fe7b675	encapsulate new unconfirmed email logic	2019-09-25 19:41:33 -07:00
Dan Ingenthron	e8f9ace8e6	Correct translation key on add card link	2019-09-24 13:42:31 -05:00
Maikel Linke	efd450606e	Replace deprecated validates_presence_of ... This syntax has been deprecated in Rails 3: https://guides.rubyonrails.org/3_0_release_notes.html#patches-and-deprecations	2019-09-24 19:16:05 +10:00
luisramos0	f3bc038c05	Make translations in new product page relative and specific to the page	2019-09-23 17:02:30 +01:00
luisramos0	cd6d34663e	Remove all usages of Spree Config track_inventory_levels, this is always true in OFN since v2.0.0	2019-09-22 15:25:24 +01:00
luisramos0	c66e5fe1e9	Make subscription line items handle soft deleted variants ... This ensures subscription list page works. The variant can be removed from the subscription by the user in the edit subscription page	2019-09-22 14:59:59 +01:00
JASON KNOEPFLER	4ec8fcd3a6	Assign flash message var from conditional return	2019-09-21 08:10:58 -07:00
JASON KNOEPFLER	07e0951490	Change users#update email change flash alert	2019-09-20 10:35:25 -07:00
luisramos0	fc433ff8f0	Refactor ship methods controller destroy action: remove single action before_filter	2019-09-20 16:29:36 +01:00
luisramos0	8e33437fbb	MErge ship method controller decorator with the controller that came from spree	2019-09-20 15:59:24 +01:00
luisramos0	a5103c737d	Fix rubocop issues in ship methods controller from spree	2019-09-20 15:58:05 +01:00
luisramos0	37c8f42244	Bring shipping methods and categories controllers from spree_backend	2019-09-20 15:56:24 +01:00
luisramos0	0e8765636b	Bring tax_settings from spree_backend to ofn	2019-09-20 15:46:33 +01:00
luisramos0	4f9eee2682	Fix feature specs added from spree_backend in the configuration area	2019-09-20 15:43:55 +01:00
luisramos0	cc0dabcd1e	Convert spree/admin/tax_rates from erb to haml	2019-09-20 15:36:58 +01:00
luisramos0	e79c672263	Convert spree/admin/tax_categories from erb to haml	2019-09-20 15:36:54 +01:00
luisramos0	bc6f7934e0	Add spree_backend views related to admin/configuration menu that are missing in ofn	2019-09-20 15:35:49 +01:00
luisramos0	89029f46f9	Fix basic rubocop issues in newly added controller	2019-09-20 15:32:34 +01:00
luisramos0	144369e55f	Add tax related controllers from spree_backend related to config	2019-09-20 15:31:30 +01:00
luisramos0	c66579a22f	Fix simple rubocop issues in helper	2019-09-20 15:24:06 +01:00
luisramos0	9291bf5c82	Bring taxons_helper from spree	2019-09-20 15:24:06 +01:00
luisramos0	def9ab7c47	Convert spree/admin/taxons from erb to haml	2019-09-20 15:24:06 +01:00
luisramos0	2a68d34fb0	Convert spree/admin/taxonomies from erb to haml	2019-09-20 15:24:06 +01:00
luisramos0	2ce56aef2c	Add spree_backend views related to admin/configuration taxonomies that are missing in ofn	2019-09-20 15:23:45 +01:00
luisramos0	20f965731d	Fix basic rubocop issues in recently added controller from spree_backend	2019-09-20 15:14:34 +01:00
luisramos0	8378dce752	Bring taxons config controller that is overriden in ofn to ofn so we can merge them with their decorator in a second step	2019-09-20 15:13:45 +01:00