Skip to content

missの修正 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nobuhiko merged 2 commits into from
Sep 16, 2025
Merged

missの修正 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c3b0c5
missの修正
nobuhiko Sep 16, 2025
a28c923
不具合の修正
nobuhiko Sep 16, 2025
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
18 changes: 10 additions & 8 deletions Controller/Admin/ConfigController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ private function saveToP($em, $tmpDir, $csvName, $tableName = null, $allow_zero

if ($this->dataMigrationService->isVersion('4.0/4.1') == false) {
// 3系には del_flg がある
if ($data['del_flg'] == 1) {
if (isset($data['del_flg']) && $data['del_flg'] == 1) {
unset($value);
continue 2;
}
Expand Down Expand Up @@ -1458,14 +1458,10 @@ private function saveOrder($em, $csvDir)
$em->exec('DELETE FROM dtb_payment_option');
}


// mtb_device_type を UPSERT した場合のシーケンス同期
if (file_exists($csvDir . 'mtb_device_type.csv')) {
$this->dataMigrationService->setIdSeq($em, 'mtb_device_type');
}
if ($platform == 'mysql') {
$em->exec('SET FOREIGN_KEY_CHECKS = 1;');
} else {
$this->dataMigrationService->setIdSeq($em, 'mtb_device_type');
$this->dataMigrationService->setIdSeq($em, 'dtb_order');
$this->dataMigrationService->setIdSeq($em, 'dtb_order_item');
$this->dataMigrationService->setIdSeq($em, 'dtb_shipping');
Expand Down Expand Up @@ -1776,13 +1772,19 @@ private function saveToO($em, $tmpDir, $csvName, $tableName = null, $allow_zero
$value['delivery_id'] = null;
}
if (isset($data['time_id']) && strlen($data['time_id']) > 0) {
$value['time_id'] = $this->delivery_time[$data['delivery_id']][$data['time_id']];
if (!empty($this->delivery_time)
&& isset($this->delivery_time[$data['delivery_id']])
&& isset($this->delivery_time[$data['delivery_id']][$data['time_id']])) {
$value['time_id'] = $this->delivery_time[$data['delivery_id']][$data['time_id']];
}
}
} else {
$value['delivery_id'] = !empty($this->delivery_id[$value['order_id']]) ? $this->delivery_id[$value['order_id']] : null;
$value['delivery_time'] = empty($data['time']) ? null : $data['time'];
if (isset($data['time_id']) && strlen($data['time_id']) > 0) {
if (!empty($this->delivery_time)) {
if (!empty($this->delivery_time)
&& isset($this->delivery_time[$value['delivery_id']])
&& isset($this->delivery_time[$value['delivery_id']][$data['time_id']])) {
$value['time_id'] = $this->delivery_time[$value['delivery_id']][$data['time_id']];
}
}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ec-cube/datamigration43",
"version": "4.3.3",
"version": "4.3.4",
"description": "データ移行プラグイン",
"type": "eccube-plugin",
"require": {
Expand Down