code

service/ocean_order.class.php

@@ -593,7 +593,7 @@ class ocean_order {
                 'ServiceList' =>$ServiceList,
                 'allColums' => $allBookingColumns,
                 'canEdiVgm' => _canEdiVgm(),
-                'rc' => $rc,
+                'rc' => $search_rc,
                 'ps' => $ps,
                 'cp' => $cp,
                 'tp' => $tp,

utils/common.class.php

@@ -1566,7 +1566,7 @@ class common {
         $Milestones_data = array();
         $Milestones_data_arr = common::excuteListSql("select 
             case when code = 'IFFECP' then 'Empty Container Pickup' else dd.description end as description,
-	        act_date||' '||act_time as date_time, remark,timezone,code,create_by,act_update_by
+	        act_date||' '||act_time as date_time, remark,timezone,code,create_by, '' as act_update_by
             from  ocean_milestone a 
                 left join LATERAL (select sno,description  from  milestone where code=a.code and project_no = '*' limit 1) dd on true
             where a.serial_no='".$ocean["serial_no"]."' and act_date is not null  order by dd.sno asc, id asc");