From 28d156055545a1e797e6c7ecbb4da98bd4213574 Mon Sep 17 00:00:00 2001 From: Oleg Hasjanov Date: Thu, 22 Apr 2021 12:59:27 +0300 Subject: [PATCH] refactoring --- app/controllers/admin/invoices_controller.rb | 16 +++++++++------- app/models/bank_transaction.rb | 2 -- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb index cf17d78a1..e0b0a6d80 100644 --- a/app/controllers/admin/invoices_controller.rb +++ b/app/controllers/admin/invoices_controller.rb @@ -24,17 +24,12 @@ module Admin invoice_id = params[:invoice_id] invoice = Invoice.find(invoice_id) - account_activity = AccountActivity.find_by(invoice_id: invoice_id) - account_activity_dup = account_activity.dup - account_activity_dup.sum = -account_activity.sum.to_i - - if account_activity_dup.save and invoice.update(cancelled_at: Time.zone.today) + if account_activity_with_negative_sum(invoice) flash[:notice] = t(:payment_was_cancelled) - redirect_to admin_invoices_path else flash[:alert] = t(:failed_to_payment_cancel) - redirect_to admin_invoices_path end + redirect_to admin_invoices_path end def index @@ -60,5 +55,12 @@ module Admin def deposit_params params.require(:deposit).permit(:amount, :description, :registrar_id) end + + def account_activity_with_negative_sum(invoice) + account_activity = AccountActivity.find_by(invoice_id: invoice.id) + account_activity_dup = account_activity.dup + account_activity_dup.sum = -account_activity.sum.to_i + account_activity_dup.save && invoice.update(cancelled_at: Time.zone.today) + end end end diff --git a/app/models/bank_transaction.rb b/app/models/bank_transaction.rb index 8fe0d86b5..ab76010ee 100644 --- a/app/models/bank_transaction.rb +++ b/app/models/bank_transaction.rb @@ -33,8 +33,6 @@ class BankTransaction < ApplicationRecord .non_cancelled .where(total: sum) return true if paid_invoices.any?(&:paid?) - - false end def registrar