From 6efad74c5c7ed4937f8b7b111ff92f1b6522e3a0 Mon Sep 17 00:00:00 2001 From: Andy Brett Date: Wed, 3 Feb 2021 13:32:27 -0800 Subject: [PATCH] add authorize link to transactions page --- app/serializers/api/order_serializer.rb | 2 +- app/serializers/api/payment_serializer.rb | 2 +- app/views/spree/users/_fat.html.haml | 2 ++ config/locales/en.yml | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/serializers/api/order_serializer.rb b/app/serializers/api/order_serializer.rb index 958187a0b5..14b7eca32e 100644 --- a/app/serializers/api/order_serializer.rb +++ b/app/serializers/api/order_serializer.rb @@ -16,7 +16,7 @@ module Api end def payments - object.payments.joins(:payment_method).completed + object.payments.joins(:payment_method).valid end def shop_id diff --git a/app/serializers/api/payment_serializer.rb b/app/serializers/api/payment_serializer.rb index 7172e21f12..033803faf9 100644 --- a/app/serializers/api/payment_serializer.rb +++ b/app/serializers/api/payment_serializer.rb @@ -1,6 +1,6 @@ module Api class PaymentSerializer < ActiveModel::Serializer - attributes :amount, :updated_at, :payment_method, :state + attributes :amount, :updated_at, :payment_method, :state, :cvv_response_message def payment_method object.payment_method.try(:name) diff --git a/app/views/spree/users/_fat.html.haml b/app/views/spree/users/_fat.html.haml index dfbcfade38..56439d0e19 100644 --- a/app/views/spree/users/_fat.html.haml +++ b/app/views/spree/users/_fat.html.haml @@ -16,6 +16,8 @@ %td.order3.show-for-large-up %i{"ng-class" => "{'ofn-i_012-warning': payment.state == 'invalid' || payment.state == 'void' || payment.state == 'failed'}"} %span{"ng-bind" => "::'spree.payment_states.' + payment.state | t | capitalize"} + %span{"ng-if" => "payment.cvv_response_message.length > 0" } + %a{"ng-href" => "{{payment.cvv_response_message}}", "ng-bind" => "::'spree.payment_states.authorise' | t | capitalize" } %td.order4.show-for-large-up %td.order5.text-right{"ng-class" => "{'credit' : payment.amount > 0, 'debit' : payment.amount < 0, 'paid' : payment.amount == 0}","ng-bind" => "::payment.amount | localizeCurrency"} %td.order6.show-for-large-up diff --git a/config/locales/en.yml b/config/locales/en.yml index 4237d739f1..a86df86873 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -3620,6 +3620,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using processing: processing void: void invalid: invalid + authorise: authorise order_mailer: cancel_email: customer_greeting: "Dear %{name},"