ivampiresp/Lae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:EdgeStanding/lae

Browse Source
This commit is contained in:
iVampireSP.com 2022-11-17 19:53:57 +08:00
commit 255e7633d0
No known key found for this signature in database
GPG Key ID: 2F7B001CA27A8132
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/Web/BalanceController.php
View File

@ -25,7 +25,7 @@ public function index(Request $request): View
$balance = $request->user()->balance; $balance = $request->user()->balance;
$balances = Balance::thisUser()->latest()->paginate(50); $balances = Balance::thisUser()->latest()->paginate(100);
$drops_rate = config('drops.rate'); $drops_rate = config('drops.rate');
@ -107,10 +107,13 @@ public function notify(Request $request): View|JsonResponse
} }
// 检测订单是否已支付 // 检测订单是否已支付
if ($balance->paid_at !== null) { // if ($balance->paid_at !== null) {
// return $this->success('订单已支付'); // // return $this->success('订单已支付');
return view('balances.process', compact('balance')); // return view('balances.process', compact('balance'));
} // }
return view('balances.process', compact('balance'));
// try { // try {
// $data = Pay::alipay()->callback(); // $data = Pay::alipay()->callback();
@ -132,8 +135,6 @@ public function notify(Request $request): View|JsonResponse
// throw new ChargeException('商户不匹配'); // throw new ChargeException('商户不匹配');
// } // }
return view('balances.process');
// //
// if ((new \App\Jobs\CheckAndChargeBalance())->checkAndCharge($balance, true)) { // if ((new \App\Jobs\CheckAndChargeBalance())->checkAndCharge($balance, true)) {
// return view('pay_process'); // return view('pay_process');
@ -164,7 +165,7 @@ public function transactions(Request $request): View
$transactions = $transactions->where('payment', $request->payment); $transactions = $transactions->where('payment', $request->payment);
} }
$transactions = $transactions->latest()->paginate(30); $transactions = $transactions->latest()->paginate(100)->withQueryString();
return view('balances.transactions', compact('transactions', 'modules')); return view('balances.transactions', compact('transactions', 'modules'));
} }

10
resources/views/balances/transactions.blade.php
View File

@ -5,6 +5,10 @@
@section('content') @section('content')
<h2>交易记录</h2> <h2>交易记录</h2>
<a href="?type=income">收入</a>
<a href="?type=payout">支出</a>
<a href="?payment=transfer">转账记录</a>
<div class="overflow-auto"> <div class="overflow-auto">
<table class="table"> <table class="table">
<thead> <thead>
@ -22,12 +26,12 @@
@foreach ($transactions as $t) @foreach ($transactions as $t)
<tr> <tr>
<td> <td>
@if ($t->type = 'payout') @if ($t->type === 'payout')
<span class="text-danger"> <span class="text-danger">
支出 支出
</span> </span>
@else($t->type = 'payin') @elseif($t->type === 'income')
<span class="text-success"> <span class="text-success">
收入 收入
</span> </span>

2
resources/views/layouts/app.blade.php
View File

@ -55,7 +55,7 @@
@guest @guest
@if (Route::has('admin.login')) @if (Route::has('admin.login'))
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{ route('admin.login') }}">{{ __('Login') }}</a> <a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
</li> </li>
@endif @endif
@else @else