Merge pull request #67 from Gramhal-Foundation/feat/resolved-feedback

Resolved feedback
Gramhal-Foundation · Apr 16, 2024 · 4bc21c6 · 4bc21c6
2 parents cf1313b + 24bc844
commit 4bc21c6
Showing 1 changed file with 37 additions and 1 deletion.
diff --git a/admin/templates/resource/extract-data.html b/admin/templates/resource/extract-data.html
@@ -160,6 +160,42 @@ <h1>Receipt Number: {{ resource['receipt_id'] }}</h1>
         return;
     }
 
+    if (receiptPrinted == 'No') {
+        if (!ownerMobileNumberCheckbox.checked && !ownerMobileNumberInput.disabled && !/^\d{10}$/.test(ownerMobileNumberInput.value) && ownerMobileNumberInput.value) {
+            alert('Please enter a valid mobile number check.');
+            button.disabled = false;
+            button.classList.remove('bg-opacity-50');
+            button.classList.remove('cursor-not-allowed');
+            return;
+        }
+
+        if (!traderCodeCheckbox.checked && !traderCodeInput.disabled && !/^\d+$/.test(traderCodeInput.value) && traderCodeInput.value ) {
+            alert('Please enter a valid trader code check.');
+            button.disabled = false;
+            button.classList.remove('bg-opacity-50');
+            button.classList.remove('cursor-not-allowed');
+            return;
+        }
+
+        var regex = /^[a-zA-Z\s]*$/;
+
+        if (traderCodeInput.value !== null && !regex.test(traderNameInput.value) && !traderCodeCheckbox.checked && traderNameInput.value ) {
+                alert('Please enter a valid trader name without special characters or numbers.');
+                button.disabled = false;
+                button.classList.remove('bg-opacity-50');
+                button.classList.remove('cursor-not-allowed');
+                return;
+        }
+
+        if (traderCodeInput.value && !traderNameInput.value){
+            alert('Please enter a valid trader name without special characters or numbers.');
+            button.disabled = false;
+            button.classList.remove('bg-opacity-50');
+            button.classList.remove('cursor-not-allowed');
+            return;
+        }
+    }
+
     var textareas = form.getElementsByTagName('textarea');
 
     var formData = {};
@@ -239,7 +275,7 @@ <h1>Receipt Number: {{ resource['receipt_id'] }}</h1>
         }
     })
     .catch(error => {
-        alert('Error: ' + error);
+        alert('Error: ' + error.message);
     });
 }