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

Fix #106 前台邀请码显示问题 & 订单列表[是否使用优惠券]过滤开关无效的问题

Browse Source
This commit is contained in:
兔姬桑
2020-12-18 14:30:00 +08:00
parent 4703394026
commit a323e2baff
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Admin/LogsController.php
View File

@@ -45,9 +45,9 @@ class LogsController extends Controller
if (isset($is_coupon)) {
if ($is_coupon) {
$query->where('coupon_id', '<>', 0);
$query->where('coupon_id', '<>', null);
} else {
$query->whereCouponId(0);
$query->whereCouponId(null);
}
}

4
app/Http/Controllers/AuthController.php
View File

@@ -711,7 +711,7 @@ class AuthController extends Controller
}
// 是否开启注册发送验证码
if (sysConfig('is_activate_account') != 1) {
if ((int) sysConfig('is_activate_account') !== 1) {
return Response::json(['status' => 'fail', 'message' => trans('auth.captcha_close')]);
}
@@ -744,7 +744,7 @@ class AuthController extends Controller
// 公开的邀请码列表
public function free()
{
$view['inviteList'] = Invite::whereInviterId(0)->whereStatus(0)->paginate();
$view['inviteList'] = Invite::whereInviterId(null)->whereStatus(0)->paginate();
return view('auth.free', $view);
}