Minor Changes

app/Http/Controllers/UserController.php

@@ -306,7 +306,7 @@ class UserController extends Controller
 
         if (empty($title) || empty($content)) {
             return Response::json([
-                'status' => 'fail', 'message' => trans('validation.required', ['attribute' => trans('validation.attributes.title').'&'.trans('validation.attributes.content')]),
+                'status' => 'fail', 'message' => trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.title')).'&'.ucfirst(trans('validation.attributes.content'))]),
             ]);
         }
 
@@ -332,7 +332,7 @@ class UserController extends Controller
 
             if (empty($content)) {
                 return Response::json([
-                    'status' => 'fail', 'message' => trans('validation.required', ['attribute' => trans('validation.attributes.title').'&'.trans('validation.attributes.content')]),
+                    'status' => 'fail', 'message' => trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.title')).'&'.ucfirst(trans('validation.attributes.content'))]),
                 ]);
             }
 

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

@@ -54,7 +54,7 @@
                             <th> #</th>
                             <th> {{ trans('model.common.type') }}</th>
                             <th> {{ trans('model.article.category') }}</th>
-                            <th> {{ trans('validation.attributes.title') }}</th>
+                            <th> {{ ucfirst(trans('validation.attributes.title')) }}</th>
                             <th> {{ trans('model.article.language') }}</th>
                             <th> {{ trans('model.common.sort') }}</th>
                             <th> {{ trans('model.article.created_at') }}</th>

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

@@ -40,7 +40,7 @@
                             <table class="text-md-center" data-toggle="table" data-height="700" data-virtual-scroll="true" data-mobile-responsive="true">
                                 <thead class="thead-default">
                                     <tr>
-                                        <th> {{ trans('validation.attributes.name') }}</th>
+                                        <th> {{ ucfirst(trans('validation.attributes.name')) }}</th>
                                         <th> {{ trans('common.action') }}</th>
                                     </tr>
                                 </thead>
@@ -74,7 +74,7 @@
                             <table class="text-md-center" data-toggle="table" data-height="700" data-virtual-scroll="true" data-mobile-responsive="true">
                                 <thead class="thead-default">
                                     <tr>
-                                        <th> {{ trans('validation.attributes.name') }}</th>
+                                        <th> {{ ucfirst(trans('validation.attributes.name')) }}</th>
                                         <th> {{ trans('common.action') }}</th>
                                     </tr>
                                 </thead>
@@ -108,7 +108,7 @@
                             <table class="text-md-center" data-toggle="table" data-height="700" data-virtual-scroll="true" data-mobile-responsive="true">
                                 <thead class="thead-default">
                                     <tr>
-                                        <th> {{ trans('validation.attributes.name') }}</th>
+                                        <th> {{ ucfirst(trans('validation.attributes.name')) }}</th>
                                         <th> {{ trans('common.action') }}</th>
                                     </tr>
                                 </thead>
@@ -143,7 +143,7 @@
                                 <thead class="thead-default">
                                     <tr>
                                         <th> {{ trans('model.common.level') }}</th>
-                                        <th> {{ trans('validation.attributes.name') }}</th>
+                                        <th> {{ ucfirst(trans('validation.attributes.name')) }}</th>
                                         <th> {{ trans('common.action') }}</th>
                                     </tr>
                                 </thead>
@@ -179,7 +179,7 @@
                             <table class="text-md-center" data-toggle="table" data-height="700" data-virtual-scroll="true" data-mobile-responsive="true">
                                 <thead class="thead-default">
                                     <tr>
-                                        <th> {{ trans('validation.attributes.name') }}</th>
+                                        <th> {{ ucfirst(trans('validation.attributes.name')) }}</th>
                                         <th> {{ trans('model.common.sort') }}</th>
                                         <th> {{ trans('common.action') }}</th>
                                     </tr>
@@ -256,7 +256,7 @@
                             <table class="text-md-center" data-toggle="table" data-height="700" data-virtual-scroll="true" data-mobile-responsive="true">
                                 <thead class="thead-default">
                                     <tr>
-                                        <th> {{ trans('validation.attributes.name') }}</th>
+                                        <th> {{ ucfirst(trans('validation.attributes.name')) }}</th>
                                         <th> {{ trans('admin.setting.common.connect_nodes') }}</th>
                                         <th> {{ trans('model.common.sort') }}</th>
                                         <th> {{ trans('common.action') }}</th>
