u20220309

d2dsoft · d2dsoft · commit 85c9e3caea70 · 2022-03-09T22:05:33.000+07:00
diff --git a/Block/Adminhtml/Migration.php b/Block/Adminhtml/Migration.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/Controller/Adminhtml/Migration.php b/Controller/Adminhtml/Migration.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/Controller/Adminhtml/Migration/Index.php b/Controller/Adminhtml/Migration/Index.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/Controller/Adminhtml/Migration/License.php b/Controller/Adminhtml/Migration/License.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/Controller/Adminhtml/Migration/Process.php b/Controller/Adminhtml/Migration/Process.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/Controller/Adminhtml/Migration/Setting.php b/Controller/Adminhtml/Migration/Setting.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/Controller/Adminhtml/Migration/Setup.php b/Controller/Adminhtml/Migration/Setup.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/registration.php b/registration.php
@@ -11,7 +11,7 @@
  * DISCLAIMER
  * Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.
  *
- * @author     D2dSoft Developers <develop@d2d-soft.com>
+ * @author     D2dSoft Developers <developer@d2d-soft.com>
  * @copyright  Copyright (c) 2021 D2dSoft (https://d2d-soft.com)
  * @license    https://d2d-soft.com/license/AFL.txt
  */
diff --git a/view/adminhtml/web/css/style.css b/view/adminhtml/web/css/style.css
@@ -10,8 +10,10 @@
 #migration-page .form-group .form-label{width: 40%;float: left;text-align: right;padding-right: 20px;}
 #migration-page .form-group .form-field{width: 60%;float: left;}
 #migration-page .form-group .form-input{padding: 4px;display: block;border: 1px solid #ccc;width: 100%;border-radius: 2px;font-size: 16px;}
+#migration-page .form-group .form-action{float: right;text-align: right;margin-right: 5px;}
 #migration-page .width50{width: 50% !important;}
 #migration-page .width80{width: 80% !important;}
+#migration-page .width90{width: 90% !important;}
 #migration-page .icon-success-wrap{padding-left:30px;display: block;background: url("../img/icon-success.png") no-repeat bottom left;}
 #migration-page .icon-success{width:20px;height:20px;display: inline-block;background: url("../img/icon-success.png") no-repeat bottom left;vertical-align: middle;}
 #migration-page .icon-warning-wrap{padding-left:30px;display: block;background: url("../img/icon-warning.png") no-repeat bottom left;}
@@ -21,12 +23,14 @@
 #migration-page .alert-box.success {background:#e9ffd9 url('../img/icon-success.png') no-repeat 10px 50%;border:1px solid #a6ca8a;}
 #migration-page .alert-box.notice {background:#e3f7fc url('../img/icon-notice.png') no-repeat 10px 50%;border:1px solid #8ed9f6;}
 #migration-page .alert-box.error {background:#ffecec url('../img/icon-error.png') no-repeat 10px 50%;border:1px solid #f5aca6;}
-#migration-page label.message-valid{padding-left: 12px;background: url('../img/icon-arrow-up.gif') no-repeat top left; color: #ff0000;margin-top: 7px;}
+#migration-page label.message-valid, #migration-page label.message-item-valid{padding-left: 12px;background: url('../img/icon-arrow-up.gif') no-repeat top left; color: #ff0000;margin-top: 7px;}
 #migration-page .width50 label.message-valid{width: 200%;}
 #migration-page .btn-site{background: #4F44AE; color: #fff; border: none;}
 #migration-page .row-no-margin{margin-right: 0;margin-left: 0;}
 #migration-page .margin-center{margin: 0 auto !important;float: none;}
 #migration-page .top10{margin-top: 10px;}
+#migration-page .display-ib{display: inline-block !important;}
+#migration-page .cursor-pointer{cursor: pointer;}
 
 /* TOOLTIP */
 #migration-page .tooltip-group {outline: none;cursor: help;text-decoration: none;position: relative;display: inline-block;text-align: left;vertical-align: middle;}
@@ -166,6 +170,7 @@
 #migration-page #upload-wrap .form-group .upload-note{clear: both; padding: 10px 0; border-top: 1px solid #e5e5e5;display: none;}
 
 /* CONFIG CONTENT */
+#migration-page .cf-section-entity{margin-bottom: 15px;}
 
 /*SELECT PLATFORM*/
 .platform-select2-container .select2-results__option{line-height: 30px;}
diff --git a/view/adminhtml/web/js/jquery.extend.js b/view/adminhtml/web/js/jquery.extend.js
@@ -27,7 +27,7 @@
     'use strict';
 
     $.validator.addMethod( "url_internal", function( value, element ) {
-        return this.optional( element ) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test( value );
+        return this.optional( element ) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?(.*)?$/i.test( value );
     }, $.validator.messages.url );
 
 }));
diff --git a/view/adminhtml/web/js/jquery.migration.js b/view/adminhtml/web/js/jquery.migration.js

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`* DISCLAIMER`
`12`	`12`	`* Do not edit or add to this file if you wish to upgrade this extension/plugin/module to newer version in the future.`
`13`	`13`	`*`
`14`		`- * @author D2dSoft Developers <develop@d2d-soft.com>`
	`14`	`+ * @author D2dSoft Developers <developer@d2d-soft.com>`
`15`	`15`	`* @copyright Copyright (c) 2021 D2dSoft (https://d2d-soft.com)`
`16`	`16`	`* @license https://d2d-soft.com/license/AFL.txt`
`17`	`17`	`*/`