Skip to content

Commit cebad1e

Browse files
author
Leonix
committed
1 parent 0b41215 commit cebad1e

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

js-legacy/backend/plugins.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,6 @@
143143
self.$menu.find('li.selected').removeClass('selected');
144144
var href = '\\#\\/' + (self.path.plugin ? self.path.plugin + '\\/' : '');
145145
self.$menu.find('a[href="' + href + '"]').parents('li').addClass('selected');
146-
147-
const wa_set_plugin_onload = sessionStorage.getItem('wa_set_plugin_onload');
148-
if (wa_set_plugin_onload) {
149-
sessionStorage.removeItem('wa_set_plugin_onload');
150-
}
151-
152146
if (!self.options.useIframeTransport) {
153147
$('#plugins-settings-form').submit(function () {
154148
self.saveHandlerAjax(this);

js/settings/payment.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,12 @@ if (typeof ($) != 'undefined') {
113113
self.locales = options.locales;
114114
//init clone plugin
115115
self.paymentPluginClone();
116+
117+
$(document).on('installer_after_install_go_to_settings', function(e, data) {
118+
if (data.type === 'plugin' && data.is_payment) {
119+
location.replace(`#/payment/plugin/add/${data.id}/`);
120+
}
121+
});
116122
},
117123

118124
updateDropdownSecondaryActions: function () {
@@ -419,7 +425,7 @@ if (typeof ($) != 'undefined') {
419425
if (!$.settings.options.installer_access) {
420426
return;
421427
}
422-
const url = this.options.backend_url + 'installer/?module=plugins&action=view&slug=wa-plugins/payment&return_hash=/payment/plugin/add/%plugin_id%/';
428+
const url = this.options.backend_url + 'installer/?module=plugins&ui=2.0&action=view&slug=wa-plugins/payment&return_hash=/payment/plugin/add/%plugin_id%/';
423429
$.get(url, (html) => {
424430
this.$payment_plugins_container.show().html(html);
425431
const $iframe = $('iframe.js-store-frame');

js/settings/shipping.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,12 @@ if (typeof ($) != 'undefined') {
9898
self.locales = options.locales;
9999
//init clone plugin
100100
self.shippingPluginClone();
101+
102+
$(document).on('installer_after_install_go_to_settings', function(e, data) {
103+
if (data.type === 'plugin' && data.is_shipping) {
104+
location.replace(`#/shipping/plugin/add/${data.id}/`);
105+
}
106+
});
101107
},
102108

103109
updateDropdownSecondaryActions: function () {
@@ -558,7 +564,7 @@ if (typeof ($) != 'undefined') {
558564
if (!$.settings.options.installer_access) {
559565
return;
560566
}
561-
const url = this.options.backend_url + 'installer/?module=plugins&action=view&slug=wa-plugins/shipping&return_hash=/shipping/plugin/add/%plugin_id%/';
567+
const url = this.options.backend_url + 'installer/?module=plugins&ui=2.0&action=view&slug=wa-plugins/shipping&return_hash=/shipping/plugin/add/%plugin_id%/';
562568
$.get(url, (html) => {
563569
this.$shipping_plugins_container.show().html(html);
564570
const $iframe = $('iframe.js-store-frame');

lib/config/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
'pages' => true,
1414
'mobile' => true,
1515
'my_account' => true,
16-
'version' => '11.1.0', // developer preview
16+
'version' => '11.1.0',
1717
'critical' => '11.1.0',
1818
'vendor' => 'webasyst',
1919
'csrf' => true,

0 commit comments

Comments
 (0)