1627 Commits

Author	SHA1	Message	Date
Matt-Yorkley	0aa8b1a30e	Make shop hidden ams injection consistent with other uses	2019-06-12 09:47:01 +01:00
Matt-Yorkley	a91ae8947b	Only query visible enterprises	2019-06-12 09:47:01 +01:00
Matt-Yorkley	4ec46c2db6	Fix groups index page	2019-06-12 09:47:01 +01:00
Matt-Yorkley	ed97400a23	Improve producers performance	2019-06-12 09:47:01 +01:00
Matt-Yorkley	45d65baf8e	Improve shops performance	2019-06-12 09:47:01 +01:00
Pau Pérez Fabregat	99b82272cc	Merge pull request #3883 from Matt-Yorkley/order_cycles_performance ... Admin order cycles performance	2019-06-12 10:38:54 +02:00
Pau Pérez Fabregat	fd95ae7e41	Merge pull request #3847 from Matt-Yorkley/api_access ... Allow unauthenticated access to OFN API endpoints	2019-06-12 09:45:11 +02:00
luisramos0	9c539da811	Fix rubocop issue in schedules_controller.collection by extracting method	2019-06-11 21:28:55 +01:00
luisramos0	6cf705ea55	In the order cycle pages (both create and edit, both simple and normal), add OC coordinator to schedules request to the server and make the controller filter schedules of order cycles coordinated by that enterprise id.	2019-06-11 21:28:52 +01:00
luisramos0	1a4e83d633	Change products controller to clear variants unit description if variant_unit is items	2019-06-01 16:56:17 +01:00
Matt-Yorkley	563f9a4f5f	Remove another N+1	2019-05-29 12:28:56 +01:00
Matt-Yorkley	8733036fb0	Remove 2 N+1s, reduce queries in #visible action ~90%	2019-05-29 10:01:44 +01:00
Matt-Yorkley	c0a40c616b	Use devise's check_authorization and skip_authorization_check	2019-05-28 22:02:18 +01:00
luisramos0	07854cf372	Fix a few problems introduced by rubocop auto correct	2019-05-28 12:57:29 +01:00
luisramos0	86b0d71c7e	Result of rubocop auto-correct and rebuilding rubocop_manual_todo	2019-05-28 12:57:29 +01:00
luisramos0	4a67acf954	Removing a few rubocop warnings	2019-05-28 12:55:17 +01:00
Luis Ramos	9ccf502365	Merge pull request #3797 from lin-d-hop/variant-master-price ... Remove non-functional Price field from Edit Product screen	2019-05-28 10:30:05 +01:00
Matt-Yorkley	74d7db9fba	Allow unauthenticated access to enterprise API endpoints	2019-05-21 17:13:00 +01:00
luisramos0	115b5dadef	Remove more dead code from usersregistration (signup calls are always ajax)	2019-05-21 12:39:29 +02:00
luisramos0	ffd883e84d	Remove dead code from usersregistration (signup calls are always ajax) and remove application.html.erb (spree frontend default layout) because this usersregistration was the last bit of OFN code to use it	2019-05-21 12:39:29 +02:00
Luis Ramos	4c767cd5b4	Merge pull request #3802 from kristinalim/fix/order_cycle_optimizations ... 3760 Optimizations related to OCs	2019-05-07 21:12:44 +01:00
Matt-Yorkley	6a8a67560b	Fix API authentication	2019-05-07 00:36:08 +01:00
Matt-Yorkley	6bdc5d4438	Fix maps performance	2019-05-07 00:36:08 +01:00
lin-d-hop	7b87e609c4	Set master variant price in products controller ... Set master variant price in products controller Code climate tidy up Syntax improvement Revert "Remove non-functional Price field from Edit Product screen" This reverts commit 585072302c. Syntax improvement fixing revert Revert "Remove non-functional Price field from Edit Product screen" This reverts commit 585072302c. fixing conflicts	2019-05-06 14:20:01 +01:00
Kristina Lim	f14e7e97b1	Do not check need to warn of invalid OCs unless request is HTML	2019-05-06 15:41:29 +08:00
Luis Ramos	637e99367d	Merge pull request #3747 from luisramos0/2-0-vo-ctrl-bug ... [Spree Upgrade] Fix bug in Variant Overrides controller	2019-05-02 17:31:13 +01:00
luisramos0	340cbe5947	Eager load variants with variant overrides to avoid n+1 in the following line	2019-05-02 11:10:53 +01:00
luisramos0	a68b5eaf22	Fix bug in Variant Overrides controller. It was validating authorization for variant overrides of deleted variants	2019-04-17 15:31:19 +01:00
luisramos0	fce3d69345	Add flash and warning to the cart page when item becomes unavailable	2019-04-13 21:39:41 +01:00
luisramos0	d602375ac7	Redirect user to cart page if some item in the order is unavailable	2019-04-13 20:31:05 +01:00
Luis Ramos	4bf9320be8	Merge pull request #3666 from mkllnk/1830-v2-edit-shipping-fees ... Close adjustments so that updates are effective	2019-04-10 21:58:22 +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	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 Linke	fabca84001	Close adjustments so that updates are effective ... Spree 2.0 keeps shipping fee adjustments open unless they are manually closed. But open adjustments cannot be edited. To preserve updates, like changing the amount of the shipping fee we close the adjustment first.	2019-03-29 17:23:15 +11: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
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	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
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	60ee17204b	Merge branch 'master' into 2-0-stable-Mar16	2019-03-16 16:17:38 +00: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	ed9321e92d	Remove product distributions from product model and controller	2019-03-13 11:47:50 +00:00