Story#105852786 - cleaner code

This commit is contained in:
Vladimir Krylov 2016-01-19 09:38:46 +02:00
parent 51c54f77c7
commit bc640c63fe

View file

@ -8,8 +8,9 @@ class Directo < ActiveRecord::Base
builder = Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml| builder = Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml|
xml.invoices { xml.invoices {
group.each do |transaction| group.each do |transaction|
next unless transaction.invoice invoice = transaction.invoice
num = transaction.invoice_num next unless invoice
num = transaction.invoice_num
mappers[num] = transaction mappers[num] = transaction
xml.invoice( xml.invoice(
@ -18,12 +19,12 @@ class Directo < ActiveRecord::Base
"InvoiceDate" => (transaction.paid_at||transaction.created_at).strftime("%Y-%m-%dT%H:%M:%S"), "InvoiceDate" => (transaction.paid_at||transaction.created_at).strftime("%Y-%m-%dT%H:%M:%S"),
"PaymentTerm" => Setting.directo_receipt_payment_term, "PaymentTerm" => Setting.directo_receipt_payment_term,
"Currency" => transaction.currency, "Currency" => transaction.currency,
"CustomerCode"=> transaction.invoice.try(:buyer).try(:directo_handle) "CustomerCode"=> invoice.buyer.try(:directo_handle)
){ ){
xml.line( xml.line(
"ProductID"=> Setting.directo_receipt_product_name, "ProductID"=> Setting.directo_receipt_product_name,
"Quantity" => 1, "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 "ProductName" => transaction.description
) )
} }