|
@@ -1618,7 +1618,7 @@ ORDER;
|
|
|
$totalAmount = 0;
|
|
$totalAmount = 0;
|
|
|
$paymentStatus = 'Paid'; // 支付状态
|
|
$paymentStatus = 'Paid'; // 支付状态
|
|
|
$invoiceRemark = $oderList[0]['INVOICE_REMARK'];
|
|
$invoiceRemark = $oderList[0]['INVOICE_REMARK'];
|
|
|
- $paymentMethod = $oderList[0]['PAY_TYPE']; // 支付方式
|
|
|
|
|
|
|
+ $paymentMethod = $oderList[0]['METHOD']??''; // 支付方式
|
|
|
$currency = Currency::findOne($oderList[0]['CURRENCY_ID'])['CODE'] ?? '';;
|
|
$currency = Currency::findOne($oderList[0]['CURRENCY_ID'])['CODE'] ?? '';;
|
|
|
$invoiceNo = $oderList[0]['INVOICE_NO'];
|
|
$invoiceNo = $oderList[0]['INVOICE_NO'];
|
|
|
|
|
|
|
@@ -1627,7 +1627,6 @@ ORDER;
|
|
|
$countyName = $oderList[0]['COUNTY'] ? Region::getCnName($oderList[0]['COUNTY']) : '';
|
|
$countyName = $oderList[0]['COUNTY'] ? Region::getCnName($oderList[0]['COUNTY']) : '';
|
|
|
$address = $provinceName . $cityName . $countyName . $oderList[0]['ADDRESS'];
|
|
$address = $provinceName . $cityName . $countyName . $oderList[0]['ADDRESS'];
|
|
|
|
|
|
|
|
- $paymentMethod = $oderList[0]['PAY_TYPE'] ?? 'Cash';
|
|
|
|
|
$paymentStatus = \Yii::$app->params['orderStatus'][$oderList[0]['STATUS']]['label'] ?? 'Paid';
|
|
$paymentStatus = \Yii::$app->params['orderStatus'][$oderList[0]['STATUS']]['label'] ?? 'Paid';
|
|
|
|
|
|
|
|
$orderTotalBv = 0;
|
|
$orderTotalBv = 0;
|
|
@@ -1868,7 +1867,7 @@ EOT;
|
|
|
<tr style="text-align: left; font-weight: normal; font-size: 12px;">
|
|
<tr style="text-align: left; font-weight: normal; font-size: 12px;">
|
|
|
<td colspan="7"></td>
|
|
<td colspan="7"></td>
|
|
|
<td colspan="2">Method:</td>
|
|
<td colspan="2">Method:</td>
|
|
|
- <td colspan="2"></td>
|
|
|
|
|
|
|
+ <td colspan="2">{$paymentMethod}</td>
|
|
|
</tr>
|
|
</tr>
|
|
|
<tr style="text-align: left; font-weight: normal; font-size: 12px;">
|
|
<tr style="text-align: left; font-weight: normal; font-size: 12px;">
|
|
|
<td colspan="7"></td>
|
|
<td colspan="7"></td>
|