1970 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
alexs	e1a876a4b5	Added default minimum height for text areas.	2013-08-13 15:19:03 +10:00
alexs	1a3c09a846	Temporarily downgraded zurb foundation to make it work with gmaps4rails (will be fixed in future release of Foundation).	2013-08-13 15:18:31 +10:00
alexs	886ac4a892	Added an escape patch with a small logo.	2013-08-13 12:07:32 +10:00
alexs	7206bf6393	Re-adjusted vertical positioning of the landing page.	2013-08-13 11:49:04 +10:00
alexs	e90ccef337	Merge branch 'master' of github.com:eaterprises/openfoodweb	2013-08-13 11:40:54 +10:00
alexs	779befe3cf	Links to the enterpise pages.	2013-08-13 11:40:35 +10:00
alexs	6a17f80c93	Added logo to the landing page.	2013-08-13 11:40:14 +10:00
alexs	72a422f7e7	Added the link that navigates to the current enterprise shopfront (for now).	2013-08-13 11:38:19 +10:00
alexs	8b87c33c97	Added layout based wrapping for the main component (used in off canvas layout).	2013-08-13 11:37:36 +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
David Cook	6c4ace8d14	Ensure that all PaymentMethod-derived classes also allow distributor_id	2013-08-13 10:57:36 +10:00
David Cook	725766d82e	Feature tests for PaymentMethod in admin and checkout	2013-08-13 10:57:36 +10:00
David Cook	98d520f0e3	Filter PaymentMethods by distributor	2013-08-13 10:55:52 +10:00
David Cook	1621e4c4a4	Add distributor to PaymentMethod	2013-08-13 10:55:51 +10:00
Rohan Mitchell	f3447f2898	Remove shipping method field from product distributions	2013-08-13 10:14:51 +10:00
Rohan Mitchell	5f4313b588	Remove itemwise shipping calculator	2013-08-13 10:14:39 +10:00
Rohan Mitchell	b71f7eec3d	Fix spec for charges by adjustment not shipping method	2013-08-13 09:11:26 +10:00
Rohan Mitchell	43f482a803	Remove use of deprecated rspec syntax	2013-08-13 09:11:26 +10:00
Rohan Mitchell	7677f79f17	Remove the now-unused Product#shipping_method_for_distributor	2013-08-13 09:11:26 +10:00
Rohan Mitchell	94e49d4190	Remove line item specs for removed functionality	2013-08-13 09:11:26 +10:00
Rohan Mitchell	7e30b664f2	Add enterprise fees relation to enterprise	2013-08-13 09:11:26 +10:00
Rohan Mitchell	c011de539d	Update rake task for product distribution fees by enterprise fee	2013-08-13 09:11:25 +10:00
Rohan Mitchell	b5d324ec8c	Drop itemwise shipping method use in tests	2013-08-13 09:11:25 +10:00
Rohan Mitchell	9aad44f093	Strip shipping method mechanics out of LineItem and Order	2013-08-13 09:11:25 +10:00
Rohan Mitchell	60956e9789	Display sum of distribution fees at cart by adjustment, not shipping methods	2013-08-13 09:11:25 +10:00
Rohan Mitchell	b7ea03f7fc	Remove distributor fees table at checkout, pending design of new breakdown	2013-08-13 09:11:25 +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	03b8b042ba	Deleted: libpeerconnection.log	2013-08-12 14:44:27 +10:00
David Cook	5baf9938e1	Ensure capture shortcut button shows for the correct payment	2013-08-12 14:44:26 +10:00
David Cook	c915bb91cf	More tests for distributor enterprise user roles	2013-08-12 14:44:26 +10:00
David Cook	2ae4efbeba	Add more order privileges for distributor enterprise users	2013-08-12 14:44:26 +10:00
David Cook	c645ad25a7	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
Rohan Mitchell	f1485bf9c5	Remove shipping method from product distribution in factory.	2013-08-12 14:21:39 +10:00
Rohan Mitchell	af6b16ecc4	Admin can assign enterprise fees to product distributions	2013-08-12 11:05:00 +10:00
Rohan Mitchell	7ea1122833	Make spec naming consistent	2013-08-12 10:13:31 +10:00
Rohan Mitchell	14268b7be0	Create adjustment metadata when creating adjustment	2013-08-12 10:00:35 +10:00
Rohan Mitchell	149d48ff5a	Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation	2013-08-12 10:00:35 +10:00
Rohan Mitchell	ba0b3bad85	Convert product distribution shipping methods to enterprise fees	2013-08-12 10:00:35 +10:00
alexs	94cab872a5	Temporarily removing ssl enforcing.	2013-08-11 17:53:53 +10:00
alexs	efc5943f57	Increase compression for landing page images.	2013-08-11 17:38:25 +10:00
alexs	653525e9b0	Updated the spec to reflect the field name change.	2013-08-11 17:19:17 +10:00
alexs	e9110ac752	Merge branch 'master' of github.com:eaterprises/openfoodweb ... Conflicts: Gemfile.lock	2013-08-11 16:59:02 +10:00
alexs	71262d3cb3	Base for enterprise search via suburb selector..	2013-08-11 16:57:00 +10:00
alexs	51a4795763	Added rack-ssl and spinjs.	2013-08-11 16:52:34 +10:00
Rohan Mitchell	b065d7db36	When updating product distribution charge, skip line items that don't have a product distribution	2013-08-09 15:30:35 +10:00
Rohan Mitchell	b84c476348	Upgrade Rails to 3.2.14, use forked spree with calculators that are compatible with LineItems	2013-08-09 15:30:35 +10:00