Merge branch 'tests-rspec' into master-spec

This commit is contained in:
wvengen 2013-09-10 11:37:05 +02:00
commit e20898c5ee
28 changed files with 786 additions and 13 deletions

View file

@ -12,7 +12,7 @@
.well.well-small
%h3= t('.notes_and_journal')
#note
- unless @order.note.empty?
- unless @order.note.blank?
= simple_format @order.note
- else
%p= t('.comment_on_transaction')