Completed
Push — master ( 169d8a...31f99c )
by Xu
803:36 queued 763:45
created
src/admin/widgets/Box.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
      * @see \yii\helpers\Html::renderTagAttributes() for details on how attributes are being rendered.
39 39
      * @since 2.0.1
40 40
      */
41
-    public $footerOptions =[];
41
+    public $footerOptions = [];
42 42
 
43 43
     public $closeButton = true;
44 44
 
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
     protected function renderTools()
135 135
     {
136 136
         $tools = '';
137
-        if($this->collapseButton !== false){
137
+        if ($this->collapseButton !== false) {
138 138
             $tools .= '<a class="collapse-link"><i class="fa fa-chevron-up"></i></a>';
139 139
         }
140 140
         if ($this->closeButton !== false) {
Please login to merge, or discard this patch.
src/admin/widgets/Alert.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
 
61 61
         foreach ($flashes as $type => $data) {
62 62
             if (isset($this->alertTypes[$type])) {
63
-                $data = (array) $data;
63
+                $data = (array)$data;
64 64
                 foreach ($data as $i => $message) {
65 65
                     /* initialize css class for each alert box */
66 66
                     $this->options['class'] = $this->alertTypes[$type] . $appendCss;
Please login to merge, or discard this patch.
src/admin/views/layouts/_navigation_header.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 use yii\helpers\Url;
3 3
 use yii\helpers\Html;
4
- ?>
4
+    ?>
5 5
 <li class="nav-header">
6 6
     <div class="logo-element-main">
7 7
         YUNCMS
Please login to merge, or discard this patch.
src/assets/FontAwesomeAsset.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
     public function init()
37 37
     {
38 38
         parent::init();
39
-        $this->publishOptions['beforeCopy'] = function ($from, $to) {
39
+        $this->publishOptions['beforeCopy'] = function($from, $to) {
40 40
             return preg_match('%(/|\\\\)(fonts|css)%', $from);
41 41
         };
42 42
     }
Please login to merge, or discard this patch.
src/admin/widgets/ActiveField.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
         }
49 49
         $this->parts['{img}'] = Html::img($src, $options);
50 50
         BootstrapFileStyleAsset::register($this->form->view);
51
-        return parent::fileInput($options).Plupload::widget(['url'=>'url']);
51
+        return parent::fileInput($options) . Plupload::widget(['url'=>'url']);
52 52
     }
53 53
 
54 54
     /**
Please login to merge, or discard this patch.
123/m180223_102826Create_user_profile_table.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
             'location' => $this->string()->comment('Location'),
31 31
             'address' => $this->string()->comment('Address'),
32 32
             'website' => $this->string()->comment('Website'),
33
-            'timezone' => $this->string(100)->comment('Timezone'),//默认格林威治时间
33
+            'timezone' => $this->string(100)->comment('Timezone'), //默认格林威治时间
34 34
             'birthday' => $this->string(15)->comment('Birthday'),
35 35
             'current' => $this->smallInteger(1)->comment('Current'),
36 36
             'qq' => $this->string(11)->comment('QQ'),
Please login to merge, or discard this patch.
123/m180315_104011_create_trade_charges_table.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -22,29 +22,29 @@
 block discarded – undo
22 22
 
23 23
         $this->createTable($this->tableName, [
24 24
             'id' => $this->bigPrimaryKey(),
25
-            'paid' => $this->boolean()->defaultValue(false),//boolean 是否已付款
26
-            'refunded' => $this->boolean()->defaultValue(false),//boolean 是否存在退款信息
27
-            'reversed' => $this->boolean()->defaultValue(false),//boolean 订单是否撤销
28
-            'channel' => $this->string(50)->notNull(),//付款渠道
29
-            'order_no' => $this->string()->notNull(),//商户订单号,适配每个渠道对此参数的要求,必须在商户的系统内唯一
30
-            'client_ip' => $this->ipAddress()->notNull(),//发起支付请求客户端的 IP 地址
31
-            'amount' => $this->unsignedInteger()->notNull(),//订单总金额(必须大于 0),单位为对应币种的最小货币单位,人民币为分
32
-            'amount_settle' => $this->unsignedInteger()->notNull(),//清算金额,单位为对应币种的最小货币单位,人民币为分。
33
-            'currency' => $this->string(3)->notNull(),//3 位 ISO 货币代码,人民币为  cny 。
34
-            'subject' => $this->string(32)->notNull(),//商品标题,该参数最长为 32 个 Unicode 字符
35
-            'body' => $this->string(128)->notNull(),//商品描述信息,该参数最长为 128 个 Unicode 字符
25
+            'paid' => $this->boolean()->defaultValue(false), //boolean 是否已付款
26
+            'refunded' => $this->boolean()->defaultValue(false), //boolean 是否存在退款信息
27
+            'reversed' => $this->boolean()->defaultValue(false), //boolean 订单是否撤销
28
+            'channel' => $this->string(50)->notNull(), //付款渠道
29
+            'order_no' => $this->string()->notNull(), //商户订单号,适配每个渠道对此参数的要求,必须在商户的系统内唯一
30
+            'client_ip' => $this->ipAddress()->notNull(), //发起支付请求客户端的 IP 地址
31
+            'amount' => $this->unsignedInteger()->notNull(), //订单总金额(必须大于 0),单位为对应币种的最小货币单位,人民币为分
32
+            'amount_settle' => $this->unsignedInteger()->notNull(), //清算金额,单位为对应币种的最小货币单位,人民币为分。
33
+            'currency' => $this->string(3)->notNull(), //3 位 ISO 货币代码,人民币为  cny 。
34
+            'subject' => $this->string(32)->notNull(), //商品标题,该参数最长为 32 个 Unicode 字符
35
+            'body' => $this->string(128)->notNull(), //商品描述信息,该参数最长为 128 个 Unicode 字符
36 36
             //'extra',
37
-            'time_paid' => $this->unixTimestamp(),//订单支付完成时的 Unix 时间戳。(银联支付成功时间为接收异步通知的时间)
38
-            'time_expire' => $this->unixTimestamp(),//订单失效时间
39
-            'time_settle' => $this->unixTimestamp(),//订单清算时间,用 Unix 时间戳表示。(暂不生效)
40
-            'transaction_no' => $this->string(64),//支付渠道返回的交易流水号。
37
+            'time_paid' => $this->unixTimestamp(), //订单支付完成时的 Unix 时间戳。(银联支付成功时间为接收异步通知的时间)
38
+            'time_expire' => $this->unixTimestamp(), //订单失效时间
39
+            'time_settle' => $this->unixTimestamp(), //订单清算时间,用 Unix 时间戳表示。(暂不生效)
40
+            'transaction_no' => $this->string(64), //支付渠道返回的交易流水号。
41 41
             //'refunds',//退款详情列表
42
-            'amount_refunded' => $this->unsignedInteger()->notNull(),//已退款总金额,单位为对应币种的最小货币单位,例如:人民币为分。
43
-            'failure_code' => $this->string(),//订单的错误码
44
-            'failure_msg' => $this->string(),//订单的错误消息的描述。
42
+            'amount_refunded' => $this->unsignedInteger()->notNull(), //已退款总金额,单位为对应币种的最小货币单位,例如:人民币为分。
43
+            'failure_code' => $this->string(), //订单的错误码
44
+            'failure_msg' => $this->string(), //订单的错误消息的描述。
45 45
             'metadata',
46 46
             //'credential',
47
-            'description' => $this->string(255),//订单附加说明,最多 255 个 Unicode 字符。
47
+            'description' => $this->string(255), //订单附加说明,最多 255 个 Unicode 字符。
48 48
             'created_at' => $this->unixTimestamp(),
49 49
         ], $tableOptions);
50 50
     }
Please login to merge, or discard this patch.
123/m180315_104659_create_trade_refunds_table.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -21,18 +21,18 @@
 block discarded – undo
21 21
         }
22 22
         $this->createTable($this->tableName, [
23 23
             'id' => $this->bigPrimaryKey(),
24
-            'amount' => $this->unsignedInteger()->notNull(),//退款金额大于 0, 单位为对应币种的最小货币单位,例如:人民币为分(如退款金额为 1 元,此处请填 100)。必须小于等于可退款金额,默认为全额退款。
25
-            'succeed' => $this->boolean()->defaultValue(false),//退款是否成功。
26
-            'status' => $this->string(10)->defaultValue('pending'),//退款状态(目前支持三种状态: pending: 处理中; succeeded: 成功; failed: 失败)。
27
-            'time_succeed' => $this->unixTimestamp(),//退款成功的时间,用 Unix 时间戳表示。
28
-            'description' => $this->string(255)->notNull(),//退款详情,最多 255 个 Unicode 字符。
29
-            'failure_code' => $this->string(),//退款的错误码,详见 错误 中的错误码。
30
-            'failure_msg' => $this->string(),//退款消息的描述。
24
+            'amount' => $this->unsignedInteger()->notNull(), //退款金额大于 0, 单位为对应币种的最小货币单位,例如:人民币为分(如退款金额为 1 元,此处请填 100)。必须小于等于可退款金额,默认为全额退款。
25
+            'succeed' => $this->boolean()->defaultValue(false), //退款是否成功。
26
+            'status' => $this->string(10)->defaultValue('pending'), //退款状态(目前支持三种状态: pending: 处理中; succeeded: 成功; failed: 失败)。
27
+            'time_succeed' => $this->unixTimestamp(), //退款成功的时间,用 Unix 时间戳表示。
28
+            'description' => $this->string(255)->notNull(), //退款详情,最多 255 个 Unicode 字符。
29
+            'failure_code' => $this->string(), //退款的错误码,详见 错误 中的错误码。
30
+            'failure_msg' => $this->string(), //退款消息的描述。
31 31
             //'metadata',
32
-            'charge_id' => $this->unsignedBigInteger()->notNull(),//支付  charge 对象的  id
33
-            'charge_order_no',//商户订单号,这边返回的是  charge 对象中的  order_no 参数。
34
-            'transaction_no' => $this->string(64),//支付渠道返回的交易流水号,部分渠道返回该字段为空。
35
-            'funding_source' => $this->string(20),//微信及 QQ 类退款资金来源。取值范围: unsettled_funds :使用未结算资金退款; recharge_funds :微信-使用可用余额退款,QQ-使用可用现金账户资金退款。注:默认值  unsettled_funds ,该参数对于微信渠道的退款来说仅适用于微信老资金流商户使用,包括  wx 、 wx_pub 、 wx_pub_qr 、 wx_lite 、 wx_wap 、 wx_pub_scan 六个渠道;新资金流退款资金默认从基本账户中扣除。该参数仅在请求退款,传入该字段时返回。
32
+            'charge_id' => $this->unsignedBigInteger()->notNull(), //支付  charge 对象的  id
33
+            'charge_order_no', //商户订单号,这边返回的是  charge 对象中的  order_no 参数。
34
+            'transaction_no' => $this->string(64), //支付渠道返回的交易流水号,部分渠道返回该字段为空。
35
+            'funding_source' => $this->string(20), //微信及 QQ 类退款资金来源。取值范围: unsettled_funds :使用未结算资金退款; recharge_funds :微信-使用可用余额退款,QQ-使用可用现金账户资金退款。注:默认值  unsettled_funds ,该参数对于微信渠道的退款来说仅适用于微信老资金流商户使用,包括  wx 、 wx_pub 、 wx_pub_qr 、 wx_lite 、 wx_wap 、 wx_pub_scan 六个渠道;新资金流退款资金默认从基本账户中扣除。该参数仅在请求退款,传入该字段时返回。
36 36
             //'extra',
37 37
             'created_at' => $this->unixTimestamp(),
38 38
         ], $tableOptions);
Please login to merge, or discard this patch.