From 0e94f51fa5cd66e19d66da89c7373925d8dd6a44 Mon Sep 17 00:00:00 2001
From: SangminLee <sangmin@tendopay.ph>
Date: Wed, 28 Oct 2020 15:17:19 -0400
Subject: [PATCH] Add draft SDK for v2

---
 README.md                                   |  51 ++-
 README_v1.md                                | 185 ++++++++
 UPGRADE.md                                  |  31 ++
 samples/api.php                             |  20 +-
 samples/callback.php                        |  27 +-
 samples/common.php                          |  12 +
 samples/index.html.php                      |  60 ++-
 samples/js/components/TpCollapse.vue        |   5 +-
 samples/js/components/TpPayment.vue         |  29 +-
 samples/js/components/TpSdkCredentials.vue  |  50 ++-
 samples/js/components/TpSdkTransactions.vue |  12 +-
 samples/payment.php                         |  18 +-
 src/Models/Payment.php                      |  63 ++-
 src/Models/Transaction.php                  |  41 +-
 src/Models/VerifyTransactionRequest.php     |  39 +-
 src/Models/VerifyTransactionResponse.php    |  17 +-
 src/Traits/TendoPayHelper.php               |  25 ++
 src/Traits/TpHttpHelper.php                 | 146 ++++++
 src/V2/ConstantsV2.php                      | 221 ++++++++++
 src/V2/TendoPayClient.php                   | 465 ++++++++++++++++++++
 20 files changed, 1404 insertions(+), 113 deletions(-)
 create mode 100644 README_v1.md
 create mode 100644 UPGRADE.md
 create mode 100644 src/Traits/TpHttpHelper.php
 create mode 100644 src/V2/ConstantsV2.php
 create mode 100644 src/V2/TendoPayClient.php

diff --git a/README.md b/README.md
index 65b4d28..da584e1 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,15 @@
-# TendoPay SDK for PHP
+# TendoPay SDK for PHP (v2)
+
+If you find a document for v1, please go to [TendoPay SDK for PHP (v1)](./README_v1.md)
 
 ## Requirements
 
 PHP 7.0 and later.
 
+## Upgrade
+
+[UPGRADE from v1](./UPGRADE.md)
+
 ## Installation
 
 ### Using Composer
