Commit Graph

4496 Commits

Author SHA1 Message Date
Rohan Mitchell
54fe63e7f3 User can add subsequent order cycles product to cart, show order cycle selection in page header along with distributor 2013-05-28 16:20:58 +10:00
David Cook
0f8cd4705a Regenerate favicon.ico from higher quality image 2013-05-24 10:14:40 +10:00
David Cook
731cf33f86 Add new favicon.ico file with size 16, 32 and 64 2013-05-22 16:21:13 +10:00
Rohan Mitchell
3b2508dad3 On local organics checkout, remove distributor change, move save button to top right 2013-05-20 15:29:13 +10:00
Rohan Mitchell
da3267a302 Add OpenFoodWeb logo to footer 2013-04-29 16:20:26 +10:00
Rohan Mitchell
3dd4e074fc Split spree variable changes into per-feature files, add an eaterprises feature for default layout 2013-04-22 16:12:50 +10:00
Rohan Mitchell
fcb1701d36 WIP Add hub and order cycle display stub with failing tests 2013-03-08 15:18:52 +11:00
Rohan Mitchell
e1b2490259 Selecting an order cycle highlights valid distributor choices 2013-03-08 15:17:23 +11:00
Rohan Mitchell
74e2b70d3a Without JS, select distributor, highlighting local order cycle choices 2013-03-08 15:17:22 +11:00
Rohan Mitchell
456dfcf6db Style distribution choice, add compass for border radius mixin 2013-03-08 15:17:22 +11:00
Rob H
046eb256ff Fix issues causing enterprise fee tests to break 2013-02-15 14:10:56 +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
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
c75738893e Display supplier name on products for distribution 2013-01-18 14:35:06 +11:00
Rohan Mitchell
d8a7570a61 Display accurate counts for distributed products 2013-01-18 12:21:35 +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
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
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
Rohan Mitchell
3694321f66 Use angular's extend instead of jquery's 2013-01-11 10:54:53 +11:00
Rohan Mitchell
24a48a9b33 Move enterpriseTotalVariants to Enterprise service 2013-01-11 10:50:03 +11:00
Rohan Mitchell
bb13ec0e02 Rename methods 2013-01-11 10:40:56 +11:00
Rohan Mitchell
d3189e333b Count selected variants on an exchange 2013-01-11 10:36:27 +11:00
Rohan Mitchell
3186b703a2 Apply basic styling for order cycle product selection 2013-01-10 15:57:22 +11:00
Rohan Mitchell
d27ef76ead Load exchange variants from correct attr 2013-01-10 11:27:39 +11:00
Rohan Mitchell
5129e31f21 Remove unneeded exchange_variants init 2013-01-10 11:00:09 +11:00
Rohan Mitchell
6a666dd7ec Move preventDefault from service to controller 2013-01-08 17:51:08 +11:00
Rohan Mitchell
f705926c72 Display check boxes for products and variants, bind to model 2013-01-08 15:16:28 +11:00
Rob H
1f8b4d185b Rearrange 'Add To Cart' section of product page 2012-12-14 14:01:13 +11:00
Rohan Mitchell
19e55428b8 Test fetching enterprises 2012-12-13 16:24:59 +11:00
Rohan Mitchell
8d8c2f04d8 Add test for removesInactiveExchanges 2012-12-13 14:55:11 +11:00
Rohan Mitchell
2382de946f Test OrderCycle service create order cycle, use $window for testability 2012-12-13 14:37:35 +11:00
Rohan Mitchell
0f5d51423b Provide jQuery to tests, test loading an order cycle 2012-12-08 17:24:57 +11:00
Rohan Mitchell
91e3ddb93c Begin writing test for OrderCycle service 2012-12-07 16:24:40 +11:00
Rohan Mitchell
8cfce57730 Add unit tests for AdminEditOrderCycleCtrl 2012-12-07 15:30:49 +11:00
Rohan Mitchell
1d4d7d064b Add exchange products form, shown/hidden by button press 2012-12-04 12:26:18 +11:00
Rohan Mitchell
a4d3cc5417 Display exchange variants in JSON, load data client side 2012-12-04 12:07:58 +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