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

Merge pull request #5269 from bagisto-europe/transactions 

fixed updating order state
This commit is contained in:
Glenn Hermans 2021-10-24 18:24:58 +02:00 committed by GitHub
parent ef882f8a31 cc40084a45
commit db7bb755ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,10 +109,10 @@ class TransactionController extends Controller
return redirect(route('admin.sales.transactions.index'));
}
$order = $this->orderRepository->find($invoice->id);
$order = $this->orderRepository->find($invoice->order_id);
$data = [
"paidAmount" => $request->amount,
"paidAmount" => $request->amount
];
$randomId = random_bytes(20);
@ -132,9 +132,9 @@ class TransactionController extends Controller
$transactionTotal = $this->orderTransactionRepository->where('invoice_id', $invoice->id)->sum('amount');
if ($transactionTotal >= $invoice->base_grand_total) {
$shipments = $this->shipmentRepository->where('order_id', $invoice->order_id);
$shipments = $this->shipmentRepository->where('order_id', $invoice->order_id)->first();
if ($shipments) {
if (isset($shipments)) {
$this->orderRepository->updateOrderStatus($order, 'completed');
} else {
$this->orderRepository->updateOrderStatus($order, 'processing');