Merge branch 'staging' of github.com:internetee/registry into staging

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Stas 2015-11-17 16:51:46 +02:00
parent 360fb57a68
commit 2dddace1b8
12 changed files with 97 additions and 55 deletions

View file

@ -117,7 +117,7 @@ class Invoice < ActiveRecord::Base
return false unless valid?
return false unless billing_email.present?
InvoiceMailer.invoice_email(self, pdf(html)).deliver_now
InvoiceMailer.invoice_email(id, html).deliver
true
end