Explorar o código

feat: EK-3320: [Order List]新增发票功能.

kevin hai 1 mes
pai
achega
a9789d5995

+ 24 - 15
common/libs/export/BaseExport.php

@@ -1578,7 +1578,6 @@ ORDER;
             $totalTaxAmount = 0; // 合计税额
             $totalAmount = 0;
             foreach ($oderList as $key => $value) {
-                LoggerTool::debug($value);
                 $provinceName = $value['PROVINCE'] ? Region::getCnName($value['PROVINCE']) : '';
                 $cityName = $value['CITY'] ? Region::getCnName($value['CITY']) : '';
                 $countyName = $value['COUNTY'] ? Region::getCnName($value['COUNTY']) : '';
@@ -1601,10 +1600,14 @@ ORDER;
                 // 订单详情
                 $orderDetails .= <<<EOT
                 <tr>
+                    <td width="10%" style="font-size: 14px; text-align: center;">{$key}</td>
                     <td>{$value['SKU_CODE']}</td>
                     <td>{$value['GOODS_TITLE']}</td>
-                    <td style="text-align: right;">{$value['REAL_PRICE']}</td>
                     <td>{$value['BUY_NUMS']}</td>
+                    <td style="text-align: right;">{$value['REAL_PRICE']}</td>
+                    <td style="text-align: right;">{$value['REAL_PRICE']}</td>
+                    <td style="text-align: right;">{$value['REAL_PRICE']}</td>
+                    <td style="text-align: right;">{$taxAmount}</td>
                     <td style="text-align: right;">{$value['TAX_RATE']}</td>
                     <td style="text-align: right;">{$taxAmount}</td>
                     <td style="text-align: right;">{$totalAmount}</td> 
@@ -1617,7 +1620,7 @@ EOT;
             $memberAddress = Yii::t('app', 'memberAddress');
             $memberPhone = Yii::t('app', 'memberPhone');
             $orderCode = Yii::t('app', 'orderCode');
-            $orderDetail = Yii::t('app', 'orderDetail');
+            $taxInvoice = Yii::t('app', 'taxInvoice');
             $productCode = Yii::t('app', 'productCode');
             $productName = Yii::t('app', 'productName');
             $productPrice = Yii::t('app', 'productPrice');
@@ -1657,10 +1660,6 @@ EOT;
                     <td width="30%" style="font-weight: bold; text-align: center; font-size: 14px;">{$createAt}</td>
                     <td width="70%">{$orderAt}</td>
                 </tr>
-                <tr>
-                    <td class="bg" style="font-weight: bold; font-size: 14px; text-align: center;">{$orderDetail}</td>
-                    <td class="bg"></td>
-                </tr>
             </table>
 ORDER;
 
@@ -1677,7 +1676,7 @@ ORDER;
             <html lang="en">
             <head>
                 <meta charset="UTF-8" />
-                <title>{$orderDetail}</title>
+                <title>{$taxInvoice}</title>
                 <style>
                     table {
                         border-collapse: collapse;
@@ -1697,22 +1696,32 @@ ORDER;
             </head>
             <body>
                 <div class="content">
-                    <p style="text-align: center; font-weight: bold; font-size: 22px;"><b>{$orderDetail}</b><br></p>
+                    <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>
                     <div>
                         <div style="display: block; width: 100%;">
                             {$orderBase}
                             
                             <table border="1" width="100%" style="padding: 10px 5px; text-align: center;">
                                 <tr>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">No</th>
                                     <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">{$productCode}</th>
                                     <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">{$productName}</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">{$productPrice}</th>
-                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">{$quantity}</th>
-                                    <th width="12%" style="font-size: 14px; font-weight: bold; text-align: center;">{$taxRate}</th>
-                                    <th width="13%" style="font-size: 14px; font-weight: bold; text-align: center;">{$totalTax}</th>
-                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">{$totalAmount}</th>
+                                    <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Quantity</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Unit Price(AED)</th>
+                                    <th width="12%" style="font-size: 14px; font-weight: bold; text-align: center;">Unit BV</th>
+                                    <th width="12%" style="font-size: 14px; font-weight: bold; text-align: center;">Total BV</th>
+                                    <th width="12%" style="font-size: 14px; font-weight: bold; text-align: center;">Taxable Amount(AED)</th>
+                                    <th width="12%" style="font-size: 14px; font-weight: bold; text-align: center;">VAT Rate</th>
+                                    <th width="13%" style="font-size: 14px; font-weight: bold; text-align: center;">VAT Amount(AED)</th>
+                                    <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total(AED)</th>
                                 </tr>
-                                {$orderDetails}
+                                
                                 <tr>
                                     <td colspan="3">{$total}</td>
                                     <td style="text-align: right;">{$orderNums}</td>

+ 1 - 0
common/messages/en-US/app.php

@@ -5,6 +5,7 @@ return [
     'reconsume' => 'Reconsume',
     'orderCode' => 'Order Code',
     'orderDetail' => 'Order Detail',
+    'taxInvoice' => 'Tax Invoice',
     'productCode' => 'Product Code',
     'productName' => 'Product Name',
     'productPrice' => 'Product Price',

+ 1 - 0
common/messages/zh-CN/app.php

@@ -4,6 +4,7 @@ return [
     'addressId' => '收货地址',
     'orderCode' => '订单号',
     'orderDetail' => '订单详情',
+    'taxInvoice' => '发票',
     'productCode' => '商品编号',
     'productName' => '商品名字',
     'productPrice' => '商品价格',