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

..

archive/features/consumer

Special Instructions in checkout are actually wired up

2014-09-06 12:00:27 +10:00

controllers

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

features

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

helpers

Decouple generic injection spec from EnterpriseSerializer

2015-06-03 12:53:46 +10:00

javascripts

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

jobs

Account invoice jobs run according to rails config time zone rather than system time zone

2015-10-23 12:33:05 +11:00

lib

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

mailers

Adding a ship address to order in spec

2015-03-01 12:22:06 +11:00

models

Merge branch 'account-invoices' into line_item_naming

2015-10-28 13:42:27 +11:00

performance

Fix currency issues, changed logo path

2015-06-18 15:38:46 +10:00

requests

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

serializers

Revert "Renaming options_text to unit_text so that we can use method from included VariantAndLineItemNaming module"

2015-10-28 13:08:50 +11:00

support

Remove old selenium-related test helper, remove unused param on handle_js_confirm

2015-07-31 16:56:08 +10:00

views/json

Removing stupid unusable spec

2015-04-09 17:20:31 +10:00

factories.rb

Refactoring invoice update process to use new AccountInvoice model

2015-09-17 22:38:29 +10:00

spec_helper.rb

Adding paper_trail verisoning RSpec helpers

2015-09-17 22:37:44 +10:00