|
@@ -19,22 +19,11 @@ use App\Helpers\HtmlHelper;
|
|
|
else {
|
|
else {
|
|
|
?>
|
|
?>
|
|
|
<table class="table table-bordered">
|
|
<table class="table table-bordered">
|
|
|
- <colgroup>
|
|
|
|
|
- <col style="width: 1%"/>
|
|
|
|
|
- <col style="width: 10%"/>
|
|
|
|
|
- <col style="width: 15%"/>
|
|
|
|
|
- <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: 1%"/>
|
|
|
|
|
- </colgroup>
|
|
|
|
|
<thead>
|
|
<thead>
|
|
|
<tr>
|
|
<tr>
|
|
|
<th><?=htmlspecialchars(__("No."))?></th>
|
|
<th><?=htmlspecialchars(__("No."))?></th>
|
|
|
<th><?=htmlspecialchars(__("Date"))?></th>
|
|
<th><?=htmlspecialchars(__("Date"))?></th>
|
|
|
|
|
+ <th><?=htmlspecialchars(__("Location"))?></th>
|
|
|
<th><?=htmlspecialchars(__("Status"))?></th>
|
|
<th><?=htmlspecialchars(__("Status"))?></th>
|
|
|
<th><?=htmlspecialchars(__("Item"))?></th>
|
|
<th><?=htmlspecialchars(__("Item"))?></th>
|
|
|
<th><?=htmlspecialchars(__("S/N"))?></th>
|
|
<th><?=htmlspecialchars(__("S/N"))?></th>
|
|
@@ -61,6 +50,9 @@ use App\Helpers\HtmlHelper;
|
|
|
<td rowspan="<?=$rowspan?>">
|
|
<td rowspan="<?=$rowspan?>">
|
|
|
<?=htmlspecialchars($sales_order->getDisplayDate())?>
|
|
<?=htmlspecialchars($sales_order->getDisplayDate())?>
|
|
|
</td>
|
|
</td>
|
|
|
|
|
+ <td rowspan="<?=$rowspan?>">
|
|
|
|
|
+ <?=htmlspecialchars($sales_order->getLocation()->name)?>
|
|
|
|
|
+ </td>
|
|
|
<td rowspan="<?=$rowspan?>">
|
|
<td rowspan="<?=$rowspan?>">
|
|
|
<?=htmlspecialchars($sales_order->getDisplaySalesOrderStatus())?>
|
|
<?=htmlspecialchars($sales_order->getDisplaySalesOrderStatus())?>
|
|
|
</td>
|
|
</td>
|