505 Commits

Author	SHA1	Message	Date
luisramos0	f77beb50ff	Fix class scope in spree/api/products_controller, should not use Spree namespace here ... Also, add missing dependency to spree/admin/products_controller_decorator	2019-07-31 09:32:33 +01:00
luisramos0	dcbdfbb081	Fix rubocop issues in multiple files copied from spree_auth_devise, mostly hash rockets	2019-07-08 11:22:56 +01:00
luisramos0	fc0ffda8ec	Bring routes and controllers from spree_auth_devise	2019-07-05 15:08:42 +01:00
Luis Ramos	00841cb537	Merge pull request #3923 from luisramos0/prod_image_error ... User friendly error when creating a product with an image in an unsupported format	2019-06-26 15:30:18 +01:00
Maikel	71f396a44f	Merge pull request #3896 from luisramos0/clear_unit_desc ... Clear product.variants.unit_description if product.variant_unit is items	2019-06-21 15:00:06 +10:00
luisramos0	0cdb49818d	Remove distinct from enterprise.ready_for_checkout scope ... Adapt use of enterprise scope not_ready_for_checkout to rails 4 by adding enterprises table alias to selected field id	2019-06-18 10:40:49 +01:00
luisramos0	a7c970054c	Add rescue in product controller create action to avoid server error and send appropriate error message to client when product image upload fails	2019-06-14 10:20:28 +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
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
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
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	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 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
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	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
luisramos0	86f9b3d663	Delete product_distributions: drop table and remove models, controllers and BO edit page	2019-03-13 11:47:50 +00:00
Kristina Lim	8782f2087c	Use service in admin/payments#create ... This separates logic for bang and non-bang versions of Spree::Order#next. The different conditions used in both methods (state == "completed" vs order.completed?) have implications in whether a transition is attempted or not.	2019-03-13 17:00:31 +11:00
Kristina Lim	0e691815ea	Use service in admin/orders/customer_details#update	2019-03-13 12:45:57 +08:00
Kristina Lim	abaf90fc41	Copy more actions advancing order from Spree ... This copies the following: * admin/orders/customer_details#update * admin/payments#create	2019-03-13 12:45:57 +08:00
Kristina Lim	7a8bf76123	Move transitioning of order in admin/orders#edit to service	2019-03-13 12:45:50 +08:00
Kristina Lim	ce5691d080	Copy admin/orders#edit from Spree controller ... This method needs to be updated to use custom order advance logic in service.	2019-03-12 18:31:27 +08:00
Pau Pérez Fabregat	aed9c41b0d	Merge pull request #3394 from mkllnk/3021-update-soft-delete ... [Spree upgrade] 3021 update soft delete	2019-02-25 11:58:41 +01:00
luisramos0	5d51ad71b0	Merge branch 'master' into 2-0-stable-Feb20	2019-02-20 14:32:36 +00:00
Maikel Linke	cdb49f88b0	Move Variant deletion into its own service ... This keeps the override of Spree's model leaner. More importantly, it prepares us for using `destroy` instead of `delete`. In the past, `Product#delete` soft-deleted the product, but didn't delete the variants. When we use `Product#destroy` to soft-delete the product, it will also call destroy on the variants. If the model doesn't allow the deletion of the last variant, it will fail. So when a product is deleted we want to allow the deletion of all variants. But the user should not be allowed to delete the last variant. That's why I'm moving the check to the controller level. Related commits: - e6c7acdff3 - 2b47c9145a - b9f19d5777 (diff-412c5af2ec1ba9f6643f6df5a673c1d4R105)	2019-02-19 14:25:18 +11:00
Maikel Linke	8f49f0006a	Update products controller decorator with Spree ... Spree changed the controller to deal with the updated soft-delete. This commit brings these changes to our decorator.	2019-02-19 14:25:18 +11:00
Maikel	d4589cc2f4	Merge pull request #3444 from mkllnk/3437-supplier-name-on-invoice ... 3437 supplier name on invoice	2019-02-15 16:31:29 +11:00
Pau Pérez Fabregat	fce92090db	Merge pull request #3479 from luisramos0/2-0-stable-Feb12 ... [Spree Upgrade] Merging master into 2-0-stable (2nd run in Feb2019)	2019-02-14 09:40:28 +01:00
luisramos0	c652cfe4d5	Merge branch 'master' into 2-0-stable-Feb12	2019-02-12 16:03:33 +00:00
luisramos0	0f44beb477	Delete all Spree::Admin::LineItemsController customizations as they are no longer used	2019-02-12 10:09:00 +00:00
luisramos0	ad0e5bb093	Re implement orders ctrl update method so we can change redirection logic and add specs for it	2019-02-10 15:31:01 +00:00
Kristina Lim	c81be75530	Move engine libraries except Engine and Version to services	2019-02-08 21:26:38 +00:00
Kristina Lim	3f84d0008a	Move some in OpenFoodNetwork to engine services ... This removes the OpenFoodNetwork namespace from these too.	2019-02-08 21:26:38 +00:00
Kristina Lim	95e3a2f45d	Move authorization to the ::Parameters class	2019-02-08 21:26:38 +00:00
Kristina Lim	9e035efd50	Render enterprise fee report directly in renderer	2019-02-08 21:26:38 +00:00
Kristina Lim	c8b154b12a	Separate enterprise fee summary action ... Split the previous "index" action into "new" and "create" actions.	2019-02-08 21:26:38 +00:00
Kristina Lim	c0e6b70131	Rename EnterpriseFeeSummaryReportController ... Remove "Report" because this is redundant, and pluralize the resource name.	2019-02-08 21:26:38 +00:00