Просмотр исходного кода

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

zhangl 1 месяц назад
Родитель
Сommit
39135cd996
1 измененных файлов с 155 добавлено и 154 удалено
  1. 155 154
      common/libs/export/BaseExport.php

+ 155 - 154
common/libs/export/BaseExport.php

@@ -1590,6 +1590,8 @@ ORDER;
                 $orderModel->save();
             }
 
+            LoggerTool::debug($oderList);
+
             $orderTotalBv = 0;
             $orderTotalTaxAmount = 0;
             $orderTotalAmount = 0;
@@ -1729,161 +1731,160 @@ EOT;
                     <hr />
                     <br>
                     <br>
-                    
-                        <div style="width: 100%; line-height: 15px; margin-left: 0; margin-right: 0; margin-top: 0; margin-bottom: 0; padding: 0;">
-                            <table style="table-layout: fixed; margin-left: 0; margin-right: 0; margin-top: 0; margin-bottom: 0; " class="table-noborder" width="100%">
-                                <tr style="text-align: left; font-size: 12px; font-weight: normal; height: 50px; vertical-align: middle;">
-                                    <td>
-                                        Bill to
-                                    </td>
-                                    <td>
-                                        Invoice No.: {$invoiceNo}
-                                    </td>
-                                </tr>
-                                <tr style="text-align: left; font-size: 12px; font-weight: normal; height: 50px; vertical-align: middle;">
-                                    <td>
-                                        Name of Distributor: {$userName}
-                                    </td>
-                                    <td>
-                                        Date: {$orderAt}
-                                    </td>
-                                </tr>
-                                <tr style="text-align: left; font-size: 12px; font-weight: normal; height: 50px; vertical-align: middle;">
-                                    <td>
-                                        Member ID: {$userId}
-                                    </td>
-                                    <td>
-                                        Payment status: {$paymentStatus}
-                                    </td>
-                                </tr>
-                                <tr style="text-align: left; font-size: 12px; font-weight: normal; height: 50px; vertical-align: middle;">
-                                    <td colspan="2">
-                                        Address: {$address}
-                                    </td>
-                                </tr>
-                                <tr style="text-align: left; font-size: 12px; font-weight: normal; height: 50px; vertical-align: middle;">
-                                    <td colspan="2">
-                                        Contact: {$mobile}
-                                    </td>
-                                </tr>
-                            </table>
-                            
-                            <br />
-                            <br />
-                            <br />
-                            <table border="1" width="100%">
-                                <tr style="text-align: left; font-weight: normal; font-size: 12px; width: 100%;">
-                                    <th style="width: 30px;">No.</th>
-                                    <th>Product Code</th>
-                                    <th>Product Name</th>
-                                    <th>Quantity</th>
-                                    <th>Unit Price({$currency})</th>
-                                    <th>Unit BV</th>
-                                    <th>Total BV</th>
-                                    <th>Taxable Amount({$currency})</th>
-                                    <th>VAT Rate</th>
-                                    <th>VAT Amount({$currency})</th>
-                                    <th>Total({$currency})</th>
-                                </tr>
-                                {$orderDetails}
-                            </table>
-                                
-                            <table style="table-layout: fixed;" class="table-noborder">
-                                <tr><td colspan="11"></td></tr>
-                                <tr><td colspan="11"></td></tr>
-                            </table>
-                            
-                            <table style="table-layout: fixed;">  
-                                <tr style="text-align: left; font-weight: normal; font-size: 12px;">
-                                    <td class="table-noborder"></td>
-                                    <td style="text-align: left; background-color: lightslategray;" colspan="2">Grand Total</td>
-                                    <td style="text-align: left; background-color: lightslategray;">{$orderTotalQuantity}</td>
-                                    <td style="text-align: left; background-color: lightslategray;"></td>
-                                    <td style="text-align: left; background-color: lightslategray;"></td>
-                                    <td style="text-align: left; background-color: lightslategray;">{$orderTotalBv}</td>
-                                    <td style="text-align: left; background-color: lightslategray;">{$orderTotalTaxAmount}</td>
-                                    <td style="text-align: left; background-color: lightslategray;"></td>
-                                    <td style="text-align: left; background-color: lightslategray;">{$orderTotalAmount}</td>
-                                    <td style="text-align: left; background-color: lightslategray;">{$orderTotal}</td>
-                                </tr>
-                            </table>
-                            
-                            <table style="table-layout: fixed;" class="table-noborder">    
-                                <tr>
-                                    <td colspan="11"></td>
-                                </tr>
-                            </table>    
-                            
-                            <table style="table-layout: fixed;">
-                                <tr style="text-align: left; font-weight: normal; font-size: 12px;">
-                                    <td colspan="7" class="table-noborder"></td>
-                                    <td style="text-align: left; background-color: lightgoldenrodyellow;" colspan="2" >Total Amount</td>
-                                    <td style="text-align: left; background-color: lightgoldenrodyellow;" colspan="2">{$currency}{$orderAmount}</td>
-                                </tr>
-                            </table>
-                            
-                            <table style="table-layout: fixed;" class="table-noborder">    
-                                <tr>
-                                    <td colspan="11"></td>
-                                </tr>
-                            </table> 
-                            
-                            <table style="table-layout: fixed;" class="table-noborder">
-                                <tr style="text-align: left; font-weight: normal; font-size: 12px;">
-                                    <td colspan="7"></td>
-                                    <td colspan="2">Method:</td>
-                                    <td colspan="2"></td>
-                                </tr>
-                                <tr style="text-align: left; font-weight: normal; font-size: 12px;">
-                                    <td colspan="7"></td>
-                                    <td colspan="2" >Paid amount:</td>
-                                    <td colspan="2">{$currency}{$orderAmount}</td>
-                                </tr>
-                            </table>
-                            
-                            <table style="table-layout: fixed;" class="table-noborder">    
-                                <tr>
-                                    <td colspan="11"></td>
-                                </tr>
-                            </table>
-                            
-                            <table style="table-layout: fixed;" class="table-noborder">    
-                                <tr style="text-align: left; font-weight: normal; font-size: 12px;">
-                                    <td colspan="2">Remark:</td>
-                                    <td colspan="9"></td>
-                                </tr>
-                                <tr style="text-align: left; font-weight: normal; font-size: 12px;">
-                                    <td colspan="4">{$invoiceRemark}</td>
-                                    <td colspan="7"></td>
-                                </tr>
-                            </table>
-                            
-                            <table style="table-layout: fixed;" class="table-noborder">    
-                                <tr>
-                                    <td colspan="11"></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="11"></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="11"></td>
-                                </tr>
-                                <tr>
-                                    <td colspan="11"></td>
-                                </tr>
-                            </table>
+                    <div style="width: 100%; line-height: 15px; margin-left: 0; margin-right: 0; margin-top: 0; margin-bottom: 0; padding: 0;">
+                        <table style="table-layout: fixed; margin-left: 0; margin-right: 0; margin-top: 0; margin-bottom: 0; " class="table-noborder" width="100%">
+                            <tr style="text-align: left; font-size: 12px; font-weight: normal; height: 50px; vertical-align: middle;">
+                                <td>
+                                    Bill to
+                                </td>
+                                <td>
+                                    Invoice No.: {$invoiceNo}
+                                </td>
+                            </tr>
+                            <tr style="text-align: left; font-size: 12px; font-weight: normal; height: 50px; vertical-align: middle;">
+                                <td>
+                                    Name of Distributor: {$userName}
+                                </td>
+                                <td>
+                                    Date: {$orderAt}
+                                </td>
+                            </tr>
+                            <tr style="text-align: left; font-size: 12px; font-weight: normal; height: 50px; vertical-align: middle;">
+                                <td>
+                                    Member ID: {$userId}
+                                </td>
+                                <td>
+                                    Payment status: {$paymentStatus}
+                                </td>
+                            </tr>
+                            <tr style="text-align: left; font-size: 12px; font-weight: normal; height: 50px; vertical-align: middle;">
+                                <td colspan="2">
+                                    Address: {$address}
+                                </td>
+                            </tr>
+                            <tr style="text-align: left; font-size: 12px; font-weight: normal; height: 50px; vertical-align: middle;">
+                                <td colspan="2">
+                                    Contact: {$mobile}
+                                </td>
+                            </tr>
+                        </table>
+                        
+                        <br />
+                        <br />
+                        <br />
+                        <table border="1" width="100%">
+                            <tr style="text-align: left; font-weight: normal; font-size: 12px; width: 100%; padding: 5px 5px;">
+                                <th style="width: 30px;">No.</th>
+                                <th>Product Code</th>
+                                <th>Product Name</th>
+                                <th>Quantity</th>
+                                <th>Unit Price({$currency})</th>
+                                <th>Unit BV</th>
+                                <th>Total BV</th>
+                                <th>Taxable Amount({$currency})</th>
+                                <th>VAT Rate</th>
+                                <th>VAT Amount({$currency})</th>
+                                <th>Total({$currency})</th>
+                            </tr>
+                            {$orderDetails}
+                        </table>
                             
