raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-27 06:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,007 Commits 15 Branches 460 Tags
8ee467d2b9d5c9911fbaf6075fa6eb565eb843d4
Commit Graph

3 Commits

Author SHA1 Message Date
Rob Harrington
cd44d43b3e Adding price to line_item serializer (oops, forgot to include when merging in master) 2015-05-21 17:48:35 +10:00
Rob Harrington
903ed7e507 Merge branch 'master' into variable_weights 
Conflicts:
	app/assets/javascripts/admin/bulk_order_management.js.coffee
	app/views/spree/admin/orders/bulk_management.html.haml
	app/views/spree/api/line_items/bulk_show.v1.rabl
	spec/features/admin/bulk_order_management_spec.rb
 2015-05-21 17:31:33 +10:00
Rob Harrington
823adf3272 Translating existing order-related rabl templates accross to AMS 2015-05-20 11:45:48 +10:00