v1.3.16
- [CUSTOMER] 드라이버 이름으로 표시. - [EXPENSE] 드라이버 이름으로 표시.
This commit is contained in:
parent
57d86d6986
commit
4e850352e0
|
|
@ -198,9 +198,10 @@ foreach ($rows as $list) {
|
||||||
<td>$c_paymenttype </td>
|
<td>$c_paymenttype </td>
|
||||||
<td>$c_rate </td>
|
<td>$c_rate </td>
|
||||||
<td>$containerChipsHtml </td>
|
<td>$containerChipsHtml </td>
|
||||||
<td>$m_initial </td>
|
<td>$m_lastname$m_firstname ($m_initial) </td>
|
||||||
|
<!--td>$m_initial ($m_lastname$m_firstname) </td-->
|
||||||
<td>$c_phoneSTR </td>
|
<td>$c_phoneSTR </td>
|
||||||
<td>$c_statusSTR </td>
|
<td>$c_status </td>
|
||||||
<!--td style=\"min-width:70px;\">$c_istopSTR </td-->
|
<!--td style=\"min-width:70px;\">$c_istopSTR </td-->
|
||||||
<td>$c_contractdateSTR </td>
|
<td>$c_contractdateSTR </td>
|
||||||
<td>$c_inactivedateSTR </td>
|
<td>$c_inactivedateSTR </td>
|
||||||
|
|
@ -447,7 +448,7 @@ $(document).ready(function(){
|
||||||
<th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_maincontainer">Container</a></th>
|
<th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_maincontainer">Container</a></th>
|
||||||
<th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=m_initial">Driver</a></th>
|
<th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=m_initial">Driver</a></th>
|
||||||
<th class="th-width-phone"><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_phone">Phone</a></th>
|
<th class="th-width-phone"><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_phone">Phone</a></th>
|
||||||
<th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_status">Status</a></th>
|
<th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_status">Sts</a></th>
|
||||||
<!-- <th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_is_top">Rank</a></th> -->
|
<!-- <th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_is_top">Rank</a></th> -->
|
||||||
<th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_contractdate">Contract</a></th>
|
<th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_contractdate">Contract</a></th>
|
||||||
<th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_inactivedate">Inactive</a></th>
|
<th><a href="/index_intranet.php?view=customer_list&switched=<?=$getSWHStr?>&page=<?=$page?>&key_word=<?=$key_wordStr?>&sorting_type=<?=$sorting_type?>&cstatus=<?=$cstatus?>&cistop=<?=$cistop?>&switch=c_inactivedate">Inactive</a></th>
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,7 @@ $list_number = $total_count - (($page-1)*$list_count);
|
||||||
$start_number = $list_count * ($page-1);
|
$start_number = $list_count * ($page-1);
|
||||||
|
|
||||||
$add_query .= " LIMIT $start_number, $INIT_PAGECNT";
|
$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
|
FROM tbl_daily
|
||||||
INNER JOIN tbl_member ON (d_druid = m_currentdriver)
|
INNER JOIN tbl_member ON (d_druid = m_currentdriver)
|
||||||
WHERE d_orderdate >= '".substr($APPLYDATE,0,8)."' AND d_orderdate <= '".date('Ymd')."' ". $add_subqry . "
|
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)) {
|
||||||
<tr>
|
<tr>
|
||||||
<td>$list_number</td>
|
<td>$list_number</td>
|
||||||
<td>$d_orderdateSTR</td>
|
<td>$d_orderdateSTR</td>
|
||||||
<td>$m_initial</td>
|
<td>$m_lastname$m_firstname ($m_initial)</td>
|
||||||
<td style=\"text-align:right; padding-right:20px;\">$openingbalance</td>
|
<td style=\"text-align:right; padding-right:20px;\">$openingbalance</td>
|
||||||
<td style=\"text-align:right; padding-right:20px;\">$h_balance_in</td>
|
<td style=\"text-align:right; padding-right:20px;\">$h_balance_in</td>
|
||||||
<td style=\"text-align:right; padding-right:20px;\">$cashoutTODAY</td>
|
<td style=\"text-align:right; padding-right:20px;\">$cashoutTODAY</td>
|
||||||
|
|
@ -307,7 +307,7 @@ while($lt_dr=mysqli_fetch_array($rt_dr, MYSQLI_ASSOC)) {
|
||||||
else $selectStr = "";
|
else $selectStr = "";
|
||||||
|
|
||||||
$c_driveruidSTR .= "
|
$c_driveruidSTR .= "
|
||||||
<option value='".$lt_dr['dr_uid']."' $selectStr>".$lt_dr['dr_initial']."</option>";
|
<option value='".$lt_dr['dr_uid']."' $selectStr>".$lt_dr['dr_lastname'].$lt_dr['dr_firstname']." (".$lt_dr['dr_initial'].")</option>";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue