소스 검색

feature/EK-33291的改动

ryan 1 개월 전
부모
커밋
b76af54498
1개의 변경된 파일2개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 4
      common/libs/export/BaseExport.php

+ 2 - 4
common/libs/export/BaseExport.php

@@ -1821,8 +1821,8 @@ EOT;
                         <table style="table-layout: fixed;" width="100%">
                             <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>
+                                <th style="white-space: normal; word-break: keep-all;" colspan="2">Taxable Amount ({$currency})</th>
+                                <th style="white-space: normal; word-break: keep-all;" colspan="2">VAT Amount ({$currency})</th>
                             </tr>
                             <tr style="text-align: left; font-weight: normal; font-size: 12px;">
                                 <th style="width: 30px;">No.</th>
@@ -1830,9 +1830,7 @@ EOT;
                                 <th style="white-space: normal; word-break: keep-all;">Product Name</th>
                                 <th style="white-space: nowrap;">Quantity</th>
                                 <th style="white-space: normal; word-break: keep-all;">Unit Price ({$currency})</th>
-                                <th style="white-space: normal; word-break: keep-all;" colspan="2">Taxable Amount ({$currency})</th>
                                 <th style="white-space: normal; word-break: keep-all;">VAT Rate</th>
-                                <th style="white-space: normal; word-break: keep-all;" colspan="2">VAT Amount ({$currency})</th>
                                 <th style="white-space: normal; word-break: keep-all;">Total({$currency})</th>
                             </tr>
                         </table>