EMERGENCY COMMIT

diff --git a/data.db b/data.db
index 16ab433244569bb27a6b81defcfc4d4fe839ce08..48a31ba2c6fa2f5d008cf829a93b406bbf174044 100755 (executable)
Binary files a/data.db and b/data.db differ

diff --git a/templates/gfx.html b/templates/gfx.html
index 7efa9aac6e85e6064413bf2e231b4386736596bc..5878c5864350695b1be5c30c23266026b12b3bc3 100644 (file)
--- a/templates/gfx.html
+++ b/templates/gfx.html
@@ -760,7 +760,7 @@ function update() {
                     side.classList.add("showExtra");
 
                     for (let d = 0; d < 4; d++) {
                     side.classList.add("showExtra");
 
                     for (let d = 0; d < 4; d++) {

-                        if (discount[d] <= 0.99) {
+                        if (discountHard[d] <= 0.99) {

                             badgeContainer[d].classList.add("show");
                         } else {
                             badgeContainer[d].classList.remove("show");
                             badgeContainer[d].classList.add("show");
                         } else {
                             badgeContainer[d].classList.remove("show");


@@ -800,7 +800,7 @@ function update() {
             document.getElementById("description").innerHTML = item.description.replaceAll(rep, "&#9608;");
 
             // calculate the price sting with the pre/postfix
             document.getElementById("description").innerHTML = item.description.replaceAll(rep, "&#9608;");
 
             // calculate the price sting with the pre/postfix

-            let price = item.origional_price * discount.reduce((a, b)=> a*b, 1);
+            let price = item.origional_price * discountHard.reduce((a, b)=> a*b, 1);

             if (data.bool_rounding) {
                 price = Math.round(price * 100) / 100;
             }
             if (data.bool_rounding) {
                 price = Math.round(price * 100) / 100;
             }


@@ -816,14 +816,14 @@ function update() {
             // set discount, pricing and ez pay
             document.getElementById("currentPrice").innerHTML = `<em>Now only:</em> ${priceString}`.replaceAll(rep, "&#9608;");
             document.getElementById("monthlyPrice").innerHTML = `12 monthly payments of <b>${ezString}</b>`.replaceAll(rep, "&#9608;");
             // set discount, pricing and ez pay
             document.getElementById("currentPrice").innerHTML = `<em>Now only:</em> ${priceString}`.replaceAll(rep, "&#9608;");
             document.getElementById("monthlyPrice").innerHTML = `12 monthly payments of <b>${ezString}</b>`.replaceAll(rep, "&#9608;");

-            document.getElementById("badge1Text").innerHTML = `${Math.round((1 - discount[0]) * 100)}% OFF`.replaceAll(rep, "&#9608;");
-            document.getElementById("badge2Text").innerHTML = `ONLY ${Math.round((discount[1]) * 100)}%`.replaceAll(rep, "&#9608;");
-            document.getElementById("badge3Text").innerHTML = `${Math.round((1 - discount[2]) * 100)}% REMOVED`.replaceAll(rep, "&#9608;");
-            document.getElementById("badge4Text").innerHTML = `10 FOR ${String(Math.round(discount[3] * 10)).replaceAll(rep, "&#9608;")}<br><span style='font-size: 0.7em;'>WHAT?</span>`;
+            document.getElementById("badge1Text").innerHTML = `${Math.round((1 - discountHard[0]) * 100)}% OFF`.replaceAll(rep, "&#9608;");
+            document.getElementById("badge2Text").innerHTML = `ONLY ${Math.round((discountHard[1]) * 100)}%`.replaceAll(rep, "&#9608;");
+            document.getElementById("badge3Text").innerHTML = `${Math.round((1 - discountHard[2]) * 100)}% REMOVED`.replaceAll(rep, "&#9608;");
+            document.getElementById("badge4Text").innerHTML = `10 FOR ${String(Math.round(discountHard[3] * 10)).replaceAll(rep, "&#9608;")}<br><span style='font-size: 0.7em;'>WHAT?</span>`;

             document.getElementById("stock").innerHTML = `${item.stock_count} units`.replaceAll(rep, "&#9608;");
             document.getElementById("sold").innerHTML = `${Math.round(item.stock_count * (1 - (data.percent_remaining / 100)))} units`.replaceAll(rep, "&#9608;");
 
             document.getElementById("stock").innerHTML = `${item.stock_count} units`.replaceAll(rep, "&#9608;");
             document.getElementById("sold").innerHTML = `${Math.round(item.stock_count * (1 - (data.percent_remaining / 100)))} units`.replaceAll(rep, "&#9608;");
 

-            if (discount.reduce((a, b)=> a*b, 1) <= 0.99) {
+            if (discountHard.reduce((a, b)=> a*b, 1) <= 0.99) {

                 let origionalPrice = Math.round(item.origional_price);
                 if (item.prefix) {origionalString = `${item.currency}${origionalPrice}`}
                 else {origionalString = `${origionalPrice}${item.currency}`};
                 let origionalPrice = Math.round(item.origional_price);
                 if (item.prefix) {origionalString = `${item.currency}${origionalPrice}`}
                 else {origionalString = `${origionalPrice}${item.currency}`};