From fc5dbd35236db3d6e8d04061a332f9829524e032 Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Mon, 16 Nov 2015 10:59:26 +0200
Subject: [PATCH] Story#107571572 - banklinks workflow fixes

---
 app/controllers/registrar/payments_controller.rb | 8 ++++----
 app/models/bank_link.rb                          | 4 ++++
 config/locales/en.yml                            | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/controllers/registrar/payments_controller.rb b/app/controllers/registrar/payments_controller.rb
index 674b8afed..931dffcf2 100644
--- a/app/controllers/registrar/payments_controller.rb
+++ b/app/controllers/registrar/payments_controller.rb
@@ -20,16 +20,16 @@ class Registrar::PaymentsController < RegistrarController
   # both back and IPN
   def back
     @bank_link = BankLink::Response.new(params[:bank], params)
-    if @bank_link.valid?
+    if @bank_link.valid? && @bank_link.ok?
       @bank_link.complete_payment
 
       if @bank_link.invoice.binded?
-        flash[:notice] = t(:pending_applieds)
+        flash[:notice] = t(:pending_applied)
       else
-        flash[:error]  = t(:something_wrong)
+        flash[:alert]  = t(:something_wrong)
       end
     else
-      flash[:error] = t(:something_wrong)
+      flash[:alert] = t(:something_wrong)
     end
     redirect_to registrar_invoice_path(@bank_link.invoice)
   end
diff --git a/app/models/bank_link.rb b/app/models/bank_link.rb
index b28611542..31be3e222 100644
--- a/app/models/bank_link.rb
+++ b/app/models/bank_link.rb
@@ -88,6 +88,10 @@ class BankLink
       !!validate
     end
 
+    def ok?
+      params["VK_SERVICE"] == "1111"
+    end
+
     def complete_payment
       if valid?
         transaction = BankTransaction.find_by(description: params["VK_MSG"])
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7a562afa6..937096ad6 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -656,7 +656,7 @@ en:
   m_id: 'M-ID'
   pending_removed: Pending was successfully removed.
   pending_applied: Pending was successfully applied.
-  something_wrong: Not success, something went wrong
+  something_wrong: Sorry, something went wrong
   failure: Not success
   not_found: Not found
   no_connection_to_registry: Connection issue to the registry EPP or REPP server! Please try again later.