boursecu/boursecu_server
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some bugs 6

Browse Source
This commit is contained in:
mohmdsdg
2026-07-21 22:28:04 +03:30
parent 3f8c47b1fc
commit 00c51ecf01
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/WalletController.php
+3 -1
View File
@@ -578,7 +578,9 @@ class WalletController extends Controller
$walletTableWith = [ $walletTableWith = [
'customer:id,name,mobile', 'customer:id,name,mobile',
'fund:id,title', 'fund:id,title',
'product:id,metal_id,unit,amount,group_type,trade_by_quantity,direct_price,title', 'product' => static function ($q) {
$q->withTrashed()->select(['id', 'metal_id', 'unit', 'amount', 'group_type', 'trade_by_quantity', 'direct_price', 'title']);
},
]; ];
$sumRows = (clone $sumQuery)->with($walletTableWith)->get(); $sumRows = (clone $sumQuery)->with($walletTableWith)->get();
app/Services/WalletBalanceService.php
+9 -2
View File
@@ -380,16 +380,23 @@ class WalletBalanceService
private function lineProduct(mixed $line): ?object private function lineProduct(mixed $line): ?object
{ {
if (is_object($line) && isset($line->product)) { if (is_object($line) && isset($line->product) && $line->product) {
return $line->product; return $line->product;
} }
if (is_array($line) && isset($line['product'])) { if (is_array($line) && isset($line['product']) && $line['product']) {
$product = $line['product']; $product = $line['product'];
return is_object($product) ? $product : (object) $product; return is_object($product) ? $product : (object) $product;
} }
$productId = (int) ($this->lineValue($line, 'product_id') ?? 0);
if ($productId > 0) {
return Product::withTrashed()
->select(['id', 'title', 'metal_id', 'unit', 'amount', 'group_type', 'trade_by_quantity', 'direct_price'])
->find($productId);
}
return null; return null;
} }