821 Commits

Author	SHA1	Message	Date
Matt-Yorkley	cd4268d219	Add manager dropdown UX	2018-04-23 12:55:49 +10:00
Maikel Linke	80da0d5330	Set enterprise form dirty on any change ... Commit 4953c69123 introduced a bug that the save button is not activated when changing enterprise fields. https://github.com/openfoodfoundation/openfoodnetwork/issues/2195 This is reverting the change and fixes #2195. Sadly, it re-opens https://github.com/openfoodfoundation/openfoodnetwork/issues/1216. But that one is not as severe as the current bug.	2018-04-04 13:36:03 +10:00
Pau Pérez Fabregat	13115d4a2d	Merge branch 'master' into email/manager_invite	2018-03-23 12:56:10 +01:00
Enrico Stano	3ce7bc54e3	Merge pull request #2143 from Matt-Yorkley/email/enterprise_user_ui ... Fix enterprise user unsaved changes	2018-03-20 16:43:40 +01:00
Matt-Yorkley	b64327fbb3	Invite enterprise manager functionality	2018-03-15 18:48:47 +00:00
Matt-Yorkley	4953c69123	Fix enterprise user unsaved changes	2018-03-14 23:04:54 +00:00
HugsDaniel	451c57da40	Changed i18n t() path to get content from locales	2018-03-14 15:01:01 +11:00
Rob Harrington	904a364bf1	Stop unnecessarily passing fee_calculators around	2018-03-02 10:11:26 +11:00
Enrico Stano	6e9efe79b7	Merge pull request #2053 from Matt-Yorkley/uk/enterprise_limit ... Increase default enterprise limit	2018-03-01 14:40:24 +01:00
Rob Harrington	6bf4ed1ac5	Add new review view to subscription wizard	2018-02-22 16:13:29 +11:00
Rob Harrington	6bdbdc06e7	Use select2_search instead of targetted_select2_search	2018-02-22 16:13:29 +11:00
Rob Harrington	2e94654f91	Create factory to hold auxillary functions for subscriptions ... NOTE: Moved estimatedSubtotal and estimatedTotal functions to the new factory from the subscription line items controller	2018-02-22 16:13:29 +11:00
Rob Harrington	8951c79f71	Only count future orders in subs index order count	2018-02-22 15:09:33 +11:00
Rob Harrington	c4a81bdc48	Translate subscriptions loading flash	2018-02-22 14:33:25 +11:00
Matt-Yorkley	d52f9fd43f	Add enterprise limit modal	2018-02-13 14:05:18 +00:00
Rob Harrington	7017c8540c	Replace references to 'standing line item' with 'subscription line item'	2018-02-09 14:44:15 +11:00
Rob Harrington	ae4420d9ba	Rename standing line item files	2018-02-09 14:44:14 +11:00
Rob Harrington	71370e0bce	Replace references to 'standing order' with 'subscription' (cleanup)	2018-02-09 14:44:14 +11:00
Rob Harrington	094c3e70f7	Replace references to 'standing order' with 'subscription' (HAML)	2018-02-09 14:44:13 +11:00
Rob Harrington	a9b5fd69d8	Renaming standing order files	2018-02-09 14:44:13 +11:00
Rob Harrington	f9727de206	Comment out interface for turning standing orders ON for an enterprise	2018-02-09 14:44:09 +11:00
Rob Harrington	76daa183d5	Add orders sub-menu to standing-order index page	2018-02-09 14:44:09 +11:00
Rob Harrington	cdf04323a9	Serialize standing order credit_card_id to enable selection in edit form	2018-02-09 14:44:06 +11:00
Rob Harrington	f95d1ef058	Show message when no credit cards available for a customer	2018-02-09 14:44:04 +11:00
Rob Harrington	61b64a7516	Add credit card selection element to standing orders form	2018-02-09 14:44:04 +11:00
Rob Harrington	26b85052e1	Load only Cash and Stripe payment methods into standing order form actions	2018-02-09 14:44:03 +11:00
Rob Harrington	07a7993109	Require a Cash or Stripe payment method in standing order setup process	2018-02-09 14:44:03 +11:00
Rob Harrington	834e5b702e	Using standing_order_form.$submitted for show/hide logic for angularjs form errors	2018-02-09 14:44:02 +11:00
Rob Harrington	1e0356a74b	StatusMessages can be shown on StandingOrder index	2018-02-09 14:44:01 +11:00
Rob Harrington	b28f2908a6	Fix 'postcode' typo in standing order form	2018-02-09 14:44:01 +11:00
Rob Harrington	7d9d510c0f	Adding a comma after each schedule listed on OC index	2018-02-09 14:44:01 +11:00
Rob Harrington	c64f3590ad	Using placeholder attribute to show prompt text for schedule dropdown	2018-02-09 14:44:01 +11:00
Rob Harrington	35e42b28fe	Using customer selection to search for addresses on standing order creation ... Can also copy copy address from billing to shipping	2018-02-09 14:44:00 +11:00
Rob Harrington	58070a8b3e	Adding loading flash and no-results messaging to standing orders index	2018-02-09 14:43:58 +11:00
Rob Harrington	57653cb911	Displaying setup instructions on Standing Orders index	2018-02-09 14:43:58 +11:00
Rob Harrington	f92b824f52	User is warned about initialising standing order orders	2018-02-09 14:43:58 +11:00
Rob Harrington	3adfb0db3f	Issues with updating orders are reported when saving standing orders	2018-02-09 14:43:58 +11:00
Rob Harrington	25639a822a	Implementing standing order feature toggle on back-end interface	2018-02-09 14:43:57 +11:00
Rob Harrington	e1f8af6d5b	Adding standing orders feature toggle to enterprise form	2018-02-09 14:43:57 +11:00
Rob Harrington	a32fb752dd	Removing number column from orders panel, adding edit action	2018-02-09 14:43:56 +11:00
Rob Harrington	e4f30cea57	Fixing styling for table rows within index panels	2018-02-09 14:43:56 +11:00
Rob Harrington	e351c3e355	Renaming StandingOrderOrder to ProxyOrder	2018-02-09 14:43:54 +11:00
Rob Harrington	805baa18a9	Adding cancel/close button to standing order form	2018-02-09 14:43:53 +11:00
Rob Harrington	533b05384c	Refactoring save bar on standing order create/edit form	2018-02-09 14:43:52 +11:00
Rob Harrington	9c2e67e953	Cancelling a standing order just changes the state, does not remove it from the page	2018-02-09 14:43:52 +11:00
Rob Harrington	522e646b36	Adding tooltips to standing order index actions	2018-02-09 14:43:52 +11:00
Rob Harrington	3d8dceb76a	Displaying state of standing orders on index	2018-02-09 14:43:52 +11:00
Rob Harrington	8d1899b13d	Adding pause and unpause actions to standing orders	2018-02-09 14:43:52 +11:00
Rob Harrington	774245f540	Adding cancel button to standing orders index	2018-02-09 14:43:51 +11:00
Rob Harrington	dd099eae54	Visualising standing order order state, still some spec failures	2018-02-09 14:43:50 +11:00