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

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

zhangl 2 месяцев назад
Родитель
Сommit
9d6ab2597b
1 измененных файлов с 36 добавлено и 11 удалено
  1. 36 11
      common/libs/export/BaseExport.php

+ 36 - 11
common/libs/export/BaseExport.php

@@ -1636,15 +1636,41 @@ EOT;
 
             // 订单基本信息
             $orderBase = <<<ORDER
-                <table style="table-layout: fixed;">
+                <table style="table-layout: fixed;" border="0">
                     <tr>
-                        <td style="font-weight: bold; text-align: center; font-size: 14px;">
+                        <td style="text-align: left; font-size: 14px; width:50%;">
                             Bill to
                         </td>
-                        <td>
+                        <td style="ext-align: left; font-size: 14px; width:50%;">
                             Invoice No.: 123213123123
                         </td>
                     </tr>
+                    <tr>
+                        <td style="text-align: left; font-size: 14px; width:50%;">
+                            Name of Distributor: {$userName}
+                        </td>
+                        <td style="text-align: left; font-size: 14px; width:50%;">
+                            Date: {$orderAt}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="text-align: left; font-size: 14px; width:50%;">
+                            Member ID: {$userId}
+                        </td>
+                        <td style="text-align: left; font-size: 14px; width:50%;">
+                            Payment status: {$paymentStatus}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="text-align: left; font-size: 14px;" rowspan="2">
+                            Address: {$address}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="text-align: left; font-size: 14px;"  rowspan="2">
+                            Contact: {$mobile}
+                        </td>
+                    </tr>
                 </table>
 ORDER;
 
@@ -1681,19 +1707,18 @@ ORDER;
             </head>
             <body>
                 <div class="content">
-                    <p style="text-align: left; font-weight: bold; font-size: 30px;"><b>{$taxInvoice}</b><br></p>
-                    <p style="text-align: left; font-weight: bold; font-size: 22px;"><b>Elken Arabiya General Grading Co.LLC</b><br></p>
-                    <p style="text-align: left; font-size: 20px;">Shop No.2, Plot 356-1142, Juneirah Street, Umm Suqeim 1, Dubai, UAE<br></p>
-                    <p style="text-align: left; font-size: 20px;">Shop No.2, Plot 356-1142, Juneirah Street, Umm Suqeim 1, Dubai, UAE<br></p>
-                    <p style="text-align: left; font-size: 20px;">Phone: +971042296118<br></p>
-                    <p style="text-align: left; font-size: 20px;">License No: 1314319<br></p>
-                    <p style="text-align: left; font-size: 20px;">VAT No: 105034822400003<br></p>
+                    <p style="text-align: left; font-weight: bold; font-size: 18px;"><b>Tax Invoice</b><br></p>
+                    <p style="text-align: left; font-weight: bold; font-size: 15px;"><b>Elken Arabiya General Grading Co.LLC</b><br></p>
+                    <p style="text-align: left; font-size: 13px;">Shop No.2, Plot 356-1142, Juneirah Street, Umm Suqeim 1, Dubai, UAE<br></p>
+                    <p style="text-align: left; font-size: 13px;">Phone: +971042296118<br></p>
+                    <p style="text-align: left; font-size: 13px;">License No: 1314319<br></p>
+                    <p style="text-align: left; font-size: 13px;">VAT No: 105034822400003<br></p>
                     <hr /><br><br>
                     <div>
                         <div style="display: block; width: 100%;">
                             {$orderBase}
                             
-                            <table border="1" width="100%" style="padding: 10px 5px; text-align: left;">
+                            <table border="1" width="100%" style="padding: 10px 5px; text-align: left; margin-top: 35px;">
                                 <tr>
                                     <th style="font-size: 14px; font-weight: bold; text-align: center;">No.</th>
                                     <th style="font-size: 14px; font-weight: bold; text-align: center;">{$productCode}</th>