@@ -314,7 +314,8 @@
                             </select>
                         </div>
                         <div class="col-md-6 form-group">
-                            <input class="form-control" id="name" name="name" type="text" placeholder="{{ trans('validation.attributes.name') }}">
+                            <input class="form-control" id="name" name="name" type="text"
+                                   placeholder="{{ ucfirst(trans('validation.attributes.name')) }}">
                         </div>
                     </div>
                 </form>
@@ -343,7 +344,7 @@
                         </div>
                         <div class="col-md-6 form-group">
                             <input class="form-control" id="add_level_name" name="level_name" type="text"
-                                   placeholder="{{ trans('validation.attributes.name') }}">
+                                   placeholder="{{ ucfirst(trans('validation.attributes.name')) }}">
                         </div>
                     </div>
                 </form>
@@ -369,7 +370,7 @@
                     <div class="row">
                         <div class="col-md-6 form-group">
                             <input class="form-control" id="add_category_name" name="name" type="text"
-                                   placeholder="{{ trans('validation.attributes.name') }}">
+                                   placeholder="{{ ucfirst(trans('validation.attributes.name')) }}">
                         </div>
                         <div class="col-md-6 form-group">
                             <input class="form-control" id="add_category_sort" name="sort" type="text" placeholder="{{ trans('model.common.sort') }}">
@@ -427,7 +428,8 @@
                     <div class="alert alert-danger" id="lable_msg" style="display: none;"></div>
                     <div class="row">
                         <div class="col-md-6 form-group">
-                            <input class="form-control" id="add_label" name="label" type="text" placeholder="{{ trans('validation.attributes.name') }}">
+                            <input class="form-control" id="add_label" name="label" type="text"
+                                   placeholder="{{ ucfirst(trans('validation.attributes.name')) }}">
                         </div>
                         <div class="col-md-6 form-group">
                             <input class="form-control" id="add_label_sort" name="label_sort" type="text" placeholder="{{ trans('model.common.sort') }}">
@@ -457,7 +459,7 @@
                 }
 
                 if (level_name.trim() === '') {
-                    $('#level_msg').show().html('{{ trans('validation.required', ['attribute' => trans('validation.attributes.name')]) }}');
+                    $('#level_msg').show().html('{{ trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.name'))]) }}');
                     $('#level_name').focus();
                     return false;
                 }
@@ -595,7 +597,7 @@
                 const sort = $('#add_category_sort').val();
 
                 if (name.trim() === '') {
-                    $('#category_msg').show().html('{{ trans('validation.required', ['attribute' => trans('validation.attributes.name')]) }}');
+                    $('#category_msg').show().html('{{ trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.name'))]) }}');
                     $('#category_name').focus();
                     return false;
                 }
@@ -882,7 +884,7 @@
                 const type = $('#type').val();
 
                 if (name.trim() === '') {
-                    $('#msg').show().html('{{ trans('validation.required', ['attribute' => trans('validation.attributes.name')]) }}');
+                    $('#msg').show().html('{{ trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.name'))]) }}');
                     $('#name').focus();
                     return false;
                 }
@@ -1019,7 +1021,7 @@
                 const sort = $('#add_label_sort').val();
 
                 if (name.trim() === '') {
-                    $('#lable_msg').show().html('{{ trans('validation.required', ['attribute' => trans('validation.attributes.name')]) }}');
+                    $('#lable_msg').show().html('{{ trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.name'))]) }}');
                     return false;
                 }
 

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

@@ -30,8 +30,8 @@
                             <th> #</th>
                             <th> {{ trans('model.common.type') }}</th>
                             <th> {{ trans('model.notification.address') }}</th>
-                            <th> {{ trans('validation.attributes.title') }}</th>
-                            <th> {{ trans('validation.attributes.content') }}</th>
+                            <th> {{ ucfirst(trans('validation.attributes.title')) }}</th>
+                            <th> {{ ucfirst(trans('validation.attributes.content')) }}</th>
                             <th> {{ trans('model.notification.created_at') }}</th>
                             <th> {{ trans('model.notification.status') }}</th>
                         </tr>

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

@@ -45,7 +45,7 @@
                             <th> {{ trans('common.account') }}</th>
                             <th> IP</th>
                             <th> {{ trans('model.ip.info') }}</th>
