|
|
@@ -160,14 +160,14 @@ function getRowsByCompany($id_company, $year = null, $week_number = null)
|
|
|
(
|
|
|
SELECT id_file_row
|
|
|
FROM file_row_update
|
|
|
- WHERE WEEK(date_modified) = :week_number
|
|
|
+ WHERE WEEKOFYEAR(date_modified) = :week_number
|
|
|
AND YEAR(date_modified) = :year
|
|
|
|
|
|
UNION
|
|
|
|
|
|
SELECT id_file_row
|
|
|
FROM file_row
|
|
|
- WHERE WEEK(date_processed) = :week_number
|
|
|
+ WHERE WEEKOFYEAR(date_processed) = :week_number
|
|
|
AND YEAR(date_processed) = :year
|
|
|
)
|
|
|
) " : "") .
|
|
|
@@ -220,7 +220,7 @@ function getRowUpdatesByCompany($id_company)
|
|
|
function getRowsByCompanyCSV($id_company, $f, $year, $week_number = null)
|
|
|
{
|
|
|
$file_rows = getRowsByCompany($id_company, $year, $week_number);
|
|
|
-
|
|
|
+
|
|
|
$headers = array('Division', 'Consignee', 'Called In', 'Dispatch #', 'Shipper', 'Ready', 'Address 1', 'Address 2', 'City', 'ST', 'Zip', 'Phone',
|
|
|
'', '', '', '',
|
|
|
'Acknowledgement', 'Pickup Date', 'Pickup Time', 'Depart Date', 'Depart Time', 'BOL Delivered Date', 'BOL Delivered Time',
|