8189 Commits

Author	SHA1	Message	Date
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	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	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	caeb8f08e7	Use link_to with mailto attribute to un-reverse email	2016-10-05 12:31:42 +11:00
Continuous Integration	815cf16822	Auto-merge from CI [skip ci]	2016-10-05 01:33:18 +11:00
Lynne Davis	79ea2fd39d	Reverse email address	2016-10-03 16:54:15 +01:00
Lynne Davis	40ca2ccee4	Updating TOS url in confirmation email to refer to content_config	2016-09-25 15:14:44 +01:00
Lynne Davis	84b4a9bcbe	update to internationalise email address in sell page	2016-09-25 14:00:11 +01:00
Rob Harrington	7d149ed198	Revert shop property filters - causing 10x slowdown ... This commit reverts commits 7eeee78c4e to e8f96e4818 (inclusive)	2016-09-18 17:46:43 +10:00
Rohan Mitchell	e8f96e4818	When a shop is open, only show taxon badges for currently open order cycles	2016-09-16 11:47:45 +10:00
Rohan Mitchell	3ca42ae055	Extract ids_to_objs to SerializerHelper	2016-09-16 11:36:27 +10:00
Rohan Mitchell	c0db23af90	Spree::Taxon.distributed_taxons can be scoped to taxons in open order cycles	2016-09-16 11:36:27 +10:00
Rohan Mitchell	db583df198	Use inner join for Spree::Taxon.distributed_taxons	2016-09-16 11:36:27 +10:00
Rohan Mitchell	306bd25dd9	EnterpriseSerialiser shows current properties for open shops and all properties for closed shops	2016-09-16 11:36:27 +10:00
Rohan Mitchell	f98b25b719	Add Spree::Property.ever_sold_by	2016-09-16 11:36:27 +10:00
Rohan Mitchell	1bc477f6b1	Add ProducerProperty.ever_sold_by	2016-09-16 11:36:26 +10:00
Rohan Mitchell	c37bf3d077	Rename Property#sold_by and ProducerProperty#sold_by to currently_sold_by	2016-09-16 11:36:26 +10:00
Rohan Mitchell	3a2e0b7eff	Fix spacing	2016-09-16 11:36:26 +10:00
Rohan Mitchell	38c63fc88b	Available producer filters update when taxon filter changed	2016-09-16 11:36:26 +10:00
Rohan Mitchell	8ec2ebbf94	Swap to using multi-line selectors for property filters - z-index issues with single-line-selectors	2016-09-16 11:36:26 +10:00
Rohan Mitchell	e00846776e	Client-side, always show properties by their presentation, not their name	2016-09-16 11:36:26 +10:00
Rohan Mitchell	8339d247f8	Shops on groups page filter by property	2016-09-16 11:36:26 +10:00
Rohan Mitchell	ed2522f6d2	Explicitly specify supplied or distributed properties for ng filters: properties, propertiesOf	2016-09-16 11:36:26 +10:00
Rohan Mitchell	63ef5de0e5	Use short syntax for render partial	2016-09-16 11:28:45 +10:00
Rohan Mitchell	38d5682762	Add property filters for shops	2016-09-16 11:28:45 +10:00
Rohan Mitchell	4c40219352	Move hubs partials from home to shops, their rightful home	2016-09-16 11:28:45 +10:00
Rohan Mitchell	7eeee78c4e	WIP: Move hubs partials from home to shops, their rightful home	2016-09-16 11:28:45 +10:00
Rob Harrington	0760d4cc1f	Fixing property filters on shopfront	2016-09-08 12:15:36 +10:00
Rob Harrington	261a574da9	Tweaking styling on enterprise change form, and dashboard header row	2016-09-07 11:13:48 +10:00
Rob Harrington	da55eb6d27	Form for changing enterprise type specifies trial length	2016-09-07 11:13:05 +10:00