BitMaster/ProxyPanel
1
0
Fork 0
mirror of https://github.com/ProxyPanel/ProxyPanel.git synced 2026-04-13 16:03:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

删除|合并不再使用|类似的系统配置&修复用户关闭工单错误的问题

Browse Source
This commit is contained in:
兔姬桑
2021-01-28 00:15:55 -05:00
parent c68087c54b
commit f83602333f
10 changed files with 81 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/UserController.php
View File

@@ -197,7 +197,7 @@ class UserController extends Controller
// 余额充值商品，只取10个
$renewOrder = Order::userActivePlan($user->id)->first();
$renewPrice = $renewOrder->goods ?? 0;
// 有重置日时按照重置日为标准，否者就以过期日为标准
// 有重置日时按照重置日为标准，否则就以过期日为标准
$dataPlusDays = $user->reset_time ?? $user->expired_at;
return view('user.services', [
@@ -337,7 +337,7 @@ class UserController extends Controller
{
$id = $request->input('id');
if (Ticket::uid()->whereId($id)->close()) {
if (Ticket::uid()->whereId($id)->firstOrFail()->close()) {
return Response::json(['status' => 'success', 'message' => trans('common.close_item', ['attribute' => trans('common.success')])]);
}
@@ -438,7 +438,7 @@ class UserController extends Controller
public function buy(Goods $good)
{
$user = auth()->user();
// 有重置日时按照重置日为标准，否者就以过期日为标准
// 有重置日时按照重置日为标准，否则就以过期日为标准
$dataPlusDays = $user->reset_time ?? $user->expired_at;
return view('user.buy', [