-                            <table style="table-layout: fixed;" class="table-noborder">    
-                                <tr style="text-align: left; font-weight: normal; font-size: 12px;">
-                                    <td colspan="4">Issued By:</td>
-                                    <td colspan="4">Picked By:</td>
-                                    <td colspan="3">Received By:</td>
-                                </tr>
-                                <tr>
-                                    <td colspan="11"></td>
-                                </tr>
-                            </table>
-                        </div>
+                        <table style="table-layout: fixed;" class="table-noborder">
+                            <tr><td colspan="11"></td></tr>
+                            <tr><td colspan="11"></td></tr>
+                        </table>
+                        
+                        <table style="table-layout: fixed;">  
+                            <tr style="text-align: left; font-weight: normal; font-size: 12px;">
+                                <td class="table-noborder"></td>
+                                <td style="text-align: left; background-color: lightslategray;" colspan="2">Grand Total</td>
+                                <td style="text-align: left; background-color: lightslategray;">{$orderTotalQuantity}</td>
+                                <td style="text-align: left; background-color: lightslategray;"></td>
+                                <td style="text-align: left; background-color: lightslategray;"></td>
+                                <td style="text-align: left; background-color: lightslategray;">{$orderTotalBv}</td>
+                                <td style="text-align: left; background-color: lightslategray;">{$orderTotalTaxAmount}</td>
+                                <td style="text-align: left; background-color: lightslategray;"></td>
+                                <td style="text-align: left; background-color: lightslategray;">{$orderTotalAmount}</td>
+                                <td style="text-align: left; background-color: lightslategray;">{$orderTotal}</td>
+                            </tr>
+                        </table>
+                        
+                        <table style="table-layout: fixed;" class="table-noborder">    
+                            <tr>
+                                <td colspan="11"></td>
+                            </tr>
+                        </table>    
+                        
+                        <table style="table-layout: fixed;">
+                            <tr style="text-align: left; font-weight: normal; font-size: 12px;">
+                                <td colspan="7" class="table-noborder"></td>
+                                <td style="text-align: left; background-color: lightgoldenrodyellow;" colspan="2" >Total Amount</td>
+                                <td style="text-align: left; background-color: lightgoldenrodyellow;" colspan="2">{$currency}{$orderAmount}</td>
+                            </tr>
+                        </table>
+                        
+                        <table style="table-layout: fixed;" class="table-noborder">    
+                            <tr>
+                                <td colspan="11"></td>
+                            </tr>
+                        </table> 
+                        
+                        <table style="table-layout: fixed;" class="table-noborder">
+                            <tr style="text-align: left; font-weight: normal; font-size: 12px;">
+                                <td colspan="7"></td>
+                                <td colspan="2">Method:</td>
+                                <td colspan="2"></td>
+                            </tr>
+                            <tr style="text-align: left; font-weight: normal; font-size: 12px;">
+                                <td colspan="7"></td>
+                                <td colspan="2" >Paid amount:</td>
+                                <td colspan="2">{$currency}{$orderAmount}</td>
+                            </tr>
+                        </table>
+                        
+                        <table style="table-layout: fixed;" class="table-noborder">    
+                            <tr>
+                                <td colspan="11"></td>
+                            </tr>
+                        </table>
+                        
+                        <table style="table-layout: fixed;" class="table-noborder">    
+                            <tr style="text-align: left; font-weight: normal; font-size: 12px;">
+                                <td colspan="2">Remark:</td>
+                                <td colspan="9"></td>
+                            </tr>
+                            <tr style="text-align: left; font-weight: normal; font-size: 12px;">
+                                <td colspan="4">{$invoiceRemark}</td>
+                                <td colspan="7"></td>
+                            </tr>
+                        </table>
+                        
+                        <table style="table-layout: fixed;" class="table-noborder">    
+                            <tr>
+                                <td colspan="11"></td>
+                            </tr>
+                            <tr>
+                                <td colspan="11"></td>
+                            </tr>
+                            <tr>
+                                <td colspan="11"></td>
+                            </tr>
+                            <tr>
+                                <td colspan="11"></td>
+                            </tr>
+                        </table>
+                        
+                        <table style="table-layout: fixed;" class="table-noborder">    
+                            <tr style="text-align: left; font-weight: normal; font-size: 12px;">
+                                <td colspan="4">Issued By:</td>
+                                <td colspan="4">Picked By:</td>
+                                <td colspan="3">Received By:</td>
+                            </tr>
+                            <tr>
+                                <td colspan="11"></td>
+                            </tr>
+                        </table>
+                    </div>
                 </div>
             </body>
         </html>