raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-26 01:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 17 Branches 454 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

4617 Commits

Author SHA1 Message Date
Rob H
febb9a44a2 Remove commented (unrequired) lines on code 2013-07-23 10:37:50 +10:00
Rob H
c503c1b10c BPUR: refactor of filterSubmitProducts 2013-07-23 10:37:50 +10:00
Rob H
dcf6446450 BPUR: can delete variants 2013-07-23 10:37:50 +10:00
Rob H
5db0d839fa BPUR: can delete products 2013-07-23 10:37:50 +10:00
Rob H
8179f45272 BPUR: remove unused product update js and tests 2013-07-23 10:37:50 +10:00
Rob H
5258cba2a2 BPUR: change to live tracking of dirty properties (variant price update still failing) 2013-07-23 10:37:50 +10:00
Rob H
c80cba7fa5 BPUR: Don't use master variant to update attributes. Changes to product filtering. 2013-07-23 10:37:50 +10:00
Rob H
f3d778af1a BPUR: can update master on_hand 2013-07-23 10:37:50 +10:00
Rob H
fbb3657bdc BPUR: can update master price. Test refactor and added angular ng-decimal directive 2013-07-23 10:37:50 +10:00
Rob H
1e64dab9f7 Bulk product update rewrite: basic integration test passing 2013-07-23 10:37:50 +10:00
Rob H
6b097eb9f8 WIP: minor fixes to bulk product update js 2013-07-23 10:37:50 +10:00
Rob H
3c57680303 WIP: bulk product update: basic integration test failing because rails infrastructure does not exist yet 2013-07-23 10:37:50 +10:00
Rob H
74291ab1f7 remove leftover debugger; call in code 2013-07-23 10:37:50 +10:00
Rob H
554c67f1a3 WIP: specs and basic js infrastructure for bulk product update 2013-07-23 10:37:50 +10:00
Rob H
731127d55c WIP: Bulk Product Update Rewrite: initial acceptance testing 2013-07-23 10:37:50 +10:00
David Cook
15c454a0f1 move style to stylesheet 2013-07-19 17:04:04 +10:00
Rohan Mitchell
3de52b10b2 Fix JS error: Unknown provider: a from order_cycle 2013-06-25 12:31:28 +10:00
Rohan Mitchell
ce2c6c5661 Fix uninjected directive for enterprise fees 2013-06-25 12:17:15 +10:00
Rohan Mitchell
b7a778b0de Define order cycles JS methods in a minification-friendly manner 2013-06-25 10:58:12 +10:00
Rohan Mitchell
f78db2493f Define enterprise fees controller in a minification-safe manner 2013-06-25 10:35:45 +10:00
David Cook
a63b8908bb Moved inline style to stylesheet 2013-06-21 16:12:56 +10:00
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