From 21543d8416ad0586deade9ee163e1382e80703fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Tue, 3 Mar 2020 12:07:05 +0200 Subject: [PATCH] Better naming for variables --- Gemfile.lock | 2 +- app/models/concerns/invoice/book_keeping.rb | 15 ++++++++------- app/models/concerns/registrar/book_keeping.rb | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8875293cf..3b36f1935 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,7 +9,7 @@ GIT GIT remote: https://github.com/internetee/directo.git - revision: 6fb158c1589c609b2519d8e8658c11de52bd3d9d + revision: 7bac1d5ca413e3cce25a7adad3c0e8d7f8cd673e branch: directo-api specs: directo (0.1.0) diff --git a/app/models/concerns/invoice/book_keeping.rb b/app/models/concerns/invoice/book_keeping.rb index 828ad7848..2469f45eb 100644 --- a/app/models/concerns/invoice/book_keeping.rb +++ b/app/models/concerns/invoice/book_keeping.rb @@ -4,14 +4,15 @@ module Concerns extend ActiveSupport::Concern def as_directo_json - inv = ActiveSupport::JSON.decode(ActiveSupport::JSON.encode(self)) - inv['customer_code'] = buyer.accounting_customer_code - inv['issue_date'] = issue_date.strftime('%Y-%m-%d') - inv['transaction_date'] = account_activity.bank_transaction&.paid_at&.strftime('%Y-%m-%d') - inv['language'] = buyer.language == 'en' ? 'ENG' : '' - inv['invoice_lines'] = compose_directo_product + invoice = ActiveSupport::JSON.decode(ActiveSupport::JSON.encode(self)) + invoice['customer_code'] = buyer.accounting_customer_code + invoice['issue_date'] = issue_date.strftime('%Y-%m-%d') + invoice['transaction_date'] = account_activity + .bank_transaction&.paid_at&.strftime('%Y-%m-%d') + invoice['language'] = buyer.language == 'en' ? 'ENG' : '' + invoice['invoice_lines'] = compose_directo_product - inv + invoice end def compose_directo_product diff --git a/app/models/concerns/registrar/book_keeping.rb b/app/models/concerns/registrar/book_keeping.rb index c85aac317..27645d2cb 100644 --- a/app/models/concerns/registrar/book_keeping.rb +++ b/app/models/concerns/registrar/book_keeping.rb @@ -10,16 +10,16 @@ module Concerns activities = monthly_activites(month) return unless activities.any? - inv = { + invoice = { 'number': 1, 'customer_code': accounting_customer_code, 'language': language == 'en' ? 'ENG' : '', 'currency': activities.first.currency, 'date': month.end_of_month.strftime('%Y-%m-%d') }.as_json - inv['invoice_lines'] = prepare_invoice_lines(month: month, activities: activities) + invoice['invoice_lines'] = prepare_invoice_lines(month: month, activities: activities) - inv + invoice end def prepare_invoice_lines(month:, activities:)