diff --git a/app/models/bank_link.rb b/app/models/bank_link.rb index 29857951f..24c94a771 100644 --- a/app/models/bank_link.rb +++ b/app/models/bank_link.rb @@ -32,7 +32,7 @@ class BankLink hash["VK_AMOUNT"] = number_with_precision(invoice.sum_cache, :precision => 2, :separator => ".") hash["VK_CURR"] = invoice.currency hash["VK_REF"] = "" - hash["VK_MSG"] = invoice.description + hash["VK_MSG"] = invoice.order hash["VK_RETURN"] = controller.registrar_return_payment_with_url(type) hash["VK_CANCEL"] = controller.registrar_return_payment_with_url(type) hash["VK_DATETIME"] = Time.now.strftime("%Y-%m-%dT%H:%M:%S%z") @@ -155,4 +155,4 @@ class BankLink bank_public_key.verify(OpenSSL::Digest::SHA1.new, Base64.decode64(mac), data) end end -end \ No newline at end of file +end diff --git a/app/models/directo.rb b/app/models/directo.rb index 05d9da5aa..fc1ad270a 100644 --- a/app/models/directo.rb +++ b/app/models/directo.rb @@ -35,7 +35,7 @@ class Directo < ActiveRecord::Base "ProductID" => Setting.directo_receipt_product_name, "Quantity" => 1, "UnitPriceWoVAT" => ActionController::Base.helpers.number_with_precision(invoice.sum_cache/(1+invoice.vat_prc), precision: 2, separator: "."), - "ProductName" => invoice.description + "ProductName" => invoice.order ) } end diff --git a/app/models/invoice.rb b/app/models/invoice.rb index b7cb92750..ad478443d 100644 --- a/app/models/invoice.rb +++ b/app/models/invoice.rb @@ -106,7 +106,12 @@ class Invoice < ActiveRecord::Base def buyer_country Country.new(buyer_country_code) end - + +# order is used for directo/banklink description + def order + "Order nr. #{number}" + end + def pdf(html) kit = PDFKit.new(html) kit.to_pdf