@@ -34,22 +40,15 @@ http://localhost:8000/
   > MERCHANT_ID,MERCHANT_SECRET for test can get them at [TendoPay Sandbox](https://sandbox.tendopay.ph)
 
 ```bash
-## Merchant Credentials
-MERCHANT_ID=
-MERCHANT_SECRET=
-
 ## Client Credentials
 CLIENT_ID=
 CLIENT_SECRET=
 
-## Enable Sandbox, it must be false in production
-TENDOPAY_SANDBOX_ENABLED=false
-
 ## Redirect URI when the transaction succeed
 REDIRECT_URL=https://localhost:8000/purhase.php
 
-## Redirect URI when the transaction fails
-ERROR_REDIRECT_URL=https://localhost:8000/purchase.php
+## Enable Sandbox, it must be false in production
+TENDOPAY_SANDBOX_ENABLED=false
 ```
 
 ```php
@@ -64,12 +63,9 @@ $client = new TendoPayClient();
 use TendoPay\SDK\TendoPayClient;
 
 $config = [
-    'MERCHANT_ID' => '',
-    'MERCHANT_SECRET' => '',
     'CLIENT_ID' => '',
     'CLIENT_SECRET' => '',
     'REDIRECT_URL' => '',
-    'ERROR_REDIRECT_URL' => '',
     'TENDOPAY_SANDBOX_ENABLED' => false,
 ];
 $client = new TendoPayClient($config);
@@ -81,13 +77,13 @@ $client = new TendoPayClient($config);
 ```php
 use TendoPay\SDK\Exception\TendoPayConnectionException;
 use TendoPay\SDK\Models\Payment;
-use TendoPay\SDK\TendoPayClient;
+use TendoPay\SDK\V2\TendoPayClient;
 
 ### S:Merchant set proper values
 $merchant_order_id = $_POST['tp_merchant_order_id'];
 $request_order_amount = $_POST['tp_amount'];
 $request_order_title = $_POST['tp_description'];
-$_SESSION['merchant_order_id'] = $merchant_order_id;
+$redirectUrl = $_POST['tp_redirect_url'] ?? '';
 ### E:Merchant set proper values
 
 $client = new TendoPayClient();
@@ -96,7 +92,10 @@ try {
     $payment = new Payment();
     $payment->setMerchantOrderId($merchant_order_id)
         ->setDescription($request_order_title)
-        ->setRequestAmount($request_order_amount);
+        ->setRequestAmount($request_order_amount)
+        ->setCurrency('PHP')
+        ->setRedirectUrl($redirectUrl);
+
 
     $client->setPayment($payment);
 
@@ -114,21 +113,27 @@ try {
 ```php
 use TendoPay\SDK\Exception\TendoPayConnectionException;
 use TendoPay\SDK\Models\VerifyTransactionRequest;
-use TendoPay\SDK\TendoPayClient;
+use TendoPay\SDK\V2\TendoPayClient;
 
 $client = new TendoPayClient();
 
 try {
     if (TendoPayClient::isCallBackRequest($_REQUEST)) {
-        $merchant_order_id = $_SESSION['merchant_order_id'] ?? null;
-        $transaction = $client->verifyTransaction($merchant_order_id, new VerifyTransactionRequest($_REQUEST));
+        $transaction = $client->verifyTransaction(new VerifyTransactionRequest($_REQUEST));
 
         if (!$transaction->isVerified()) {
             throw new UnexpectedValueException('Invalid signature for the verification');
         }
 
-        // Save $transactionNumber here
-        // Proceed merchant post order process
+        if ($transaction->getStatus() == \TendoPay\SDK\V2\ConstantsV2::STATUS_SUCCESS) {
+            // PAID
+            // Save $transactionNumber here
+            // Proceed merchant post order process
+        } else if ($transaction->getStatus() == \TendoPay\SDK\V2\ConstantsV2::STATUS_FAILURE) {
+            // FAILED
+            // do something in failure case
+            // error message $transaction->getMessage()
+        }       
     }
 } catch (TendoPayConnectionException $e) {
     echo 'Connection Error:'.$e->getMessage();
@@ -141,7 +146,7 @@ try {
 
 ```php
 use TendoPay\SDK\Exception\TendoPayConnectionException;
-use TendoPay\SDK\TendoPayClient;
+use TendoPay\SDK\V2\TendoPayClient;
 
 $client = new TendoPayClient();
 
@@ -161,7 +166,7 @@ try {
 
 ```php
 use TendoPay\SDK\Exception\TendoPayConnectionException;
-use TendoPay\SDK\TendoPayClient;
+use TendoPay\SDK\V2\TendoPayClient;
 
 $client = new TendoPayClient();
 
diff --git a/README_v1.md b/README_v1.md
new file mode 100644
index 0000000..65b4d28
--- /dev/null
+++ b/README_v1.md
@@ -0,0 +1,185 @@
+# TendoPay SDK for PHP
+
+## Requirements
+
+PHP 7.0 and later.
+
+## Installation
+
+### Using Composer
+
+You can install the sdk via [Composer](http://getcomposer.org/). Run the following command:
+
+```bash
+composer require tendopay/tendopay-sdk-php
+```
+
+## Run SDK Tester
+
+- Run a sample server
+```bash
+php -s localhost:8000 -t vendor/tendopay/tendopay-sdk-php/samples
+```
+
+- Open browser and goto
+```bash
+http://localhost:8000/
+```
+
+## Code Examples
+
+### Create TendoPayClient
+
+- Using .env
+  > MERCHANT_ID,MERCHANT_SECRET for test can get them at [TendoPay Sandbox](https://sandbox.tendopay.ph)
+
+```bash
+## Merchant Credentials
+MERCHANT_ID=
+MERCHANT_SECRET=
+
+## Client Credentials
+CLIENT_ID=
+CLIENT_SECRET=
+
+## Enable Sandbox, it must be false in production
+TENDOPAY_SANDBOX_ENABLED=false
+
+## Redirect URI when the transaction succeed
+REDIRECT_URL=https://localhost:8000/purhase.php
+
+## Redirect URI when the transaction fails
+ERROR_REDIRECT_URL=https://localhost:8000/purchase.php
+```
+
+```php
+use TendoPay\SDK\TendoPayClient;
+
+$client = new TendoPayClient();
+```
+
+- Using $config variable
+
+```php
+use TendoPay\SDK\TendoPayClient;
+
+$config = [
+    'MERCHANT_ID' => '',
+    'MERCHANT_SECRET' => '',
+    'CLIENT_ID' => '',
+    'CLIENT_SECRET' => '',
+    'REDIRECT_URL' => '',
+    'ERROR_REDIRECT_URL' => '',
+    'TENDOPAY_SANDBOX_ENABLED' => false,
+];
+$client = new TendoPayClient($config);
+```
+
+
+### Make Payment
+
+```php
+use TendoPay\SDK\Exception\TendoPayConnectionException;
+use TendoPay\SDK\Models\Payment;
+use TendoPay\SDK\TendoPayClient;
+
+### S:Merchant set proper values
+$merchant_order_id = $_POST['tp_merchant_order_id'];
+$request_order_amount = $_POST['tp_amount'];
+$request_order_title = $_POST['tp_description'];
+$_SESSION['merchant_order_id'] = $merchant_order_id;
+### E:Merchant set proper values
+
+$client = new TendoPayClient();
+
+try {
+    $payment = new Payment();
+    $payment->setMerchantOrderId($merchant_order_id)
+        ->setDescription($request_order_title)
+        ->setRequestAmount($request_order_amount);
+
+    $client->setPayment($payment);
+
+    $redirectURL = $client->getAuthorizeLink();
+    header('Location: '.$redirectURL);
+} catch (TendoPayConnectionException $e) {
+    echo 'Connection Error:'.$e->getMessage();
+} catch (Exception $e) {
+    echo 'Runtime Error:'.$e->getMessage();
+}
+```
+
+### Callback (redirected page)
+
+```php
+use TendoPay\SDK\Exception\TendoPayConnectionException;
+use TendoPay\SDK\Models\VerifyTransactionRequest;
+use TendoPay\SDK\TendoPayClient;
+
+$client = new TendoPayClient();
+
+try {
+    if (TendoPayClient::isCallBackRequest($_REQUEST)) {
+        $merchant_order_id = $_SESSION['merchant_order_id'] ?? null;
+        $transaction = $client->verifyTransaction($merchant_order_id, new VerifyTransactionRequest($_REQUEST));
+
+        if (!$transaction->isVerified()) {
+            throw new UnexpectedValueException('Invalid signature for the verification');
+        }
+
+        // Save $transactionNumber here
+        // Proceed merchant post order process
+    }
+} catch (TendoPayConnectionException $e) {
+    echo 'Connection Error:'.$e->getMessage();
+} catch (Exception $e) {
+    echo 'Runtime Error:'.$e->getMessage();
+}
+```
+
+### Cancel Payment
+
+```php
+use TendoPay\SDK\Exception\TendoPayConnectionException;
+use TendoPay\SDK\TendoPayClient;
+
+$client = new TendoPayClient();
+
+try {
+    $client->cancelPayment($transactionNumber);
+    // merchant process here
+
+} catch (TendoPayConnectionException $e) {
+    echo 'Connection Error:'.$e->getMessage();
+} catch (Exception $e) {
+    echo 'Runtime Error:'.$e->getMessage();
+}
+```
+
+
+### Show Transaction Detail
+
+```php
+use TendoPay\SDK\Exception\TendoPayConnectionException;
+use TendoPay\SDK\TendoPayClient;
+
+$client = new TendoPayClient();
+
+try {
+
+    $transaction = $client->getTransactionDetail($transactionNumber);
+
+    // merchant process here
+    // $transaction->getMerchantId();
+    // $transaction->getMerchantOrderId();
+    // $transaction->getAmount();
+    // $transaction->getTransactionNumber();
+    // $transaction->getCreatedAt();
+    // $transaction->getStatus();
+    
+} catch (TendoPayConnectionException $e) {
+    echo 'Connection Error:'.$e->getMessage();
+} catch (Exception $e) {
+    echo 'Runtime Error:'.$e->getMessage();
+}
+```
diff --git a/UPGRADE.md b/UPGRADE.md
new file mode 100644
index 0000000..a707ea5
--- /dev/null
+++ b/UPGRADE.md
@@ -0,0 +1,31 @@
+# Upgrade Guide
+
+## # Upgrading to v2 from 0.8.x
+
+### Changes
+
+##### New Client ID/ Client Secret
+    Merchant should create a new Client App(REST V2) in the Merchant Dashboard to use SDK 2.x
+    Existing credentils is not compatible with SDK 2.x 
+
+##### MERCHANT_ID/MERCHANT_SECRET
+    MERCHANT_ID/MERCHANT_SECRET has been removed
+
+##### ERROR_REDIRECT_URL
+    ERROR_REDIRECT_URL has been removed. 
+    All successful or unsuccessful response will be redirected to REDIRECT_URL
+    
+##### Backend Notification
+    When a merchant creates an app (REST V2), 
+    if 'NOTIFICATION_URL' is set, TendoPay notifies some changes of transactions to the notification callback URL.
+    This callback is asynchronous back-end API request. 
+    'PAID', 'FAILED', 'CANCELLED' events of transactions are triggered.  
+              
+##### Change the namespace of TendoPayClient
+```php
+    # TendoPayClient for v1
+    use TendoPay\SDK\TendoPayClient;
+    
+    # TendoPayClient for v2
+    use TendoPay\SDK\V2\TendoPayClient;
+````
diff --git a/samples/api.php b/samples/api.php
index 933e957..7a67692 100644
--- a/samples/api.php
+++ b/samples/api.php
@@ -2,20 +2,8 @@
 
 require_once __DIR__.'/common.php';
 
-use TendoPay\SDK\TendoPayClient;
 global $config;
 
-/**
- *
- * @param  mixed  $response
- * @param  int  $status
- */
-function json($response = [], $status = 200)
-{
-    echo header('Content-Type: application/json', true, $status);
-    echo json_encode($response);
-}
-
 ## Main
 $request = json_decode(file_get_contents('php://input'), false);
 $job = $request->job ?? null;
@@ -31,13 +19,17 @@ function json($response = [], $status = 200)
         case 'GET_TRANSACTIONS':
             return json($_SESSION['transactions'] ?? []);
         case 'GET_TRANSACTION':
-            $client = new TendoPayClient($config);
+            $client = ($config['TP_SDK_VERSION'] ?? null) === 'v2' ?
+                new \TendoPay\SDK\V2\TendoPayClient($config) :
+                new \TendoPay\SDK\TendoPayClient($config);
             $response = $client->getTransactionDetail($request->transactionNumber);
 
             return json($response->toArray());
         case 'CANCEL_TRANSACTION':
             $transactionNumber = $request->transactionNumber;
-            $client = new TendoPayClient($config);
+            $client = ($config['TP_SDK_VERSION'] ?? null) === 'v2' ?
+                new \TendoPay\SDK\V2\TendoPayClient($config) :
+                new \TendoPay\SDK\TendoPayClient($config);
             $client->cancelPayment($transactionNumber);
 
             $_SESSION['transactions'] = array_filter($_SESSION['transactions'] ?? [],
diff --git a/samples/callback.php b/samples/callback.php
index 98ce8fa..7cb4f51 100644
--- a/samples/callback.php
+++ b/samples/callback.php
@@ -4,13 +4,32 @@
 
 use TendoPay\SDK\Exception\TendoPayConnectionException;
 use TendoPay\SDK\Models\VerifyTransactionRequest;
-use TendoPay\SDK\TendoPayClient;
 
 global $config;
-$client = new TendoPayClient($config);
+//echo "<pre>";print_r($_REQUEST);echo "</pre>";exit;
+$client = $config['TP_SDK_VERSION'] === 'v2' ?
+    new \TendoPay\SDK\V2\TendoPayClient($config) :
+    new \TendoPay\SDK\TendoPayClient($config);
 
 try {
-    if (TendoPayClient::isCallBackRequest($_REQUEST)) {
+    if ($config['TP_SDK_VERSION'] === 'v2' &&
+        \TendoPay\SDK\V2\TendoPayClient::isCallBackRequest($_REQUEST)) {
+
+        $transaction = $client->verifyTransaction(new VerifyTransactionRequest($_REQUEST));
+
+        if (!$transaction->isVerified()) {
+            throw new UnexpectedValueException('Invalid signature for the verification');
+        }
+
+//        dump('verificationResult:', $transaction->toArray());exit;
+        // @Note check request amount with approved amount. it can be different but must be enough to purchase
+        // Save $transactionNumber here
+        $transactions = $_SESSION['transactions'] ?? [];
+        $transactions[] = $transaction->toArray();
+        $_SESSION['transactions'] = $transactions;
+        header('Location: /');
+
+    } elseif (\TendoPay\SDK\TendoPayClient::isCallBackRequest($_REQUEST)) {
         $merchant_order_id = $_SESSION['merchant_order_id'] ?? null;
         $transaction = $client->verifyTransaction($merchant_order_id, new VerifyTransactionRequest($_REQUEST));
 
@@ -18,7 +37,7 @@
             throw new UnexpectedValueException('Invalid signature for the verification');
         }
 
-//        dump('verificationResult:', $transaction->toArray());
+//        dump('verificationResult:', $transaction->toArray());exit;
         // @Note check request amount with approved amount. it can be different but must be enough to purchase
         // Save $transactionNumber here
         $transactions = $_SESSION['transactions'] ?? [];
diff --git a/samples/common.php b/samples/common.php
index 6dabd8f..0624ac6 100644
--- a/samples/common.php
+++ b/samples/common.php
@@ -25,6 +25,17 @@ function dump()
     echo '</pre>';
 }
 
+/**
+ *
+ * @param  mixed  $response
+ * @param  int  $status
+ */
+function json($response = [], $status = 200)
+{
+    echo header('Content-Type: application/json', true, $status);
+    echo json_encode($response);
+}
+
 $credentials = $_SESSION['credentials'] ?? null;
 //putenv('MERCHANT_ID='.$credentials->merchant_id);
 //putenv('MERCHANT_SECRET='.$credentials->merchant_secret);
@@ -35,6 +46,7 @@ function dump()
 //putenv('TENDOPAY_SANDBOX_ENABLED=true');
 
 $config = [
+    'TP_SDK_VERSION' => $credentials->tp_sdk_version ?? '',
     'MERCHANT_ID' => $credentials->merchant_id ?? '',
     'MERCHANT_SECRET' => $credentials->merchant_secret ?? '',
     'CLIENT_ID' => $credentials->client_id ?? '',
diff --git a/samples/index.html.php b/samples/index.html.php
index 5019ba4..1d49986 100644
--- a/samples/index.html.php
+++ b/samples/index.html.php
@@ -39,10 +39,10 @@
 
       <div class="card-body">
         <p class="card-text">
-          <tp-sdk-credentials v-model="credentials"/>
+          <tp-sdk-credentials v-model="credentials" @save="saveCredentials"/>
         </p>
         <p class="card-text">
-          <tp-payment v-model="payload"/>
+          <tp-payment v-model="payload" @submit="submitForm"/>
         </p>
       </div>
 
@@ -70,6 +70,7 @@
     },
     data: {
       credentials: {
+        tp_sdk_version: 'v2',
         merchant_id: null,
         merchant_secret: null,
         client_id: null,
@@ -85,6 +86,28 @@
       transactions: null,
     },
     methods: {
+      initOrder () {
+        const tp_merchant_order_id = `TEST-ORD-${Date.now()}`
+        this.payload = {
+          tp_merchant_order_id,
+          tp_description: `Invoice #${tp_merchant_order_id}`,
+          tp_amount: 1500
+        }
+      },
+      async saveCredentials () {
+        try {
+          window.setTimeout(async () => {
+            const { data } = await axios.post(API_END_POINT, {
+              job: 'SAVE_CREDENTIALS',
+              credentials: this.credentials
+            })
+            // console.log('saveCredentials', data)
+            this.$emit('input', this.credentials)
+          }, 400)
+        } catch (e) {
+          console.log('error:saveCredentials() ', e)
+        }
+      },
       async submit () {
         // console.log('submit', this.payload)
         const { data } = await axios.post(API_END_POINT, {
@@ -92,12 +115,41 @@
         })
         // console.log('getCredentials', data)
       },
-      async initTransactions() {
+      async initTransactions () {
         const { data } = await axios.post(API_END_POINT, {
           job: 'GET_TRANSACTIONS'
         })
         // console.log('getTransactions', data)
         this.transactions = data
+      },
+      async submitForm () {
+        console.log('submit form:', this.credentials, this.payload)
+        const { tp_sdk_version = '', redirect_url = '' } = this.credentials
+        const params = {
+          ...this.payload,
+          tp_sdk_version,
+          tp_redirect_url: redirect_url,
+        }
+        // const { data } = await axios.post('/payment.php', params)
+        // console.log('data', data)
+
+        const form = document.createElement('form')
+        form.method = 'POST'
+        form.action = '/payment.php'
+
+        for (const key in params) {
+          if (params.hasOwnProperty(key)) {
+            const hiddenField = document.createElement('input')
+            hiddenField.type = 'hidden'
+            hiddenField.name = key
+            hiddenField.value = params[key]
+
+            form.appendChild(hiddenField)
+          }
+        }
+
+        document.body.appendChild(form)
+        form.submit()
       }
     },
     mounted () {
@@ -105,6 +157,8 @@
         ...this.credentials,
         ...initCredentials,
       }
+      this.initOrder()
+      this.saveCredentials()
       this.initTransactions()
     }
   })
diff --git a/samples/js/components/TpCollapse.vue b/samples/js/components/TpCollapse.vue
index b3a1804..ab89ade 100644
--- a/samples/js/components/TpCollapse.vue
+++ b/samples/js/components/TpCollapse.vue
@@ -1,13 +1,14 @@
 <template>
   <div class="card">
-    <div class="card-header" :id="id">
-      <h5 class="mb-0">
+    <div class="card-header d-flex" :id="id">
+      <h5 class="mb-0 mr-auto">
         <button class="btn btn-link" data-toggle="collapse" :data-target="`#${collapseId}`" aria-expanded="true"
                 :aria-controls="collapseId" @click="toggleContainer">
           <i class="fa" :class="{'fa-minus': expand, 'fa-plus': !expand}" aria-hidden="true"></i>
           {{ title }}
         </button>
       </h5>
+      <slot name="side-header"></slot>
     </div>
     <div :id="collapseId" class="collapse show" v-if="expand" :aria-labelledby="id">
       <div class="card-body">
diff --git a/samples/js/components/TpPayment.vue b/samples/js/components/TpPayment.vue
index b97b09d..6265b79 100644
--- a/samples/js/components/TpPayment.vue
+++ b/samples/js/components/TpPayment.vue
@@ -1,5 +1,11 @@
 <template>
   <tp-collapse id="tp-payment" title="Make Payment">
+    <template #side-header>
+      <div class="d-flex justify-content-end">
+        <button type="button" class="btn btn-primary" v-if="!loading" @click="submit">Checkout</button>
+        <div class="mr-5" v-if="loading"><i class="fa fa-spinner fa-spin fa-fw"></i></div>
+      </div>
+    </template>
     <template #body>
       <form method="post" action="/payment.php" ref="form">
         <div class="form-group">
@@ -19,10 +25,10 @@
                  v-model="payload.tp_amount">
         </div>
 
-        <div class="d-flex justify-content-end">
-          <button type="button" class="btn btn-primary" v-if="!loading" @click="submit">Checkout</button>
-          <div class="mr-5" v-if="loading"><i class="fa fa-spinner fa-spin fa-fw"></i></div>
-        </div>
+<!--        <div class="d-flex justify-content-end">-->
+<!--          <button type="button" class="btn btn-primary" v-if="!loading" @click="submit">Checkout</button>-->
+<!--          <div class="mr-5" v-if="loading"><i class="fa fa-spinner fa-spin fa-fw"></i></div>-->
+<!--        </div>-->
       </form>
     </template>
   </tp-collapse>
@@ -47,22 +53,15 @@ module.exports = {
     }
   },
   methods: {
-    initOrder () {
-      const tp_merchant_order_id = `TEST-ORD-${Date.now()}`
-      this.payload = {
-        tp_merchant_order_id,
-        tp_description: `Invoice #${tp_merchant_order_id}`,
-        tp_amount: 1500
-      }
-    },
-    submit() {
+    submit () {
       this.loading = true
-      this.$refs.form.submit()
+      // this.$refs.form.submit()
+      this.$emit('submit', this.payload)
     }
   },
   mounted () {
     this.loading = false
-    this.initOrder()
+    // this.initOrder()
   }
 }
 </script>
diff --git a/samples/js/components/TpSdkCredentials.vue b/samples/js/components/TpSdkCredentials.vue
index 1fb1017..4c79ea6 100644
--- a/samples/js/components/TpSdkCredentials.vue
+++ b/samples/js/components/TpSdkCredentials.vue
@@ -1,12 +1,20 @@
 <template>
   <tp-collapse id="tp-sdk-credentials" title="Credentials">
+    <template #side-header>
+      <div>
+        <select class="form-control" v-model="credentials.tp_sdk_version" @change="saveCredentials">
+          <option value="v2">Ver.2</option>
+          <option value="v1">Ver.1</option>
+        </select>
+      </div>
+    </template>
     <template #body>
-      <div class="form-group">
+      <div class="form-group" v-if="show.merchantCredentials">
         <label for="merchant_id">Merchant ID</label>
         <input type="text" class="form-control" id="merchant_id"
                v-model="credentials.merchant_id" @input="saveCredentials">
       </div>
-      <div class="form-group">
+      <div class="form-group" v-if="show.merchantCredentials">
         <label for="merchant_secret">Merchant Secret</label>
         <input type="text" class="form-control" id="merchant_secret"
                v-model="credentials.merchant_secret" @input="saveCredentials">
@@ -31,7 +39,7 @@
       </div>
 
 
-      <div class="form-group">
+      <div class="form-group" v-if="show.errorRedirectUrl">
         <label for="error_redirect_url">Error Redirect URL</label>
         <input type="text" class="form-control" id="error_redirect_url"
                v-model="credentials.error_redirect_url" @input="saveCredentials">
@@ -56,28 +64,32 @@ module.exports = {
   },
   data () {
     return {
-      credentials: this.value
+      credentials: this.value,
+    }
+  },
+  computed: {
+    show () {
+      const { tp_sdk_version = 'v2' } = this.credentials || {}
+
+      if (tp_sdk_version === 'v2') {
+        return {
+          merchantCredentials: false,
+          errorRedirectUrl: false,
+        }
+      }
+
+      return {
+        merchantCredentials: true,
+        errorRedirectUrl: true,
+      }
     }
   },
   methods: {
     async saveCredentials () {
-      try {
-        window.setTimeout(async () => {
-          const { data } = await axios.post(API_END_POINT, {
-            job: 'SAVE_CREDENTIALS',
-            credentials: this.credentials
-          })
-          // console.log('saveCredentials', data)
-          this.$emit('input', this.credentials)
-        }, 400)
-      } catch (e) {
-        console.log('error:saveCredentials() ', e)
-      }
+      this.$emit('input', this.credentials)
+      this.$emit('save', this.credentials)
     }
   },
-  mounted () {
-    this.saveCredentials()
-  }
 }
 </script>
 
diff --git a/samples/js/components/TpSdkTransactions.vue b/samples/js/components/TpSdkTransactions.vue
index 40ed0b6..a0042b3 100644
--- a/samples/js/components/TpSdkTransactions.vue
+++ b/samples/js/components/TpSdkTransactions.vue
@@ -7,23 +7,27 @@
         <tr class="text-center">
           <th scope="col">#</th>
           <th scope="col">Status</th>
+          <th scope="col">Message</th>
           <th scope="col">Detail</th>
           <th scope="col">Cancel</th>
         </tr>
         </thead>
         <tbody>
-        <tr v-if="transactions" v-for="({transactionNumber, status, hash}) in transactions" :key="hash"
+        <tr v-if="transactions" v-for="({transactionNumber, status, hash, message = ''}) in transactions" :key="hash"
             class="text-center">
           <th scope="row">{{ transactionNumber }}</th>
           <td>{{ status }}</td>
+          <td>{{ message }}</td>
           <td>
-            <button v-if="!loading.show.has(transactionNumber)" type="button" class="btn btn-sm btn-link" @click="show(transactionNumber)">
+            <button v-if="!loading.show.has(transactionNumber)" type="button" class="btn btn-sm btn-link"
+                    @click="show(transactionNumber)">
               Show
             </button>
             <i class="fa fa-spinner fa-spin fa-fw" v-if="loading.show.has(transactionNumber)"></i>
           </td>
           <td>
-            <button v-if="!loading.cancel.has(transactionNumber)" type="button" class="btn btn-sm btn-link" @click="cancel(transactionNumber)">
+            <button v-if="!loading.cancel.has(transactionNumber)" type="button" class="btn btn-sm btn-link"
+                    @click="cancel(transactionNumber)">
               Cancel
             </button>
             <i class="fa fa-spinner fa-spin fa-fw" v-if="loading.cancel.has(transactionNumber)"></i>
@@ -44,7 +48,7 @@
 
       <div class="collapse show" id="show-transaction" v-if="transaction">
         <div class="card card-body">
-          <pre>{{transaction}}</pre>
+          <pre>{{ transaction }}</pre>
           <button type="button" class="close" data-dismiss="alert" aria-label="Close" @click="transaction = null">
             <i class="fa fa-angle-double-up" aria-hidden="true"></i>
           </button>
diff --git a/samples/payment.php b/samples/payment.php
index 417f125..e331ace 100644
--- a/samples/payment.php
+++ b/samples/payment.php
@@ -4,17 +4,22 @@
 
 use TendoPay\SDK\Exception\TendoPayConnectionException;
 use TendoPay\SDK\Models\Payment;
-use TendoPay\SDK\TendoPayClient;
 
 ### Merchant Transaction Example Start
 $merchant_order_id = $_POST['tp_merchant_order_id'];
 $request_order_amount = $_POST['tp_amount'];
 $request_order_title = $_POST['tp_description'];
 $_SESSION['merchant_order_id'] = $merchant_order_id;
+$redirectUrl = $_POST['tp_redirect_url'] ?? '';
 ### Merchant Transaction Example End
 
 global $config;
-$client = new TendoPayClient($config);
+//echo "<pre>";print_r($config);echo "</pre>";exit;
+//echo "<pre>";print_r($_REQUEST);echo "</pre>";exit;
+
+$client = $config['TP_SDK_VERSION'] === 'v2' ?
+    new \TendoPay\SDK\V2\TendoPayClient($config) :
+    new \TendoPay\SDK\TendoPayClient($config);
 
 try {
     $payment = new Payment();
@@ -22,10 +27,15 @@
         ->setDescription($request_order_title)
         ->setRequestAmount($request_order_amount);
 
+    if ($redirectUrl) {
+        $payment->setCurrency('PHP')
+            ->setRedirectUrl($redirectUrl);
+    }
+
     $client->setPayment($payment);
 
-    $redirectURL = $client->getAuthorizeLink();
-    header('Location: '.$redirectURL);
+    $authUrl = $client->getAuthorizeLink();
+    header('Location: '.$authUrl);
 } catch (TendoPayConnectionException $e) {
     dump('Connection Error:'.$e->getMessage());
 } catch (Exception $e) {
diff --git a/src/Models/Payment.php b/src/Models/Payment.php
index 6067ad8..480ff1e 100644
--- a/src/Models/Payment.php
+++ b/src/Models/Payment.php
@@ -30,15 +30,36 @@ class Payment
      */
     private $items;
 
+
+    /**
+     * Redirect Url
+     * @var
+     */
+    private $redirectUrl;
+
+    /**
+     * Currency
+     * @var
+     */
+    private $currency;
+
     /**
      * TendoPayOrder constructor.
      * @param array $params
      */
     public function __construct(array $params = [])
     {
-        $this->merchantOrderId = $params['merchant_order_id'] ?? null;
-        $this->description = $params['description'] ?? '';
-        $this->requestAmount = $params['request_amount'] ?? 0;
+        if ($params['tp_amount'] ?? null) {
+            $this->requestAmount = $params['tp_amount'] ?? 0;
+            $this->currency = $params['tp_currency'] ?? 'PHP';
+            $this->merchantOrderId = $params['tp_merchant_order_id'] ?? null;
+            $this->description = $params['tp_description'] ?? '';
+            $this->redirectUrl = $params['tp_redirect_url'] ?? '';
+        } else {
+            $this->merchantOrderId = $params['merchant_order_id'] ?? null;
+            $this->description = $params['description'] ?? '';
+            $this->requestAmount = $params['request_amount'] ?? 0;
+        }
     }
 
     /**
@@ -113,4 +134,40 @@ public function setItems(array $items): self
         $this->items = $items;
         return $this;
     }
+
+    /**
+     * @param  string  $currency
+     * @return Payment
+     */
+    public function setCurrency(string $currency): self
+    {
+        $this->currency = $currency;
+        return $this;
+    }
+
+    /**
+     * @return mixed|string
+     */
+    public function getCurrency()
+    {
+        return $this->currency;
+    }
+
+    /**
+     * @param  string  $redirectUrl
+     * @return Payment
+     */
+    public function setRedirectUrl(string $redirectUrl): self
+    {
+        $this->redirectUrl = $redirectUrl;
+        return $this;
+    }
+
+    /**
+     * @return mixed|string
+     */
+    public function getRedirectUrl()
+    {
+        return $this->redirectUrl;
+    }
 }
diff --git a/src/Models/Transaction.php b/src/Models/Transaction.php
index bca0054..a1c7081 100644
--- a/src/Models/Transaction.php
+++ b/src/Models/Transaction.php
@@ -5,6 +5,7 @@
 
 use TendoPay\SDK\Constants;
 use TendoPay\SDK\Exception\TendoPayParameterException;
+use TendoPay\SDK\V2\ConstantsV2;
 
 /**
  * Class Transaction
@@ -36,18 +37,34 @@ class Transaction
      */
     public function __construct(array $response = [])
     {
-        $this->merchantId = $response[Constants::MERCHANT_ID] ?? null;
-        $this->merchantOrderId = $response[Constants::MERCHANT_ORDER_ID] ?? null;
-        $this->amount = $response[Constants::AMOUNT] ?? null;
-        $this->transactionNumber = $response[Constants::TRANSACTION_NO_PARAM] ?? null;
-        $this->status = $response[Constants::TRANSACTION_STATUS] ?? null;
-        $this->createdAt = $response[Constants::CREATED_AT] ?? null;
-
-        if (!$this->transactionNumber || !$this->merchantOrderId) {
-            throw new TendoPayParameterException(sprintf('%s, %s cannot be null',
-                Constants::TRANSACTION_NO_PARAM,
-                Constants::MERCHANT_ORDER_ID
-            ));
+        if ($response[ConstantsV2::TRANSACTION_NO_PARAM] ?? null) {
+            $this->merchantId = $response[ConstantsV2::MERCHANT_ID] ?? null;
+            $this->merchantOrderId = $response[ConstantsV2::MERCHANT_ORDER_ID] ?? null;
+            $this->amount = $response[ConstantsV2::AMOUNT] ?? null;
+            $this->transactionNumber = $response[ConstantsV2::TRANSACTION_NO_PARAM] ?? null;
+            $this->status = $response[ConstantsV2::TRANSACTION_STATUS] ?? null;
+            $this->createdAt = $response[ConstantsV2::CREATED_AT] ?? null;
+
+            if (!$this->transactionNumber || !$this->merchantOrderId) {
+                throw new TendoPayParameterException(sprintf('%s, %s cannot be null',
+                    ConstantsV2::TRANSACTION_NO_PARAM,
+                    ConstantsV2::MERCHANT_ORDER_ID
+                ));
+            }
+        } else {
+            $this->merchantId = $response[Constants::MERCHANT_ID] ?? null;
+            $this->merchantOrderId = $response[Constants::MERCHANT_ORDER_ID] ?? null;
+            $this->amount = $response[Constants::AMOUNT] ?? null;
+            $this->transactionNumber = $response[Constants::TRANSACTION_NO_PARAM] ?? null;
+            $this->status = $response[Constants::TRANSACTION_STATUS] ?? null;
+            $this->createdAt = $response[Constants::CREATED_AT] ?? null;
+
+            if (!$this->transactionNumber || !$this->merchantOrderId) {
+                throw new TendoPayParameterException(sprintf('%s, %s cannot be null',
+                    Constants::TRANSACTION_NO_PARAM,
+                    Constants::MERCHANT_ORDER_ID
+                ));
+            }
         }
     }
 
diff --git a/src/Models/VerifyTransactionRequest.php b/src/Models/VerifyTransactionRequest.php
index 316fb49..b8f1765 100644
--- a/src/Models/VerifyTransactionRequest.php
+++ b/src/Models/VerifyTransactionRequest.php
@@ -3,6 +3,7 @@
 namespace TendoPay\SDK\Models;
 
 use TendoPay\SDK\Constants;
+use TendoPay\SDK\V2\ConstantsV2;
 
 class VerifyTransactionRequest
 {
@@ -18,6 +19,8 @@ class VerifyTransactionRequest
 
     private $hash;
 
+    private $request;
+
     /**
      * TendoPayCallbackRequest constructor.
      * @param array $request
@@ -33,12 +36,27 @@ class VerifyTransactionRequest
      */
     public function __construct(array $request)
     {
-        $this->disposition = $request[Constants::DISPOSITION_PARAM] ?? Constants::STATUS_FAILURE;
-        $this->transactionNumber = $request[Constants::TRANSACTION_NO_PARAM] ?? '';
-        $this->verificationToken = $request[Constants::VERIFICATION_TOKEN_PARAM] ?? '';
-        $this->merchantOrderId = $request[Constants::ORDER_ID_PARAM] ?? '';
-        $this->userId = $request[Constants::USER_ID_PARAM] ?? '';
-        $this->hash = $request[Constants::HASH_PARAM] ?? '';
+        if ($request['tp_transaction_id'] ?? null) {
+            //[tp_transaction_status] => FAILED
+            //[tp_transaction_id] => 20412
+            //[tp_merchant_order_id] => TEST-ORD-1603907027113
+            //[tp_message] => Your available TendoPay credit is ₱1. You do not have the sufficient credits for this purchase. Please make a purchase below this amount.
+            //[x_signature] => 77daab16115b25454f4d769ea96de2dcfd22ffb362651cc5274e5635c5a4e924
+            $this->request = $request;
+            $this->disposition = $request[ConstantsV2::STATUS_PARAM] ?? Constants::STATUS_FAILURE;
+            $this->transactionNumber = $request[ConstantsV2::TRANSACTION_NO_PARAM] ?? '';
+            $this->verificationToken = $request[ConstantsV2::VERIFICATION_TOKEN_PARAM] ?? '';
+            $this->merchantOrderId = $request[ConstantsV2::ORDER_ID_PARAM] ?? '';
+            $this->userId = $request[ConstantsV2::USER_ID_PARAM] ?? '';
+            $this->hash = $request[ConstantsV2::HASH_PARAM] ?? '';
+        } else {
+            $this->disposition = $request[Constants::DISPOSITION_PARAM] ?? Constants::STATUS_FAILURE;
+            $this->transactionNumber = $request[Constants::TRANSACTION_NO_PARAM] ?? '';
+            $this->verificationToken = $request[Constants::VERIFICATION_TOKEN_PARAM] ?? '';
+            $this->merchantOrderId = $request[Constants::ORDER_ID_PARAM] ?? '';
+            $this->userId = $request[Constants::USER_ID_PARAM] ?? '';
+            $this->hash = $request[Constants::HASH_PARAM] ?? '';
+        }
     }
 
     /**
@@ -89,4 +107,13 @@ public function getUserId()
         return $this->userId;
     }
 
+    /**
+     * return raw request
+     * @return mixed
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+
 }
diff --git a/src/Models/VerifyTransactionResponse.php b/src/Models/VerifyTransactionResponse.php
index dfd7684..c524317 100644
--- a/src/Models/VerifyTransactionResponse.php
+++ b/src/Models/VerifyTransactionResponse.php
@@ -9,22 +9,25 @@ class VerifyTransactionResponse
     /**
      * @var string
      */
-    private $status;
+    protected $status;
 
     /**
      * @var string
      */
-    private $message;
+    protected $message;
 
     /**
      * @var string
      */
-    private $transactionNumber;
+    protected $transactionNumber;
 
     /**
      * @var string
      */
-    private $hash;
+    protected $hash;
+
+
+    protected $isHashValid = null;
 
     /**
      * VerifyTransactionResult constructor.
@@ -40,6 +43,9 @@ class VerifyTransactionResponse
      */
     public function __construct(array $response)
     {
+        if (array_key_exists('is_hash_valid', $response)) {
+            $this->isHashValid = $response['is_hash_valid'] ?? null;
+        }
         $this->status = $response[Constants::STATUS_PARAM] ?? 'failure';
         $this->message = $response[Constants::MESSAGE_PARAM] ?? '';
         $this->transactionNumber = $response[Constants::TRANSACTION_NO_PARAM] ?? '';
@@ -83,6 +89,9 @@ public function getHash(): string
      */
     public function isVerified(): bool
     {
+        if ($this->isHashValid !== null) {
+            return $this->isHashValid;
+        }
         return $this->status === Constants::STATUS_SUCCESS;
     }
 
diff --git a/src/Traits/TendoPayHelper.php b/src/Traits/TendoPayHelper.php
index 5b33ac9..da1872e 100644
--- a/src/Traits/TendoPayHelper.php
+++ b/src/Traits/TendoPayHelper.php
@@ -33,6 +33,19 @@ public static function hash(array $data): string
         return hash_hmac(Constants::get_hash_algorithm(), $message, $secret);
     }
 
+    /**
+     * @param  array  $payload
+     * @return string
+     */
+    public static function hashForV2(array $payload): string
+    {
+        ksort($payload);
+        $message = array_reduce(array_keys($payload), static function ($p, $k) use ($payload) {
+            return strpos($k, 'tp_') === 0 ? $p.$k.trim($payload[$k]) : $p;
+        }, '');
+        return hash_hmac('sha256', $message, self::getClientSecret());
+    }
+
     /**
      * @param array $params
      * @return array
@@ -45,6 +58,18 @@ public static function appendHash(array $params): array
         ]);
     }
 
+    /**
+     * @param  array  $params
+     * @return array
+     */
+    public static function appendV2Hash(array $params): array
+    {
+        $hash = static::hashForV2($params);
+        return array_merge($params, [
+            'x_signature' => $hash
+        ]);
+    }
+
     /**
      * Generate compatible legacy tendopay_description
      * @return string
diff --git a/src/Traits/TpHttpHelper.php b/src/Traits/TpHttpHelper.php
new file mode 100644
index 0000000..e29b4a2
--- /dev/null
+++ b/src/Traits/TpHttpHelper.php
@@ -0,0 +1,146 @@
+<?php
+
+
+namespace TendoPay\SDK\Traits;
+
+
+use TendoPay\SDK\Constants;
+use TendoPay\SDK\Exception\TendoPayConnectionException;
+use TendoPay\SDK\Models\AccessToken;
+
+trait TpHttpHelper
+{
+    /**
+     * @param $method
+     * @param $endPointURL
+     * @param $data
+     * @param $headers
+     * @param  false  $debug
+     * @return mixed
+     */
+    protected function requestCurl($method, $endPointURL, $data, $headers, $debug = false)
+    {
+        $ch = curl_init();
+
+        if (strtoupper($method) == 'GET') {
+            if ($data) {
+                $endPointURL .= '?'.http_build_query($data);
+            }
+        } else {
+            curl_setopt($ch, CURLOPT_POST, 1);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        }
+
+        $curlHeaders = [];
+        foreach ($headers as $k => $v) {
+            $curlHeaders[] = "$k: $v";
+        }
+
+        curl_setopt($ch, CURLOPT_URL, $endPointURL);
+        curl_setopt($ch, CURLOPT_VERBOSE, $debug);
+        curl_setopt($ch, CURLOPT_HEADER, 0);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 4);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $curlHeaders);
+
+        $body = curl_exec($ch);
+        $status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+
+        if ((int) $status >= 400) {
+            $response = json_decode($body, false);
+            $error = $response->error ?? $response->message ?? curl_error($ch);
+            curl_close($ch);
+            throw new \UnexpectedValueException($error, $status);
+        }
+
+        curl_close($ch);
+        return $body;
+    }
+
+    /**
+     * @param $method
+     * @param $requestURI
+     * @param $params
+     * @param  array  $headers
+     * @param  bool  $rawOutput
+     * @return mixed
+     * @throws TendoPayConnectionException
+     */
+    protected function request($method, $requestURI, $params, $headers = [], $rawOutput = false)
+    {
+        try {
+            $data = $method === 'GET' ? $params : json_encode($params);
+            $response = $this->requestCurl(
+                $method,
+                Constants::get_base_api_url().DIRECTORY_SEPARATOR.$requestURI,
+                $data,
+                array_merge([
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json',
+                    'X-Using' => 'TendoPay_PHP_SDK_Client/1.0',
+                ], $headers), $this->debug);
+
+            return $rawOutput ? $response : json_decode($response, false);
+        } catch (\Exception $e) {
+            throw new TendoPayConnectionException($e->getMessage(), $e->getCode());
+        }
+    }
+
+    /**
+     * @param  bool  $usePersonalAccessToken
+     * @return array
+     * @throws TendoPayConnectionException
+     */
+    protected function getAuthorizationHeader($usePersonalAccessToken = false): array
+    {
+        $accessToken = $usePersonalAccessToken ?
+            $this->getPersonalAccessToken() :
+            $this->getAccessToken();
+
+        return [
+            'Authorization' => 'Bearer '.$accessToken,
+        ];
+    }
+
+    /**
+     * @return string
+     * @throws TendoPayConnectionException
+     */
+    protected function getAccessToken(): string
+    {
+        if ($this->accessToken instanceof AccessToken
+            && !$this->accessToken->isExpired()) {
+            return $this->accessToken->getToken();
+        }
+
+        $params = [
+            'grant_type' => 'client_credentials',
+            'client_id' => $this->getClientId(),
+            'client_secret' => $this->getClientSecret(),
+        ];
+        $body = $this->request('POST',
+            Constants::get_bearer_token_endpoint_uri(),
+            $params, [], true);
+
+        $token = json_decode($body, true);
+        $this->accessToken = new AccessToken($token);
+
+        return $this->accessToken->getToken();
+    }
+
+    /**
+     * Return Personal Access Token
+     * @return string
+     */
+    protected function getPersonalAccessToken(): string
+    {
+        $token = $this->config['MERCHANT_PERSONAL_ACCESS_TOKEN'] ?? (string) getenv('MERCHANT_PERSONAL_ACCESS_TOKEN',
+                true);
+        if (!$token) {
+            throw new \InvalidArgumentException('MERCHANT_PERSONAL_ACCESS_TOKEN does not exists');
+        }
+
+        return $token;
+    }
+}
diff --git a/src/V2/ConstantsV2.php b/src/V2/ConstantsV2.php
new file mode 100644
index 0000000..2e6a058
--- /dev/null
+++ b/src/V2/ConstantsV2.php
@@ -0,0 +1,221 @@
+<?php
+
+namespace TendoPay\SDK\V2;
+
+/**
+ * Configuration class.
+ *
+ * @package TendoPay\API
+ */
+class ConstantsV2
+{
+
+    public const PAYMENT_FAILED_QUERY_PARAM = 'tendopay_payment_failed';
+
+    public const REDIRECT_URL_PATTERN = '^tendopay-result/?';
+
+    public const HASH_ALGORITHM = 'sha256';
+
+    public const BASE_API_URL = 'https://app.tendopay.ph';
+    public const SANDBOX_BASE_API_URL = 'https://sandbox.tendopay.ph';
+
+    public const REDIRECT_URI = 'payments/authorise';
+//    public const VERIFICATION_ENDPOINT_URI = 'payments/api/v1/verification';
+//    public const AUTHORIZATION_ENDPOINT_URI = 'payments/api/v1/authTokenRequest';
+//    public const DESCRIPTION_ENDPOINT_URI = 'payments/api/v1/paymentDescription';
+    public const BEARER_TOKEN_ENDPOINT_URI = 'oauth/token';
+//    public const ORDER_STATUS_TRANSITION_ENDPOINT_URI = 'payments/api/v1/orderUpdate';
+    public const CANCEL_PAYMENT_ENDPOINT_URI = 'payments/api/v2/cancelPayment';
+    public const CREATE_PAYMENT_ORDER_ENDPOINT_URI = 'payments/api/v2/order';
+    /**
+     * Gets the transaction detail endpoint uri
+     */
+    public const TRANSACTION_DETAIL_ENDPOINT_URI = 'payments/api/v2/showTransaction';
+
+    public const TENDOPAY_ICON = 'https://s3.ca-central-1.amazonaws.com/candydigital/images/tendopay/tp-icon-32x32.png';
+    public const TENDOPAY_FAQ = 'https://tendopay.ph/page-faq.html';
+
+
+    /**
+     * Below public constant names are used as keys of data send to or received from TP API
+     */
+    public const AMOUNT_PARAM = 'tp_amount';
+    public const AUTH_TOKEN_PARAM = 'tendopay_authorisation_token';
+    public const ORDER_ID_PARAM = 'tp_merchant_order_id';
+    public const ORDER_KEY_PARAM = 'tendopay_customer_reference_2';
+    public const REDIRECT_URL_PARAM = 'tp_redirect_url';
+    public const VENDOR_ID_PARAM = 'tendopay_tendo_pay_vendor_id';
+    public const VENDOR_PARAM = 'tendopay_vendor';
+    public const HASH_PARAM = 'x_signature';
+    public const DISPOSITION_PARAM = 'tendopay_disposition';
+    public const TRANSACTION_NO_PARAM = 'tp_transaction_id';
+    public const VERIFICATION_TOKEN_PARAM = 'x_signature';
+    public const DESC_PARAM = 'tp_description';
+    public const STATUS_PARAM = 'tp_transaction_status';
+    public const USER_ID_PARAM = 'tp_user_id';
+    public const ORDER_UPDATE_PARAM = 'tendopay_order_update';
+
+    public const MESSAGE_PARAM = 'tendopay_message';
+
+    public const STATUS_SUCCESS = 'PAID';
+    public const STATUS_FAILURE = 'FAILED';
+    public const STATUS_CANCELED = 'CANCELED';
+
+    /**
+     * Notification Parameters
+     */
+    public const TRANSACTION_STATUS = 'tp_transaction_status';
+    public const NOTIFIED_AT = 'notified_at';
+    public const MERCHANT_ID = 'tp_merchant_id';
+    public const MERCHANT_ORDER_ID = 'tp_merchant_order_id';
+    public const AMOUNT = 'tp_amount';
+    public const CREATED_AT = 'tp_created_at';
+
+
+    /**
+     * Purchase Transaction successfully completed
+     */
+    public const PURCHASE_TRANSACTION_SUCCESS = 'PTOK';
+
+    /**
+     * Purchase Transaction not successfully completed
+     */
+    public const PURCHASE_TRANSACTION_FAILURE = 'PTNG';
+
+    /**
+     * Purchase Transaction has canceled
+     */
+    public const PURCHASE_TRANSACTION_CANCELED = 'PTCA';
+
+    /**
+     * Cancel previous purchase transaction successfully completed
+     */
+    public const CANCEL_TRANSACTION_SUCCESS = 'CTOK';
+
+    /**
+     * Below public constants are the keys of description object that is being sent during request to Description Endpoint
+     */
+    public const ITEMS_DESC_PROPNAME = 'items';
+    public const META_DESC_PROPNAME = 'meta';
+    public const ORDER_DESC_PROPNAME = 'order';
+
+    /**
+     * Gets the hash algorithm.
+     *
+     * @return string hash algorithm
+     */
+    public static function get_hash_algorithm(): string
+    {
+        return self::HASH_ALGORITHM;
+    }
+
+    /**
+     * Gets the base api URL. It checks whether to use SANDBOX URL or Production URL.
+     *
+     * @return string the base api url
+     */
+    public static function get_base_api_url(): string
+    {
+        if (self::is_sandbox_enabled()) {
+            $sandBoxURL = getenv('SANDBOX_HOST_URL', true);
+            return $sandBoxURL ?: self::SANDBOX_BASE_API_URL;
+        }
+        return self::BASE_API_URL;
+    }
+
+    /**
+     * Gets the redirect uri. It checks whether to use SANDBOX URI or Production URI.
+     *
+     * @return string redirect uri
+     */
+    public static function get_redirect_uri(): string
+    {
+        return self::get_base_api_url() . DIRECTORY_SEPARATOR . self::REDIRECT_URI;
+    }
+
+    /**
+     * Gets the view uri pattern. It checks whether to use SANDBOX pattern or Production pattern.
+     *
+     * @return string view uri pattern
+     */
+    public static function get_view_uri_pattern(): string
+    {
+        return self::VIEW_URI_PATTERN;
+    }
+
+    /**
+     * Gets the verification endpoint uri. It checks whether to use SANDBOX URI or Production URI.
+     *
+     * @return string verification endpoint uri
+     */
+    public static function get_verification_endpoint_uri(): string
+    {
+        return self::VERIFICATION_ENDPOINT_URI;
+    }
+
+    /**
+     * Gets the authorization endpoint uri. It checks whether to use SANDBOX URI or Production URI.
+     *
+     * @return string authorization endpoint uri
+     */
+    public static function get_authorization_endpoint_uri(): string
+    {
+        return self::AUTHORIZATION_ENDPOINT_URI;
+    }
+
+    /**
+     * Gets the description endpoint uri. It checks whether to use SANDBOX URI or Production URI.
+     *
+     * @return string description endpoint uri
+     */
+    public static function get_description_endpoint_uri(): string
+    {
+        return self::DESCRIPTION_ENDPOINT_URI;
+    }
+
+    /**
+     * Gets the bearer token endpoint uri. It checks whether to use SANDBOX URI or Production URI.
+     *
+     * @return string bearer token endpoint uri
+     */
+    public static function get_bearer_token_endpoint_uri(): string
+    {
+        return self::BEARER_TOKEN_ENDPOINT_URI;
+    }
+
+    /**
+     *
+     * @return bool true if sandbox is enabled
+     */
+    private static function is_sandbox_enabled(): bool
+    {
+        return (bool)getenv('TENDOPAY_SANDBOX_ENABLED', true);
+    }
+
+    /**
+     * Gets the transaction detail endpoint uri
+     * @param string $transactionNumber
+     * @return string
+     */
+    public static function getTransactionDetailEndpointURI($transactionNumber): string
+    {
+        return str_replace(
+            '{transactionNumber}',
+            $transactionNumber,
+            self::TRANSACTION_DETAIL_ENDPOINT_URI
+        );
+    }
+
+    /**
+     * Get cancel payment uri
+     */
+    public static function get_cancel_payment_endpoint_uri(): string
+    {
+        return self::CANCEL_PAYMENT_ENDPOINT_URI;
+    }
+
+    public static function get_create_payment_order_endpoint_uri(): string
+    {
+        return self::CREATE_PAYMENT_ORDER_ENDPOINT_URI;
+    }
+}
diff --git a/src/V2/TendoPayClient.php b/src/V2/TendoPayClient.php
new file mode 100644
index 0000000..17d0af4
--- /dev/null
+++ b/src/V2/TendoPayClient.php
@@ -0,0 +1,465 @@
+<?php
+
+namespace TendoPay\SDK\V2;
+
+use Exception;
+use InvalidArgumentException;
+use TendoPay\SDK\Constants;
+use TendoPay\SDK\Exception\TendoPayConnectionException;
+use TendoPay\SDK\Exception\VerifyTransactionException;
+use TendoPay\SDK\Models\AccessToken;
+use TendoPay\SDK\Models\Payment;
+use TendoPay\SDK\Models\Transaction;
+use TendoPay\SDK\Models\VerifyTransactionRequest;
+use TendoPay\SDK\Models\VerifyTransactionResponse;
+use TendoPay\SDK\Traits\TendoPayHelper;
+
+/**
+ *  A sample class
+ *
+ *  Use this section to define what this class is doing, the PHPDocumentator will use this
+ *  to automatically generate an API documentation using this information.
+ *
+ * @author yourname
+ */
+class TendoPayClient
+{
+
+    use TendoPayHelper;
+
+    public const STATUS_SUCCESS = ConstantsV2::STATUS_SUCCESS;
+    public const STATUS_FAILURE = ConstantsV2::STATUS_FAILURE;
+
+    /**
+     * Configuration
+     * @var array
+     */
+    protected $config;
+
+    /**
+     * @var Payment
+     */
+    protected $payment;
+
+    /**
+     * @var AccessToken
+     */
+    protected $accessToken;
+
+    /**
+     * Redirect URL when the transaction succeeds
+     * @var string
+     */
+    protected $redirectURL;
+
+//    /**
+//     * Redirect URL when the transaction fails
+//     * @var string
+//     */
+//    protected $errorRedirectURL;
+
+    /**
+     * @var bool
+     */
+    protected $debug = false;
+
+    /**
+     * TendoPayClient constructor.
+     * @param  array  $config
+     */
+    public function __construct($config = [])
+    {
+        $this->config = $config;
+        $this->debug = $config['TENDOPAY_DEBUG'] ?? getenv('TENDOPAY_DEBUG') ?? false;
+        $this->initCredentials();
+        $this->setSandBoxMode($config['TENDOPAY_SANDBOX_ENABLED'] ?? getenv('TENDOPAY_SANDBOX_ENABLED', true) ?? false);
+        $this->initRedirectURL();
+    }
+
+    /**
+     * Set Sandbox configuration
+     * @param $bool
+     */
+    protected function setSandBoxMode($bool): void
+    {
+        putenv('TENDOPAY_SANDBOX_ENABLED='.$bool);
+    }
+
+    /**
+     * Set credentials
+     */
+    protected function initCredentials(): void
+    {
+//        if (isset($this->config['MERCHANT_ID'])) {
+//            putenv("MERCHANT_ID=".$this->config['MERCHANT_ID']);
+//        }
+//        if (isset($this->config['MERCHANT_SECRET'])) {
+//            putenv("MERCHANT_SECRET=".$this->config['MERCHANT_SECRET']);
+//        }
+        if (isset($this->config['CLIENT_ID'])) {
+            putenv("CLIENT_ID=".$this->config['CLIENT_ID']);
+        }
+        if (isset($this->config['CLIENT_SECRET'])) {
+            putenv("CLIENT_SECRET=".$this->config['CLIENT_SECRET']);
+        }
+    }
+
+    /**
+     * Set Redirect urls
+     */
+    protected function initRedirectURL(): void
+    {
+        $this->redirectURL = $this->config['REDIRECT_URL'] ?? (string) getenv('REDIRECT_URL', true);
+//        $this->errorRedirectURL = $this->config['ERROR_REDIRECT_URL'] ?? (string) getenv('ERROR_REDIRECT_URL', true);
+    }
+
+    /**
+     * @param $method
+     * @param $endPointURL
+     * @param $data
+     * @param $headers
+     * @param  false  $debug
+     * @return mixed
+     */
+    protected function requestCurl($method, $endPointURL, $data, $headers, $debug = false)
+    {
+        $ch = curl_init();
+
+        if (strtoupper($method) == 'GET') {
+            if ($data) {
+                $endPointURL .= '?'.http_build_query($data);
+            }
+        } else {
+            curl_setopt($ch, CURLOPT_POST, 1);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        }
+
+        $curlHeaders = [];
+        foreach ($headers as $k => $v) {
+            $curlHeaders[] = "$k: $v";
+        }
+
+        curl_setopt($ch, CURLOPT_URL, $endPointURL);
+        curl_setopt($ch, CURLOPT_VERBOSE, $debug);
+        curl_setopt($ch, CURLOPT_HEADER, 0);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 4);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $curlHeaders);
+
+        $body = curl_exec($ch);
+        $status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+
+        if ((int) $status >= 400) {
+            $response = json_decode($body, false);
+            $error = $response->error ?? $response->message ?? curl_error($ch);
+            curl_close($ch);
+            throw new \UnexpectedValueException($error, $status);
+        }
+
+        curl_close($ch);
+
+        return $body;
+    }
+
+    /**
+     * @param $method
+     * @param $requestURI
+     * @param $params
+     * @param  array  $headers
+     * @param  bool  $rawOutput
+     * @return mixed
+     * @throws TendoPayConnectionException
+     */
+    protected function request($method, $requestURI, $params, $headers = [], $rawOutput = false)
+    {
+        try {
+            $data = $method === 'GET' ? $params : json_encode($params);
+            $response = $this->requestCurl(
+                $method,
+                ConstantsV2::get_base_api_url().DIRECTORY_SEPARATOR.$requestURI,
+                $data,
+                array_merge([
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json',
+                    'X-Using' => 'TendoPay_PHP_SDK_Client/1.0',
+                ], $headers), $this->debug);
+
+            return $rawOutput ? $response : json_decode($response, false);
+        } catch (\Exception $e) {
+            throw new TendoPayConnectionException($e->getMessage(), $e->getCode());
+        }
+    }
+
+    /**
+     * @param  bool  $usePersonalAccessToken
+     * @return array
+     * @throws TendoPayConnectionException
+     */
+    protected function getAuthorizationHeader($usePersonalAccessToken = false): array
+    {
+        $accessToken = $usePersonalAccessToken ?
+            $this->getPersonalAccessToken() :
+            $this->getAccessToken();
+
+        return [
+            'Authorization' => 'Bearer '.$accessToken,
+        ];
+    }
+
+    /**
+     * @return string
+     * @throws TendoPayConnectionException
+     */
+    protected function getAccessToken(): string
+    {
+        if ($this->accessToken instanceof AccessToken
+            && !$this->accessToken->isExpired()) {
+            return $this->accessToken->getToken();
+        }
+
+        $params = [
+            'grant_type' => 'client_credentials',
+            'client_id' => $this->getClientId(),
+            'client_secret' => $this->getClientSecret(),
+        ];
+        $body = $this->request('POST',
+            ConstantsV2::get_bearer_token_endpoint_uri(),
+            $params, [], true);
+
+        $token = json_decode($body, true);
+        $this->accessToken = new AccessToken($token);
+
+        return $this->accessToken->getToken();
+    }
+
+    /**
+     * Return Personal Access Token
+     * @return string
+     */
+    protected function getPersonalAccessToken(): string
+    {
+        $token = $this->config['MERCHANT_PERSONAL_ACCESS_TOKEN'] ?? (string) getenv('MERCHANT_PERSONAL_ACCESS_TOKEN',
+                true);
+        if (!$token) {
+            throw new InvalidArgumentException('MERCHANT_PERSONAL_ACCESS_TOKEN does not exists');
+        }
+
+        return $token;
+    }
+
+    /**
+     * @param $params
+     * @return mixed|string
+     * @throws TendoPayConnectionException
+     * @deprecated in v2
+     */
+    protected function getRequestToken($params)
+    {
+        return $this->request('POST',
+            ConstantsV2::get_authorization_endpoint_uri(),
+            static::appendV2Hash($params),
+            $this->getAuthorizationHeader());
+    }
+
+    /**
+     * @param $params
+     * @return array|string
+     * @throws TendoPayConnectionException
+     */
+    protected function requestPaymentDescription($params)
+    {
+        return $this->request('POST',
+            ConstantsV2::get_description_endpoint_uri(),
+            static::appendV2Hash($params),
+            $this->getAuthorizationHeader(),
+            true);
+    }
+
+    /** Public Methods **/
+
+    /**
+     * Simple ping to check the server is alive or not
+     *
+     * @return bool
+     */
+    public function ping(): bool
+    {
+        //@TODO check server is alive or throw an Exception
+        return true;
+//        throw new TendoPayConnectionException('There is some problem to communicate with the server');
+    }
+
+    /**
+     * @param  string  $url
+     * @return TendoPayClient
+     */
+    public function setRedirectURL(string $url): self
+    {
+        $this->redirectURL = $url;
+
+        return $this;
+    }
+
+//    /**
+//     * @param  string  $url
+//     * @return TendoPayClient
+//     */
+//    public function setErrorRedirectURL(string $url): self
+//    {
+//        $this->errorRedirectURL = $url;
+//
+//        return $this;
+//    }
+
+    /**
+     * Enable Sandbox mode
+     *
+     * @param  bool  $bool
+     * @return TendoPayClient
+     */
+    public function enableSandBox(bool $bool = true): self
+    {
+        $this->setSandBoxMode($bool);
+
+        return $this;
+    }
+
+    /**
+     * @param  Payment  $payment
+     * @return TendoPayClient
+     */
+    public function setPayment(Payment $payment): self
+    {
+        $this->payment = $payment;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @throws TendoPayConnectionException
+     */
+    public function getAuthorizeLink(): string
+    {
+        $params = [
+            'tp_currency' => $this->payment->getCurrency(),
+            ConstantsV2::AMOUNT_PARAM => $this->payment->getRequestAmount(),
+            ConstantsV2::ORDER_ID_PARAM => $this->payment->getMerchantOrderId(),
+            ConstantsV2::DESC_PARAM => $this->payment->getDescription(),
+            ConstantsV2::REDIRECT_URL_PARAM => $this->payment->getRedirectUrl(),
+        ];
+
+        $order = $this->createPaymentOrder($params);
+
+        return $order->authorize_url ?? '';
+    }
+
+    /**
+     * Just validity check with x_signature
+     * @return VerifyTransactionResponse
+     */
+    public function verifyTransaction(): VerifyTransactionResponse
+    {
+        if (func_num_args() === 2) {
+            $request = func_get_arg(1);
+        } else {
+            $request = func_get_arg(0);
+        }
+
+        if (!($request instanceof VerifyTransactionRequest)) {
+            throw new InvalidArgumentException('$request should be VerifyTransactionRequest');
+        }
+
+        $expected = static::hashForV2($request->getRequest());
+
+        $isHashValid = hash_equals($expected, $request->getHash());
+
+        $status = $request->getDisposition();
+        $message = $request->getRequest()['tp_message'] ?? '';
+
+        if (!$isHashValid) {
+            $status = ConstantsV2::STATUS_FAILURE;
+            $message = 'Invalid signature';
+        }
+
+        $data = [
+            'is_hash_valid' => $isHashValid,
+            Constants::STATUS_PARAM => $status,
+            Constants::MESSAGE_PARAM => $message,
+            Constants::TRANSACTION_NO_PARAM => $request->getTransactionNumber(),
+            Constants::HASH_PARAM => $request->getHash(),
+        ];
+
+        return new VerifyTransactionResponse($data);
+    }
+
+    /**
+     * Check required fields of the callback request
+     * if the given request is a callback request or not
+     *
+     * @param $request
+     * @return bool
+     */
+    public static function isCallbackRequest($request): bool
+    {
+        return isset(
+            $request[ConstantsV2::STATUS_PARAM],
+            $request[ConstantsV2::TRANSACTION_NO_PARAM]
+        );
+    }
+
+    /**
+     * Retrieve Transaction Details with the transactionNumber
+     * @param $transactionNumber
+     * @return Transaction
+     * @throws Exception
+     */
+    public function getTransactionDetail($transactionNumber): Transaction
+    {
+        $params = [
+            ConstantsV2::TRANSACTION_NO_PARAM => $transactionNumber,
+        ];
+        $response = $this->request('POST',
+            ConstantsV2::getTransactionDetailEndpointURI($transactionNumber),
+            static::appendV2Hash($params),
+            $this->getAuthorizationHeader(), true);
+
+        $transaction = json_decode($response, true);
+
+        return new Transaction($transaction);
+    }
+
+    /**
+     * Cancel transaction
+     * @param $transactionNumber
+     * @return mixed|string
+     * @throws TendoPayConnectionException
+     */
+    public function cancelPayment($transactionNumber)
+    {
+        $params = [
+            ConstantsV2::TRANSACTION_NO_PARAM => $transactionNumber,
+        ];
+
+        return $this->request('POST',
+            ConstantsV2::get_cancel_payment_endpoint_uri(),
+            static::appendV2Hash($params),
+            $this->getAuthorizationHeader());
+    }
+
+    /**
+     * @param $params
+     * @return mixed
+     * @throws TendoPayConnectionException
+     */
+    public function createPaymentOrder($params)
+    {
+        return $this->request('POST',
+            ConstantsV2::get_create_payment_order_endpoint_uri(),
+            static::appendV2Hash($params),
+            $this->getAuthorizationHeader());
+    }
+}
+
+