Merge pull request self-xdsd#313 from criske/issue300

self-xdsd#300 Allow Invoice Payment Only If totalAmount >= 108 EUR
criske · Jan 5, 2021 · b6142ef · b6142ef
2 parents d932daf + 37c5912
commit b6142ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/resources/public/js/getAndAddContracts.js b/src/main/resources/public/js/getAndAddContracts.js
@@ -157,7 +157,9 @@ var projectContractsCount = -1;
                 + "</a>  ";
             if (invoice.paymentTime == "null" && invoice.transactionId == "null") {
                 status = "Active";
-                if (parseFloat(invoice.totalAmount) > 0.0) {
+                var totalAmount = parseFloat(invoice.totalAmount.substring(0, invoice.totalAmount.length - 1)
+                        .replace(",",".").trim())
+                if (totalAmount >= 108.0) {
                     payIcon = "<a href='#' title='Pay Invoice' class='payInvoice' "
                         + "data-contributor='" + contract.id.contributorUsername + "' "
                         + "data-role='" + contract.id.role + "' data-repo='" + contract.id.repoFullName + "'>"

diff --git a/src/main/resources/public/js/wallets.js b/src/main/resources/public/js/wallets.js
@@ -215,7 +215,7 @@ function payInvoice(invoice, contract, payButton) {
      */
     function newInvoiceAsTableRow(invoice) {
         var status = "Active"
-        var downloadLink = "<a href='#' title='Download Invoice' class='downloadInvoice'>"
+        var downloadLink ="<a href='#' title='Download Invoice' class='downloadInvoice'>"
             + "<i class='fa fa-file-pdf-o fa-lg'></i>"
             + "</a>";
         return "<tr>" +