File tree Expand file tree Collapse file tree 2 files changed +6
-9
lines changed
Checkout/view/frontend/web/js
Multishipping/view/frontend/templates/checkout Expand file tree Collapse file tree 2 files changed +6
-9
lines changed Original file line number Diff line number Diff line change @@ -10,13 +10,12 @@ define([
10
10
"mage/translate"
11
11
] , function ( $ ) {
12
12
"use strict" ;
13
-
13
+
14
14
$ . widget ( 'mage.orderOverview' , {
15
15
options : {
16
16
opacity : 0.5 , // CSS opacity for the 'Place Order' button when it's clicked and then disabled.
17
17
pleaseWaitLoader : 'span.please-wait' , // 'Submitting order information...' Ajax loader.
18
- placeOrderSubmit : 'button[type="submit"]' , // The 'Place Order' button.
19
- agreements : '#checkout-agreements' // Container for all of the checkout agreements and terms/conditions
18
+ placeOrderSubmit : 'button[type="submit"]' // The 'Place Order' button.
20
19
} ,
21
20
22
21
/**
@@ -28,21 +27,19 @@ define([
28
27
} ,
29
28
30
29
/**
31
- * Verify that all agreements and terms/conditions are checked. Show the Ajax loader. Disable
32
- * the submit button (i.e. Place Order).
30
+ * Show the Ajax loader. Disable the submit button (i.e. Place Order).
33
31
* @return {Boolean }
34
32
* @private
35
33
*/
36
34
_showLoader : function ( ) {
37
- if ( $ ( this . options . agreements ) . find ( 'input[type="checkbox"]:not(:checked)' ) . length > 0 ) {
38
- alert ( $ . mage . __ ( 'Please agree to all Terms and Conditions before placing the orders.' ) ) ;
35
+ if ( ! this . element . validation ( 'isValid' ) ) {
39
36
return false ;
40
37
}
41
38
this . element . find ( this . options . pleaseWaitLoader ) . show ( ) . end ( )
42
39
. find ( this . options . placeOrderSubmit ) . prop ( 'disabled' , true ) . css ( 'opacity' , this . options . opacity ) ;
43
40
return true ;
44
41
}
45
42
} ) ;
46
-
43
+
47
44
return $ . mage . orderOverview ;
48
45
} ) ;
Original file line number Diff line number Diff line change 3
3
* @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
4
4
*/
5
5
?>
6
- <form action="<?php echo $ this ->getPostActionUrl () ?> " method="post" id="review-order-form" data-mage-init='{"orderOverview": {}}' class="form multicheckout order-review">
6
+ <form action="<?php echo $ this ->getPostActionUrl () ?> " method="post" id="review-order-form" data-mage-init='{"orderOverview": {}, "validation":{} }' class="form multicheckout order-review">
7
7
<?php echo $ this ->getBlockHtml ('formkey ' ); ?>
8
8
<div class="block block-billing">
9
9
<div class="block-title"><strong><?php echo __ ('Billing Information ' ) ?> </strong></div>
You can’t perform that action at this time.
0 commit comments