Ver Fonte

acknowledged
rename to authorization number

Jad Meouchy há 9 anos atrás
pai
commit
cffb96d132
2 ficheiros alterados com 10 adições e 5 exclusões
  1. 8 3
      db.php
  2. 2 2
      www/js/routes.js

+ 8 - 3
db.php

@@ -99,7 +99,8 @@ function getRowsByCompany($id_company, $week_number = null)
 				LIMIT 1) bol_delivered,
 			
 			dispatch_reference,
-			ctns, weight, cube
+			ctns, weight, cube,
+			DATE_FORMAT(file.date_processed, '%m/%d/%Y %h:%i %p') date_processed
 
 		FROM file_row
 		INNER JOIN file USING(id_file)
@@ -162,7 +163,9 @@ function getRowsByCompanyCSV($id_company, $f, $week_number = null)
 						'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
 						'Dispatch Refere',
 						'', '', '', '', '', '', '', '',
-						'Ctns', 'Weight', 'Cube');
+						'Ctns', 'Weight', 'Cube',
+						'',
+						'Acknowledged');
 						
 	fputcsv($f, $headers);
 
@@ -175,7 +178,9 @@ function getRowsByCompanyCSV($id_company, $f, $week_number = null)
 			'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
 			$row['dispatch_reference'],
 			'', '', '', '', '', '', '', '',
-			$row['ctns'], $row['weight'], $row['cube']
+			$row['ctns'], $row['weight'], $row['cube'],
+			'',
+			$row['date_processed']
 			));
 	}
 }

+ 2 - 2
www/js/routes.js

@@ -183,7 +183,7 @@ function createTable(id_company, table_dom)
 			{ 'title': 'Ready Time', 'data': 'time_ready', 'defaultContent': '', 'className': 'time_ready' },
 			{ 'title': 'Close Time', 'data': 'time_close', 'defaultContent': '', 'className': 'time_close' },
 			
-			{ 'title': 'Dispatch Reference', 'data': 'dispatch_reference', 'defaultContent': '', 'className': 'dispatch_reference' },
+			{ 'title': 'Authorization #', 'data': 'dispatch_reference', 'defaultContent': '', 'className': 'dispatch_reference' },
 
 			{ 'title': 'Ctns', 'data': 'ctns', 'defaultContent': '', 'className': 'ctns' },
 			{ 'title': 'Weight', 'data': 'weight', 'defaultContent': '', 'className': 'weight' },
@@ -308,7 +308,7 @@ function createUpdatesTable(id_company, table_dom)
 			{ 'title': 'User', 'data': 'user_name', 'defaultContent': ' ', 'className': 'user_name' },
 			
 			{ 'title': 'Dispatch #', 'data': 'dispatch_number', 'defaultContent': '', 'className': 'dispatch_number' },
-			{ 'title': 'Dispatch Reference', 'data': 'dispatch_reference', 'defaultContent': '', 'className': 'dispatch_reference' },
+			{ 'title': 'Authorization #', 'data': 'dispatch_reference', 'defaultContent': '', 'className': 'dispatch_reference' },
 			
 			{ 'title': 'Pickup Time', 'data': 'time_pickup', 'defaultContent': ' ', 'className': 'time_pickup' },
 			{ 'title': 'Depart Time', 'data': 'time_depart', 'defaultContent': ' ', 'className': 'time_depart' },