|
|
@@ -793,7 +793,7 @@ ORDER;
|
|
|
}
|
|
|
table td, table th {
|
|
|
border: 1px solid #ccc;
|
|
|
- padding: 5px 5px;
|
|
|
+ /*padding: 5px 5px;*/
|
|
|
border-collapse: collapse;
|
|
|
}
|
|
|
/*td {*/
|
|
|
@@ -814,11 +814,11 @@ ORDER;
|
|
|
<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;">Product Code</th>
|
|
|
- <th width="25%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Name</th>
|
|
|
+ <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Name</th>
|
|
|
<th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Price</th>
|
|
|
<th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Qty</th>
|
|
|
- <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax rate</th>
|
|
|
- <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax</th>
|
|
|
+ <th width="12%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax rate</th>
|
|
|
+ <th width="13%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax</th>
|
|
|
<th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total amount</th>
|
|
|
</tr>
|
|
|
{$orderDetails}
|
|
|
@@ -974,13 +974,13 @@ ORDER;
|
|
|
// 订单详情
|
|
|
$orderDetails .= <<<EOT
|
|
|
<tr>
|
|
|
- <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['TAX_RATE']}</td>
|
|
|
- <td style="text-align: right;">{$taxAmount}</td>
|
|
|
- <td style="text-align: right;">{$totalAmount}</td>
|
|
|
+ <td style="text-align: center;">{$value['SKU_CODE']}</td>
|
|
|
+ <td style="text-align: center;">{$value['GOODS_TITLE']}</td>
|
|
|
+ <td style="text-align: center;">{$value['REAL_PRICE']}</td>
|
|
|
+ <td style="text-align: center;">{$value['BUY_NUMS']}</td>
|
|
|
+ <td style="text-align: center;">{$value['TAX_RATE']}</td>
|
|
|
+ <td style="text-align: center;">{$taxAmount}</td>
|
|
|
+ <td style="text-align: center;">{$totalAmount}</td>
|
|
|
</tr>
|
|
|
EOT;
|
|
|
}
|
|
|
@@ -1039,7 +1039,7 @@ ORDER;
|
|
|
}
|
|
|
table td, table th {
|
|
|
border: 1px solid #ccc;
|
|
|
- padding: 5px 5px;
|
|
|
+ /*padding: 5px 5px;*/
|
|
|
border-collapse: collapse;
|
|
|
}
|
|
|
/*td {*/
|
|
|
@@ -1060,11 +1060,11 @@ ORDER;
|
|
|
<table border="1" width="100%" style="padding: 10px 20px; text-align: center;">
|
|
|
<tr>
|
|
|
<th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Code</th>
|
|
|
- <th width="25%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Name</th>
|
|
|
+ <th width="20%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Name</th>
|
|
|
<th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Price</th>
|
|
|
<th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Qty</th>
|
|
|
- <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax Rate</th>
|
|
|
- <th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax</th>
|
|
|
+ <th width="12%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax Rate</th>
|
|
|
+ <th width="13%" style="font-size: 14px; font-weight: bold; text-align: center;">Total Tax</th>
|
|
|
<th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total Amount</th>
|
|
|
</tr>
|
|
|
{$orderDetails}
|
|
|
@@ -1526,13 +1526,13 @@ ORDER;
|
|
|
// 订单详情
|
|
|
$orderDetails .= <<<EOT
|
|
|
<tr>
|
|
|
- <td align="center" style="text-align: center;">{$value['SKU_CODE']}</td>
|
|
|
- <td align="center" style="text-align: center;">{$value['GOODS_TITLE']}</td>
|
|
|
- <td align="center" style="text-align: center;">{$value['REAL_PRICE']}</td>
|
|
|
- <td align="center" style="text-align: center;">{$value['BUY_NUMS']}</td>
|
|
|
- <td align="center" style="text-align: center;">{$value['TAX_RATE']}</td>
|
|
|
- <td align="center" style="text-align: center;">{$taxAmount}</td>
|
|
|
- <td align="center" style="text-align: center;">{$totalAmount}</td>
|
|
|
+ <td style="text-align: center;">{$value['SKU_CODE']}</td>
|
|
|
+ <td style="text-align: center;">{$value['GOODS_TITLE']}</td>
|
|
|
+ <td style="text-align: center;">{$value['REAL_PRICE']}</td>
|
|
|
+ <td style="text-align: center;">{$value['BUY_NUMS']}</td>
|
|
|
+ <td style="text-align: center;">{$value['TAX_RATE']}</td>
|
|
|
+ <td style="text-align: center;">{$taxAmount}</td>
|
|
|
+ <td style="text-align: center;">{$totalAmount}</td>
|
|
|
</tr>
|
|
|
EOT;
|
|
|
}
|
|
|
@@ -1616,8 +1616,8 @@ ORDER;
|
|
|
<th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Product Price</th>
|
|
|
<th width="10%" style="font-size: 14px; font-weight: bold; text-align: center;">Qty</th>
|
|
|
<th width="12%" style="font-size: 14px; font-weight: bold; text-align: center;">Tax Rate</th>
|
|
|
- <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total Tax</th>
|
|
|
- <th width="13%" style="font-size: 14px; font-weight: bold; text-align: center;">Total Amount</th>
|
|
|
+ <th width="13%" style="font-size: 14px; font-weight: bold; text-align: center;">Total Tax</th>
|
|
|
+ <th width="15%" style="font-size: 14px; font-weight: bold; text-align: center;">Total Amount</th>
|
|
|
</tr>
|
|
|
{$orderDetails}
|
|
|
<tr>
|