Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions Controller/Admin/ConfigController.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,27 @@ public function index(Request $request, Connection $em)
}

if ($this->dataMigrationService->isVersion('4.0/4.1')) {
// 権限/メンバーを先に処理(外部キー制約のため)
$this->upsertAuthorityAndMember($em, $csvDir);
$this->collectMissingCreatorIds($csvDir, [
'dtb_delivery',
'dtb_delivery_time',
'dtb_delivery_fee',
'dtb_payment',
'dtb_order',
'dtb_shipping',
'dtb_mail_history'
]);

// $csvDir 内のファイルをすべて読み込む
$files = scandir($csvDir);
foreach ($files as $file) {
// csvファイルのみ処理
if (is_file($csvDir . $file) && pathinfo($file, PATHINFO_EXTENSION) === 'csv') {
$this->fix4x($em, $csvDir, $file);
// dtb_member, dtb_plugin はスキップ(別途処理済み or 処理不要)
if ($file !== 'dtb_member.csv' && $file !== 'dtb_plugin.csv') {
$this->fix4x($em, $csvDir, $file);
}
}
}
} else {
Expand Down Expand Up @@ -2120,11 +2134,6 @@ private function getTaxRule($order_date)

private function fix4x($em, $tmpDir, $csvName)
{
if ($csvName == "dtb_member.csv") {
// 変更するとログアウトしちゃうので
return;
}

// csvNameからテーブル名を取得

if (filesize($tmpDir . $csvName) == 0) {
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ec-cube/datamigration43",
"version": "4.3.4",
"version": "4.3.5",
"description": "データ移行プラグイン",
"type": "eccube-plugin",
"require": {
Expand Down