浏览代码

commit fix for stripe card payments

iamsaltedfish 3 年之前
父节点
当前提交
5e5f9ed46b

+ 10 - 0
config/settings.json

@@ -928,5 +928,15 @@
         "type": "bool",
         "type": "bool",
         "default": "0",
         "default": "0",
         "mark": "微信支付"
         "mark": "微信支付"
+    },
+    {
+        "id": null,
+        "item": "stripe_max_recharge",
+        "value": "1000",
+        "class": "stripe",
+        "is_public": 1,
+        "type": "int",
+        "default": "1000",
+        "mark": "最高充值限额"
     }
     }
 ]
 ]

+ 7 - 0
resources/views/material/admin/setting.tpl

@@ -372,6 +372,11 @@
                                             <label class="floating-label">最低充值限额(整数)</label>
                                             <label class="floating-label">最低充值限额(整数)</label>
                                             <input class="form-control maxwidth-edit" id="stripe_min_recharge" value="{$settings['stripe_min_recharge']}">
                                             <input class="form-control maxwidth-edit" id="stripe_min_recharge" value="{$settings['stripe_min_recharge']}">
                                         </div>
                                         </div>
+                                        <!-- stripe_max_recharge -->
+                                        <div class="form-group form-group-label">
+                                            <label class="floating-label">最高充值限额(整数)</label>
+                                            <input class="form-control maxwidth-edit" id="stripe_max_recharge" value="{$settings['stripe_max_recharge']}">
+                                        </div>
                                         <!-- stripe_pk -->
                                         <!-- stripe_pk -->
                                         <div class="form-group form-group-label">
                                         <div class="form-group form-group-label">
                                             <label class="floating-label">stripe_pk</label>
                                             <label class="floating-label">stripe_pk</label>
@@ -1438,6 +1443,8 @@
                     class: 'stripe',
                     class: 'stripe',
                     stripe_card: $$getValue('stripe_card'),
                     stripe_card: $$getValue('stripe_card'),
                     stripe_currency: $$getValue('stripe_currency'),
                     stripe_currency: $$getValue('stripe_currency'),
+                    stripe_min_recharge: $$getValue('stripe_min_recharge'),
+                    stripe_max_recharge: $$getValue('stripe_max_recharge'),
                     stripe_pk: $$getValue('stripe_pk'),
                     stripe_pk: $$getValue('stripe_pk'),
                     stripe_sk: $$getValue('stripe_sk'),
                     stripe_sk: $$getValue('stripe_sk'),
                     stripe_webhook_key: $$getValue('stripe_webhook_key')
                     stripe_webhook_key: $$getValue('stripe_webhook_key')

文件差异内容过多而无法显示
+ 1 - 2
resources/views/material/user/stripe_card.tpl


+ 1 - 1
src/Controllers/Admin/SettingController.php

@@ -65,7 +65,7 @@ class SettingController extends AdminController
                 $list = array('pmw_publickey', 'pmw_privatekey', 'pmw_widget', 'pmw_height');
                 $list = array('pmw_publickey', 'pmw_privatekey', 'pmw_widget', 'pmw_height');
                 break;
                 break;
             case 'stripe':
             case 'stripe':
-                $list = array('stripe_card', 'stripe_currency', 'stripe_pk', 'stripe_sk', 'stripe_webhook_key');
+                $list = array('stripe_card', 'stripe_currency', 'stripe_pk', 'stripe_sk', 'stripe_webhook_key', 'stripe_min_recharge', 'stripe_max_recharge');
                 break;
                 break;
             // 邮件
             // 邮件
             case 'mail':
             case 'mail':

+ 1 - 0
src/Services/Config.php

@@ -34,6 +34,7 @@ class Config
             'baseUrl'                 => $_ENV['baseUrl'],
             'baseUrl'                 => $_ENV['baseUrl'],
             // 充值
             // 充值
             'stripe_min_recharge'     => $public_configs['stripe_min_recharge'],
             'stripe_min_recharge'     => $public_configs['stripe_min_recharge'],
+            'stripe_max_recharge'     => $public_configs['stripe_max_recharge'],
             // 个性化
             // 个性化
             'user_center_bg'          => $public_configs['user_center_bg'],
             'user_center_bg'          => $public_configs['user_center_bg'],
             'admin_center_bg'         => $public_configs['admin_center_bg'],
             'admin_center_bg'         => $public_configs['admin_center_bg'],

+ 1 - 1
src/Services/Gateway/StripeCard.php

@@ -76,7 +76,7 @@ class StripeCard extends AbstractPayment
 	
 	
     public function getReturnHTML($request, $response, $args)
     public function getReturnHTML($request, $response, $args)
     {
     {
-        $sign      = $request->getParam('sign');
+        $sign       = $request->getParam('sign');
         $trade_no   = $request->getParam('trade_no');
         $trade_no   = $request->getParam('trade_no');
         $session_id = $request->getParam('session_id');
         $session_id = $request->getParam('session_id');
 
 

部分文件因为文件数量过多而无法显示