Merge pull request #87 from EC-CUBE/chihiro-adachi-patch-2

delivery_id, delivery_timeでSQLエラーが発生する不具合の修正
EC-CUBE · Sep 16, 2021 · 9cafab4 · 9cafab4
2 parents b163d06 + 192b587
commit 9cafab4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Controller/Admin/ConfigController.php b/Controller/Admin/ConfigController.php
@@ -1320,7 +1320,7 @@ private function saveToO($em, $tmpDir, $csvName, $tableName = null, $allow_zero
                     } elseif ($column == 'delivery_time') {
                         if (isset($data['deliv_time'])) {
                             $value[$column] = $data['deliv_time'];
-                        } elseif (isset($data['delivery_time'])) {
+                        } elseif (isset($data['delivery_time']) && strlen($data['delivery_time']) > 0) {
                             $value[$column] = $data['delivery_time'];
                         } else {
                             $value[$column] = null;
@@ -1424,6 +1424,11 @@ private function saveToO($em, $tmpDir, $csvName, $tableName = null, $allow_zero
                         $this->shipping_id[$data['order_id']][$data['shipping_id']] = $i;
 
                         if ($this->flag_3) {
+                            if (isset($data['delivery_id']) & strlen($data['delivery_id']) > 0) {
+                                $value['delivery_id'] = $data['delivery_id'];
+                            } else {
+                                $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']];
                             }