From 00f340d97d14d796e0583ce81f06324373cfa1bd Mon Sep 17 00:00:00 2001
From: F-Node-Karlsruhe <undzn@student.kit.edu>
Date: Tue, 29 Jun 2021 10:08:37 +0200
Subject: [PATCH] improve manual payment check

---
 .gitignore         |  3 ++-
 iota.py            |  4 ++++
 templates/pay.html | 19 +++++++++++--------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07dba86..074c1be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@ iota/
 .DS_store
 .env
 db/*
-__pycache__/
\ No newline at end of file
+__pycache__/
+env/
\ No newline at end of file
diff --git a/iota.py b/iota.py
index 517e836..7184205 100644
--- a/iota.py
+++ b/iota.py
@@ -162,6 +162,10 @@ def manual_payment_check(self, address, user_token_hash):
 
                             self.unlock_content(user_token_hash, exp_time)
 
+                            self.manual_payment_checks.remove(user_token_hash)
+
+                            return
+
             # prevent key errors
             if user_token_hash in self.socket_session_ids.keys():
 
diff --git a/templates/pay.html b/templates/pay.html
index 4fcdb84..58d1398 100644
--- a/templates/pay.html
+++ b/templates/pay.html
@@ -15,15 +15,17 @@
         });
         socket.on('payment_not_found', function() {
             console.log('Payment not found');
+            document.getElementById("loader_text").innerHTML = 'Waiting for payment ...'
         });
         $('#check_payment_button').on('click', function(){
             socket.emit('check_payment', {user_token_hash: '{{ user_token_hash }}', iota_address: '{{ iota_address }}'});
+            document.getElementById("loader_text").innerHTML = 'Searching for payment ...'
         });
-        // show manual payment check after 30 seconds time
-        setTimeout("showCheckPayment()", 30000);
+        // show manual payment check after 30 seconds
+        setTimeout("enableCheckPayment()", 30000);
     });
-    function showCheckPayment() { 
-        document.getElementById("check_payment").style.display = "inline"; 
+    function enableCheckPayment() { 
+        document.getElementById("check_payment").style.display = 'inline'; 
     }
 </script>
 <style>
@@ -84,7 +86,11 @@ <h5>Access until</h5>
     <br>
     <div>
         <div class="loader"></div>
-        <p style="font-size: small;">Waiting for payment ...</p>
+        <p id="loader_text" style="font-size: small;">Waiting for payment ...</p>
+        <p id="check_payment" style="font-size: x-small; display:none;">
+            Already paid? 
+            <button style="border-radius: 5px;" id="check_payment_button">Manual payment check</button>
+        </p>
     <h5>
     <a style="color: white;
             text-decoration: none;
@@ -94,8 +100,5 @@ <h5>
                 Firefly wallet
     </a>
     </h5>
-    <div id="check_payment" style="display:none">
-        <button id="check_payment_button">Check for payment</button>
-    </div>
     </div>
 </div>