Merge pull request #50 from EC-CUBE/i45

fixed #45 会員と受注データのみ移行するとエラーになる件の修正
EC-CUBE · Sep 10, 2020 · e54f4c3 · e54f4c3
2 parents 62a115b + 2b79469
commit e54f4c3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Controller/Admin/ConfigController.php b/Controller/Admin/ConfigController.php
@@ -1339,7 +1339,9 @@ private function saveToO($em, $tmpDir, $csvName, $tableName = null, $allow_zero
                             $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) {
-                                $value['time_id'] = $this->delivery_time[$value['delivery_id']][$data['time_id']];
+                                if (!empty($this->delivery_time)) {
+                                    $value['time_id'] = $this->delivery_time[$value['delivery_id']][$data['time_id']];
+                                }
                             }
                             // dtb_shipping.shipping_commit_dateが空の場合は、dtb_order.commit_dateを使用
                             if (!empty($data['shipping_commit_date'])) {