Browse Source

remove downgrade

Tokumeikoi 5 years ago
parent
commit
153bdcaad1

+ 1 - 2
app/Http/Controllers/Admin/ConfigController.php

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

+ 0 - 1
app/Http/Controllers/User/OrderController.php

@@ -143,7 +143,6 @@ class OrderController extends Controller
             $order->type = 3;
             $order->surplus_amount = $this->getSurplusValue($user);
             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->total_amount = 0;
             } else {

+ 0 - 1
app/Http/Requests/Admin/ConfigSave.php

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

File diff suppressed because it is too large
+ 0 - 0
public/assets/admin/umi.js


Some files were not shown because too many files changed in this diff