|
@@ -3437,7 +3437,7 @@ class InvoiceController extends DooController {
|
|
|
Doo::loadModel ( 'invoiceReceivables' );
|
|
|
$invoiceReceivables = new invoiceReceivables ();
|
|
|
|
|
|
- $con = ' and iid=0 and bindStatus=0 and receivablesStaff="PUBLIC"';
|
|
|
+ $con = ' and bindStatus=0 ';
|
|
|
$detail = $invoiceReceivables->getInvoiceReceivablesByIrid ( $claimKey, $con );
|
|
|
if (empty ( $detail ))
|
|
|
die ( 'illegal request' );
|
|
@@ -4960,7 +4960,7 @@ class InvoiceController extends DooController {
|
|
|
$get = "/" . $status . "?date=" . urlencode ( $date ) . "&MebSea=" . urlencode ( $MebSea );
|
|
|
|
|
|
if (! empty ( $MebSea )) {
|
|
|
- $con .= ' and ( a.receivablesMessage like "%' . $MebSea . '%" or a.receivablesPrice like "%' . $MebSea . '%" )';
|
|
|
+ $con .= ' and ( a.receivablesMessage like "%' . $MebSea . '%" or a.receivablesPrice like "%' . $MebSea . '%" or a.receivablesSerial like "%' . $MebSea . '%" )';
|
|
|
}
|
|
|
$pageinfo ['page'] = array (
|
|
|
'previous' => ''
|
|
@@ -5057,6 +5057,8 @@ class InvoiceController extends DooController {
|
|
|
$refundCompany = $this->get_args ( 'refundCompany' ) ? $this->get_args ( 'refundCompany' ) : "";
|
|
|
$refundNumber = $this->get_args ( 'refundNumber' ) ? $this->get_args ( 'refundNumber' ) : "";
|
|
|
$refundPrice = $this->get_args ( 'refundPrice' ) ? $this->get_args ( 'refundPrice' ) : "";
|
|
|
+ $refundRemarks = $this->get_args ( 'refundRemarks' ) ? $this->get_args ( 'refundRemarks' ) : "";
|
|
|
+
|
|
|
|
|
|
if($refundPrice<0)
|
|
|
die ( 'illegal request' );
|
|
@@ -5070,6 +5072,9 @@ class InvoiceController extends DooController {
|
|
|
$irid = $invoiceReceivables->authcode ( $iridKey );
|
|
|
$irDetail = $invoiceReceivables->getInvoiceReceivablesByIrid ( $irid );
|
|
|
|
|
|
+ if($irDetail ['receivablesPrice'] < $refundPrice)
|
|
|
+ die ( 'illegal request' );
|
|
|
+
|
|
|
$invoiceReceivables = new invoiceReceivables ();
|
|
|
$refundLog = $this->staff [0] ['username'] . ' 退款 <b class="colRed">¥' . $refundPrice . '</b>
|
|
|
<br/><a href="#refunded" onclick="getRefundByDetail(\'' . $iridKey . '\')" data-toggle="modal">退款信息</a> <br/>' . date ( "Y-m-d H:i:s" ) . '
|
|
@@ -5079,12 +5084,13 @@ class InvoiceController extends DooController {
|
|
|
'refundCompany' => $refundCompany,
|
|
|
'refundNumber' => $refundNumber,
|
|
|
'refundPrice' => $refundPrice,
|
|
|
+ 'refundRemarks' =>$refundRemarks,
|
|
|
'refundLog' => $refundLog
|
|
|
);
|
|
|
if ($refundType == 1) {
|
|
|
$item += array (
|
|
|
'refundType' => $refundType,
|
|
|
- 'receivablesPrice' => $refundPrice,
|
|
|
+ 'receivablesPrice' => $irDetail ['receivablesPrice'] -$refundPrice,
|
|
|
'bindStatus' => 2
|
|
|
);
|
|
|
} elseif ($refundType == 0 && $irDetail ['receivablesPrice'] <= $refundPrice) {
|
|
@@ -5109,6 +5115,7 @@ class InvoiceController extends DooController {
|
|
|
'refundNumber' => $refundNumber,
|
|
|
'refundPrice' => $refundPrice,
|
|
|
'refundLog' => $refundLog,
|
|
|
+ 'refundRemarks'=>$refundRemarks,
|
|
|
'date' => date ( "Y-m-d H:i:s" )
|
|
|
);
|
|
|
$invoiceRefund->addInvoiceRefund ( $item );
|
|
@@ -5144,6 +5151,37 @@ class InvoiceController extends DooController {
|
|
|
die ( 'illegal request' );
|
|
|
}
|
|
|
|
|
|
+ function ajaxCheckInvoiceReceivablesRefund(){
|
|
|
+ $iridKey = $this->get_args ( 'iridKey' ) ? $this->get_args ( 'iridKey' ) : '';
|
|
|
+ $refundPrice = $this->get_args ( 'refundPrice' ) ? $this->get_args ( 'refundPrice' ) : "";
|
|
|
+
|
|
|
+ if($refundPrice<0){
|
|
|
+ echo json_encode ( array (
|
|
|
+ 'error' => '金额不能为负'
|
|
|
+ ) );
|
|
|
+ die ();
|
|
|
+ }
|
|
|
+
|
|
|
+ if (! empty ( $refundPrice ) && ! empty ( $iridKey )) {
|
|
|
+ Doo::loadModel ( 'invoiceReceivables' );
|
|
|
+ $invoiceReceivables = new invoiceReceivables ();
|
|
|
+
|
|
|
+ $irid = $invoiceReceivables->authcode ( $iridKey );
|
|
|
+ $irDetail = $invoiceReceivables->getInvoiceReceivablesByIrid ( $irid );
|
|
|
+
|
|
|
+ if($irDetail ['receivablesPrice'] < $refundPrice){
|
|
|
+ echo json_encode ( array (
|
|
|
+ 'error' => '退款金额不能超过收款金额'
|
|
|
+ ) );
|
|
|
+ die ();
|
|
|
+ }
|
|
|
+ echo json_encode ( array (
|
|
|
+ 'ok' => '可以使用!'
|
|
|
+ ) );
|
|
|
+ die ();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 获得收款退款信息
|
|
|
*/
|
|
@@ -5176,8 +5214,8 @@ class InvoiceController extends DooController {
|
|
|
if (! empty ( $receivablesSerial )) {
|
|
|
Doo::loadModel ( 'invoiceReceivables' );
|
|
|
$invoiceReceivables = new invoiceReceivables ();
|
|
|
-
|
|
|
- $irDetail = $invoiceReceivables->getInvoiceReceivablesBySerial ( $receivablesSerial, ' and refundLog=""' );
|
|
|
+ //, ' and refundLog=""'
|
|
|
+ $irDetail = $invoiceReceivables->getInvoiceReceivablesBySerial ( $receivablesSerial );
|
|
|
$html = '';
|
|
|
if (! empty ( $irDetail ))
|
|
|
$html = '<td><b>¥' . $irDetail ['receivablesPrice'] . '</b></td>
|
|
@@ -6296,7 +6334,15 @@ class InvoiceController extends DooController {
|
|
|
</tbody></table>';
|
|
|
if (! empty ( $ireList )) {
|
|
|
$html .= '
|
|
|
- <table class="table table-bordered table-condensed"><tbody><tr><th class="taC" colspan="2">退款记录</th></tr>';
|
|
|
+ <table class="table table-bordered table-condensed"><tbody><tr><th class="taC" colspan="5">退款记录</th></tr>
|
|
|
+ <tr>
|
|
|
+ <th class="taC">退款单位名称</th>
|
|
|
+ <th class="taC">退款的账号</th>
|
|
|
+ <th class="taC">退款金额</th>
|
|
|
+ <th class="taC">退款</th>
|
|
|
+ <th class="taC">备注</th>
|
|
|
+ </tr>
|
|
|
+ ';
|
|
|
|
|
|
foreach ( $ireList as $key => $value ) {
|
|
|
|
|
@@ -6304,22 +6350,14 @@ class InvoiceController extends DooController {
|
|
|
|
|
|
$refundLogList=explode("<br/>",$value['refundLog']);
|
|
|
|
|
|
-
|
|
|
-
|
|
|
- $html .= '
|
|
|
- <tr>
|
|
|
- <th class="taC">退款单位名称</th><td>' . $value ['refundCompany'] . '</td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <th class="taC">退款的账号</th><td>' . $value ['refundNumber'] . '</td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <th class="taC">退款金额</th><td class="colRed">¥' . $value ['refundPrice'] . '</td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <th class="taC">退款</th><td>' . $refundLogList [0].$refundLogList [2] . '</td>
|
|
|
- </tr>
|
|
|
- ';
|
|
|
+ $html .= '<tr>
|
|
|
+ <td>' . $value ['refundCompany'] . '</td>
|
|
|
+ <td>' . $value ['refundNumber'] . '</td>
|
|
|
+ <td><b class="colRed">¥' . $value ['refundPrice'] . '</b></td>
|
|
|
+ <td>' . $refundLogList [0].$refundLogList [2] . '</td>
|
|
|
+ <td>' . $value ['refundRemarks'] . '</td>
|
|
|
+ </tr>
|
|
|
+ ';
|
|
|
}
|
|
|
}
|
|
|
$html .= '</tbody></table></div><div class="modal-footer"><a href="#" class="button btn-gray" data-dismiss="modal" aria-hidden="true">关闭</a></div></div></div>';
|