17514 Commits

Author	SHA1	Message	Date
Rohan Mitchell	fdd6400cb8	Fix perms for API soft delete	2016-11-04 09:39:17 +11:00
Rohan Mitchell	225e436293	Update included tax param before loading resource	2016-11-04 09:39:17 +11:00
Rohan Mitchell	0e354f8fc1	Remove unused currency config vars: decimal_mark, thousands_separator	2016-11-04 09:39:17 +11:00
Rohan Mitchell	a6a0bdb063	Sanitize values before they're used	2016-11-04 09:39:17 +11:00
Rohan Mitchell	6753320336	Do not stomp address on create	2016-11-04 09:39:17 +11:00
Rohan Mitchell	a3b91dabe5	TEMP: Remove override for no-longer-present method	2016-11-04 09:39:17 +11:00
Rohan Mitchell	257441c9be	Re-add object-level auth to Spree::Admin::ResourceController	2016-11-04 09:39:17 +11:00
Rohan Mitchell	1497d2c3bb	Remove missing call	2016-11-04 09:39:17 +11:00
Rohan Mitchell	8f0bc367d0	Include missing helpers	2016-11-04 09:39:17 +11:00
Rohan Mitchell	764219b9ed	Fix OrderMailer#find_order	2016-11-04 09:39:17 +11:00
Rohan Mitchell	32d2adc8a2	Fix mailers - provide from address	2016-11-04 09:39:17 +11:00
Rohan Mitchell	d890770104	Order state transition condition removed in Spree	2016-11-04 09:39:17 +11:00
Rohan Mitchell	a0b740f52d	Generalise fix for missing EnterpriseFee::Calculator to any use of calculated_adjustments	2016-11-04 09:39:17 +11:00
Rohan Mitchell	0d4c4f20df	Fix missing EnterpriseFee::Calculator error ... Conflicts: app/models/enterprise_fee.rb	2016-11-04 09:39:17 +11:00
Rohan Mitchell	9989b76b7d	Integrate from Spree fork: Calculators work against LineItems	2016-11-04 09:39:17 +11:00
Rohan Mitchell	04a714426f	Integrate from Spree fork: Fix spree issues #3531 and #2210 (patch provided by leiyangyou)	2016-11-04 09:39:17 +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	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	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