-                            <th> {{ trans('validation.attributes.time') }}</th>
+                            <th> {{ ucfirst(trans('validation.attributes.time')) }}</th>
                         </tr>
                     </thead>
                     <tbody>

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

@@ -73,7 +73,7 @@
                                                     <th> {{ trans('model.node.attribute') }}</th>
                                                     <th> {{ trans('model.ip.network_type') }}</th>
                                                     <th> IP</th>
-                                                    <th> {{ trans('validation.attributes.time') }}</th>
+                                                    <th> {{ ucfirst(trans('validation.attributes.time')) }}</th>
                                                 </tr>
                                             </thead>
                                             <tbody>

resources/views/admin/node/info.blade.php

@@ -327,7 +327,7 @@
                                                 <div class="form-group row ssr-setting">
                                                     <label class="col-md-3 col-form-label" for="passwd">{{ trans('model.node.single_passwd') }}</label>
                                                     <input class="form-control col-md-4" id="passwd" name="passwd" type="text"
-                                                           placeholder="{{ trans('validation.attributes.password') }}">
+                                                           placeholder="{{ ucfirst(trans('validation.attributes.password')) }}">
                                                 </div>
                                             </div>
                                         </div>

resources/views/admin/report/accounting.blade.php

@@ -156,7 +156,7 @@
                 },
                 plugins: {
                     legend: false,
-                    tooltip: label_callbacks(' {{ trans('validation.attributes.year') }}')
+                    tooltip: label_callbacks(' {{ ucfirst(trans('validation.attributes.year')) }}')
                 },
             },
         });

resources/views/admin/report/nodeDataAnalysis.blade.php

@@ -44,34 +44,24 @@
             </div>
         </div>
         @isset($data)
-            <div class="row">
+            <div class="row mx-0">
                 <div class="col-md-12 col-xxl-7 card card-shadow">
-                    <div class="card-block p-30">
-                        <div class="row pb-20">
-                            <div class="col-md-8 col-sm-6">
-                                <div class="blue-grey-700 font-size-26 font-weight-500">{{ trans('admin.report.hourly_traffic') }}</div>
-                            </div>
-                        </div>
+                    <div class="card-block p-md-30">
+                        <div class="blue-grey-700 font-size-26 font-weight-500">{{ trans('admin.report.hourly_traffic') }}</div>
                         <canvas id="hourlyBar"></canvas>
                     </div>
                 </div>
                 <div class="col-md-12 col-xxl-5 card card-shadow">
-                    <div class="card-block p-30">
-                        <div class="row pb-20">
-                            <div class="col-md-8 col-sm-6">
-                                <div class="blue-grey-700 font-size-26 font-weight-500">{{ trans('admin.report.daily_distribution') }}</div>
-                            </div>
+                    <div class="card-block p-md-30">
+                        <div class="blue-grey-700 font-size-26 font-weight-500">{{ trans('admin.report.daily_distribution') }}</div>
+                        <div class="d-flex justify-content-around">
+                            <canvas id="dailyPie"></canvas>
                         </div>
-                        <canvas id="dailyPie"></canvas>
                     </div>
                 </div>
                 <div class="col-12 offset-xxl-2 col-xxl-8 card card-shadow">
-                    <div class="card-block p-30">
-                        <div class="row pb-20">
-                            <div class="col-md-8 col-sm-6">
-                                <div class="blue-grey-700 font-size-26 font-weight-500">{{ trans('admin.report.daily_traffic') }}</div>
-                            </div>
-                        </div>
+                    <div class="card-block p-md-30">
+                        <div class="blue-grey-700 font-size-26 font-weight-500">{{ trans('admin.report.daily_traffic') }}</div>
                         <canvas id="dailyBar"></canvas>
                     </div>
                 </div>
@@ -94,13 +84,15 @@
             window.location.href = window.location.href.split('?')[0];
         }
 
-        function initDatepicker() {
-            $('.input-daterange').datepicker({
-                format: 'yyyy-mm-dd',
-                startDate: nodeData.start_date,
-                endDate: new Date(),
-            });
-        }
+        $('.input-daterange').datepicker({
+            format: 'yyyy-mm-dd',
+            startDate: nodeData.start_date,
+            endDate: new Date(),
+        });
+
+        $('form').on('submit', function() {
+            cleanSubmit(this);
+        });
 
         function cleanSubmit(form) {
             $(form).find('input:not([type="submit"]), select').filter(function() {
@@ -112,18 +104,6 @@
             }, 0);
         }
 
