|
@@ -23,7 +23,8 @@ use App\Helpers\HtmlHelper;
|
|
|
<colgroup>
|
|
<colgroup>
|
|
|
<col style="width: 1%"/>
|
|
<col style="width: 1%"/>
|
|
|
<col style="width: 15%"/>
|
|
<col style="width: 15%"/>
|
|
|
- <col style="width: 45%"/>
|
|
|
|
|
|
|
+ <col style="width: 30%"/>
|
|
|
|
|
+ <col style="width: 15%"/>
|
|
|
<col style="width: 10%"/>
|
|
<col style="width: 10%"/>
|
|
|
<col style="width: 10%"/>
|
|
<col style="width: 10%"/>
|
|
|
<col style="width: 10%"/>
|
|
<col style="width: 10%"/>
|
|
@@ -35,6 +36,7 @@ use App\Helpers\HtmlHelper;
|
|
|
<th><?=htmlspecialchars(__("No."))?></th>
|
|
<th><?=htmlspecialchars(__("No."))?></th>
|
|
|
<th><?=htmlspecialchars(__("Status"))?></th>
|
|
<th><?=htmlspecialchars(__("Status"))?></th>
|
|
|
<th><?=htmlspecialchars(__("Item"))?></th>
|
|
<th><?=htmlspecialchars(__("Item"))?></th>
|
|
|
|
|
+ <th><?=htmlspecialchars(__("S/N"))?></th>
|
|
|
<th><?=htmlspecialchars(__("Qty"))?></th>
|
|
<th><?=htmlspecialchars(__("Qty"))?></th>
|
|
|
<th><?=htmlspecialchars(__("Subtotal"))?></th>
|
|
<th><?=htmlspecialchars(__("Subtotal"))?></th>
|
|
|
<th><?=htmlspecialchars(__("Tax"))?></th>
|
|
<th><?=htmlspecialchars(__("Tax"))?></th>
|
|
@@ -59,11 +61,19 @@ use App\Helpers\HtmlHelper;
|
|
|
<?=htmlspecialchars($sale_order->getDisplaySalesOrderStatus())?>
|
|
<?=htmlspecialchars($sale_order->getDisplaySalesOrderStatus())?>
|
|
|
</td>
|
|
</td>
|
|
|
<td>
|
|
<td>
|
|
|
- <?=htmlspecialchars($item->description ?? "")?>
|
|
|
|
|
<?php
|
|
<?php
|
|
|
- if($item && $item->serial_number) {
|
|
|
|
|
|
|
+ if($item) {
|
|
|
?>
|
|
?>
|
|
|
- <span class="text-muted">(S/N: <?=htmlspecialchars($item->serial_number)?>)</span>
|
|
|
|
|
|
|
+ <?=htmlspecialchars($item->description)?>
|
|
|
|
|
+ <?php
|
|
|
|
|
+ }
|
|
|
|
|
+ ?>
|
|
|
|
|
+ </td>
|
|
|
|
|
+ <td>
|
|
|
|
|
+ <?php
|
|
|
|
|
+ if($item) {
|
|
|
|
|
+ ?>
|
|
|
|
|
+ <?=$item->getSerialNumberHtml()?>
|
|
|
<?php
|
|
<?php
|
|
|
}
|
|
}
|
|
|
?>
|
|
?>
|
|
@@ -92,13 +102,9 @@ use App\Helpers\HtmlHelper;
|
|
|
<tr class="<?=$row_class?>">
|
|
<tr class="<?=$row_class?>">
|
|
|
<td>
|
|
<td>
|
|
|
<?=htmlspecialchars($item->description)?>
|
|
<?=htmlspecialchars($item->description)?>
|
|
|
- <?php
|
|
|
|
|
- if($item->serial_number) {
|
|
|
|
|
- ?>
|
|
|
|
|
- <span class="text-muted">(S/N: <?=htmlspecialchars($item->serial_number)?>)</span>
|
|
|
|
|
- <?php
|
|
|
|
|
- }
|
|
|
|
|
- ?>
|
|
|
|
|
|
|
+ </td>
|
|
|
|
|
+ <td>
|
|
|
|
|
+ <?=$item->getSerialNumberHtml()?>
|
|
|
</td>
|
|
</td>
|
|
|
<td class="text-end">
|
|
<td class="text-end">
|
|
|
<?=htmlspecialchars($item->quantity)?>
|
|
<?=htmlspecialchars($item->quantity)?>
|