4688 Commits

Author	SHA1	Message	Date
idanceinbetween	7790401d59	added buttons to form and updated sanitizer to allow extra formatting	2019-05-08 14:45:05 +01:00
Maikel Linke	a3adbd9fc8	Replace connect-learn banner with custom content ... The connect and learn banner is only used in Australia at the moment. We would like to have customisable content here. Now every instance can choose to place a custom alert banner at the top. Unfortunately, custom banners are not translated into other languages. That's why I kept the standard register call. For example, the register call is in use where it is displayed in French and Italian. Completely switching to custom content would break the translation. Translations in custom content are an existing feature request, "multi-lang 2.0".	2019-05-08 11:38:49 +10:00
Luis Ramos	dffa50468b	Merge pull request #3801 from Matt-Yorkley/need_for_speed ... Fix /maps performance	2019-05-07 21:08:34 +01:00
Kristina Lim	12b28fdc32	Remove "Debug Information" in edit OC page	2019-05-08 01:33:58 +08:00
Syed Usama Amer	f71df770d0	added social links	2019-05-06 23:28:14 -05:00
Matt-Yorkley	6bdc5d4438	Fix maps performance	2019-05-07 00:36:08 +01:00
lin-d-hop	10fba9b39f	Add translation to order cycle spinner ... lazy text	2019-05-05 19:12:53 +01:00
lin-d-hop	585072302c	Remove non-functional Price field from Edit Product screen ... Update initializer to override Product Price as required field. Revert "Update initializer to override Product Price as required field." This reverts commit 1bfca09c5cf9245fbc3d30a23e9d80ac545adcf5.	2019-05-05 16:41:54 +01:00
Matt-Yorkley	3323ac7650	Fix duplicate error messages	2019-05-05 13:30:38 +01:00
jazzdragon	37d15a1be3	Add classes to indicate collapsible is for medium screens or smaller	2019-05-04 20:12:12 -07:00
jazzdragon	623471290e	Make sure styling doesn't get messed up if resizing down and back up	2019-05-04 19:52:08 -07:00
jazzdragon	271330d2fc	Add collapsible elements and styles	2019-05-04 19:43:46 -07:00
Luis Ramos	6f0d155508	Merge pull request #3742 from openfoodfoundation/2-0-stable ... Merge 2-0-stable to master	2019-05-04 00:06:27 +01:00
Luis Ramos	3b2e614c57	Merge pull request #3734 from luisramos0/2-0-validate-distribution ... Removing a variant from OC will prevent user with that variant in the cart from checking out	2019-05-02 16:12:41 +01:00
Syed Usama Amer	75a7745736	Closes translation bug for enterprise fee settings	2019-05-01 10:43:35 -05:00
Maikel	736ac49581	Merge pull request #3701 from luisramos0/2-0-fix-order-edit-issues ... [Spree Upgrade] Fix two issues in admin orders edit page	2019-04-19 07:33:26 +10:00
Luis Ramos	67a7e26757	Merge pull request #3695 from luisramos0/2-0-emails-transl ... [Spree Upgrade] Fix translation missing in order confirmation email subject and bring cancel email to ofn	2019-04-16 13:44:24 +01:00
luisramos0	fce3d69345	Add flash and warning to the cart page when item becomes unavailable	2019-04-13 21:39:41 +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	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	5989a654d1	Remove stock location from stock levels table and fix Spree.t entry bug	2019-04-05 14:01:27 +01:00
luisramos0	6e49cf9f87	Bring cancel email from spree so it gets the normal ofn style	2019-04-04 12:31:12 +01:00
Maikel Linke	7035d57267	Better helper naming and spec cover	2019-04-03 11:13:56 +11: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	3ad2c9f7c4	Fix 'clear all' button width on Order Cycles page	2019-04-01 11:41:46 +01: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	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
Usama	698c71f039	Fixed producer profile translation bug	2019-03-22 18:25:40 -05:00
luisramos0	c1d14686a6	Merge branch 'master' into 2-0-stable-Mar22	2019-03-22 10:55:17 +00: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
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
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	60ee17204b	Merge branch 'master' into 2-0-stable-Mar16	2019-03-16 16:17:38 +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
luisramos0	7c39c45f79	Stop using inexistent en.order_state translations keys and use existing en.spree.order_state in haml code and new js.admin.orders.order_state in JS code	2019-03-12 19:42:08 +00:00
luisramos0	77655bfffb	Rename resource content to contents so that it matches the name of the controller ContentsController. This makes the is_active logic work on the configuration menu ... See the menu is_active code here: f55722b38d/backend/app/helpers/spree/admin/navigation_helper.rb (L145)	2019-03-12 19:11:37 +00:00