7772 Commits

Author	SHA1	Message	Date
luisramos0	a1905e43f7	Move a group of translations related to customers to the js translations namespace	2019-04-15 18:12:04 +01:00
luisramos0	9662323261	Move a group of translations related to schedules to the js translations namespace	2019-04-15 17:42:45 +01:00
Luis Ramos	ddd3443a86	Merge pull request #3659 from mkllnk/missing-translation ... Fix "What's this?" on admin dashboard	2019-04-10 22:05:19 +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	984155013c	Merge pull request #3648 from luisramos0/2-0-fix-ui-issue ... [Spree Upgrade] Fix "back to list" button overlap and remove configurations menu from payments methods list	2019-04-10 21:46:40 +01:00
Luis Ramos	97c920f1b0	Merge pull request #3667 from mkllnk/3477-display-eligible-adjustments ... 3477 Render only eligible adjustments on the order page	2019-04-10 21:44:16 +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
Maikel Linke	d31b5efac6	Simplify orders helper	2019-04-03 11:15:54 +11:00
Maikel Linke	7035d57267	Better helper naming and spec cover	2019-04-03 11:13:56 +11:00
luisramos0	5e64c9f392	Fix deface override to remove configurations menu from payment methods list, this is necessary because non-admin users do get to this page through enterprises management"	2019-04-02 16:58:50 +01:00
luisramos0	5c69d6c9dc	Fix page action in the backoffice when translations are long	2019-04-02 16:58:45 +01:00
Maikel Linke	0c846758dd	Add missing translation to order form ... I saw the following error: translation missing: en.spree.line_item_adjustments In this commit I change all three translations in the view file to use lazy lookup.	2019-04-02 17:47:36 +11:00
Maikel Linke	2a6236823f	Move adjustment filtering from view to helper	2019-04-02 17:25:33 +11:00
Maikel Linke	11c12787f6	Move adjustment selection to helper	2019-04-02 17:02:05 +11:00
Maikel Linke	d78c709ad2	Remove unused variables from view	2019-04-02 16:58:08 +11:00
Maikel Linke	500cf925ad	Fix HTML validity and element finding in spec ... The fixed partial was used twice on the same page. So the used element id appeared twice on the page which is invalid HTML. It also confused the spec. Now we look at the actually displayed text to select the correct element.	2019-04-02 16:50:44 +11: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 Linke	f630738b2c	Fix HTML syntax in admin view	2019-03-29 18:42:06 +11:00
Maikel Linke	5760aed6a6	Render only eligible adjustments on the order page ... https://github.com/openfoodfoundation/openfoodnetwork/issues/3477 The admin orders edit form was displaying adjustments even if they were "not eligible". For example, an additional fee with amount `0` is not eligible. They were already hidden in the adjustments view and we are hiding them in reports.	2019-03-29 18:41:38 +11: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
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
Maikel Linke	bcebb99967	Fix "What's this?" on admin dashboard ... When a user has no enterprises, the admin dashboard displays a "What's this?" hint in the right corner of the enterprises tab. The link text and the tooltip were both broken (missing translation).	2019-03-27 11:04:08 +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