373 Commits

Author	SHA1	Message	Date
David Cook	a63b8908bb	Moved inline style to stylesheet	2013-06-21 16:12:56 +10:00
David Cook	250e76c281	Fix incorrect count of enterprises (due to bug in rails issue #5554)	2013-06-21 15:10:21 +10:00
David Cook	7121860416	new view to display all distributors	2013-06-21 10:53:24 +10:00
David Cook	2d64e257ff	break long lines into two; no functional change	2013-06-21 10:45:11 +10:00
David Cook	d95903a82d	add html output format for all distributors	2013-06-21 10:44:16 +10:00
David Cook	b0e4bef75e	rename sidebar collection variables to avoid clash, fix count to be distinct	2013-06-21 10:42:42 +10:00
David Cook	1a9fd4a9a8	Merge branch 'supplied-active-products-on-hand' of github.com:eaterprises/openfoodweb into supplied-active-products-on-hand	2013-06-14 17:40:12 +10:00
David Cook	7ce7107c6c	Add meaningfull ids and classnames	2013-06-14 17:37:44 +10:00
David Cook	1abc0dac68	rename vars again	2013-06-14 17:36:38 +10:00
Rohan Mitchell	063d760047	Merge branch 'master' into supplied-active-products-on-hand	2013-06-14 11:07:24 +10:00
Rohan Mitchell	1e94f88c5e	Ensure order decorator is required, fix test fragility	2013-06-07 15:40:03 +10:00
David Cook	423bd52fd6	rename _count vars to _total	2013-05-22 14:03:51 +10:00
vagrant	4e7f966429	add suppliers scope, limit by 5, test	2013-05-22 13:07:30 +10:00
Rob H	055c07a466	Add before_payment method to checkout controller (fixes issues with spree_paypal_express)	2013-02-20 14:04:10 +11:00
Rob H	046eb256ff	Fix issues causing enterprise fee tests to break	2013-02-15 14:10:56 +11:00
Rob H	2cdf458d6a	Move additional of tabs to main nav bar to defaces, rather than overriding view directly	2013-02-14 15:42:47 +11:00
Rob H	9e9199643e	Remove unneeded :partial from override	2013-02-14 15:35:50 +11:00
Rob H	c956706d78	Move set_current_order override to new location in lib (Spree 1.3 Upgrade), and update home controller test	2013-02-14 15:12:50 +11:00
Rob H	a3746c6c59	Add analytics helper to Enterprises Controller	2013-02-14 12:10:31 +11:00
Rob H	1d4fbe865b	Finished revision of defaces	2013-02-09 00:40:34 +11:00
Rob H	2a07d61e81	Finish Deface review, two defaces which appear on orders/show remain unchecked due to Spree 1.2 migration issue	2013-02-07 15:09:25 +11:00
Rob H	99b4530db2	WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name	2013-02-07 13:07:14 +11:00
Rob H	3507c5414d	Changed Sass variable: back to our green colour following upgrade	2013-02-07 09:25:29 +11:00
Rob H	4b254a5529	WIP: revise overrides following upgrade to Spree 1.3, update ':original' definitions and reconcile filename and :name	2013-02-06 11:25:26 +11:00
Rob H	612017f143	WIP Upgrade to Spree 1.3	2013-02-05 15:01:45 +11:00
Rohan Mitchell	f2f3bbd3ed	Merge branch 'order-cycles-exchange-products' ... Conflicts: Gemfile.lock	2013-01-22 10:40:56 +11:00
Rohan Mitchell	83e3c6815d	Merge branch 'checkout-changes' ... Conflicts: .rvmrc app/helpers/application_helper.rb	2013-01-22 10:30:51 +11:00
Rohan Mitchell	662aaf75bf	When editing an order cycle, distributor collection details are loaded	2013-01-22 09:34:07 +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	c75738893e	Display supplier name on products for distribution	2013-01-18 14:35:06 +11:00
Rohan Mitchell	074d5715e7	Only provide distributors as coordinating enterprises. Order by name.	2013-01-18 14:26:56 +11:00
Rohan Mitchell	87d5ffeee2	Add fields for outgoing exchange collection details	2013-01-18 14:24:17 +11:00
Rohan Mitchell	d8a7570a61	Display accurate counts for distributed products	2013-01-18 12:21:35 +11:00
Rohan Mitchell	33b9d45f43	Distributors and products displayed on edit	2013-01-18 11:59:32 +11:00
Rohan Mitchell	0a2ce30bb6	Only show variants for distribution that are supplied to the order cycle	2013-01-18 11:52:01 +11:00
Rohan Mitchell	1a0ef85030	Test distributor exchanges are created with order cycles	2013-01-18 11:40: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
Rohan Mitchell	8f17df0e45	Name exchange elements independently	2013-01-17 11:36:56 +11:00
Rohan Mitchell	8e9845be12	Functionalise	2013-01-17 11:03:15 +11:00
Rohan Mitchell	3991199c30	Only show products for distribution that have been supplied to the order cycle	2013-01-17 10:49:59 +11:00
Rohan Mitchell	8f05c69696	Display all supplied products for distribution	2013-01-15 12:31:57 +11:00
Rohan Mitchell	f3f0f37716	Return to indexing for exchanges - this way new entries without an id get an index	2013-01-15 12:21:57 +11:00
Rohan Mitchell	850d65958b	Build Enterprise.supplied_products, an array of all products supplied by any enterprise	2013-01-15 12:21:13 +11:00
Rohan Mitchell	a10eb0d0c7	List and add distributor exchanges	2013-01-11 15:53:51 +11:00
Rohan Mitchell	9e59dead07	Tidy up coffee	2013-01-11 15:52:45 +11:00
Rohan Mitchell	d3fca565a3	Fix file naming and controller definition/testing	2013-01-11 14:09:56 +11:00
Rohan Mitchell	f971958042	Port order cycles js to coffeescript	2013-01-11 13:39:26 +11:00
Rohan Mitchell	3e06220b7f	WIP: Rename order_cycle to coffee	2013-01-11 10:57:02 +11:00