Skip to content

Commit 5984b24

Browse files
committed
Merge remote-tracking branch 'magento-mpi/MC-18200' into PR23-20190718
# Conflicts: # app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml
2 parents a102409 + 4a8c042 commit 5984b24

File tree

1 file changed

+10
-10
lines changed
  • app/code/Magento/Payment/view/frontend/templates/transparent

1 file changed

+10
-10
lines changed

app/code/Magento/Payment/view/frontend/templates/transparent/iframe.phtml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ $params = $block->getParams();
1313
<?php if (isset($params['redirect'])) : ?>
1414
window.location="<?= $block->escapeUrl($params['redirect']) ?>";
1515
<?php elseif (isset($params['redirect_parent'])) : ?>
16-
var require = window.top.require;
16+
var require = window.parent.require;
1717
require(
1818
[
1919
'jquery'
2020
],
2121
function($) {
22-
var parent = window.top;
22+
var parent = window.parent;
2323
$(parent).trigger('clearTimeout');
2424
parent.location="<?= $block->escapeUrl($params['redirect_parent']) ?>";
2525
}
2626
);
2727
<?php elseif (isset($params['error_msg'])) : ?>
28-
var require = window.top.require;
28+
var require = window.parent.require;
2929
require(
3030
[
3131
'jquery',
@@ -34,7 +34,7 @@ $params = $block->getParams();
3434
'Magento_Checkout/js/model/full-screen-loader'
3535
],
3636
function($, globalMessageList, $t, fullScreenLoader) {
37-
var parent = window.top;
37+
var parent = window.parent;
3838
$(parent).trigger('clearTimeout');
3939
fullScreenLoader.stopLoader();
4040
globalMessageList.addErrorMessage({
@@ -43,21 +43,21 @@ $params = $block->getParams();
4343
}
4444
);
4545
<?php elseif (isset($params['multishipping'])) : ?>
46-
var require = window.top.require;
46+
var require = window.parent.require;
4747
require(
4848
[
4949
'jquery'
5050
],
5151
function($) {
52-
var parent = window.top;
52+
var parent = window.parent;
5353
$(parent).trigger('clearTimeout');
5454
$(parent.document).find('#multishipping-billing-form').submit();
5555
}
5656
);
5757
<?php elseif (isset($params['order_success'])) : ?>
58-
window.top.location = "<?= $block->escapeUrl($params['order_success']) ?>";
58+
window.parent.location = "<?= $block->escapeUrl($params['order_success']) ?>";
5959
<?php else : ?>
60-
var require = window.top.require;
60+
var require = window.parent.require;
6161
require(
6262
[
6363
'jquery',
@@ -67,7 +67,7 @@ $params = $block->getParams();
6767
'Magento_Checkout/js/model/full-screen-loader'
6868
],
6969
function($, quote, placeOrderAction, redirectOnSuccessAction, fullScreenLoader) {
70-
var parent = window.top;
70+
var parent = window.parent;
7171

7272
$(parent).trigger('clearTimeout');
7373
$.when(
@@ -78,7 +78,7 @@ $params = $block->getParams();
7878
}
7979
).fail(
8080
function () {
81-
var parent = window.top;
81+
var parent = window.parent;
8282
$(parent).trigger('clearTimeout');
8383
fullScreenLoader.stopLoader();
8484
}

0 commit comments

Comments
 (0)