Merge pull request #76 from EC-CUBE/fix/eccube3/dtb_payment_min_max

３系の支払方法利用条件修正
EC-CUBE · Feb 26, 2021 · ac888d6 · ac888d6
2 parents 37a077b + d8118aa
commit ac888d6
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/Controller/Admin/ConfigController.php b/Controller/Admin/ConfigController.php
@@ -1317,12 +1317,21 @@ private function saveToO($em, $tmpDir, $csvName, $tableName = null, $allow_zero
                     // --> payment
                     } elseif ($column == 'fixed') {
                         $value[$column] = 1;
-                    } elseif ($column == 'rule_max') { // 2.13
-                        $value[$column] = !empty($data['upper_rule']) ? $data['upper_rule'] : null;
-                    } elseif ($column == 'rule_min') { // 2.13
-                        $value[$column] = !empty($data['rule_max']) ? $data['rule_max'] :
-                            (!empty($data['rule']) ? $data['rule'] : null) ;
-
+                    } elseif ($column == 'rule_max') {
+                        if ($this->flag_3) {
+                            $value[$column] = isset($data['rule_max']) && strlen($data['rule_max']) > 0 ? $data['rule_max'] : null;
+                        } else {
+                            // 2.13
+                            $value[$column] = !empty($data['upper_rule']) ? $data['upper_rule'] : null;
+                        }
+                    } elseif ($column == 'rule_min') {
+                        if ($this->flag_3) {
+                            $value[$column] = isset($data['rule_min']) && strlen($data['rule_min']) > 0 ? $data['rule_min'] : null;
+                        } else {
+                            // 2.13
+                            $value[$column] = !empty($data['rule_max']) ? $data['rule_max'] :
+                                (!empty($data['rule']) ? $data['rule'] : null ) ;
+                        }
                     // --> dtb_order_item
                     } elseif ($column == 'class_category_name1') {
                         $value[$column] = isset($data['classcategory_name1']) && strlen($data['classcategory_name1']) > 0 ? $data['classcategory_name1'] : null;