Commit Graph

17 Commits

Author SHA1 Message Date
Rob Harrington
18a7317185 Merge branch 'account-invoices' into line_item_naming
Conflicts:
	app/models/spree/line_item_decorator.rb
2015-10-28 13:42:27 +11:00
Rob Harrington
e52f7165c3 Overriding any last references to options_text in the spree codebase 2015-10-28 13:07:31 +11:00
Rob Harrington
6dfae1b014 Whitespace crusader 2015-10-28 13:07:31 +11:00
Rob Harrington
ef08977dbe Prevent invoices from being sent unless the distributor of an order has set their ABN 2015-10-21 16:23:48 +11:00
Rob Harrington
f12fd7b4a3 Adding button for print action to admin orders show page 2015-10-16 17:25:40 +11:00
Rob Harrington
6e7fc6a0f7 Adding invoice action to orders controller, to allow sending of invoice email 2015-10-16 17:25:40 +11:00
Maikel Linke
f017197221 orders list: filter by distributor and order cycle 2015-05-21 18:00:14 +10:00
Maikel Linke
b7bac326bd admin order edit: re-label update button to "update and recalculate fees" 2015-05-01 12:05:43 +10:00
Maikel Linke
2e66a082eb add customer notes to admin order index page 2015-04-29 14:31:59 +10:00
Maikel Linke
e82a3a9d82 add ship button to admin order index page 2015-04-29 12:30:05 +10:00
Maikel Linke
8511bd19ce add ship button to order edit page 2015-04-29 12:03:49 +10:00
Rob Harrington
ffb915ccc5 Orders page doesn't crash when orders have no distributor 2014-11-14 16:48:33 +11:00
Rohan Mitchell
edeb820c64 Send distributor and order cycle id to order add variant autocomplete search 2014-07-16 09:33:59 +10:00
David Cook
af71838610 Fix deface comment 2013-09-12 15:33:17 +10:00
David Cook
a99f23eb01 Add distributor name to admin orders table 2013-09-12 15:16:51 +10:00
Rohan Mitchell
4f8014306e Admin can't change distributor or order cycle once order has been finalized 2013-08-23 14:00:31 +10:00
Rohan Mitchell
2cab83cb29 Admin create order can set distributor and order cycle 2013-08-23 14:00:31 +10:00