From 4b388705b6261f1a35623a6565cbefd591113c6e Mon Sep 17 00:00:00 2001
From: Oleg Hasjanov <oleg.phenomenon@gmail.com>
Date: Fri, 22 Sep 2023 11:02:03 +0300
Subject: [PATCH 1/2] removed invoice payment link

---
 app/mailers/ban_mailer.rb                | 2 --
 app/views/ban_mailer/ban_mail.html.erb   | 1 -
 config/locales/mailers/ban_mailer.en.yml | 2 --
 config/locales/mailers/ban_mailer.et.yml | 2 --
 4 files changed, 7 deletions(-)

diff --git a/app/mailers/ban_mailer.rb b/app/mailers/ban_mailer.rb
index f5c64880b..5f60d4e7e 100644
--- a/app/mailers/ban_mailer.rb
+++ b/app/mailers/ban_mailer.rb
@@ -3,8 +3,6 @@ def ban_mail(ban, ban_strikes, domain_name)
     @ban = ban
     @user = @ban.user
     @domain_name = domain_name
-    invoice = @ban.invoice
-    @linkpay_url = invoice.payment_link
 
     I18n.locale = @user.locale
     @past_due_invoices = I18n.locale == :en ? ban_strikes.ordinalize : ban_strikes
diff --git a/app/views/ban_mailer/ban_mail.html.erb b/app/views/ban_mailer/ban_mail.html.erb
index 3fc914d5b..a2935af2c 100644
--- a/app/views/ban_mailer/ban_mail.html.erb
+++ b/app/views/ban_mailer/ban_mail.html.erb
@@ -8,7 +8,6 @@
 
         <p><%= t('.introduction', domain_name: @domain_name) %></p>
         <p id='number-of-strikes'><%= t('.number_of_strikes', number: @past_due_invoices) %></p>
-        <p><%= t('.linkpay_html', linkpay_url: @linkpay_url) if @linkpay_url %></p>
         <%= t('.footer_html') %>
     </body>
 </html>
diff --git a/config/locales/mailers/ban_mailer.en.yml b/config/locales/mailers/ban_mailer.en.yml
index b795bf86a..a38b7eb16 100644
--- a/config/locales/mailers/ban_mailer.en.yml
+++ b/config/locales/mailers/ban_mailer.en.yml
@@ -10,8 +10,6 @@ en:
         This is your %{number} invoice overdue. According to clause 7.3.3 of the .ee Auction Environment
         User Agreement, a user can use the service of the environment if there are less than 3 unpaid
         invoices under their user account.
-      linkpay_html: |
-        You can pay for this invoice using following <a href=%{linkpay_url}>link</a>.
       footer_html: |
         <p>If you have any further questions, please contact the Estonian Internet Foundation at
         info@internet.ee or +372 727 1000.</p>
diff --git a/config/locales/mailers/ban_mailer.et.yml b/config/locales/mailers/ban_mailer.et.yml
index f30edd856..405478a80 100644
--- a/config/locales/mailers/ban_mailer.et.yml
+++ b/config/locales/mailers/ban_mailer.et.yml
@@ -9,8 +9,6 @@ et:
       number_of_strikes: |
         See on %{number}. tasumata arve. Tulenevalt Kasutajalepingu punktist 7.3.3. saab Teenuse
         kasutaja oksjonikeskkonna teenuseid kasutada, kui maksmata arveid on vähem kui kolm.
-      linkpay_html: |
-        Saad arve koheselt tasuda selle <a href=%{linkpay_url}>lingi</a> abil.
       footer_html: |
         <p>Täiendavate küsimuste korral võtke palun ühendust Eesti Interneti Sihtasutusega aadressil
         info@internet.ee või +372 727 1000.</p>

From 9f73338c0f544775f199a902e2ffe491394f8421 Mon Sep 17 00:00:00 2001
From: Oleg Hasjanov <oleg.phenomenon@gmail.com>
Date: Fri, 22 Sep 2023 11:05:59 +0300
Subject: [PATCH 2/2] return back localizations

---
 config/locales/mailers/ban_mailer.en.yml | 2 ++
 config/locales/mailers/ban_mailer.et.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/config/locales/mailers/ban_mailer.en.yml b/config/locales/mailers/ban_mailer.en.yml
index a38b7eb16..b795bf86a 100644
--- a/config/locales/mailers/ban_mailer.en.yml
+++ b/config/locales/mailers/ban_mailer.en.yml
@@ -10,6 +10,8 @@ en:
         This is your %{number} invoice overdue. According to clause 7.3.3 of the .ee Auction Environment
         User Agreement, a user can use the service of the environment if there are less than 3 unpaid
         invoices under their user account.
+      linkpay_html: |
+        You can pay for this invoice using following <a href=%{linkpay_url}>link</a>.
       footer_html: |
         <p>If you have any further questions, please contact the Estonian Internet Foundation at
         info@internet.ee or +372 727 1000.</p>
diff --git a/config/locales/mailers/ban_mailer.et.yml b/config/locales/mailers/ban_mailer.et.yml
index 405478a80..f30edd856 100644
--- a/config/locales/mailers/ban_mailer.et.yml
+++ b/config/locales/mailers/ban_mailer.et.yml
@@ -9,6 +9,8 @@ et:
       number_of_strikes: |
         See on %{number}. tasumata arve. Tulenevalt Kasutajalepingu punktist 7.3.3. saab Teenuse
         kasutaja oksjonikeskkonna teenuseid kasutada, kui maksmata arveid on vähem kui kolm.
+      linkpay_html: |
+        Saad arve koheselt tasuda selle <a href=%{linkpay_url}>lingi</a> abil.
       footer_html: |
         <p>Täiendavate küsimuste korral võtke palun ühendust Eesti Interneti Sihtasutusega aadressil
         info@internet.ee või +372 727 1000.</p>