修改支付方式

packages/Longyi/Pay/Afterpay/src/Config/system.php

@@ -39,7 +39,7 @@ return [
                 'locale_based' => true,
             ], [
                 'name' => 'client_id',
-                'title' => 'ClientId',
+                'title' => 'Merchant ID',
                 'type' => 'text',
                 'depend' => 'active:1',
                 'validation' => 'required_if:active,1',
@@ -47,20 +47,12 @@ return [
                 'locale_based' => true,
             ], [
                 'name' => 'secret_id',
-                'title' => 'Secret',
+                'title' => 'Merchant Key',
                 'type' => 'password',
                 'depend' => 'active:1',
                 'validation' => 'required_if:active,1',
                 'channel_based' => false,
                 'locale_based' => true,
-            ], [
-                'name' => 'webhook_id',
-                'title' => 'WebhookId',
-                'type' => 'text',
-                'depend' => 'active:1',
-                'validation' => 'required_if:active,1',
-                'channel_based' => false,
-                'locale_based' => true,
             ], [
                 'name'          => 'sort',
                 'title'         => 'Sort Order',

packages/Longyi/Pay/Afterpay/src/Payment/Afterpay.php

@@ -130,7 +130,7 @@ class Afterpay extends Payment
             'headers' => [
                 'Accept' => 'application/json',
                 'Content-Type' => 'application/json',
-                'Authorization' =>  'Bearer '.base64_encode("{$this->clientId}:{$this->apikey}")
+                'Authorization' =>  'Basic '.base64_encode("{$this->clientId}:{$this->apikey}")
             ],
             'json' => $data,
             'timeout' => 30,

packages/Longyi/Pay/Airwallex/src/Http/Controllers/AirwallexController.php

@@ -51,8 +51,8 @@ class AirwallexController extends Controller
         $orderId = str_replace($prefix, '', $orderNo);
         $transactionId = $notifyData['data']['object']['id'] ?: '';
         switch ($type) {
-            case 'payment_intent.succeeded':
             case 'payment_intent.requires_capture':
+            case 'payment_intent.succeeded':
                 $this->airwallex->paymentSucceeded($orderId, $transactionId);
                 @header("HTTP/1.0 200 ok");
                 break;

packages/Longyi/Pay/AwxKlarna/src/Config/system.php

@@ -39,7 +39,7 @@ return [
                 'locale_based' => true,
             ], [
                 'name' => 'client_id',
-                'title' => 'Merchant ID',
+                'title' => 'ClientId',
                 'type' => 'text',
                 'depend' => 'active:1',
                 'validation' => 'required_if:active,1',
@@ -47,7 +47,7 @@ return [
                 'locale_based' => true,
             ], [
                 'name' => 'secret_id',
-                'title' => 'Merchant Key',
+                'title' => 'Secret',
                 'type' => 'password',
                 'depend' => 'active:1',
                 'validation' => 'required_if:active,1',