Support v2 Details API method

yidas · Dec 21, 2020 · d551217 · d551217
1 parent 4be1317
commit d551217
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/linePay/Client.php b/src/linePay/Client.php
@@ -47,6 +47,7 @@ class Client
         'ordersCapture' => '/v2/payments/orders/{orderId}/capture',
         'ordersRefund' => '/v2/payments/orders/{orderId}/refund',
         'authorizations' => '/v2/payments/authorizations',
+        'detailsV2' => '/v2/payments',
     ];
 
     /**
@@ -213,11 +214,14 @@ protected function requestHandler($version, $method, $uri, $queryParams=null, $b
      * Get payment details
      *
      * @param array $queryParams
+     * @param string $version API version
      * @return yidas\linePay\Response
      */
-    public function details($queryParams)
-    {
-        return $this->requestHandler('v3', 'GET', self::$apiUris['details'], $queryParams, null, [
+    public function details($queryParams, $version="v3")
+    {   
+        $version = ($version == "v2") ? $version : "v3";
+        $apiUrl = ($version == "v2") ? self::$apiUris['detailsV2'] : self::$apiUris['details'];
+        return $this->requestHandler($version, 'GET', $apiUrl, $queryParams, null, [
             'connect_timeout' => 5,
             'timeout' => 20,
             ]);

diff --git a/tool/details.php b/tool/details.php
@@ -4,9 +4,11 @@
 
 $input = $_POST;
 $input['isSandbox'] = (isset($input['isSandbox'])) ? true : false;
-// Custom merchant only for security
+// Merchant config option
 if (isset($input['merchant'])) {
-    die("<script>alert('Custom merchant input only!');history.back();</script>");
+    $merchant = Merchant::getMerchant($input['merchant']);
+    $input['channelId'] = $merchant['channelId'];
+    $input['channelSecret'] = $merchant['channelSecret'];
 }
 
 // Create LINE Pay client
@@ -19,7 +21,7 @@
 // Use Order Check API to confirm the transaction
 $response = $linePay->details([
     'transactionId' => $input['transactionId'],
-]);
+], "v2");
 
 // Log
 saveLog('Payment Details API', $response);

diff --git a/tool/index.php b/tool/index.php
@@ -315,7 +315,7 @@ function formSubmit(form) {
         </div>
         <hr>
         <div class="form-group">
-          <label>Search Transaction <font color="#cccccc"><i>(Effective with Custom merchant & Sandbox setting)</i></font></label>
+          <label>Search Transaction</label>
           <div class="input-group">
             <input type="text" class="form-control" name="transactionId" placeholder="Input transactionId to search">
             <div class="input-group-append">

diff --git a/tool/refund.php b/tool/refund.php
@@ -25,7 +25,7 @@
 }
 
 // Online Refund API
-$refundParams = ($_GET['amount']!="") ? ['refundAmount' => (integer) $_GET['amount']] : null;
+$refundParams = (isset($_GET['amount']) && $_GET['amount']!="") ? ['refundAmount' => (integer) $_GET['amount']] : null;
 $response = $linePay->refund($order['transactionId'], $refundParams);
 
 // Log