code

service/tools.class.php

@@ -714,6 +714,18 @@ class tools {
                 $rules["ocean_eta_old_sub_new"] = !empty($rules["ocean_eta_old_sub_new"]) ? intval($rules["ocean_eta_old_sub_new"]): $rules["ocean_eta_old_sub_new"];
                 $rules["air_etd_old_sub_new"] = !empty($rules["air_etd_old_sub_new"]) ? intval($rules["air_etd_old_sub_new"]): $rules["air_etd_old_sub_new"];
                 $rules["air_eta_old_sub_new"] = !empty($rules["air_eta_old_sub_new"]) ? intval($rules["air_eta_old_sub_new"]): $rules["air_eta_old_sub_new"];
+
+                // $air_etd_old_sub_new_unit=="Day(s)" ? "days":"hours";
+                $rules["ocean_atd_sub_etd_unit"] = common::convertoVue($rules["ocean_atd_sub_etd_unit"]);
+                $rules["ocean_ata_sub_eta_unit"] = common::convertoVue($rules["ocean_ata_sub_eta_unit"]);
+                $rules["air_atd_sub_etd_unit"] = common::convertoVue($rules["air_atd_sub_etd_unit"]);
+                $rules["air_ata_sub_eta_unit"] = common::convertoVue($rules["air_ata_sub_eta_unit"]);
+
+                $rules["ocean_etd_old_sub_new_unit"] = common::convertoVue($rules["ocean_etd_old_sub_new_unit"]);
+                $rules["ocean_eta_old_sub_new_unit"] = common::convertoVue($rules["ocean_eta_old_sub_new_unit"]);
+                $rules["air_etd_old_sub_new_unit"] = common::convertoVue($rules["air_etd_old_sub_new_unit"]);
+                $rules["air_eta_old_sub_new_unit"] = common::convertoVue($rules["air_eta_old_sub_new_unit"]);
+                
                 $ret = $rules;
             }
         }
@@ -1084,9 +1096,24 @@ class tools {
                     }
                 } elseif ($filed == "ocean_etd_change" || $filed == "ocean_eta_change" || $filed == "air_etd_change" || $filed == "air_eta_change"){
                     $post_boolean = (empty($_POST[$filed]) || $_POST[$filed] == "false") ? "f":"t";
+                    $ss = $post_boolean;
+                    $sss = $rule[$filed];
                     if($post_boolean != $rule[$filed]){
                         $details_flag = false;
                     }
+                } elseif ($filed == "ocean_atd_sub_etd_unit" || $filed == "ocean_ata_sub_eta_unit"
+                    || $filed == "air_atd_sub_etd_unit" || $filed == "air_ata_sub_eta_unit"
+                    || $filed == "ocean_etd_old_sub_new_unit" || $filed == "ocean_eta_old_sub_new_unit"
+                    || $filed == "air_etd_old_sub_new_unit" || $filed == "air_eta_old_sub_new_unit"){
+
+                    $postValue =  !empty($_POST[$filed]) ? $_POST[$filed] : "";
+                    if(!empty($postValue)){
+                        $postValue = $postValue=="Day(s)" ? "days":"hours";
+                    }
+                    $dbValue = !empty($rule[$filed]) ? $rule[$filed] : "";
+                    if($postValue != $dbValue){
+                        $details_flag = false;
+                    }
                 } else {
                     $postValue = !empty($_POST[$filed]) ? $_POST[$filed] : "";
                     $dbValue = !empty($rule[$filed]) ? $rule[$filed] : "";

utils/common.class.php

@@ -2261,5 +2261,17 @@ class common {
         }
         return $ret;
     }
+    /**
+     *  /unit=="Day(s)" ? "days":"hours";
+    */
+    public static function convertoVue($unit){
+        if(empty($unit))
+            return $unit;
+        if ($unit == "days"){
+            return "Day(s)";
+        }else{
+            return "Hour(s)";
+        }
+    }
 }
 ?>