Tweek 未关闭工单聊天泡泡时间标签变更 & 更加严苛的支付&验证码系统设置

app/Http/Controllers/Admin/SystemController.php

@@ -6,7 +6,6 @@ use App\Components\PushNotification;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\SystemRequest;
 use App\Models\Config;
-use App\Models\Label;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Response;
@@ -16,7 +15,52 @@ class SystemController extends Controller
     // 系统设置
     public function index()
     {
-        return view('admin.config.system', array_merge(['labelList' => Label::orderByDesc('sort')->orderBy('id')->get()], Config::pluck('value', 'name')->toArray()));
+        return view('admin.config.system', array_merge(['payments' => $this->getPayment(), 'captcha' => $this->getCaptcha()], Config::pluck('value', 'name')->toArray()));
+    }
+
+    private function getPayment()
+    {
+        if (sysConfig('f2fpay_app_id') && sysConfig('f2fpay_private_key') && sysConfig('f2fpay_public_key')) {
+            $payment[] = 'f2fpay';
+        }
+        if (sysConfig('codepay_url') && sysConfig('codepay_id') && sysConfig('codepay_key')) {
+            $payment[] = 'codepay';
+        }
+        if (sysConfig('epay_url') && sysConfig('epay_mch_id') && sysConfig('epay_key')) {
+            $payment[] = 'epay';
+        }
+        if (sysConfig('payjs_mch_id') && sysConfig('payjs_key')) {
+            $payment[] = 'payjs';
+        }
+        if (sysConfig('bitpay_secret')) {
+            $payment[] = 'bitpayx';
+        }
+        if (sysConfig('paypal_username') && sysConfig('paypal_password') && sysConfig('paypal_secret')) {
+            $payment[] = 'paypal';
+        }
+        if (sysConfig('stripe_public_key') && sysConfig('stripe_secret_key')) {
+            $payment[] = 'stripe';
+        }
+        if (sysConfig('paybeaver_app_id') && sysConfig('paybeaver_app_secret')) {
+            $payment[] = 'paybeaver';
+        }
+
+        return $payment ?? [];
+    }
+
+    private function getCaptcha()
+    {
+        if (sysConfig('geetest_id') && sysConfig('geetest_key')) {
+            $captcha[] = '2';
+        }
+        if (sysConfig('google_captcha_secret') && sysConfig('google_captcha_sitekey')) {
+            $captcha[] = '3';
+        }
+        if (sysConfig('hcaptcha_secret') && sysConfig('hcaptcha_sitekey')) {
+            $captcha[] = '4';
+        }
+
+        return $captcha ?? [];
     }
 
     // 设置系统扩展信息，例如客服、统计代码
@@ -121,6 +165,7 @@ class SystemController extends Controller
         if (config('app.demo')) {
             $denyConfig = [
                 'website_url',
+                'is_captcha',
                 'min_rand_traffic',
                 'max_rand_traffic',
                 'push_bear_send_key',

resources/views/admin/config/system.blade.php

@@ -1703,8 +1703,34 @@
         $('#is_QQPay').selectpicker('val', '{{$is_QQPay}}');
         $('#is_WeChatPay').selectpicker('val', '{{$is_WeChatPay}}');
         $('#is_otherPay').selectpicker('val', '{{$is_otherPay}}');
+
+        // Get all options within select
+        disablePayment(document.getElementById('is_AliPay').getElementsByTagName('option'));
+        disablePayment(document.getElementById('is_QQPay').getElementsByTagName('option'));
+        disablePayment(document.getElementById('is_WeChatPay').getElementsByTagName('option'));
+        disablePayment(document.getElementById('is_otherPay').getElementsByTagName('option'));
+        disableCaptcha(document.getElementById('is_captcha').getElementsByTagName('option'));
       });
 
+      function disablePayment(op) {
+        for (let i = 1; i < op.length; i++) {
+            @json($payments).
+          includes(op[i].value)
+              ? op[i].disabled = false
+              : op[i].disabled = true;
+        }
+      }
+
+      function disableCaptcha(op) {
+        console.log(@json($captcha))
+        for (let i = 2; i < op.length; i++) {
+            @json($captcha).
+          includes(op[i].value)
+              ? op[i].disabled = false
+              : op[i].disabled = true;
+        }
+      }
+
       // 系统设置更新
       function systemUpdate(systemItem, value) {
           @can('admin.system.update')

resources/views/admin/logs/order.blade.php

@@ -22,11 +22,11 @@
                             <div class="input-group-prepend">
                                 <span class="input-group-text"><i class="icon wb-calendar" aria-hidden="true"></i></span>
                             </div>
-                            <input type="text" class="form-control" name="start" id="start" placeholder="{{date("Y-m-d")}}"/>
+                            <input type="text" class="form-control" name="start" id="start" placeholder="{{date('Y-m-d')}}"/>
                             <div class="input-group-prepend">
                                 <span class="input-group-text">至</span>
                             </div>
-                            <input type="text" class="form-control" name="end" id="end" placeholder="{{date("Y-m-d",strtotime("+1 month"))}}"/>
+                            <input type="text" class="form-control" name="end" id="end" placeholder="{{date('Y-m-d', strtotime('+1 month'))}}"/>
                         </div>
                     </div>
                     <div class="form-group col-lg-2 col-sm-6">

resources/views/admin/ticket/index.blade.php

@@ -61,7 +61,7 @@
                             </td>
                             <td>
                                 @can('admin.ticket.edit')
-                                    <a href="{{route('admin.ticket.edit',$ticket)}}" class="btn btn-animate btn-animate-vertical btn-outline-info">
+                                    <a href="{{route('admin.ticket.edit', $ticket)}}" class="btn btn-animate btn-animate-vertical btn-outline-info">
                                         <span>
                                             @if($ticket->status === 2)
                                                 <i class="icon wb-eye" aria-hidden="true" style="left: 40%"> </i>{{trans('common.view')}}

resources/views/components/chat-unit.blade.php

@@ -14,7 +14,9 @@
             <p>
                 {!! $ticket->content !!}
             </p>
-            <time class="chat-time">{{$ticket->created_at}}</time>
+            <time class="chat-time" datetime="{{$ticket->created_at}}">
+                {{($ticket->ticket && $ticket->ticket->status === 2) || $ticket->status === 2 ? $ticket->created_at : $ticket->created_at->diffForHumans()}}
+            </time>
         </div>
     </div>
 </div>

resources/views/user/layouts.blade.php

@@ -19,8 +19,7 @@
             <div class="navbar-brand navbar-brand-center">
                 <img src="{{sysConfig('website_logo') ? asset(sysConfig('website_logo')) : '/assets/images/logo64.png'}}"
                      class="navbar-brand-logo" alt="logo"/>
-                <span
-                        class="navbar-brand-text hidden-xs-down"> {{sysConfig('website_name')}}</span>
+                <span class="navbar-brand-text hidden-xs-down"> {{sysConfig('website_name')}}</span>
             </div>
         </div>
         <div class="navbar-container container-fluid">