Skip to content

Commit 56582c1

Browse files
committed
u20230709
1 parent a30f273 commit 56582c1

File tree

6 files changed

+55
-0
lines changed

6 files changed

+55
-0
lines changed

Controller/Adminhtml/Migration/Process.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public function import(){
4545
\D2dInit::PROCESS_IMPORT,
4646
\D2dInit::PROCESS_RESUME,
4747
\D2dInit::PROCESS_REFRESH,
48+
\D2dInit::PROCESS_AUTH,
4849
\D2dInit::PROCESS_FINISH))){
4950
$this->responseJson(array(
5051
'status' => 'error',

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
[Magento 2 Data Migration Extension](https://d2d-soft.com/15-magento-migration) is a solution for migrating data to Magento from another platform. The extension support migrating many entity types (taxes, manufacturers, categories, products, customers, orders, reviews) with many options. The extension can work in the local environment or the online environment. We also provide the [Custom Migration Service](https://d2d-soft.com/migration-services/296-data-migration-customization.html) if you have a specific requirement.
33

44
## Products
5+
- [AmeriCommerce to Magento Migration](https://d2d-soft.com/magento-migration/773-7250-americommerce-to-magento-2-migration-extension.html#/72-entities-1000)
56
- [BigCommerce to Magento Migration](https://d2d-soft.com/magento-migration/415-1677-bigcommerce-to-magento-2-migration-extension.html#/72-entities-1000)
67
- [CS-Cart to Magento Migration](https://d2d-soft.com/magento-migration/326-1397-cs-cart-to-magento-2-migration-extension.html)
78
- [CubeCart to Magento Migration](https://d2d-soft.com/magento-migration/46-148-cubecart-to-magento-2-migration-extension.html)
@@ -17,6 +18,7 @@
1718
- [osCommerce to Magento Migration](https://d2d-soft.com/magento-migration/49-166-oscommerce-to-magento-2-migration-extension.html)
1819
- [OXID-eShop to Magento Migration](https://d2d-soft.com/magento-migration/50-171-oxid-eshop-to-magento-2-migation-extension.html)
1920
- [PrestaShop to Magento Migration](https://d2d-soft.com/magento-migration/30-176-prestashop-to-magento-2-migration.html)
21+
- [Salesforce to Magento Migration](https://d2d-soft.com/magento-migration/719-6737-salesforce-to-magento-2-migration-extension.html#/72-entities-1000)
2022
- [Shopify to Magento Migration](https://d2d-soft.com/magento-migration/378-1497-shopify-to-magento-2-migration-extension.html#/72-entities-1000)
2123
- [VirtueMart to Magento Migration](https://d2d-soft.com/magento-migration/51-179-virtuemart-to-magento-2-migration-extension.html)
2224
- [Volusion to Magento Migration](https://d2d-soft.com/magento-migration/642-5934-volusion-to-magento-2-migration-extension.html#/72-entities-1000)
@@ -28,6 +30,7 @@
2830
- [ZenCart to Magento Migration](https://d2d-soft.com/magento-migration/55-202-zencart-to-magento-2-migration-extension.html)
2931

3032
## Supported Platforms
33+
- [AmeriCommerce](https://www.americommerce.com/)
3134
- [BigCommerce](https://www.bigcommerce.com/)
3235
- [CS-Cart](https://www.cs-cart.com/)
3336
- [CubeCart](https://www.cubecart.com/)
@@ -43,6 +46,7 @@
4346
- [osCommerce](https://www.oscommerce.com/)
4447
- [OXID-eShop](https://www.oxid-esales.com)
4548
- [PrestaShop](https://www.prestashop.com)
49+
- [Salesforce](https://www.salesforce.com/)
4650
- [Shopify](https://www.shopify.com/)
4751
- [VirtueMart](https://virtuemart.net/)
4852
- [Volusion](https://volusion.com/)

view/adminhtml/web/css/style.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@
239239
.platform-icon-base.platform-icon-pinnaclecart{background-image: url("../img/platform/icon-pinnaclecart.png");}
240240
.platform-icon-base.platform-icon-premmerce{background-image: url("../img/platform/icon-premmerce.png");}
241241
.platform-icon-base.platform-icon-prestashop{background-image: url("../img/platform/icon-prestashop.png");}
242+
.platform-icon-base.platform-icon-salesforce{background-image: url("../img/platform/icon-salesforce.png");}
242243
.platform-icon-base.platform-icon-shopify{background-image: url("../img/platform/icon-shopify.png");}
243244
.platform-icon-base.platform-icon-shopp{background-image: url("../img/platform/icon-shopp.png");}
244245
.platform-icon-base.platform-icon-shopscript{background-image: url("../img/platform/icon-shopscript.png");}
14.4 KB
Loading
2.14 KB
Loading

view/adminhtml/web/js/jquery.migration.js

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,6 +1341,55 @@
13411341
window.open(url, '_blank');
13421342
});
13431343

1344+
$(container).on('click', '.oauth-authenticate', function(){
1345+
showLoading();
1346+
var form = $('#setup-form');
1347+
resetFormValidate(form);
1348+
var rules = getFormValidateRule(form);
1349+
form.validate({
1350+
rules: rules,
1351+
errorClass: "message-valid"
1352+
});
1353+
var validate = form.valid();
1354+
if(!validate){
1355+
hideLoading();
1356+
return false;
1357+
}
1358+
var _this = $(this);
1359+
var stateElement = _this.closest('.form-group').find('.oauth_state');
1360+
var state = stateElement.val();
1361+
var type = _this.data('type');
1362+
var platform = $('#' + type + '-type', container).val();
1363+
var url = $('#' + type + '-url', container).val();
1364+
var data = {
1365+
process: 'authenticate',
1366+
state: state,
1367+
type: type,
1368+
platform: platform,
1369+
url: url
1370+
};
1371+
callProcess(settings.url, data).done(function(response){
1372+
hideLoading();
1373+
if(response.status == 'success'){
1374+
var state = response.state;
1375+
stateElement.val(state);
1376+
var action = response.action;
1377+
if(action == 'auth'){
1378+
window.open(response.url);
1379+
} else {
1380+
showAlert(response.message);
1381+
}
1382+
} else if(response.status == 'error'){
1383+
if(response.message){
1384+
showAlert(response.message);
1385+
}
1386+
}
1387+
}).fail(function(xhr, status, error){
1388+
hideLoading();
1389+
showAlert(getRetryMessage());
1390+
});
1391+
});
1392+
13441393
registerEvents();
13451394

13461395
}

0 commit comments

Comments
 (0)