Merge pull request #11 from segsalerty2013/dev

Upgrade implementation

.gitignore

@@ -1,3 +1,4 @@
 /vendor/
 composer.lock
-/.idea
+/.idea
+.phpunit.result.cache

composer.json

@@ -27,7 +27,8 @@
         "php": ">=7.1",
         "guzzlehttp/guzzle": "~6.0",
         "ext-openssl": "*",
-        "ext-json": "*"
+        "ext-json": "*",
+        "symfony/var-dumper": "^5.1"
     },
     "require-dev":{
         "phpunit/phpunit": "^8.4"

http_example/callback.php → http_example/accept_payment/callback.php

@@ -1,6 +1,5 @@
 <?php
-require_once('./vendor/autoload.php');
-require_once('init.php');
+require_once('../init.php');
 
 use Opay\Payload\OrderStatusRequest;
 

http_example/order.php → http_example/accept_payment/order.php

@@ -1,25 +1,27 @@
 <?php
-require_once('./vendor/autoload.php');
-require_once('init.php');
+require_once('../init.php');
 
 use Opay\Payload\OrderRequest;
 use Opay\Utility\OpayConstants;
 
-$reference = "test_20196659118854400";
-
-$_orderRequest = new OrderRequest([OpayConstants::PAYMENT_CHANNEL_BALANCE_PAYMENT, OpayConstants::PAYMENT_CHANNEL_BONUS_PAYMENT], $reference,
-    "WOW. The best wireless earphone in history. Cannot agree more! Right!", [OpayConstants::PAYMENT_METHODS_ACCOUNT, OpayConstants::PAYMENT_METHODS_QRCODE], OpayConstants::CURRENCY_NAIRA,
-    "100", "+2349876543210", getUserIP(), "http://a7384c7d.ngrok.io/callback.php",
-    "http://a7384c7d.ngrok.io/order_status.php", "Jerry's shop", "Apple AirPods Pro");
+$_orderRequest = new OrderRequest(
+    [OpayConstants::PAYMENT_METHODS_ACCOUNT, OpayConstants::PAYMENT_METHODS_QRCODE, OpayConstants::PAYMENT_METHODS_BANK_CARD, OpayConstants::PAYMENT_METHODS_BANK_ACCOUNT], $reference,
+    "WOW. The best wireless earphone in history. Cannot agree more! Right!",
+    [OpayConstants::PAYMENT_CHANNEL_BALANCE_PAYMENT, OpayConstants::PAYMENT_CHANNEL_BONUS_PAYMENT, OpayConstants::PAYMENT_CHANNEL_O_WEALTH_PAYMENT],
+    OpayConstants::CURRENCY_NAIRA,
+    "100", "+2348036952110", getUserIP(), $hostBaseUrl."/accept_payment/callback.php",
+    $hostBaseUrl."/accept_payment/order_status.php", "Jerry's shop", "Apple AirPods Pro");
 
 $merchantCashier->order($_orderRequest);
 
 $response = $merchantCashier->getOrderApiResult();
 
-echo "status : ". $response->getCode(). "<br/>";
-
+dump("status : ". $response->getCode());
 if($response->getCode() === "00000") {
-    var_dump($response->getData());
+    $_SESSION['orderNumberInSession'] = $response->getData()->getOrderNo();
+    dump($response->getData());
+} else {
+    dump($response);
 }
 
 function getUserIP() {
@@ -42,5 +44,5 @@ function getUserIP() {
      $ipaddress = 'UNKNOWN';
     return $ipaddress;
 }
-?>
+
 

http_example/accept_payment/order_cancel.php

@@ -0,0 +1,21 @@
+<?php
+require_once('../init.php');
+
+use Opay\Payload\OrderCloseRequest;
+
+$_orderCloseRequest = new OrderCloseRequest($orderNumberInSession, $reference);
+$merchantCashier->orderClose($_orderCloseRequest);
+
+$response = $merchantCashier->getOrderCloseApiResult();
+
+dump("status : ". $response->getCode());
+if ($response->getCode() === "00000") {
+    dump($response->getData());
+} else {
+    dump($response);
+}
+
+
+
+
+

http_example/accept_payment/order_status.php

@@ -0,0 +1,17 @@
+<?php
+require_once('../init.php');
+
+use Opay\Payload\OrderStatusRequest;
+
+$_orderStatusRequest = new OrderStatusRequest($orderNumberInSession, $reference);
+
+$merchantCashier->orderStatus($_orderStatusRequest);
+
+$response = $merchantCashier->getOrderStatusApiResult();
+
+dump("status : ". $response->getCode());
+if($response->getCode() === "00000") {
+    dump($response->getData());
+} else {
+    dump($response);
+}

http_example/init.php

@@ -1,11 +1,18 @@
 <?php
-
-require_once('./vendor/autoload.php');
+session_start();
+require_once __DIR__  .'/../vendor/autoload.php';
 
 use Opay\MerchantCashier;
+use Opay\MerchantTransfer;
+
+$reference = "test_2019122709408400"; // update/change this when creating a new order
+$hostBaseUrl = "https://1da67619a3b4.ngrok.io";
+$orderNumberInSession = isset($_SESSION['orderNumberInSession'])?$_SESSION['orderNumberInSession']:null;
+
+$endpointBaseUrl = 'http://sandbox-cashierapi.opayweb.com';
+$pubKey = 'OPAYPUBxxxxxxxxxxxxx.xxxxxxxxxxxxx';
+$prvKey = 'OPAYPRVxxxxxxxxxxxxx.xxxxxxxxxxxxx';
+$merchantId = '256620xxxxxxxxxxxxx';
 
-$merchantCashier = new MerchantCashier(
-    "http://api.test.opaydev.com:8081",
-    "qazwert12345!@#$",
-    "fKJ8jwsj1nHNkKon",
-    "256619112122000");
+$merchantCashier = new MerchantCashier($endpointBaseUrl, $pubKey, $prvKey, $merchantId);
+$merchantTransfer = new MerchantTransfer($endpointBaseUrl, $pubKey, $prvKey, $merchantId);

http_example/transfer/bank/get_banks.php

@@ -0,0 +1,17 @@
+<?php
+
+use Opay\Payload\BanksRequest;
+
+require_once('../../init.php');
+
+$getBanksRequest = new BanksRequest("NG");
+$merchantTransfer->getBanks($getBanksRequest);
+$response = $merchantTransfer->getBanksApiResult();
+
+dump("status : ". $response->getCode());
+
+if($response->getCode() === "00000") {
+    dump($response->getData());
+} else {
+    dump($response);
+}

http_example/transfer/bank/get_countries.php

@@ -0,0 +1,13 @@
+<?php
+require_once('../../init.php');
+
+$merchantTransfer->getCountries();
+$response = $merchantTransfer->getCountriesApiResult();
+
+dump("status : ". $response->getCode());
+
+if($response->getCode() === "00000") {
+    dump($response->getData());
+} else {
+    dump($response);
+}

http_example/transfer/bank/initiate.php

@@ -0,0 +1,18 @@
+<?php
+use Opay\Payload\BankTransferRequest;
+
+require_once('../../init.php');
+
+$bankTransferRequest = new BankTransferRequest($reference, '100', 'NGN', 'NG',
+    'Andy Lee', '050', '22222222222222', 'transfer reason message');
+$merchantTransfer->bankTransfer($bankTransferRequest);
+$response = $merchantTransfer->bankTransferApiResult();
+
+dump("status : ". $response->getCode());
+
+if($response->getCode() === "00000") {
+    $_SESSION['orderNumberInSession'] = $response->getData()->getOrderNo();
+    dump($response->getData());
+} else {
+    dump($response);
+}

http_example/transfer/bank/order_status.php

@@ -0,0 +1,18 @@
+<?php
+require_once('../../init.php');
+
+use Opay\Payload\OrderStatusRequest;
+
+$_orderStatusRequest = new OrderStatusRequest("201120020221116097", $reference);
+
+$merchantTransfer->transferStatus($_orderStatusRequest);
+$response = $merchantTransfer->bankTransferStatusApiResult();
+
+dump("status : ". $response->getCode());
+
+if($response->getCode() === "00000") {
+    $_SESSION['orderNumberInSession'] = $response->getData()->getOrderNo();
+    dump($response->getData());
+} else {
+    dump($response);
+}

http_example/transfer/bank/validate_account.php

@@ -0,0 +1,16 @@
+<?php
+use Opay\Payload\ValidateBankAccountRequest;
+
+require_once('../../init.php');
+
+$validateBankAccountRequest = new ValidateBankAccountRequest('NG', '108', '45345343434');
+$merchantTransfer->validateAccount($validateBankAccountRequest);
+$response = $merchantTransfer->validateBankAccountApiResult();
+
+dump("status : ". $response->getCode());
+
+if($response->getCode() === "00000") {
+    dump($response->getData());
+} else {
+    dump($response);
+}

http_example/transfer/wallet/initiate.php

@@ -0,0 +1,26 @@
+<?php
+use Opay\Payload\OpayTransferRequest;
+use Opay\Utility\OpayConstants;
+
+require_once('../../init.php');
+
+$opayTransferRequest = new OpayTransferRequest($reference, 100, 'NGN', 'NG',
+    'Andy Lee', OpayConstants::TRANSFER_RECEIVER_TYPE_USER,
+    'transfer reason message', '+2348036952110');
+
+// to send to a merchant: *uncomment below and comment above
+//$opayTransferRequest = new OpayTransferRequest($reference, 100, 'NGN', 'NG',
+//    'Andy Lee', OpayConstants::TRANSFER_RECEIVER_TYPE_MERCHANT,
+//    'transfer reason message', '256620111818011');
+
+$merchantTransfer->opayTransfer($opayTransferRequest);
+$response = $merchantTransfer->opayTransferApiResult();
+
+dump("status : ". $response->getCode());
+
+if($response->getCode() === "00000") {
+    $_SESSION['orderNumberInSession'] = $response->getData()->getOrderNo();
+    dump($response->getData());
+} else {
+    dump($response);
+}

http_example/transfer/wallet/order_status.php

@@ -0,0 +1,18 @@
+<?php
+require_once('../../init.php');
+
+use Opay\Payload\OrderStatusRequest;
+
+$_orderStatusRequest = new OrderStatusRequest($orderNumberInSession, $reference);
+
+$merchantTransfer->transferStatus($_orderStatusRequest);
+$response = $merchantTransfer->opayTransferStatusApiResult();
+
+dump("status : ". $response->getCode());
+
+if($response->getCode() === "00000") {
+    $_SESSION['orderNumberInSession'] = $response->getData()->getOrderNo();
+    dump($response->getData());
+} else {
+    dump($response);
+}

http_example/transfer/wallet/validate_merchant.php

@@ -0,0 +1,16 @@
+<?php
+use Opay\Payload\ValidateOpayMerchantRequest;
+
+require_once('../../init.php');
+
+$validateOpayMerchantRequest = new ValidateOpayMerchantRequest('segsalerty@gmail.com');
+$merchantTransfer->validateOpayMerchant($validateOpayMerchantRequest);
+$response = $merchantTransfer->validateOpayMerchantApiResult();
+
+dump("status : ". $response->getCode());
+
+if($response->getCode() === "00000") {
+    dump($response->getData());
+} else {
+    dump($response);
+}

http_example/transfer/wallet/validate_user.php

@@ -0,0 +1,16 @@
+<?php
+use Opay\Payload\ValidateOpayUserRequest;
+
+require_once('../../init.php');
+
+$validateOpayUserRequest = new ValidateOpayUserRequest('+2348036952110');
+$merchantTransfer->validateOpayUser($validateOpayUserRequest);
+$response = $merchantTransfer->validateOpayUserApiResult();
+
+dump("status : ". $response->getCode());
+
+if($response->getCode() === "00000") {
+    dump($response->getData());
+} else {
+    dump($response);
+}