From e6b3ef7a778367ac2f3ecca376d8aca1f15e9363 Mon Sep 17 00:00:00 2001
From: QualityWorks <development@qualityworks.eu>
Date: Thu, 26 Oct 2017 16:30:11 +0200
Subject: [PATCH] Fix bug in quick checkouts.

---
 .../payment/mollie_checkout_form.tpl          | 20 +----
 .../payment/mollie_checkout_form.twig         | 76 +++++++------------
 2 files changed, 30 insertions(+), 66 deletions(-)

diff --git a/catalog/view/theme/default/template/extension/payment/mollie_checkout_form.tpl b/catalog/view/theme/default/template/extension/payment/mollie_checkout_form.tpl
index fdbad80c..7a7daef2 100644
--- a/catalog/view/theme/default/template/extension/payment/mollie_checkout_form.tpl
+++ b/catalog/view/theme/default/template/extension/payment/mollie_checkout_form.tpl
@@ -23,24 +23,11 @@
 
 		<script type="text/javascript">
 			(function ($) {
-				function initiateMollieConfirmClick(confirm_button_exists) {
-					if (confirm_button_exists) {
-						$("#qc_confirm_order").click(function () {
-							$("#mollie_payment_form").submit();
-						});
-					} else {
-						$("#button-confirm").click(function () {
-							$("#mollie_payment_form").submit();
-						});
-					}
-				}
-
-				// Run after pageload.
 				$(function () {
 					var issuers = $("#mollie_issuers"),
 							confirm_button_exists = ($("#qc_confirm_order").length > 0);
 
-					if (issuers.find("option").length == 1) {
+					if (issuers.find("option").length === 1) {
 						$.post("<?php echo $set_issuer_url; ?>", {mollie_issuer_id: issuers.val()});
 					}
 
@@ -55,8 +42,6 @@
 							$("#mollie_payment_form").parent().show();
 						}
 
-						// render after change (for ajax checkouts)
-						initiateMollieConfirmClick(confirm_button_exists);
 						return;
 					}
 
@@ -64,9 +49,6 @@
 					$("#button-confirm").show().click(function () {
 						$("#mollie_payment_form").submit();
 					});
-
-					// default confirm button render
-					initiateMollieConfirmClick(confirm_button_exists);
 				});
 			})(window.jQuery || window.$);
 		</script>
diff --git a/catalog/view/theme/default/template/extension/payment/mollie_checkout_form.twig b/catalog/view/theme/default/template/extension/payment/mollie_checkout_form.twig
index 3fa7384f..db34b65e 100644
--- a/catalog/view/theme/default/template/extension/payment/mollie_checkout_form.twig
+++ b/catalog/view/theme/default/template/extension/payment/mollie_checkout_form.twig
@@ -22,53 +22,35 @@
     </div>
 
     <script type="text/javascript">
-        (function ($) {
-            function initiateMollieConfirmClick(confirm_button_exists) {
-                if (confirm_button_exists) {
-                    $("#qc_confirm_order").click(function () {
-                        $("#mollie_payment_form").submit();
-                    });
-                } else {
-                    $("#button-confirm").click(function () {
-                        $("#mollie_payment_form").submit();
-                    });
-                }
-            }
-
-            // Run after pageload.
-            $(function () {
-                var issuers = $("#mollie_issuers"),
-                    confirm_button_exists = ($("#qc_confirm_order").length > 0);
-
-                if (issuers.find("option").length == 1) {
-                    $.post("{{ set_issuer_url }}", {mollie_issuer_id: issuers.val()});
-                }
-
-                issuers.bind("change", function () {
-                    $.post("{{ set_issuer_url }}", {mollie_issuer_id: $(this).val()});
-                });
-
-                // See if we can find a a confirmation button on the page (i.e. ajax checkouts).
-                if (confirm_button_exists) {
-                    // If we have issuers, show the form.
-                    if (issuers.length) {
-                        $("#mollie_payment_form").parent().show();
-                    }
-
-                    // render after change (for ajax checkouts)
-                    initiateMollieConfirmClick(confirm_button_exists);
-                    return;
-                }
-
-                // No confirmation button found. Show our own confirmation button.
-                $("#button-confirm").show().click(function () {
-                    $("#mollie_payment_form").submit();
-                });
-
-                // default confirm button render
-                initiateMollieConfirmClick(confirm_button_exists);
-            });
-        })(window.jQuery || window.$);
+			(function ($) {
+				$(function () {
+					var issuers = $("#mollie_issuers"),
+							confirm_button_exists = ($("#qc_confirm_order").length > 0);
+
+					if (issuers.find("option").length === 1) {
+						$.post("{{ set_issuer_url }}", {mollie_issuer_id: issuers.val()});
+					}
+
+					issuers.bind("change", function () {
+						$.post("{{ set_issuer_url }}", {mollie_issuer_id: $(this).val()});
+					});
+
+					// See if we can find a a confirmation button on the page (i.e. ajax checkouts).
+					if (confirm_button_exists) {
+						// If we have issuers, show the form.
+						if (issuers.length) {
+							$("#mollie_payment_form").parent().show();
+						}
+
+						return;
+					}
+
+					// No confirmation button found. Show our own confirmation button.
+					$("#button-confirm").show().click(function () {
+						$("#mollie_payment_form").submit();
+					});
+				});
+			})(window.jQuery || window.$);
     </script>
   </form>
 </div>