-        function handleFormSubmit() {
-            $('form').on('submit', function() {
-                cleanSubmit(this);
-            });
-        }
-
-        function initSelectors() {
-            $('#nodes').selectpicker('val', @json(Request::query('nodes')));
-            $('#hour_date').selectpicker('val', @json(Request::query('hour_date')));
-            $('.input-daterange').datepicker('update', @json(Request::query('start')), @json(Request::query('end')));
-        }
-
         function optimizeDatasets(datasets) {
             const dataByDate = datasets.reduce((acc, dataset) => {
                 dataset.data.forEach(item => {
@@ -281,7 +261,7 @@
                         top,
                         left
                     } = chartArea;
-                    const text = `${date}\n\n${total.toFixed(2)} GiB`;
+                    const text = `${date}\n${total.toFixed(2)} GiB`;
                     ctx.save();
                     ctx.font = 'bold 32px Roboto';
                     ctx.fillStyle = 'black';
@@ -326,7 +306,7 @@
                                 const total = context.dataset.data.reduce((sum, val) => sum + val, 0);
                                 const percentage = (value / total * 100).toFixed(1);
                                 const label = context.chart.data.labels[context.dataIndex];
-                                return percentage > 1 ? `${label} ${value.toFixed(2)}G ${percentage}%` : '';
+                                return percentage > 1 ? `${label} ${percentage}%` : '';
                             },
                             anchor: "center",
                             rotation: function(ctx) {
@@ -370,9 +350,9 @@
         }
 
         $(document).ready(function() {
-            initDatepicker();
-            handleFormSubmit();
-            initSelectors();
+            $('#nodes').selectpicker('val', @json(Request::query('nodes')));
+            $('#hour_date').selectpicker('val', @json(Request::query('hour_date')));
+            $('.input-daterange').datepicker('update', @json(Request::query('start')), @json(Request::query('end')));
             initCharts();
         });
     </script>

resources/views/admin/report/siteDataAnalysis.blade.php

@@ -185,7 +185,7 @@
         ], common_options());
 
         create_chart('years', 'line', yearlyFlowsLabels, [
-            create_area_dataset('{{ trans('validation.attributes.year') }}', yearlyFlowsData, 'rgba(184, 215, 255)'),
+            create_area_dataset('{{ ucfirst(trans('validation.attributes.year')) }}', yearlyFlowsData, 'rgba(184, 215, 255)'),
         ], {
             responsive: true,
             scales: {
@@ -203,7 +203,7 @@
             },
             plugins: {
                 legend: false,
-                tooltip: label_callbacks(' {{ trans('validation.attributes.year') }}', ' TiB'),
+                tooltip: label_callbacks(' {{ ucfirst(trans('validation.attributes.year')) }}', ' TiB'),
             },
         });
 

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

@@ -30,7 +30,7 @@
                         <tr>
                             <th> #</th>
                             <th> {{ trans('model.user.username') }}</th>
-                            <th> {{ trans('validation.attributes.title') }}</th>
+                            <th> {{ ucfirst(trans('validation.attributes.title')) }}</th>
                             <th> {{ trans('common.status.attribute') }}</th>
                             <th> {{ trans('common.action') }}</th>
                         </tr>
@@ -112,10 +112,10 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <input class="form-control" id="title" name="title" type="text" placeholder="{{ trans('validation.attributes.title') }}">
+                            <input class="form-control" id="title" name="title" type="text" placeholder="{{ ucfirst(trans('validation.attributes.title')) }}">
                         </div>
                         <div class="form-group">
-                            <textarea class="form-control" id="content" name="content" type="text" rows="5" placeholder="{{ trans('validation.attributes.content') }}"></textarea>
+                            <textarea class="form-control" id="content" name="content" type="text" rows="5" placeholder="{{ ucfirst(trans('validation.attributes.content')) }}"></textarea>
                         </div>
                     </div>
                     <div class="modal-footer">
@@ -147,7 +147,7 @@
 
                 if (title.trim() === '') {
                     swal.fire({
-                        title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.title')]) }}',
+                        title: '{{ ucfirst(trans('validation.required', ['attribute' => trans('validation.attributes.title')])) }}',
                         icon: 'warning',
                     });
                     return false;
@@ -155,7 +155,7 @@
 
                 if (content.trim() === '') {
                     swal.fire({
-                        title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.content')]) }}',
+                        title: '{{ ucfirst(trans('validation.required', ['attribute' => trans('validation.attributes.content')])) }}',
                         icon: 'warning',
                     });
                     return false;

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

@@ -206,7 +206,7 @@
 
                     if (content.trim() === '') {
                         swal.fire({
-                            title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.content')]) }}!',
+                            title: '{{ ucfirst(trans('validation.required', ['attribute' => trans('validation.attributes.content')])) }}!',
                             icon: 'warning',
                             timer: 1500,
                         });

resources/views/auth/activeUser.blade.php

@@ -16,7 +16,7 @@
             <div class="form-group form-material floating" data-plugin="formMaterial">
                 <input class="form-control" name="username" type="text" value="{{ Request::query('username') }}" required />
                 <label class="floating-label" for="username">
-                    {{ sysConfig('username_type') === 'email' || sysConfig('username_type') === null ? trans('validation.attributes.email') : trans('model.user.username') }}
+                    {{ sysConfig('username_type') === 'email' || sysConfig('username_type') === null ? ucfirst(trans('validation.attributes.email')) : trans('model.user.username') }}
                 </label>
             </div>
         @else

resources/views/auth/login.blade.php

@@ -12,12 +12,12 @@
         <div class="form-group form-material floating" data-plugin="formMaterial">
             <input class="form-control" name="username" type="text" value="{{ old('username') }}" required />
             <label class="floating-label" for="username">
-                {{ sysConfig('username_type') === 'email' || sysConfig('username_type') === null ? trans('validation.attributes.email') : trans('model.user.username') }}
+                {{ sysConfig('username_type') === 'email' || sysConfig('username_type') === null ? ucfirst(trans('validation.attributes.email')) : trans('model.user.username') }}
             </label>
         </div>
         <div class="form-group form-material floating" data-plugin="formMaterial">
             <input class="form-control" name="password" type="password" value="{{ old('password') }}" autocomplete required />
-            <label class="floating-label" for="password">{{ trans('validation.attributes.password') }}</label>
+            <label class="floating-label" for="password">{{ ucfirst(trans('validation.attributes.password')) }}</label>
         </div>
         @yield('captcha', view('auth.captcha'))
         <div class="form-group clearfix">

resources/views/auth/maintenance.blade.php

@@ -27,8 +27,8 @@
         const countdownElement = document.getElementById('countdown');
         const daysLabel = '{{ trans_choice('common.days.attribute', 1) }}';
         const hoursLabel = '{{ trans_choice('common.hour', 1) }}';
-        const minutesLabel = '{{ trans('validation.attributes.minute') }}';
-        const secondsLabel = '{{ trans('validation.attributes.second') }}';
+        const minutesLabel = '{{ ucfirst(trans('validation.attributes.minute')) }}';
+        const secondsLabel = '{{ ucfirst(trans('validation.attributes.second')) }}';
 
         const updateCountdown = () => {
             const distance = countDownDate - new Date().getTime();

resources/views/auth/register.blade.php

@@ -21,7 +21,7 @@
                 @if ($emailList)
                     <div class="input-group">
                         <input class="form-control" id="emailHead" name="emailHead" type="text" value="{{ old('emailHead') }}" required />
-                        <label class="floating-label" for="emailHead">{{ trans('validation.attributes.email') }}</label>
+                        <label class="floating-label" for="emailHead">{{ ucfirst(trans('validation.attributes.email')) }}</label>
                         <div class="input-group-prepend">
                             <span class="input-group-text bg-indigo-600 text-white">@</span>
                         </div>
@@ -35,7 +35,7 @@
                 @else
                     <input class="form-control" id="username" name="username" type="text" value="{{ old('username') }}" required />
                     <label class="floating-label" for="username">
-                        {{ sysConfig('username_type') === 'email' || sysConfig('username_type') === null ? trans('validation.attributes.email') : trans('model.user.username') }}
+                        {{ sysConfig('username_type') === 'email' || sysConfig('username_type') === null ? ucfirst(trans('validation.attributes.email')) : trans('model.user.username') }}
                     </label>
                 @endif
             </div>
@@ -54,11 +54,11 @@
             @endif
             <div class="form-group form-material floating" data-plugin="formMaterial">
                 <input class="form-control" name="password" type="password" required />
-                <label class="floating-label" for="password">{{ trans('validation.attributes.password') }}</label>
+                <label class="floating-label" for="password">{{ ucfirst(trans('validation.attributes.password')) }}</label>
             </div>
             <div class="form-group form-material floating" data-plugin="formMaterial">
                 <input class="form-control" name="password_confirmation" type="password" required />
-                <label class="floating-label" for="password_confirmation">{{ trans('validation.attributes.password_confirmation') }}</label>
+                <label class="floating-label" for="password_confirmation">{{ ucfirst(trans('validation.attributes.password_confirmation')) }}</label>
             </div>
             @if (sysConfig('is_invite_register'))
                 <div class="form-group form-material floating" data-plugin="formMaterial">
@@ -169,7 +169,7 @@
                 const emailTail = $('#emailTail').val();
                 if (email === '') {
                     swal.fire({
-                        title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.email')]) }}',
+                        title: '{{ trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.email'))]) }}',
                         icon: 'warning',
                         timer: 1500,
                     });
