diff --git a/public_html/doc/customer_list.php b/public_html/doc/customer_list.php index bee1d50..11f9c1b 100644 --- a/public_html/doc/customer_list.php +++ b/public_html/doc/customer_list.php @@ -198,9 +198,10 @@ foreach ($rows as $list) { $c_paymenttype $c_rate $containerChipsHtml - $m_initial + $m_lastname$m_firstname ($m_initial) + $c_phoneSTR - $c_statusSTR + $c_status $c_contractdateSTR $c_inactivedateSTR @@ -447,7 +448,7 @@ $(document).ready(function(){ Container Driver Phone - Status + Sts Contract Inactive diff --git a/public_html/doc/report_expense.php b/public_html/doc/report_expense.php index 0e7cac3..45e3f53 100644 --- a/public_html/doc/report_expense.php +++ b/public_html/doc/report_expense.php @@ -110,7 +110,7 @@ $list_number = $total_count - (($page-1)*$list_count); $start_number = $list_count * ($page-1); $add_query .= " LIMIT $start_number, $INIT_PAGECNT"; -$query = "SELECT d_orderdate, d_druid, m_initial +$query = "SELECT d_orderdate, d_druid, m_initial, m_lastname, m_firstname FROM tbl_daily INNER JOIN tbl_member ON (d_druid = m_currentdriver) WHERE d_orderdate >= '".substr($APPLYDATE,0,8)."' AND d_orderdate <= '".date('Ymd')."' ". $add_subqry . " @@ -245,7 +245,7 @@ while($list=mysqli_fetch_array($result, MYSQLI_ASSOC)) { $list_number $d_orderdateSTR - $m_initial + $m_lastname$m_firstname ($m_initial) $openingbalance $h_balance_in $cashoutTODAY @@ -307,7 +307,7 @@ while($lt_dr=mysqli_fetch_array($rt_dr, MYSQLI_ASSOC)) { else $selectStr = ""; $c_driveruidSTR .= " - "; + "; }