Added location column in invoice data report
This commit is contained in:
@@ -105,7 +105,7 @@ class SendInvoiceDataReport extends Command
|
|||||||
->where('distribution_channel_desc', $selectedDistribution)
|
->where('distribution_channel_desc', $selectedDistribution)
|
||||||
->whereBetween('document_date', [$startDate, $endDate])
|
->whereBetween('document_date', [$startDate, $endDate])
|
||||||
->orderBy('document_date', 'asc')
|
->orderBy('document_date', 'asc')
|
||||||
->select('customer_code', 'document_number', 'document_date', 'customer_trade_name', 'customer_location')
|
->select('customer_code', 'document_number', 'document_date', 'customer_trade_name', 'customer_location', 'location')
|
||||||
->get()
|
->get()
|
||||||
->unique('document_number')
|
->unique('document_number')
|
||||||
->values();
|
->values();
|
||||||
@@ -190,6 +190,7 @@ class SendInvoiceDataReport extends Command
|
|||||||
'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,
|
||||||
|
'location' => $inv->location,
|
||||||
'no_of_days_pending' => abs((int)now()->diffInDays($documentDate)),
|
'no_of_days_pending' => abs((int)now()->diffInDays($documentDate)),
|
||||||
'status' => 'Pending',
|
'status' => 'Pending',
|
||||||
'status_class' => $statusColor,
|
'status_class' => $statusColor,
|
||||||
|
|||||||
@@ -85,6 +85,7 @@
|
|||||||
<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>Location</th>
|
||||||
<th>Pending Days</th>
|
<th>Pending Days</th>
|
||||||
<th>Status</th>
|
<th>Status</th>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -108,6 +109,7 @@
|
|||||||
{{-- <td>{{ $row['customer_trade_name'] }}</td> --}}
|
{{-- <td>{{ $row['customer_trade_name'] }}</td> --}}
|
||||||
<td class="td-left">{{ $row['customer_trade_name'] }}</td>
|
<td class="td-left">{{ $row['customer_trade_name'] }}</td>
|
||||||
<td>{{ $row['customer_location'] }}</td>
|
<td>{{ $row['customer_location'] }}</td>
|
||||||
|
<td>{{ $row['location'] }}</td>
|
||||||
{{-- <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> --}}
|
||||||
|
|||||||
Reference in New Issue
Block a user