yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2024-09-20 12:54:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove downgrade

Browse Source
This commit is contained in:
Tokumeikoi 2020-02-18 02:55:44 +08:00
parent f3ac8a37be
commit 153bdcaad1
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Admin/ConfigController.php
View File

@ -34,8 +34,7 @@ class ConfigController extends Controller
'email_whitelist_suffix' => config('v2board.email_whitelist_suffix', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT) 'email_whitelist_suffix' => config('v2board.email_whitelist_suffix', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT)
], ],
'subscribe' => [ 'subscribe' => [
'plan_change_enable' => (int)config('v2board.plan_change_enable', 1), 'plan_change_enable' => (int)config('v2board.plan_change_enable', 1)
'plan_downgrade_enable' => (int)config('v2board.plan_downgrade_enable', 1)
], ],
'pay' => [ 'pay' => [
// alipay // alipay

1
app/Http/Controllers/User/OrderController.php
View File

@ -143,7 +143,6 @@ class OrderController extends Controller
$order->type = 3; $order->type = 3;
$order->surplus_amount = $this->getSurplusValue($user); $order->surplus_amount = $this->getSurplusValue($user);
if ($order->surplus_amount >= $order->total_amount) { if ($order->surplus_amount >= $order->total_amount) {
if (!(int)config('v2board.plan_downgrade_enable', 1)) abort(500, '目前不允许降级订阅，请联系管理员');
$order->refund_amount = $order->surplus_amount - $order->total_amount; $order->refund_amount = $order->surplus_amount - $order->total_amount;
$order->total_amount = 0; $order->total_amount = 0;
} else { } else {

1
app/Http/Requests/Admin/ConfigSave.php
View File

@ -25,7 +25,6 @@ class ConfigSave extends FormRequest
'email_whitelist_suffix' => '', 'email_whitelist_suffix' => '',
// subscribe // subscribe
'plan_change_enable' => 'in:0,1', 'plan_change_enable' => 'in:0,1',
'plan_downgrade_enable' => 'in:0,1',
// server // server
'server_token' => 'nullable|min:16', 'server_token' => 'nullable|min:16',
'server_license' => 'nullable', 'server_license' => 'nullable',

2
public/assets/admin/umi.js vendored
View File

File diff suppressed because one or more lines are too long