370 Commits

Author	SHA1	Message	Date
Rohan Mitchell	31a078a53c	Enterprise manager can access enterprise fees for enterprises they manage - fixes fees on order cycles interface	2013-08-20 16:26:46 +10:00
Rohan Mitchell	fb33b853dd	Revert payment method changes that broke the build: 5f7cbe3, 5a3ad8e, 3ffe732, 2d305b5, 08babee, 6f73f41, 77329b5, 4be2fe5	2013-08-20 10:47:56 +10:00
alexs	8f67f385b7	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-19 17:37:49 +10:00
alexs	f160e051e5	Added new temporary landing page.	2013-08-19 17:37:22 +10:00
David Cook	3ffe732b30	Ensure valid payment method is selected	2013-08-19 13:57:40 +10:00
David Cook	2d305b59d9	Only show payment methods for the distributor of the order	2013-08-19 13:57:40 +10:00
David Cook	4be2fe5fe9	Only show payment methods that user has access to	2013-08-19 13:57:40 +10:00
Andrew Spinks	38522e2b74	Fix order cycle permissions for enterprise user.	2013-08-18 19:41:04 +10:00
Andrew Spinks	a8d4efd067	Add new 'shop' route that switches to the selected distributor and empties the cart if it has any line_items for a different distributor.	2013-08-16 17:08:19 +10:00
Andrew Spinks	82726d032c	Add enterprise roles for order cycles.	2013-08-16 11:34:07 +10:00
alexs	4e715f62a2	Moved limit into the model.	2013-08-16 09:53:40 +10:00
alexs	a7256611cf	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-15 16:54:47 +10:00
alexs	cfffced652	Fixed the bug in the enterprise geo search.	2013-08-15 16:33:41 +10:00
Andrew Spinks	fdaa5364a1	Add controller action for adding products to multi cart via javascript API.	2013-08-15 15:36:35 +10:00
Andrew Spinks	d160a3256a	Make adding to cart via spree front end kind of work again.	2013-08-15 15:36:35 +10:00
alexs	bdc8387346	Added base for shop front (enterprise).	2013-08-14 17:31:25 +10:00
Andrew Spinks	59fce8a964	Show line items for each order in multi-cart.	2013-08-14 10:49:55 +10:00
Andrew Spinks	0a39fb87a5	Fix multi-cart association and add some temporary multi-cart support into the current front end.	2013-08-14 10:49:54 +10:00
alexs	77d31b3004	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-14 10:48:47 +10:00
alexs	6b760f3068	Added feedback info for search criteria.	2013-08-14 10:37:25 +10:00
David Cook	293661377e	Remove text to the left of TOTAL	2013-08-13 17:01:19 +10:00
David Cook	015dbc5c01	Only show active or complete order cycles, ordered by cycle close date	2013-08-13 16:47:23 +10:00
David Cook	6bad6e2675	Add order cycle selection to Order Cycles Report	2013-08-13 15:48:04 +10:00
alexs	e90ccef337	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-13 11:40:54 +10:00
alexs	215d6030d7	Added link to 'About OFN' page (as well as the base for that page).	2013-08-13 11:36:24 +10:00
Rohan Mitchell	f3447f2898	Remove shipping method field from product distributions	2013-08-13 10:14:51 +10:00
Rohan Mitchell	2379cc0c3c	Do not display double error when using js	2013-08-13 09:11:25 +10:00
alexs	03b36bb14b	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-12 17:35:36 +10:00
alexs	f2f507c5c7	Suburb auto-complete functionality for the new landing page.	2013-08-12 17:34:56 +10:00
David Cook	c5f0848a56	More comments	2013-08-12 14:44:27 +10:00
David Cook	2ae4efbeba	Add more order privileges for distributor enterprise users	2013-08-12 14:44:26 +10:00
Rohan Mitchell	d7cce918f5	Instead of protecting shipping methods from destruction when referenced by product distributions, protect enterprise fees	2013-08-12 14:22:11 +10:00
alexs	71262d3cb3	Base for enterprise search via suburb selector..	2013-08-11 16:57:00 +10:00
alexs	4ff8e825e9	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-09 13:21:24 +10:00
alexs	b5cc2ab4cf	Added postcode search that redirect to page with map view.	2013-08-09 13:20:22 +10:00
Andrew Spinks	bc57364c7e	Add simple angular cart to the main page.	2013-08-08 18:31:56 +10:00
Andrew Spinks	ac37dff946	Add controller for cart and beginnings of an API.	2013-08-08 18:31:56 +10:00
alexs	f45ed42bdb	Skeleton for the search results.	2013-08-08 11:42:45 +10:00
David Cook	c247c2d3ea	WIP: Allow distributor enterprise user to access their orders	2013-08-07 09:19:28 +10:00
Rohan Mitchell	ec3e00c128	Refactor LineItem and clients for new fields	2013-08-06 13:47:17 +10:00
alexs	17f9a4645a	Added login to the landing page.	2013-08-06 12:34:22 +10:00
alexs	24d559cd3a	Merge branch 'master' into landing_page ... Conflicts: db/schema.rb db/seeds.rb	2013-08-05 17:08:39 +10:00
alexs	38b0a581e0	New landing page - initial layout and functionality	2013-08-05 17:04:56 +10:00
Andrew Spinks	e75021d7bd	Fix loading of products for an enterprise in the admin section. NOTE: this is a major hack - had to copy the current fetch data from the spree product_controller and modify it to get the roles to take affect. There must be a better way.	2013-08-02 18:13:42 +10:00
Andrew Spinks	9d32a5775a	Enterprise user admin: only allow suppliers and distributors that we manage to be selected when creating and editing products.	2013-08-02 16:08:10 +10:00
Andrew Spinks	0bb4f676e1	Add permissions to enterprise users so they can manage their own products.	2013-08-02 11:51:25 +10:00
Rohan Mitchell	a19a43da79	Add blank enterprise fees in js rather than in controller	2013-07-30 11:34:10 +10:00
Rohan Mitchell	36a124c10e	Fix merge issues: DCV name change and application controller var name issues.	2013-07-29 11:49:43 +10:00
Rohan Mitchell	7640eb497a	Merge branch 'supplied-active-products-on-hand' ... Conflicts: app/controllers/application_controller.rb app/models/enterprise.rb app/views/spree/products/_source_sidebar.html.haml spec/features/consumer/distributors_spec.rb spec/models/enterprises_spec.rb	2013-07-29 11:05:42 +10:00
Rohan Mitchell	2f83cecc23	Merge branch 'add-capture-order-shortcut-deface' ... Conflicts: spec/support/request/authentication_workflow.rb	2013-07-23 16:55:33 +10:00