Преглед изворни кода

feat: EK-3320: 订单增加 Invoice 下载

zhangl пре 1 месец
родитељ
комит
e475e6213c
1 измењених фајлова са 5 додато и 5 уклоњено
  1. 5 5
      common/libs/export/BaseExport.php

+ 5 - 5
common/libs/export/BaseExport.php

@@ -1589,7 +1589,7 @@ ORDER;
                 $userName = $value['REAL_NAME'];
                 $address = $provinceName . $cityName . $countyName . $value['ADDRESS'];
                 $mobile = $value['MOBILE'];
-                $orderAt = Date::convert($value['CREATED_AT'],'Y-m-d H:i:s');
+                $orderAt = Date::convert($value['CREATED_AT'],'Y/m/d');
                 $orderSn = $value['SN'];
                 // 总价
                 $totalAmount = $value['BUY_NUMS'] * $value['REAL_PRICE'];
@@ -1751,6 +1751,7 @@ ORDER;
                                     <th style="font-size: 14px; font-weight: bold; text-align: center;">VAT Amount(AED)</th>
                                     <th style="font-size: 14px; font-weight: bold; text-align: center;">Total(AED)</th>
                                 </tr>
+                                {$orderDetails}
                             </table>
                                 
                             <table style="table-layout: fixed;" class="table-noborder">
@@ -1793,14 +1794,14 @@ ORDER;
                                 </tr>
                             </table> 
                             
-                            <table style="table-layout: fixed;">
+                            <table style="table-layout: fixed;" class="table-noborder">
                                 <tr>
-                                    <td colspan="7" class="table-noborder"></td>
+                                    <td colspan="7"></td>
                                     <td style="text-align: left;" colspan="2" >Method:</td>
                                     <td style="text-align: left;" colspan="2">Cash</td>
                                 </tr>
                                 <tr>
-                                    <td colspan="7" class="table-noborder"></td>
+                                    <td colspan="7"></td>
                                     <td style="text-align: left;" colspan="2" >Paid amount:</td>
                                     <td style="text-align: left;" colspan="2">AED 1423.1</td>
                                 </tr>
@@ -1904,7 +1905,6 @@ ORDER;
             $pdf->writeHTML($context);
 
             $result = $pdf->Output($realFile, 'F');
-            LoggerTool::debug(['result' => $result]);
 
             $this->_updateFirst($realFile, 1);
         }