Merge pull request #10666 from jibees/9723-admin-missing-translation-in-payment-report

Admin, Payment reports: add missing translation for payment state

lib/reporting/reports/payments/base.rb

@@ -11,6 +11,12 @@ module Reporting
         def query_result
           search.result.group_by { |order| [order.payment_state, order.distributor] }.values
         end
+
+        protected
+
+        def payment_state(order)
+          I18n.t "spree.payment_states.#{order.payment_state}"
+        end
       end
     end
   end

lib/reporting/reports/payments/itemised_payment_totals.rb

@@ -6,7 +6,7 @@ module Reporting
       class ItemisedPaymentTotals < Base
         def columns
           {
-            payment_state: proc { |orders| orders.first.payment_state },
+            payment_state: proc { |orders| payment_state(orders.first) },
             distributor: proc { |orders| orders.first.distributor.name },
             product_total_price: proc { |orders| orders.to_a.sum(&:item_total) },
             shipping_total_price: proc { |orders| orders.sum(&:ship_total) },

lib/reporting/reports/payments/payment_totals.rb

@@ -6,7 +6,7 @@ module Reporting
       class PaymentTotals < Base
         def columns
           {
-            payment_state: proc { |orders| orders.first.payment_state },
+            payment_state: proc { |orders| payment_state(orders.first) },
             distributor: proc { |orders| orders.first.distributor.name },
             product_total_price: proc { |orders| orders.to_a.sum(&:item_total) },
             shipping_total_price: proc { |orders| orders.sum(&:ship_total) },

lib/reporting/reports/payments/payments_by_payment_type.rb

@@ -15,7 +15,7 @@ module Reporting
 
         def columns
           {
-            payment_state: proc { |payments| payments.first.order.payment_state },
+            payment_state: proc { |payments| payment_state(payments.first.order) },
             distributor: proc { |payments| payments.first.order.distributor.name },
             payment_type: proc { |payments| payments.first.payment_method.name },
             total_price: proc { |payments| payments.sum(&:amount) }

spec/system/admin/reports/payments_report_spec.rb

@@ -86,7 +86,7 @@ describe "Payments Reports" do
       ].join(" ").upcase)
 
       expect(page.find("table.report__table tbody tr").text).to have_content([
-        order.payment_state,
+        "credit owed",
         order.distributor.name,
         order.item_total.to_f + other_order.item_total.to_f,
         order.ship_total.to_f + other_order.ship_total.to_f,