From bc640c63fe2116a59cffa6cf70b11a3045e30d1b Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Tue, 19 Jan 2016 09:38:46 +0200 Subject: [PATCH] Story#105852786 - cleaner code --- app/models/directo.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/directo.rb b/app/models/directo.rb index 2a1ec118c..3ca40eaf1 100644 --- a/app/models/directo.rb +++ b/app/models/directo.rb @@ -8,8 +8,9 @@ class Directo < ActiveRecord::Base builder = Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml| xml.invoices { group.each do |transaction| - next unless transaction.invoice - num = transaction.invoice_num + invoice = transaction.invoice + next unless invoice + num = transaction.invoice_num mappers[num] = transaction xml.invoice( @@ -18,12 +19,12 @@ class Directo < ActiveRecord::Base "InvoiceDate" => (transaction.paid_at||transaction.created_at).strftime("%Y-%m-%dT%H:%M:%S"), "PaymentTerm" => Setting.directo_receipt_payment_term, "Currency" => transaction.currency, - "CustomerCode"=> transaction.invoice.try(:buyer).try(:directo_handle) + "CustomerCode"=> invoice.buyer.try(:directo_handle) ){ xml.line( "ProductID"=> Setting.directo_receipt_product_name, "Quantity" => 1, - "UnitPriceWoVAT" =>ActionController::Base.helpers.number_with_precision(transaction.invoice.sum_without_vat, precision: 2, separator: "."), + "UnitPriceWoVAT" =>ActionController::Base.helpers.number_with_precision(invoice.sum_cache/(1+invoice.vat_prc), precision: 2, separator: "."), "ProductName" => transaction.description ) }