code

include.ini.php

@@ -97,6 +97,10 @@ function _getLoginEamil() {
     return $_SESSION['ONLINE_USER']['email'];
 }
 
+function _getLoginEmployeeEamil() {
+    return $_SESSION['ONLINE_USER']['employee_email'];
+}
+
 function _isAdminHandNew($user) {
     return $user['is_super'] == 't';
 }

service/column.class.php

@@ -332,7 +332,7 @@ class column {
         $children['General'] = array();
         $children['Parties'] = array();
         $children['Packing'] = array();
-        $children['Time'] = array();
+        $children['Date Range'] = array();
         $children['Places'] = array();
         $children['Transportation'] = array();
         $children['Others'] = array();

service/destination_delivery.class.php

@@ -616,7 +616,7 @@ class destination_delivery {
             $sqlDeliveryWhere = " 1=1"; 
             if(_isApexLogin()){
                 //$sqlWhere .= " and kln_pic ilike '"._getLoginEamil()."'";
-                $sqlDeliveryWhere .= " and '".strtolower(_getLoginEamil())."' in (select regexp_split_to_table(lower(kd.kln_pic), ','))";
+                $sqlDeliveryWhere .= " and '".strtolower(_getLoginEmployeeEamil())."' in (select regexp_split_to_table(lower(kd.kln_pic), ','))";
             }    
 
             //条件带入
@@ -767,9 +767,9 @@ class destination_delivery {
                 common::checkedActionLegal($serial_no,$operate);
             }else{
                 if(!_isApexLogin()){
-                    //$data = array("msg" =>"Employees cannot create booking");
-                    //common::echo_json_encode(200,$data); 
-                    //exit(); 
+                    $data = array("msg" =>"Employees cannot create booking");
+                    common::echo_json_encode(200,$data); 
+                    exit(); 
                 }
             }
 
@@ -1149,7 +1149,7 @@ class destination_delivery {
             $sqlDeliveryWhere = " 1=1"; 
             if(_isApexLogin()){
                 //$sqlWhere .= " and kln_pic ilike '"._getLoginEamil()."'";
-                $sqlDeliveryWhere .= " and '".strtolower(_getLoginEamil())."' in (select regexp_split_to_table(lower(kd.kln_pic), ','))";
+                $sqlDeliveryWhere .= " and '".strtolower(_getLoginEmployeeEamil())."' in (select regexp_split_to_table(lower(kd.kln_pic), ','))";
             }      
             //$sqlWhere_befrom_filterTag = $sqlWhere;
             $sql = "select delivery_date::date as delivery_date,

service/login.class.php

@@ -22,7 +22,10 @@ class login {
     }
 
     private function getLoginSql() {
-        return "select first_name,last_name,user_login,(select active from public.employee ee where ee.employee_id=u.employee_id) as employee_id_active, can_visit_vgm,can_add_booking, can_add_tk_status,truck_driver,po_booking,o_final_delivery_u,ipad_view_po,can_view_doc,can_upload_doc,can_add_catalog,can_add_po,packing_list_company,is_only_vgm,contact_id_user,is_demo, ra_password as password,employee_id, contact_id, user_type, last_pwd_change, EXTRACT(DAY from (now() - last_pwd_change)) as last_pwd_change_date, email, user_webtype_id, active, is_online, station, allow_login_remote, can_see_amslog,can_view_eccn, can_see_isflog, can_see_isflog_withaddress, 
+        return "select first_name,last_name,user_login,
+        (select active from public.employee ee where ee.employee_id=u.employee_id) as employee_id_active,
+        (select email from public.employee ee where ee.employee_id=u.employee_id) as employee_email,
+         can_visit_vgm,can_add_booking, can_add_tk_status,truck_driver,po_booking,o_final_delivery_u,ipad_view_po,can_view_doc,can_upload_doc,can_add_catalog,can_add_po,packing_list_company,is_only_vgm,contact_id_user,is_demo, ra_password as password,employee_id, contact_id, user_type, last_pwd_change, EXTRACT(DAY from (now() - last_pwd_change)) as last_pwd_change_date, email, user_webtype_id, active, is_online, station, allow_login_remote, can_see_amslog,can_view_eccn, can_see_isflog, can_see_isflog_withaddress, 
         customer_search_type, customer_destination, can_add_ams, can_add_isf, air_station, air_sales, ocean_station, ocean_sales,ocean_following_sales,ocean_following_sales_or,air_following_sales,air_following_sales_or, trucking_station, ocean_dest_op, can_see_password, can_add_opsales_code, ocean_station_or, ocean_agent_or, ocean_sales_or, ocean_dest_op_or, air_station_or, air_sales_or, trucking_station_or, 
         can_add_user, can_add_employee, can_add_contact, company_name, ams_email, isf_email, customer_discharge, online_active, is_super, ocean_agent,active, can_send_email, view_file_format as docdownload, container_status, consolidated_cbsa_code, can_add_aci, 
         air_customers, air_customer_search_type,trucking_customers,trucking_customer_search_type, upload_document, view_file_format, event_type, belong_schemas, main_schemas, error_login_count, EXTRACT(EPOCH FROM (now()-COALESCE(error_login_time, now()))) as second, po_status, view_air_file_format,