Merge pull request 'Added remark column in panel box consolidate report' (#1018) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Reviewed-on: #1018
This commit was merged in pull request #1018.
This commit is contained in:
@@ -91,7 +91,7 @@ class SendPanelBoxReport extends Command
|
||||
->where('machine_id', $machineId)
|
||||
->whereBetween('created_at', [$startDate, $endDate])
|
||||
->where('status', 'NotOk')
|
||||
->select('serial_number')
|
||||
->select('serial_number', 'remark')
|
||||
->distinct()
|
||||
->get();
|
||||
|
||||
|
||||
@@ -266,6 +266,7 @@
|
||||
<th width="12%">S.No</th>
|
||||
<th>Supplier Number</th>
|
||||
<th>Serial Number</th>
|
||||
<th>Remark</th>
|
||||
<th width="20%">Status</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -292,6 +293,12 @@
|
||||
</span>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<span class="remark" style="white-space: nowrap;">
|
||||
{{ $record->remark }}
|
||||
</span>
|
||||
</td>
|
||||
|
||||
<td>
|
||||
<span class="not-ok">
|
||||
NOT OK
|
||||
|
||||
Reference in New Issue
Block a user