7756 Commits

Author	SHA1	Message	Date
Matt-Yorkley	e13db873b0	Fix subs panel button vertical alignment	2019-04-10 12:15:21 +01:00
Matt-Yorkley	896a45c399	Fix subs state buttons	2019-04-10 12:15:21 +01:00
Matt-Yorkley	3968cfd238	Fix chevron horizontal position	2019-04-10 12:15:21 +01:00
Luis Ramos	4478d51aee	Merge pull request #3668 from luisramos0/2-0-stable-Mar29 ... [Spree Upgrade] Merging master into 2-0-stable (4th run in Mar2019)	2019-04-09 17:46:36 +01:00
luisramos0	ecc60f3b61	Merge branch 'master' into 2-0-stable-Mar29	2019-04-05 15:47:46 +01:00
Pau Pérez Fabregat	1b55d04963	Merge pull request #3673 from Matt-Yorkley/spree2/css ... Spree2/css	2019-04-05 14:57:57 +02:00
Pau Pérez Fabregat	c515a8f115	Merge pull request #3537 from Matt-Yorkley/pi/on_demand_error ... Fix nil values in on_hand column	2019-04-03 11:56:06 +02:00
Matt-Yorkley	668a37f564	Fix "clear all" button spacing in inventory	2019-04-01 12:18:19 +01:00
Matt-Yorkley	4a0e5a42a3	Fix admin menu items different heights	2019-04-01 12:11:29 +01:00
Matt-Yorkley	082be15df2	Fix admin menu mixed font weights	2019-04-01 12:00:29 +01:00
Matt-Yorkley	fa91a66de6	Fix button padding after Spree 2 font changes increased the vertical height	2019-04-01 11:48:18 +01:00
Matt-Yorkley	3ad2c9f7c4	Fix 'clear all' button width on Order Cycles page	2019-04-01 11:41:46 +01:00
luisramos0	bc8bca074c	Switch object in the ability to access reports. This adapts to this change in Spree: 3685569db4 ... Adapt NavigationHelper to return the controller object for reports so that Reports tab works correctly.	2019-03-29 22:16:39 +00:00
luisramos0	527cfc1601	Merge branch 'master' into 2-0-stable-Mar29	2019-03-29 13:48:49 +00:00
Maikel	6e31f0078a	Merge pull request #3639 from coopdevs/fix-variant-cache-refreshing-on-delete ... Fix variant cache refreshing on delete	2019-03-29 15:12:46 +11:00
Maikel	fed2b60743	Merge pull request #3644 from kevinchristianson/master ... Fixed producer profile translation bug	2019-03-28 15:51:45 +11:00
Maikel	74aea76c4c	Merge pull request #3609 from luisramos0/2-0-delete-acct-invoices-last-bit ... [Spree Upgrade] Finish up deleting account invoices	2019-03-28 13:42:01 +11:00
luisramos0	f35972cee9	Remove deleted menu entry product distributions	2019-03-26 09:08:52 +00:00
luisramos0	010007a2c7	Merge branch '2-0-stable' into 2-0-stable-Mar22	2019-03-26 09:07:48 +00:00
Luis Ramos	9a771ecbb8	Merge pull request #3613 from luisramos0/2-0-update-variants-stock ... [Spree Upgrade] Add on_hand and on_demand to the variants create and edit pages	2019-03-26 08:55:34 +00:00
Kristina Lim	79d0b63069	Add Spree::Address#full_name_reverse	2019-03-25 07:46:31 +08:00
Usama	698c71f039	Fixed producer profile translation bug	2019-03-22 18:25:40 -05:00
luisramos0	a8c0eef3d3	Improve admin variants controller create action, it doesn't try to set on_hand and on_demand if there are previous errors in the variant	2019-03-22 23:23:10 +00:00
luisramos0	78ea16c684	Remove unnecessary data-hooks from stock management deface override	2019-03-22 21:30:25 +00:00
luisramos0	c1d14686a6	Merge branch 'master' into 2-0-stable-Mar22	2019-03-22 10:55:17 +00:00
Pau Pérez Fabregat	846e6fdd90	Merge pull request #3560 from kristinalim/fix/2788-shipping_method_id_in_shipments ... 2696,2788 [Spree Upgrade] Fix use of shipping method ID for subscriptions	2019-03-22 11:08:23 +01:00
Pau Pérez Fabregat	87f0ddabe7	Merge pull request #3548 from luisramos0/2-0-remove-unused-new-v2-features ... [Spree Upgrade] Remove unused spree v2 features	2019-03-22 10:35:15 +01:00
Pau Perez	96b8c8ac2c	Refresh products cache also on Variant#delete ... Note that, as explained in https://apidock.com/rails/v3.2.13/ActiveRecord/Relation/delete, `delete` does not trigger callbacks and so it skips the products cache logic. If we still want to avoid instantiating the AR object, we need to explicitly call that logic for the cache to be up-to-date.	2019-03-22 09:57:15 +01:00
Pau Perez	fbc3fc6a51	Test spree/admin/variants_controller #destroy	2019-03-22 09:18:31 +01:00
Kristina Lim	94606025c9	Separate call and call! for AdvanceOrderService	2019-03-21 20:34:51 +08:00
Maikel Linke	1ea2f37c18	Support international decimals in weight calculator ... A previous pull request added support for flexible decimal characters when editing money amounts. https://github.com/openfoodfoundation/openfoodnetwork/pull/1831 This pull request applies the same principle to the weight calculator which was missed in the previous pull request.	2019-03-21 12:49:19 +11:00
Maikel	f1ac33f304	Merge pull request #3590 from mkllnk/3576-bulk-order-spec ... 3576 Fix bulk order management race condition	2019-03-21 12:40:41 +11:00
Luis Ramos	61c778eeac	Merge pull request #3555 from luisramos0/2-0-fix-order-state-translations ... [Spree Upgrade] Improve order state translations in v2	2019-03-20 12:26:35 +00:00
luisramos0	c0c14b16b6	Remove dynamic monthly pricing description that would come from the deleted business model configurations	2019-03-20 11:19:04 +00:00
Pau Pérez Fabregat	2a3a935c16	Merge pull request #3570 from luisramos0/byebye-prod-distributions ... Delete dead feature product distributions	2019-03-20 09:01:23 +01:00
luisramos0	21a10d0206	Add on_hand and on_demand back to variants form (both variant create and edit pagei), this is where they used to be in spree v1 ... The admin variants controller create action is adapted (same as in the admin ProductsController). This is necessary because variant.on_hand and on_demand cannot be mass assigned on creation in v2, see VariantStock for more details. For now we are hiding the new stock management page that comes in spree v2 as we don't need the complexity added by the management of stock per stock location (only one stock location in ofn v2 for now)	2019-03-18 19:02:48 +00:00
luisramos0	9194a711ea	De-deface product tabs ... We do not include stock management from v2 because we will use the variants edit page to manage on_hand and on_demand	2019-03-18 18:47:25 +00:00
luisramos0	22a051e720	Enable products cache by default only in staging and production ... We keep tests running by default without cache, keeping it as it was before 10a79d5a65 Additionally, cached_products_renderer no longer depends on Rails.env, so here we remove that dependency from it's spec.	2019-03-17 15:03:15 +00:00
luisramos0	60ee17204b	Merge branch 'master' into 2-0-stable-Mar16	2019-03-16 16:17:38 +00:00
Kristina Lim	7505dd0410	Make order sync for shipping methods readable	2019-03-15 07:59:54 +11:00
Pau Pérez Fabregat	75abd4586e	Merge pull request #3583 from coopdevs/handle-deleted-oc-refreshing-cache ... Handle deleted order cycle when refreshing cache	2019-03-14 20:11:14 +01:00
Pau Perez	bc34d04c31	Do not retry when refreshing cache on deleted OC	2019-03-14 18:53:11 +01:00
Pau Perez	10a79d5a65	Decouple CachedProductsRenderer from the Rails env ... This way we don't need to touch the class implementation to enable the products cache in development. Just change the default value in `app/models/spree/app_configuration_decorator.rb`.	2019-03-13 19:08:46 +01:00
Pau Pérez Fabregat	13b2115a29	Merge pull request #3581 from coopdevs/cache-stylistic-improvements ... Cache stylistic improvements	2019-03-13 19:05:38 +01:00
luisramos0	b62e350fab	Improve reports controller decorator by removing some copy pasted code and deleting some code repeated across data_load and the main action methods	2019-03-13 12:24:40 +00:00
luisramos0	05d42d475e	Make reports and subscriptions specs work without product.distributors attribute	2019-03-13 12:24:40 +00:00
luisramos0	2de6c46834	Make order.order_cycle required in cart_service. There’s no more exception for that without product_distributions.	2019-03-13 12:24:40 +00:00
luisramos0	4768ca27c7	Remove all dependencies to product distributions including the validation to avoid deleting fees with product distributions	2019-03-13 11:50:35 +00:00
luisramos0	3117dbf624	Remove product distributions from order model	2019-03-13 11:50:35 +00:00
luisramos0	a022cebfc8	Remove product distributions from enterprise model and controller	2019-03-13 11:49:13 +00:00