update gateway name

app/Http/Controllers/Admin/ConfigController.php

@@ -65,9 +65,11 @@ class ConfigController extends Controller
                     'stripe_webhook_key' => config('v2board.stripe_webhook_key'),
                     'stripe_currency' => config('v2board.stripe_currency', 'hkd'),
                     // bitpayx
+                    'bitpayx_name' => config('v2board.bitpayx_name', '聚合支付'),
                     'bitpayx_enable' => (int)config('v2board.bitpayx_enable', 0),
                     'bitpayx_appsecret' => config('v2board.bitpayx_appsecret'),
                     // paytaro
+                    'paytaro_name' => config('v2board.paytaro_name', '聚合支付'),
                     'paytaro_enable' => (int)config('v2board.paytaro_enable', 0),
                     'paytaro_app_id' => config('v2board.paytaro_app_id'),
                     'paytaro_app_secret' => config('v2board.paytaro_app_secret')

app/Http/Controllers/User/OrderController.php

@@ -263,7 +263,7 @@ class OrderController extends Controller
 
         if ((int)config('v2board.bitpayx_enable')) {
             $bitpayX = new \StdClass();
-            $bitpayX->name = '聚合支付';
+            $bitpayX->name = config('v2board.bitpayx_name', '聚合支付');
             $bitpayX->method = 4;
             $bitpayX->icon = 'wallet';
             array_push($data, $bitpayX);
@@ -271,7 +271,7 @@ class OrderController extends Controller
 
         if ((int)config('v2board.paytaro_enable')) {
             $obj = new \StdClass();
-            $obj->name = '聚合支付';
+            $obj->name = config('v2board.paytaro_name', '聚合支付');
             $obj->method = 5;
             $obj->icon = 'wallet';
             array_push($data, $obj);

app/Http/Controllers/User/TicketController.php

@@ -181,4 +181,9 @@ class TicketController extends Controller
             'data' => true
         ]);
     }
+
+    private function sendNotify(Ticket $ticket, TicketMessage $ticketMessage)
+    {
+
+    }
 }

app/Http/Requests/Admin/ConfigSave.php

@@ -47,9 +47,11 @@ class ConfigSave extends FormRequest
         'stripe_webhook_key' => '',
         'stripe_currency' => 'in:hkd,usd,sgd,eur,gbp',
         // bitpayx
+        'bitpayx_name' => '',
         'bitpayx_enable' => 'in:0,1',
         'bitpayx_appsecret' => '',
         // paytaro
+        'paytaro_name' => '',
         'paytaro_enable' => 'in:0,1',
         'paytaro_app_id' => '',
         'paytaro_app_secret' => '',
@@ -65,7 +67,9 @@ class ConfigSave extends FormRequest
         'email_template' => '',
         // telegram
         'telegram_bot_enable' => 'in:0,1',
-        'telegram_bot_token' => ''
+        'telegram_bot_token' => '',
+        'telegram_discuss_id' => '',
+        'telegram_channel_id' => ''
     ];
 
     /**

database/install.sql

@@ -1,4 +1,4 @@
--- Adminer 4.7.3 MySQL dump
+-- Adminer 4.7.6 MySQL dump
 
 SET NAMES utf8;
 SET time_zone = '+00:00';
@@ -54,7 +54,7 @@ CREATE TABLE `v2_mail_log` (
   `email` varchar(64) NOT NULL,
   `subject` varchar(255) NOT NULL,
   `template_name` varchar(255) NOT NULL,
-  `error` varchar(255) DEFAULT NULL,
+  `error` text,
   `created_at` int(11) NOT NULL,
   `updated_at` int(11) NOT NULL,
   PRIMARY KEY (`id`)
@@ -259,4 +259,4 @@ CREATE TABLE `v2_user` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
--- 2020-04-25 12:00:52
+-- 2020-05-12 05:24:10

database/update.sql

@@ -241,3 +241,15 @@ ADD `id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
 
 ALTER TABLE `v2_server_log`
 ADD `log_at` int(11) NOT NULL AFTER `rate`;
+
+ALTER TABLE `v2_mail_log`
+CHANGE `error` `error` text COLLATE 'utf8_general_ci' NULL AFTER `template_name`;
+
+ALTER TABLE `v2_plan`
+CHANGE `month_price` `month_price` int(11) NULL AFTER `content`,
+CHANGE `quarter_price` `quarter_price` int(11) NULL AFTER `month_price`,
+CHANGE `half_year_price` `half_year_price` int(11) NULL AFTER `quarter_price`,
+CHANGE `year_price` `year_price` int(11) NULL AFTER `half_year_price`;
+
+ALTER TABLE v2_server_log
+ADD INDEX log_at (`log_at`);