Added customer code column and no of days pending and indication colour messages
This commit is contained in:
@@ -181,11 +181,12 @@ class SendInvoiceDataReport extends Command
|
|||||||
//'no' => $no++,
|
//'no' => $no++,
|
||||||
'plant' => $plant->name,
|
'plant' => $plant->name,
|
||||||
// 'distribution_type' => $selectedDistribution,
|
// 'distribution_type' => $selectedDistribution,
|
||||||
// 'customer_code' => $inv->customer_code,
|
'customer_code' => $inv->customer_code,
|
||||||
'document_number' => $inv->document_number,
|
'document_number' => $inv->document_number,
|
||||||
'document_date' => $inv->document_date,
|
'document_date' => $inv->document_date,
|
||||||
'customer_trade_name' => $inv->customer_trade_name,
|
'customer_trade_name' => $inv->customer_trade_name,
|
||||||
'customer_location' => $inv->customer_location,
|
'customer_location' => $inv->customer_location,
|
||||||
|
'no_of_days_pending' => abs((int)now()->diffInDays($documentDate)),
|
||||||
'status' => 'Pending',
|
'status' => 'Pending',
|
||||||
'status_class' => $statusColor,
|
'status_class' => $statusColor,
|
||||||
];
|
];
|
||||||
@@ -208,7 +209,7 @@ class SendInvoiceDataReport extends Command
|
|||||||
|
|
||||||
$this->info($contentVars['greeting'] ?? 'Invoice Data Report');
|
$this->info($contentVars['greeting'] ?? 'Invoice Data Report');
|
||||||
$this->table(
|
$this->table(
|
||||||
['No', 'Plant', 'Document Number', 'Document Date', 'Trade Name', 'Location', 'Status'],//'Distribution Type', 'Customer Code',
|
['No', 'Plant', 'Customer Code', 'Document Number', 'Document Date', 'Trade Name', 'Location', 'Pending Days', 'Status'],//'Distribution Type'
|
||||||
$tableData
|
$tableData
|
||||||
);
|
);
|
||||||
$this->info($contentVars['wishes'] ?? '');
|
$this->info($contentVars['wishes'] ?? '');
|
||||||
|
|||||||
@@ -79,12 +79,13 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<th>No</th>
|
<th>No</th>
|
||||||
<th>Plant</th>
|
<th>Plant</th>
|
||||||
{{-- <th>Distribution Type</th>
|
{{-- <th>Distribution Type</th> --}}
|
||||||
<th>Customer Code</th> --}}
|
<th>Customer Code</th>
|
||||||
<th>Document Number</th>
|
<th>Document Number</th>
|
||||||
<th>Document Date</th>
|
<th>Document Date</th>
|
||||||
<th>Customer TradeName</th>
|
<th>Customer TradeName</th>
|
||||||
<th>Customer Location</th>
|
<th>Customer Location</th>
|
||||||
|
<th>Pending Days</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@@ -93,8 +94,8 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>{{ $row['no'] }}</td>
|
<td>{{ $row['no'] }}</td>
|
||||||
<td>{{ $row['plant'] }}</td>
|
<td>{{ $row['plant'] }}</td>
|
||||||
{{-- <td>{{ $row['distribution_type'] }}</td>
|
{{-- <td>{{ $row['distribution_type'] }}</td> --}}
|
||||||
<td>{{ $row['customer_code'] }}</td> --}}
|
<td>{{ $row['customer_code'] }}</td>
|
||||||
<td>{{ $row['document_number'] }}</td>
|
<td>{{ $row['document_number'] }}</td>
|
||||||
<td>
|
<td>
|
||||||
@if(!empty($row['document_date']) && $row['document_date'] != '-')
|
@if(!empty($row['document_date']) && $row['document_date'] != '-')
|
||||||
@@ -110,6 +111,7 @@
|
|||||||
{{-- <td class="{{ $row['status'] == 'Went Out' ? 'status-wentout' : ($row['status'] == 'Pending' ? 'status-pending' : '') }}">
|
{{-- <td class="{{ $row['status'] == 'Went Out' ? 'status-wentout' : ($row['status'] == 'Pending' ? 'status-pending' : '') }}">
|
||||||
{{ $row['status'] }}
|
{{ $row['status'] }}
|
||||||
</td> --}}
|
</td> --}}
|
||||||
|
<td>{{ $row['no_of_days_pending'] }}</td>
|
||||||
<td class="{{ $row['status_class'] ?? '' }}">
|
<td class="{{ $row['status_class'] ?? '' }}">
|
||||||
{{ $row['status'] }}
|
{{ $row['status'] }}
|
||||||
</td>
|
</td>
|
||||||
@@ -118,6 +120,15 @@
|
|||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
@endif
|
@endif
|
||||||
|
{{-- <p>* <span class="status-pending-red">Pending</span> - Long Days Pending, <span class="status-pending-yellow">Pending</span> - One Day Pending</p> --}}
|
||||||
|
<p style="margin-top: 20px;">
|
||||||
|
<strong>* Pending</strong><br>
|
||||||
|
<span style="display:inline-block; width:11px; height:11px; background-color:#ff4d4d; border:1px solid #ccc; vertical-align:middle; margin-right:6px;"></span>
|
||||||
|
- Long Days Pending<br>
|
||||||
|
<span style="display:inline-block; width:9px; height:9px; background-color:#ffd633; border:1px solid #ccc; vertical-align:middle; margin-right:6px;"></span>
|
||||||
|
- One Day Pending
|
||||||
|
</p>
|
||||||
|
|
||||||
<p>{!! $wishes !!}</p>
|
<p>{!! $wishes !!}</p>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
Reference in New Issue
Block a user