@@ -191,7 +191,7 @@
 
             if (email === '') {
                 swal.fire({
-                    title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.email')]) }}',
+                    title: '{{ trans('validation.required', ['attribute' => ucfirst(trans('validation.attributes.email'))]) }}',
                     icon: 'warning',
                     timer: 1500,
                 });

resources/views/auth/reset.blade.php

@@ -18,7 +18,7 @@
             </div>
             <div class="form-group form-material floating" data-plugin="formMaterial">
                 <input class="form-control" name="password_confirmation" type="password" autocomplete="off" required />
-                <label class="floating-label" for="password_confirmation">{{ trans('validation.attributes.password_confirmation') }}</label>
+                <label class="floating-label" for="password_confirmation">{{ ucfirst(trans('validation.attributes.password_confirmation')) }}</label>
             </div>
         @endif
         <a class="btn btn-danger btn-lg {{ $verify->status === 0 ? 'float-left' : 'btn-block' }}" href="{{ route('login') }}">{{ trans('common.back') }}</a>

resources/views/auth/resetPassword.blade.php

@@ -16,7 +16,7 @@
             <div class="form-group form-material floating" data-plugin="formMaterial">
                 <input class="form-control" name="username" type="text" value="{{ old('username') }}" autofocus required />
                 <label class="floating-label" for="username">
-                    {{ sysConfig('username_type') === 'email' || sysConfig('username_type') === null ? trans('validation.attributes.email') : trans('model.user.username') }}
+                    {{ sysConfig('username_type') === 'email' || sysConfig('username_type') === null ? ucfirst(trans('validation.attributes.email')) : trans('model.user.username') }}
                 </label>
             </div>
         @else

resources/views/user/buy.blade.php

@@ -102,7 +102,6 @@
                                 discount.toFixed(2);
                             total_price = goods_price - discount;
                         } else {
-                            console.log(ret.data.value);
                             total_price = goods_price - ret.data.value.match(/(.*?[^0-9])(\d+\.?.*)/)[2];
                             total_price = total_price > 0 ? total_price : 0;
                             if (ret.data.type === 1) {

resources/views/user/index.blade.php

@@ -26,7 +26,7 @@
                         <div class="content-text text-center mb-0">
                             @if (!$paying_user)
                                 <p class="ml-15 mt-15 text-left">{{ trans('common.more') }}
-                                    <code>{{ trans('validation.attributes.time') }}</code>
+                                    <code>{{ ucfirst(trans('validation.attributes.time')) }}</code>
                                 </p>
                                 <p class="text-center">{{ trans('common.more') }}
                                     <code>{{ trans('user.attribute.data') }}</code>
@@ -283,7 +283,7 @@
                                         </li>
                                         <li class="nav-item">
                                             <a class="nav-link" data-toggle="tab" href="#monthly" role="tab" aria-controls="monthly"
-                                               aria-selected="true">{{ trans('validation.attributes.month') }}</a>
+                                               aria-selected="true">{{ ucfirst(trans('validation.attributes.month')) }}</a>
                                         </li>
                                     </ul>
                                 </div>
@@ -487,10 +487,10 @@
                 string += hour + ' ' + @json(trans_choice('common.hour', 1));
             }
             if (minute) {
-                string += ' ' + minute + ' ' + @json(trans('validation.attributes.minute'));
+                string += ' ' + minute + ' ' + @json(ucfirst(trans('validation.attributes.minute')));
             }
             if (seconds) {
-                string += ' ' + Math.floor((distance % 60000) / 1000) + ' ' + @json(trans('validation.attributes.second'));
+                string += ' ' + Math.floor((distance % 60000) / 1000) + ' ' + @json(ucfirst(trans('validation.attributes.second')));
             }
             document.getElementById(id).innerHTML = string;
 

resources/views/user/invoiceDetail.blade.php

@@ -52,7 +52,7 @@
                                         <br />
                                         @if ($order->goods->type === 2)
                                             <code>{{ $order->goods->traffic_label }}</code>
-                                            {{ trans('user.attribute.data') }}/{{ trans('validation.attributes.month') }}
+                                            {{ trans('user.attribute.data') }}/{{ ucfirst(trans('validation.attributes.month')) }}
                                         @else
                                             <code>{{ $order->goods->traffic_label }}</code>
                                             {{ trans('user.attribute.data') }}/

resources/views/user/profile.blade.php

@@ -85,7 +85,7 @@
                         <ul class="nav nav-tabs nav-tabs-line" role="tablist">
                             <li class="nav-item" role="presentation">
                                 <a class="active nav-link" data-toggle="tab" href="#account" role="tab"
-                                   aria-controls="account">{{ trans('validation.attributes.password') }}</a>
+                                   aria-controls="account">{{ ucfirst(trans('validation.attributes.password')) }}</a>
                             </li>
                             <li class="nav-item" role="presentation">
                                 <a class="nav-link" data-toggle="tab" href="#contact" role="tab" aria-controls="contact">{{ trans('user.contact') }}</a>

resources/views/user/replyTicket.blade.php

@@ -91,7 +91,7 @@
 
             if (content.trim() === '') {
                 swal.fire({
-                    title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.content')]) }}!',
+                    title: '{{ ucfirst(trans('validation.required', ['attribute' => trans('validation.attributes.content')])) }}!',
                     icon: 'warning',
                     timer: 1500,
                 });

resources/views/user/services.blade.php

@@ -73,7 +73,7 @@
                                         <ul class="pricing-features">
                                             <li>
                                                 <strong>{{ $goods->traffic_label }}</strong>{{ trans('user.attribute.data') }}
-                                                {!! $goods->type === 1 ? ' <code>' . $dataPlusDays . '</code> ' . trans_choice('common.days.attribute', 1) : '/' . trans('validation.attributes.month') !!}
+                                                {!! $goods->type === 1 ? "<code> $dataPlusDays </code>" . trans_choice('common.days.attribute', 1) : '/' . ucfirst(trans('validation.attributes.month')) !!}
                                             </li>
                                             <li>
                                                 {!! trans('user.service.node_count', ['num' => $goods->node_count]) !!}

resources/views/user/ticketList.blade.php

@@ -25,7 +25,7 @@
                                 <thead class="thead-default">
                                     <tr>
                                         <th data-cell-style="cellStyle"> #</th>
-                                        <th> {{ trans('validation.attributes.title') }} </th>
+                                        <th> {{ ucfirst(trans('validation.attributes.title')) }} </th>
                                         <th> {{ trans('common.status.attribute') }} </th>
                                         <th></th>
                                     </tr>
@@ -139,7 +139,7 @@
 
             if (title.trim() === '') {
                 swal.fire({
-                    title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.title')]) }}!',
+                    title: '{{ ucfirst(trans('validation.required', ['attribute' => trans('validation.attributes.title')])) }}!',
                     icon: 'warning',
                 });
                 return false;
@@ -147,7 +147,7 @@
 
             if (content.trim() === '') {
                 swal.fire({
-                    title: '{{ trans('validation.required', ['attribute' => trans('validation.attributes.content')]) }}!',
+                    title: '{{ ucfirst(trans('validation.required', ['attribute' => trans('validation.attributes.content')])) }}!',
                     icon: 'warning',
                 });
                 return false;