refactor: move duplicate methods into concern

Author: OlegPhenomenon

app/controllers/admin/invoices/mark_as_paids_controller.rb

@@ -3,8 +3,9 @@ class Invoices::MarkAsPaidsController < BaseController
     rescue_from Errors::InvoiceAlreadyPaid, with: :invoice_already_paid
 
     before_action :set_invoice
-    before_action :authorize_user
-    before_action :authorize_for_update
+    
+    # order is important! before set invoice, otherwise @invoice wont be set
+    include ::Invoices::UpdateAuthorizable
 
     def edit; end
 
@@ -30,14 +31,6 @@ def invoice_already_paid
       redirect_to admin_invoice_path(@invoice), status: :see_other
     end
 
-    def authorize_user
-      authorize! :read, Invoice
-    end
-
-    def authorize_for_update
-      authorize! :update, @invoice
-    end
-
     def invoice_params
       params.require(:invoice).permit(:notes, :paid_at)
     end

app/controllers/admin/invoices/toggle_partial_payments_controller.rb

@@ -1,8 +1,9 @@
 module Admin
   class Invoices::TogglePartialPaymentsController < BaseController
     before_action :set_invoice
-    before_action :authorize_user
-    before_action :authorize_for_update
+
+    # order is important! before set invoice, otherwise @invoice wont be set
+    include ::Invoices::UpdateAuthorizable
 
     def update
       if @invoice.toggle(:partial_payments).save
@@ -19,13 +20,5 @@ def update
     def set_invoice 
       @invoice = Invoice.find(params[:invoice_id])
     end
-
-    def authorize_user
-      authorize! :read, Invoice
-    end
-
-    def authorize_for_update
-      authorize! :update, @invoice
-    end
   end
 end

app/controllers/concerns/invoices/update_authorizable.rb

@@ -0,0 +1,20 @@
+module Invoices
+  module UpdateAuthorizable
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :authorize_user
+      before_action :authorize_for_update
+    end
+
+    private
+
+    def authorize_user
+      authorize! :read, Invoice
+    end
+
+    def authorize_for_update
+      authorize! :update, @invoice
+    end
+  end
+end

config/locales/invoices.en.yml

@@ -45,6 +45,7 @@ en:
     paid_deposit_title: "Paid deposits"
     pay_all: Pay all invoices
     partial_payments_activated: "Allowed clients to make partial payments for this invoice"
+    partial_payments_deactivated: "Disallowed clients to make partial payments for this invoice"
     allow_partial_payments: "Allow partial payments"
     disallow_partial_payments: "Disallow partial payments"
     amount_must_be_positive: "Amount must be greater than 0"

config/locales/invoices.et.yml

@@ -46,6 +46,7 @@ et:
     paid_deposit_title: Deposiidimaksed
     pay_all: "Maksa kõik arved"
     partial_payments_activated: "Lubatud klientidel teha selle arve osalisi makseid"
+    partial_payments_deactivated: "Keelatud klientidel teha selle arve osalisi makseid"
     allow_partial_payments: "Luba osalisi makseid"
     disallow_partial_payments: "Keela osalised maksed"
     amount_must_be_positive: "Summa peab olema suurem kui 0"