16954 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Maikel Linke	b66cf14bcb	Merge remote-tracking branch 'origin/master' into transifex ... Conflicts: config/locales/en_GB.yml v1.8.6	2016-10-28 15:21:03 +11:00
Transifex-Openfoodnetwork	b78739f777	Updating translations for config/locales/it.yml [skip ci]	2016-10-21 22:51:27 +11:00
Bing Xie	fb08759bec	Add more tests	2016-10-21 14:45:04 +11:00
Bing Xie	a4755865ca	Fix customer name	2016-10-21 11:58:50 +11:00
Bing Xie	5318aaedcf	Fix country id and state in type bug	2016-10-21 11:42:13 +11:00
Rob Harrington	3e56571e59	Making checkout accordion work with new local storage library	2016-10-21 10:51:36 +11:00
Rob Harrington	e57a25d05f	Replacing local storage library with actively maintained one: grevory/angular-local-storage	2016-10-21 10:51:36 +11:00
Rob Harrington	b59a1cc232	Using true/false instead of YES/NO for address defaults and billing same as shipping	2016-10-21 10:51:36 +11:00
Bing Xie	720ca17533	Fix the mistake	2016-10-21 10:51:36 +11:00
Bing Xie	d48b00c77c	Fix failed user spec	2016-10-21 10:51:36 +11:00
Bing Xie	77f43e3ca7	Refactor setting default addresses	2016-10-21 10:51:36 +11:00
Bing Xie	23b8fbbbc7	Update customer's default address	2016-10-21 10:51:36 +11:00
Bing Xie	b0402daf32	Fix failed customers filter spec	2016-10-21 10:51:36 +11:00
Bing Xie	079788b4eb	Add customer preferred bill and ship address	2016-10-21 10:51:36 +11:00
Bing Xie	21ed37189a	Only search customers in user managed enterprises	2016-10-21 10:51:36 +11:00
Bing Xie	80d755da0d	Convert state_id and country_id in serializer	2016-10-21 10:51:36 +11:00
Bing Xie	8d534041b2	Refactor js CurrentOrder	2016-10-21 10:51:36 +11:00
Bing Xie	e91c313f1e	Fix state_id and country_id type bug	2016-10-21 10:51:36 +11:00
Bing Xie	2f241485a2	Set default addresses for user or customer	2016-10-21 10:51:36 +11:00
Bing Xie	f14ca87eb5	Set new address for user	2016-10-21 10:51:36 +11:00
Bing Xie	1caf648fe5	Move customer search to directive	2016-10-21 10:51:36 +11:00
Bing Xie	ac39c93bbf	Fix failed js test	2016-10-21 10:51:36 +11:00
Bing Xie	63617f80c5	Add confirm when delete customer	2016-10-21 10:51:36 +11:00
Bing Xie	a94a30f422	Update the orders spec	2016-10-21 10:51:36 +11:00
Bing Xie	63dc48a075	Override customer search UI	2016-10-21 10:51:36 +11:00
Bing Xie	bc798504e0	Add new enterprise customers search API	2016-10-21 10:51:36 +11:00
Bing Xie	fd32152e88	Search customers in enterprises	2016-10-21 10:51:36 +11:00
Bing Xie	1877bea68d	Customer serializer without tag_rule_mapping option	2016-10-21 10:51:36 +11:00
Bing Xie	f7523ad88c	Create customer with default name and addresses	2016-10-21 10:51:36 +11:00
Bing Xie	ae2357d309	Edit customer address with first name and last name	2016-10-21 10:51:36 +11:00
Bing Xie	8afbdcaf79	Move phone down	2016-10-21 10:51:36 +11:00
Bing Xie	3e590f92ff	Set default billing address and shipping address	2016-10-21 10:51:36 +11:00
Bing Xie	a6cfa061e4	Fix ship_address_same_as_billing checkbox value with string	2016-10-21 10:51:36 +11:00
Maikel Linke	d59db1cd97	Merge remote-tracking branch 'origin/master' into uk/delivery-address	2016-10-19 11:01:24 +11:00
Transifex-Openfoodnetwork	7cfb25ace9	Updating translations for config/locales/en_GB.yml [skip ci]	2016-10-15 01:48:24 +11:00
Continuous Integration	51f97f5b28	Merge remote-tracking branch 'origin/master' into HEAD	2016-10-12 13:02:27 +11:00
Transifex-Openfoodnetwork	33d940c736	Updating translations for config/locales/fr.yml [skip ci]	2016-10-12 01:03:42 +11:00
Maikel Linke	08b9b50f33	Re-phrase shop options	2016-10-07 13:17:28 +11:00
Maikel Linke	7c3968b64e	Hide guest checkout if deactivated	2016-10-05 15:41:09 +11:00
Maikel Linke	c59cd21698	Add option 'allow guest orders' to enterprise ... An enterprise manager can choose to allow guest orders (default) or require a valid login for checkout.	2016-10-05 14:04:08 +11:00
Maikel Linke	92694c729f	Move 'shopfront requires login' setting ... Move 'shopfront requires login' setting to 'shop preferences' tab in Profile Edit. Solves issue #901.	2016-10-05 14:04:08 +11:00
Maikel Linke	7b2b285ba7	Rescue spec fails within enqueue_job matcher ... Failing code tested by the enqueue_job matcher made it fail with: expected ConfirmOrderJob to be enqueued matching {} (??? others enqueued) That was not helpful and masking the real failure. That failure is now passed on. The hidden intermittent failure happened in 5% of runs on Travis.	2016-10-05 14:04:08 +11:00
Maikel Linke	caeb8f08e7	Use link_to with mailto attribute to un-reverse email	2016-10-05 12:31:42 +11:00
Continuous Integration	499237715e	Auto-merge from CI [skip ci]	2016-10-05 03:08:43 +11:00
Lynne Davis	7eb2dfba48	Update delivery report to use shipping address	2016-10-04 17:04:35 +01:00
Continuous Integration	815cf16822	Auto-merge from CI [skip ci]	2016-10-05 01:33:18 +11:00
Lynne Davis	a3722dee80	delete file - fix conflict	2016-10-04 15:29:57 +01:00
Lynne Davis	79ea2fd39d	Reverse email address	2016-10-03 16:54:15 +01:00
Transifex-Openfoodnetwork	b349c28b9b	Updating translations for config/locales/nb.yml [skip ci]	2016-10-02 00:38:02 +10:00
Lynne Davis	40ca2ccee4	Updating TOS url in confirmation email to refer to content_config	2016-09-25 15:14:44 +01:00