Merge remote-tracking branch 'origin/master' into akun

@@ -18,7 +18,7 @@ class PayStripeApi
     private $secretKey;
     private $secretKey;
     //币种对应支付方式
     //币种对应支付方式
     public $currency_types = [
     public $currency_types = [
-        'usd' => ['card', 'cashapp', 'link', 'alipay', 'wechat_pay', 'afterpay_clearpay'],
+        'usd' => ['card'],
 //        'eur' => ['card', 'ideal', 'giropay', 'sofort', 'bancontact', 'klarna', 'link'],
 //        'eur' => ['card', 'ideal', 'giropay', 'sofort', 'bancontact', 'klarna', 'link'],
 //        'gbp' => ['card', 'apple_pay', 'google_pay', 'klarna', 'link', 'afterpay_clearpay'],
 //        'gbp' => ['card', 'apple_pay', 'google_pay', 'klarna', 'link', 'afterpay_clearpay'],
 //        'aud' => ['card', 'afterpay_clearpay', 'apple_pay', 'google_pay'],
 //        'aud' => ['card', 'afterpay_clearpay', 'apple_pay', 'google_pay'],
@@ -89,7 +89,7 @@ class PayStripeApi
         $data = [
         $data = [
             'amount' => $amount,
             'amount' => $amount,
             'currency' => $currency,
             'currency' => $currency,
-            'payment_method_types' => $this->currency_types[$currency],
+            'automatic_payment_methods' => ['enabled' => true],
         ];
         ];
         return $this->sendRequest($url, 'POST', $data);
         return $this->sendRequest($url, 'POST', $data);
     }
     }

@@ -141,6 +141,6 @@ class Extension3059ModuleController extends BaseController
             $this->fail('error,请联系管理员');
             $this->fail('error,请联系管理员');
         }
         }
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
-        $this->response('success',Code::SUCCESS,$payData);
+        $this->response('success - The page is about to be redirected to the payment page',Code::SUCCESS,$payData);
     }
     }
 }
 }