299 Commits

Author	SHA1	Message	Date
Rohan Mitchell	83e3c6815d	Merge branch 'checkout-changes' ... Conflicts: .rvmrc app/helpers/application_helper.rb	2013-01-22 10:30:51 +11:00
Rob H	f7890bd94d	Fixes following code review for checkout changes	2013-01-18 19:17:55 +11:00
Rob H	6a45e8be3b	Make tests pass after changes to checkout broke them all	2013-01-18 15:29:36 +11:00
Rohan Mitchell	05c9a189c8	Merge branch 'email-changes'	2013-01-17 16:09:25 +11:00
Rohan Mitchell	43a1cf7779	Merge branch 'product-quantity-fix'	2013-01-17 16:07:55 +11:00
Rob H	63cf128f86	Remove product descriptions from line item listings in cart and order	2012-12-14 15:08:35 +11:00
Rob H	1f8b4d185b	Rearrange 'Add To Cart' section of product page	2012-12-14 14:01:13 +11:00
Rob H	c7ac0f7d91	Allow distributor to be changed from product page	2012-12-14 11:57:34 +11:00
Rob H	8a37b4e918	Push validation logic for changing distributor down into lib class	2012-12-14 11:02:01 +11:00
Rob H	fc34c9c804	Add controller level check of product count_on_hand for adding products to cart	2012-12-13 11:16:46 +11:00
Rob H	3a3f427a8d	Reference name of payment method rather than payment method itself	2012-12-07 14:30:05 +11:00
Rob H	b5a95e73dc	Only show alternative distributors on 'address' page of checkout process	2012-12-07 12:29:44 +11:00
Rob H	9cf6124df3	Change checkout explanations from CMS pages to CMS snippets	2012-12-07 12:24:28 +11:00
Rob H	46abc2fc42	Add ability to change distributor based on whether products in the cart are available	2012-12-07 11:56:40 +11:00
Rohan Mitchell	cd13ab4f77	Fix failing tests	2012-12-04 11:39:39 +11:00
Rohan Mitchell	9880c45313	Perform all XHR with instead of	2012-12-04 11:07:44 +11:00
Rohan Mitchell	5afb2bb8f9	Extract Enterprise fetching into service	2012-12-04 10:51:14 +11:00
Rohan Mitchell	aefa06b67d	Edit works with service	2012-12-04 10:31:45 +11:00
Rohan Mitchell	7d84803bad	Extract OrderCycle into service, create works	2012-12-04 10:18:31 +11:00
Rohan Mitchell	fee64a5764	Datetime recognises input datetime format	2012-12-04 09:43:39 +11:00
Rohan Mitchell	34ef8a1deb	Datetime pickers interact with angular model	2012-12-04 09:38:12 +11:00
Rohan Mitchell	a0c40607ec	Bulk update order cycle opening/closing times	2012-12-02 15:43:05 +11:00
Rohan Mitchell	25a2732253	Add basic styling to order cycle edit page	2012-12-02 15:14:31 +11:00
Rohan Mitchell	97401ca370	Remove exchanges in both create and edit	2012-12-02 14:32:52 +11:00
Rohan Mitchell	71320aa977	Display correct label for submit button	2012-12-02 14:02:17 +11:00
Rohan Mitchell	8e4b729351	Load correct order cycle, prep for saving order cycle	2012-12-02 13:53:35 +11:00
Rohan Mitchell	cfa96c7615	Each order cycle may not have duplicate exchanges between the same enterprises	2012-11-30 16:37:29 +11:00
Rohan Mitchell	34120730cd	Load enterprises, all data displays	2012-11-30 15:46:53 +11:00
Rohan Mitchell	31735d3d10	Add edit order cycle controller, load basic data	2012-11-30 15:44:07 +11:00
Rohan Mitchell	ba3a595af2	Output an order cycle in JSON	2012-11-30 15:43:46 +11:00
Rohan Mitchell	6e4638b12d	Upgrade angular to 1.0.3, move form to partial, use angular resource	2012-11-30 15:17:21 +11:00
Rohan Mitchell	145fed09a1	Fixy	2012-11-29 11:54:22 +11:00
Rohan Mitchell	8736254f12	Create incoming exchanges on save	2012-11-29 11:52:34 +11:00
Rohan Mitchell	243e1ccd93	Add supplier to order cycle	2012-11-29 11:16:59 +11:00
Rohan Mitchell	ac66bf4871	Add client-side validation to order cycle form	2012-11-29 10:40:19 +11:00
Rohan Mitchell	64d4e405dd	Add datetimepicker for order cycle opening and closing times	2012-11-29 10:25:33 +11:00
Rohan Mitchell	aacc36ea44	Create order cycle basic fields	2012-11-29 10:02:23 +11:00
Rob H	ef22168349	Move select_distributor and deselect_distributor actions from enterprises controller to orders controller	2012-11-28 10:54:11 +11:00
Rob H	43248aee99	Add can_change_distributor validation to the Order model	2012-11-28 09:17:05 +11:00
Rohan Mitchell	a19e697556	Add header to admin enterprises page	2012-11-27 13:46:59 +11:00
Rohan Mitchell	5103ce64ba	Output new order cycle as JSON	2012-11-27 10:51:22 +11:00
Rohan Mitchell	d5310452b6	Admin list order cycles	2012-11-27 10:13:12 +11:00
Rohan Mitchell	47c28e65a7	Add detailed order cycle factory, add methods to report on order cycle suppliers, distributors and products/variants exchanged	2012-11-27 10:09:40 +11:00
Rohan Mitchell	6b97872a25	Create OrderCycles, Exchanges, ExchangeFees and ExchangeVariants	2012-11-26 11:03:44 +11:00
Rohan Mitchell	7a6d930706	Merge branch 'enterprise-fees'	2012-11-26 10:13:48 +11:00
Rohan Mitchell	7c5dcd6a90	Change angular_ prefix to ng_	2012-11-26 10:03:20 +11:00
Rohan Mitchell	6106f1b469	Calculator type change works, enterprise fee tests pass	2012-11-26 09:45:06 +11:00
Rohan Mitchell	59af447739	Fix ?	2012-11-26 09:44:42 +11:00
Rohan Mitchell	d502705362	Raise an error when using unsupported nested angular_fields_for	2012-11-24 07:50:09 +11:00
Rohan Mitchell	5ae13d6156	Order all the fees	2012-11-23 17:21:46 +11:00