merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Invoice ID Recognizable

This commit is contained in:
devansh bawari 2021-07-21 19:23:22 +05:30
parent 823bdff6a7
commit 31ca7cc5a2
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Webkul/Admin/src/DataGrids/InvoicesTransactionsDatagrid.php
View File

@ -17,7 +17,8 @@ class InvoicesTransactionsDatagrid extends DataGrid
$queryBuilder = DB::table('order_transactions')
->leftJoin('invoices as inv', 'order_transactions.invoice_id', '=', 'inv.id')
->select('order_transactions.id as id', 'order_transactions.transaction_id as transaction_id', 'order_transactions.invoice_id as invoice_id', 'order_transactions.created_at as created_at')
->where('order_transactions.invoice_id', request('id'));
->where('order_transactions.invoice_id', request('id'))
->orWhere('order_transactions.invoice_id', request('id'));
$this->addFilter('id', 'order_transactions.id');

4
packages/Webkul/Admin/src/Http/Controllers/Sales/TransactionController.php
View File

@ -100,7 +100,7 @@ class TransactionController extends Controller
'amount' => 'required|numeric'
]);
$invoice = $this->invoiceRepository->find($request->invoice_id);
$invoice = $this->invoiceRepository->where('increment_id', $request->invoice_id)->first();
if ($invoice) {
@ -121,7 +121,7 @@ class TransactionController extends Controller
$transactionData['transaction_id'] = $transactionId;
$transactionData['type'] = $request->payment_method;
$transactionData['payment_method'] = $request->payment_method;
$transactionData['invoice_id'] = $request->invoice_id;
$transactionData['invoice_id'] = $invoice->id;
$transactionData['order_id'] = $invoice->order_id;
$transactionData['status'] = 'paid';
$transactionData['data'] = json_encode($data);

2
packages/Webkul/Admin/src/Resources/views/sales/transactions/view.blade.php
View File

@ -60,7 +60,7 @@
</span>
<span class="value">
<a href="{{ route('admin.sales.invoices.view', $transaction->order_id)}}">
<a href="{{ route('admin.sales.invoices.view', $transaction->invoice_id)}}">
{{ $transaction->invoice_id }}
</a>
</span>