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

fix bug 2

Browse Source
This commit is contained in:
mohmdsdg
2026-06-11 21:17:40 +03:30
parent 2636df99ad
commit a21dbcf3e1
5 changed files with 95 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/ProductController.php
+7 -1
View File
@@ -160,7 +160,13 @@ class ProductController extends SuperController
$products = Product::with(['file'])->where('active', 1)->get();
if (str_contains(request()->path(), '/customer/')) {
app(ProductDisplayPriceService::class)->enrichForApi($products);
$displayPriceService = app(ProductDisplayPriceService::class);
$displayPriceService->enrichForApi($products);
$products->each(function (Product $product) use ($displayPriceService) {
if (!$displayPriceService->hasCustomerDisplayPrice($product)) {
$product->setAttribute('show', false);
}
});
}
if (Product::hasPriceOffsetColumn() && str_contains(request()->path(), '/customer/')) {
app/Http/Controllers/Customer/CustomerController.php
+2
View File
@@ -132,6 +132,8 @@ class CustomerController extends Controller
$wallet->cash_from_silver = $count_cash_from_silver;
$wallet->cash_from_copper = $count_cash_from_copper;
$wallet->count_cash_total = $count_cash_total;
// cash در پاسخ = موجودی ریالی کیف اصلی (نه کیف legacy محصولات main_wallet_products)
$wallet->cash = $count_cash_pure;
// جمع واقعی طلا از کیف‌ها — هم‌تراز wallet/me و کارت محصول (بدون دوباره‌شماری customers.gold)
$wallet->gold_sum = round((float) $wallet->count_gold, 2);
app/Http/Controllers/Customer/WalletController.php
+14 -3
View File
@@ -40,11 +40,22 @@ class WalletController extends Controller
public function walletMe()
{
$wallet = Wallet::select(['owner', 'id', 'gold', 'cash'])->where('owner', auth('customer')->id())
$customerId = auth('customer')->id();
$wallet = Wallet::select(['owner', 'id', 'gold', 'cash'])
->where('owner', $customerId)
->whereNull('product_id')
->whereNull('fund_id')
->first();
// $wallet['gold_sum'] = Wallet::where('owner', auth('customer')->id())->get();
$wallet['gold_sum'] = round(Wallet::where('owner', auth('customer')->id())->where('product_id', null)->sum('gold'), 2);
if (!$wallet) {
$wallet = Wallet::select(['owner', 'id', 'gold', 'cash'])
->where('owner', $customerId)
->whereNull('fund_id')
->first() ?? new Wallet();
}
$wallet['gold_sum'] = round(Wallet::where('owner', $customerId)->where('product_id', null)->sum('gold'), 2);
return response()->json($wallet);
}