Commit Graph

708 Commits

Author SHA1 Message Date
Rohan Mitchell
f1fa90d7c3 Clone order cycles 2013-08-22 16:53:11 +10:00
alexs
8b4c0682fb Replaced eaterprises logo with the distributor name header. 2013-08-21 16:05:06 +10:00
alexs
dd9b6b344f Changed links to point to the shopfront urls (that set the distributor). 2013-08-20 15:31:43 +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
Rohan Mitchell
0458f7a6bb Summarise distribution fees in checkout after cart page 2013-08-19 17:02:02 +10:00
Rohan Mitchell
24cd5209d6 Do not error when attempting to mix product and order cycle distribution 2013-08-19 10:41:14 +10:00
alexs
8ee98e3d96 Added bugherd to admin and sree frontend and re-arranged the bugherd code. 2013-08-16 15:50:45 +10:00
alexs
d73dc1dc48 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-16 12:13:47 +10:00
alexs
ec9bfa3114 Added BugHerd script for new landing page (staging only). 2013-08-16 12:13:25 +10:00
Andrew Spinks
82726d032c Add enterprise roles for order cycles. 2013-08-16 11:34:07 +10:00
Rohan Mitchell
19e7537b64 Style order cycle fees 2013-08-16 10:36:41 +10:00
Rohan Mitchell
290607b5bf CrUD for order cycle exchange fees 2013-08-16 10:22:29 +10:00
Rohan Mitchell
715ec9b21a Send enterprise id along with exchange enterprise fees 2013-08-16 10:22:29 +10:00
alexs
a3970dde8a Forcing POST for the search form. 2013-08-16 10:18:46 +10:00
alexs
cfffced652 Fixed the bug in the enterprise geo search. 2013-08-15 16:33:41 +10:00
alexs
0705c7af36 Added vertical separators for search results. 2013-08-15 11:37:50 +10:00
alexs
bdc8387346 Added base for shop front (enterprise). 2013-08-14 17:31:25 +10:00
alexs
773c2b4217 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-08-14 11:31:25 +10:00
alexs
a8a0c0513e Fixed id duplication for login and sign up forms. 2013-08-14 11:12:36 +10:00
Andrew Spinks
d5791657f3 Support multiple orders when adding a product to a cart. 2013-08-14 10:49:55 +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
9501d2c8a1 Core of sign up functionality. 2013-08-14 10:38:49 +10:00
alexs
6b760f3068 Added feedback info for search criteria. 2013-08-14 10:37:25 +10:00
Rohan Mitchell
f67a6fa3fb Extract coordinator fees to partial 2013-08-14 09:48:45 +10:00
Rohan Mitchell
4120bc3dca Output exchange fees as JSON 2013-08-14 09:48:45 +10:00
David Cook
6bad6e2675 Add order cycle selection to Order Cycles Report 2013-08-13 15:48:04 +10:00
alexs
0a5f8afcb6 Added modal placeholders for new distributors and farmers sections. 2013-08-13 15:20:21 +10:00
alexs
886ac4a892 Added an escape patch with a small logo. 2013-08-13 12:07:32 +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
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
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
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
5baf9938e1 Ensure capture shortcut button shows for the correct payment 2013-08-12 14:44:26 +10:00
Rohan Mitchell
af6b16ecc4 Admin can assign enterprise fees to product distributions 2013-08-12 11:05:00 +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
alexs
7f74b85040 Markup tweak. 2013-08-07 19:26:21 +10:00
alexs
8efc95e095 Separated Foundation powered site from the Spree powered content (for now). 2013-08-07 19:25:48 +10:00