#35 fixes for creditcard and sepa if lincence agreement checkbox is used

view/frontend/web/js/view/payment/method-renderer/adyen-cc-method.js

@@ -59,8 +59,6 @@ define(
                     ]);
                 return this;
             },
-            placeOrderHandler: null,
-            validateHandler: null,
             setPlaceOrderHandler: function(handler) {
                 this.placeOrderHandler = handler;
             },

view/frontend/web/js/view/payment/method-renderer/adyen-hpp-method.js

@@ -32,7 +32,7 @@ define(
         'Magento_Checkout/js/checkout-data',
         'Magento_Checkout/js/model/payment/additional-validators'
     ],
-    function (ko, $, Component, setPaymentMethodAction, selectPaymentMethodAction,quote, checkoutData, additionalValidators) {
+    function (ko, $, Component, setPaymentMethodAction, selectPaymentMethodAction, quote, checkoutData, additionalValidators) {
         'use strict';
         var brandCode = ko.observable(null);
         var paymentMethod = ko.observable(null);

view/frontend/web/template/payment/cc-form.html

@@ -233,28 +233,28 @@
 
                 <!-- /ko -->
             </fieldset>
+        </form>
 
-            <div class="checkout-agreements-block">
-                <!-- ko foreach: $parent.getRegion('before-place-order') -->
-                <!-- ko template: getTemplate() --><!-- /ko -->
-                <!--/ko-->
-            </div>
-            <div class="actions-toolbar">
-                <div class="primary">
-                    <button class="action primary checkout"
-                            type="submit"
-                            data-bind="
-                            click: placeOrder,
-                            attr: {title: $t('Place Order')},
-                            enable: (getCode() == isChecked()),
-                            css: {disabled: !isPlaceOrderActionAllowed()}
-                            "
-                            disabled>
-                        <span data-bind="text: $t('Place Order')"></span>
-                    </button>
-                </div>
+        <div class="checkout-agreements-block">
+            <!-- ko foreach: $parent.getRegion('before-place-order') -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+            <!--/ko-->
+        </div>
+        <div class="actions-toolbar">
+            <div class="primary">
+                <button class="action primary checkout"
+                        type="submit"
+                        data-bind="
+                        click: placeOrder,
+                        attr: {title: $t('Place Order')},
+                        enable: (getCode() == isChecked()),
+                        css: {disabled: !isPlaceOrderActionAllowed()}
+                        "
+                        disabled>
+                    <span data-bind="text: $t('Place Order')"></span>
+                </button>
             </div>
-        </form>
+        </div>
     </div>
 </div>
 

view/frontend/web/template/payment/sepa-form.html

@@ -137,8 +137,7 @@
 
 
             </fieldset>
-
-
+        </form>
         <div class="checkout-agreements-block">
             <!-- ko foreach: $parent.getRegion('before-place-order') -->
             <!-- ko template: getTemplate() --><!-- /ko -->