2934 Commits

Author	SHA1	Message	Date
Maikel Linke	2367b73d3a	Revert "Associate new users with existing customer records" ... This reverts commit a25f4fdf44. Since email addresses are not validated, these associations would allow an attacker to signup with the email address of another person and view their orders.	2016-04-22 14:55:43 +10:00
Rohan Mitchell	a26266159c	Fix timing issue: change in client-side value during server update	2016-04-22 10:47:20 +10:00
Rohan Mitchell	06d7665bf9	Prospective fix for intermittent spec fail	2016-04-21 09:54:56 +10:00
Rohan Mitchell	5151779f80	When update is for another line item, still update all stock levels and show warnings	2016-04-21 09:36:23 +10:00
Rohan Mitchell	3dcfa810fd	Display out of stock banner when viewing cart directly	2016-04-21 09:36:23 +10:00
Rohan Mitchell	9b3139dba9	When there's an out of stock product in the cart, visiting the shopfront returns user to the cart	2016-04-21 09:36:23 +10:00
Rohan Mitchell	b2d78e7df6	Set allow_backorders explicitly for consistency in CI	2016-04-21 09:36:23 +10:00
Rohan Mitchell	dac90c8003	Fix specs	2016-04-21 09:36:23 +10:00
Rohan Mitchell	35117f7af4	Show a modal when available stock levels have reduced	2016-04-21 09:36:23 +10:00
Rohan Mitchell	5e39b11c2f	Spec out of stock handling for group buy	2016-04-21 09:36:23 +10:00
Rohan Mitchell	cfe062918b	When a variant goes out of stock, disable the input and grey out the row	2016-04-21 09:36:23 +10:00
Rohan Mitchell	8695dea0a5	Remove variant from cart when it becomes out of stock	2016-04-21 09:36:23 +10:00
Rohan Mitchell	792e17c385	When removing variant from order, if not found then do nothing	2016-04-21 09:36:23 +10:00
Rohan Mitchell	6fbbe580c5	After adding an item to the cart, when less quantity available, reduce quantity and reset client-side stock level	2016-04-21 09:36:23 +10:00
Rohan Mitchell	8a62d26af4	After adding an item to the cart, when out of stock, remove from cart and reset client-side stock level	2016-04-21 09:36:23 +10:00
Rohan Mitchell	fee0f90a1b	After adding products to cart, return status of cart and available stock levels	2016-04-21 09:36:22 +10:00
Rohan Mitchell	292d027498	When adding an item to cart with not enough stock, add as much as we can without erroring	2016-04-21 09:36:22 +10:00
Rohan Mitchell	d45b525497	When there's an out of stock product in the cart, placing order returns user to the cart	2016-04-21 09:36:22 +10:00
Rohan Mitchell	243f59c87d	When there's an out of stock product in the cart, checkout returns user to cart	2016-04-21 09:36:22 +10:00
Rohan Mitchell	9e321a63c0	Don't put master in order cycle - we don't do that no more	2016-04-21 09:36:22 +10:00
Maikel Linke	49febc6333	Store customer email as lower case	2016-04-15 15:35:43 +10:00
Maikel Linke	48f1794d70	Allow admin user to create customers	2016-04-15 14:34:29 +10:00
Maikel Linke	a25f4fdf44	Associate new users with existing customer records	2016-04-15 11:57:18 +10:00
Maikel Linke	831df0b222	Create and delete customers in admin interface ... Removed Customers service and extended CustomerResource.	2016-04-15 11:12:22 +10:00
Maikel Linke	ecd32819a6	Remove unused matcher	2016-04-15 11:12:22 +10:00
Maikel Linke	ef0d6bd4d6	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into state_translation_override ... Conflicts: spec/lib/open_food_network/order_cycle_management_report_spec.rb	2016-04-15 08:27:09 +10:00
Rohan Mitchell	53e6d391e3	Fix intermittent fail on insignificant result ordering	2016-04-14 09:40:55 +10:00
Maikel Linke	a2c58c7ca1	Match array without order in ocm spec ... That spec was randomly failing.	2016-04-13 16:59:54 +10:00
Rohan Mitchell	59b564c4be	Report job queue status via API	2016-04-13 16:48:24 +10:00
Rohan Mitchell	eb846e27fd	Run a job queue heartbeat every 5 minutes	2016-04-13 16:48:24 +10:00
Bing Xie	852dce2dff	Add default logos and home_hero	2016-04-08 14:41:44 +10:00
Rob Harrington	0ed97d820c	Removing unrequired Spree::Order#with_payment_method_name scope	2016-04-02 01:04:09 +11:00
Rob Harrington	9b5bfdeb00	Allowing Order Management Report to filter by multiple payment / shipping methods at once ... Also switched to using id rather than name to filter	2016-04-02 01:04:09 +11:00
Lynne Davis	f8e3f29d1a	More bug fixes. Spec updated to reflect changes	2016-04-02 01:04:09 +11:00
Rob Harrington	6c5aaef86e	Removing ability to create order discount rules ... Issue with application of tax to discounted items is yet to be resolved	2016-04-01 21:31:36 +11:00
Rob Harrington	d8c17d160a	Applying shipping method rules in checkout	2016-04-01 19:48:25 +11:00
Rob Harrington	d278b72289	Updating Tag Rules UI to allow management of new FilterShippingMethods rule type	2016-04-01 19:48:25 +11:00
Rob Harrington	82bc26fe90	Splitting tag rule feature specs out into their own spec file	2016-04-01 19:48:25 +11:00
Rob Harrington	f70b1f4572	Refactoring tag rule model and adding new rule type: FilterShippingMethod	2016-04-01 19:48:25 +11:00
Rob Harrington	3d78b375c6	Moving angularjs tag rule logic into its own module	2016-04-01 19:48:25 +11:00
Rob Harrington	f9acee2be4	Shipping methods can be tagged	2016-04-01 19:48:25 +11:00
Rob Harrington	f902474591	Relevant DiscountOrder tag rules are applied to orders on update	2016-04-01 19:48:25 +11:00
Rob Harrington	bf72864c2b	Tag Rules can be deleted	2016-04-01 19:48:25 +11:00
Rob Harrington	4c2552e0bf	Enterprise users can create tag rules	2016-04-01 19:48:25 +11:00
Rob Harrington	066190c16f	First cut at an interface for updating tag rules	2016-04-01 19:48:25 +11:00
Rob Harrington	3aea387b9a	First iteration of a model for tag rules	2016-04-01 19:44:17 +11:00
Maikel Linke	d12c486dd2	Use new spree_paypal_express branch to hide password	2016-04-01 15:48:21 +11:00
Maikel Linke	04f661f646	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into hide-closed-shops ... Conflicts: config/locales/en.yml	2016-04-01 13:02:53 +11:00
Maikel Linke	c4f92fd4cc	Hide closed shops by default, add "show" button	2016-04-01 11:45:24 +11:00
Maikel Linke	813dff8af2	Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login	2016-04-01 11:04:36 +11:00