Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add rms wallet #366

Merged
merged 21 commits into from
Aug 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions Controller/Callback/Offsite.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
use Omise\Payment\Model\Config\Rabbitlinepay;
use Omise\Payment\Model\Config\Ocbcpao;
use Omise\Payment\Model\Config\Grabpay;
use Omise\Payment\Model\Config\Boost;
use Omise\Payment\Model\Config\DuitnowOBW;
use Omise\Payment\Model\Config\DuitnowQR;
use Omise\Payment\Model\Config\MaybankQR;
use Omise\Payment\Model\Config\Shopeepay;
use Omise\Payment\Model\Config\Touchngo;
use Magento\Framework\Exception\LocalizedException;
use Omise\Payment\Helper\OmiseHelper;
use Omise\Payment\Helper\OmiseEmailHelper;
Expand Down Expand Up @@ -211,8 +217,8 @@ public function execute()
case Alipayplus::KAKAOPAY_CODE:
$dispPaymentMethod = "Kakao Pay (Alipay+ Partner)";
break;
case Alipayplus::TOUCHNGO_CODE:
$dispPaymentMethod = "TNG eWallet (Alipay+ Partner)";
case Touchngo::CODE:
$dispPaymentMethod = "Touch`n Go eWallet";
break;
case Mobilebanking::CODE:
$dispPaymentMethod = "Mobile Banking";
Expand All @@ -226,6 +232,21 @@ public function execute()
case Grabpay::CODE:
$dispPaymentMethod = "GrabPay";
break;
case Boost::CODE:
$dispPaymentMethod = "Boost";
break;
case DuitnowOBW::CODE:
$dispPaymentMethod = "DuitNow Online Banking/Wallets";
break;
case DuitnowQR::CODE:
$dispPaymentMethod = "DuitNow QR";
break;
case MaybankQR::CODE:
$dispPaymentMethod = "Maybank QR";
break;
case Shopeepay::CODE:
$dispPaymentMethod = "ShopeePay";
break;
}

// Add transaction.
Expand Down
5 changes: 5 additions & 0 deletions Cron/OrderSyncStatus.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ class OrderSyncStatus
"omise_offsite_rabbitlinepay",
"omise_offsite_ocbcpao",
"omise_offsite_grabpay",
"omise_offsite_boost",
"omise_offsite_duitnowobw",
"omise_offsite_duitnowqr",
"omise_offsite_maybankqr",
"omise_offsite_shopeepay",
];

/**
Expand Down
37 changes: 36 additions & 1 deletion Gateway/Request/APMBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,16 @@
use Omise\Payment\Model\Config\Rabbitlinepay;
use Omise\Payment\Model\Config\Ocbcpao;
use Omise\Payment\Model\Config\Grabpay;
use Omise\Payment\Model\Config\Boost;
use Omise\Payment\Model\Config\DuitnowOBW;
use Omise\Payment\Model\Config\DuitnowQR;
use Omise\Payment\Model\Config\MaybankQR;
use Omise\Payment\Model\Config\Shopeepay;
use Omise\Payment\Model\Config\Touchngo;

use Omise\Payment\Observer\ConveniencestoreDataAssignObserver;
use Omise\Payment\Observer\FpxDataAssignObserver;
use Omise\Payment\Observer\DuitnowOBWDataAssignObserver;
use Omise\Payment\Observer\InstallmentDataAssignObserver;
use Omise\Payment\Observer\MobilebankingDataAssignObserver;
use Omise\Payment\Observer\InternetbankingDataAssignObserver;
Expand Down Expand Up @@ -211,7 +218,7 @@ public function build(array $buildSubject)
self::PLATFORM_TYPE => $this->helper->getPlatformType(),
];
break;
case Alipayplus::TOUCHNGO_CODE:
case Touchngo::CODE:
$paymentInfo[self::SOURCE] = [
self::SOURCE_TYPE => 'touch_n_go',
self::PLATFORM_TYPE => $this->helper->getPlatformType(),
Expand Down Expand Up @@ -240,6 +247,34 @@ public function build(array $buildSubject)
self::PLATFORM_TYPE => $this->helper->getPlatformType(),
];
break;
case Boost::CODE:
$paymentInfo[self::SOURCE] = [
self::SOURCE_TYPE => 'boost',
];
break;
case DuitnowOBW::CODE:
$paymentInfo[self::SOURCE] = [
self::SOURCE_TYPE => 'duitnow_obw',
self::BANK => $method->getAdditionalInformation(
DuitnowOBWDataAssignObserver::BANK
)
];
break;
case DuitnowQR::CODE:
$paymentInfo[self::SOURCE] = [
self::SOURCE_TYPE => 'duitnow_qr',
];
break;
case MaybankQR::CODE:
$paymentInfo[self::SOURCE] = [
self::SOURCE_TYPE => 'maybank_qr',
];
break;
case Shopeepay::CODE:
$paymentInfo[self::SOURCE] = [
self::SOURCE_TYPE => 'shopeepay',
];
break;
}

return $paymentInfo;
Expand Down
30 changes: 26 additions & 4 deletions Helper/OmiseHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Omise\Payment\Model\Config\Pointsciti;
use Omise\Payment\Model\Config\Installment;
use Omise\Payment\Model\Config\Truemoney;
use Omise\Payment\Model\Config\Touchngo;
use Omise\Payment\Model\Config\Fpx;
use Omise\Payment\Model\Config\Paynow;
use Omise\Payment\Model\Config\Promptpay;
Expand All @@ -20,6 +21,11 @@
use Omise\Payment\Model\Config\Rabbitlinepay;
use Omise\Payment\Model\Config\Ocbcpao;
use Omise\Payment\Model\Config\Grabpay;
use Omise\Payment\Model\Config\Boost;
use Omise\Payment\Model\Config\DuitnowOBW;
use Omise\Payment\Model\Config\DuitnowQR;
use Omise\Payment\Model\Config\MaybankQR;
use Omise\Payment\Model\Config\Shopeepay;
use Omise\Payment\Model\Config\Cc;
use Omise\Payment\Model\Config\CcGooglePay;
use Omise\Payment\Model\Config\Conveniencestore;
Expand Down Expand Up @@ -50,11 +56,16 @@ class OmiseHelper extends AbstractHelper
Alipayplus::DANA_CODE,
Alipayplus::GCASH_CODE,
Alipayplus::KAKAOPAY_CODE,
Alipayplus::TOUCHNGO_CODE,
Touchngo::CODE,
Mobilebanking::CODE,
Rabbitlinepay::CODE,
Ocbcpao::CODE,
Grabpay::CODE
Grabpay::CODE,
Boost::CODE,
DuitnowOBW::CODE,
DuitnowQR::CODE,
MaybankQR::CODE,
Shopeepay::CODE
];

/**
Expand Down Expand Up @@ -110,10 +121,15 @@ class OmiseHelper extends AbstractHelper
Alipayplus::DANA_ID => Alipayplus::DANA_CODE,
Alipayplus::GCASH_ID => Alipayplus::GCASH_CODE,
Alipayplus::KAKAOPAY_ID => Alipayplus::KAKAOPAY_CODE,
Alipayplus::TOUCHNGO_ID => Alipayplus::TOUCHNGO_CODE,
Touchngo::ID => Touchngo::CODE,
Rabbitlinepay::ID => Rabbitlinepay::CODE,
Ocbcpao::ID => Ocbcpao::CODE,
Grabpay::ID => Grabpay::CODE,
Boost::ID => Boost::CODE,
DuitnowOBW::ID => DuitnowOBW::CODE,
DuitnowQR::ID => DuitnowQR::CODE,
MaybankQR::ID => MaybankQR::CODE,
Shopeepay::ID => Shopeepay::CODE,

// offsite internet banking payment
Internetbanking::BBL_ID => Internetbanking::CODE,
Expand Down Expand Up @@ -167,11 +183,17 @@ class OmiseHelper extends AbstractHelper
Alipayplus::DANA_CODE => "DANA (Alipay+ Partner) Payment",
Alipayplus::GCASH_CODE => "GCash (Alipay+ Partner) Payment",
Alipayplus::KAKAOPAY_CODE => "Kakao Pay (Alipay+ Partner) Payment",
Alipayplus::TOUCHNGO_CODE => "TNG eWallet (Alipay+ Partner) Payment",
Touchngo::CODE => "Touch`n Go eWallet Payment",
Mobilebanking::CODE => "Mobile Banking Payment",
Rabbitlinepay::CODE => "Rabbit LINE Pay Payment",
Ocbcpao::CODE => "OCBC Pay Anyone Payment",
Grabpay::CODE => "GrabPay Payment",
Boost::CODE => "Boost Payment",
DuitnowOBW::CODE => "DuitNow Online Banking/Wallets Payment",
DuitnowQR::CODE => "DuitNow QR Payment",
MaybankQR::CODE => "Maybank QRPay Payment",
Shopeepay::CODE => "ShopeePay Payment",


// offline payment
Paynow::CODE => "PayNow QR Payment",
Expand Down
20 changes: 12 additions & 8 deletions Model/Capabilities.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,12 @@ public function getBackendsWithOmiseCode()
{
$backends = $this->capabilitiesAPI->getBackends();
$list = [];
foreach ($backends as $backend) {
$code = $this->helper->getOmiseCodeByOmiseId($backend->_id);
if (isset($code)) {
$list[$code][] = $backend;
if ($backends) {
foreach ($backends as $backend) {
$code = $this->helper->getOmiseCodeByOmiseId($backend->_id);
if (isset($code)) {
$list[$code][] = $backend;
}
}
}
return $list;
Expand Down Expand Up @@ -130,10 +132,12 @@ public function getTokenizationMethodsWithOmiseCode()
{
$methods = $this->capabilitiesAPI->getTokenizationMethods();
$list = [];
foreach ($methods as $method) {
$code = $this->helper->getOmiseCodeByOmiseId($method);
if (isset($code)) {
$list[$code][] = $methods;
if ($methods) {
foreach ($methods as $method) {
$code = $this->helper->getOmiseCodeByOmiseId($method);
if (isset($code)) {
$list[$code][] = $methods;
}
}
}
return $list;
Expand Down
2 changes: 0 additions & 2 deletions Model/Config/Alipayplus.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class Alipayplus extends Config
const DANA_CODE = 'omise_offsite_dana';
const GCASH_CODE = 'omise_offsite_gcash';
const KAKAOPAY_CODE = 'omise_offsite_kakaopay';
const TOUCHNGO_CODE = 'omise_offsite_touchngo';

/**
* Backends identifier
Expand All @@ -24,5 +23,4 @@ class Alipayplus extends Config
const DANA_ID = 'dana';
const GCASH_ID = 'gcash';
const KAKAOPAY_ID = 'kakaopay';
const TOUCHNGO_ID = 'touch_n_go';
}
18 changes: 18 additions & 0 deletions Model/Config/Boost.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php
namespace Omise\Payment\Model\Config;

use Omise\Payment\Model\Config\Config;

class Boost extends Config
{
/**
* @var string
*/
const CODE = 'omise_offsite_boost';

/**
* Backends identifier
* @var string
*/
const ID = 'boost';
}
18 changes: 18 additions & 0 deletions Model/Config/DuitnowOBW.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php
namespace Omise\Payment\Model\Config;

use Omise\Payment\Model\Config\Config;

class DuitnowOBW extends Config
{
/**
* @var string
*/
const CODE = 'omise_offsite_duitnowobw';

/**
* Backends identifier
* @var string
*/
const ID = 'duitnow_obw';
}
18 changes: 18 additions & 0 deletions Model/Config/DuitnowQR.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php
namespace Omise\Payment\Model\Config;

use Omise\Payment\Model\Config\Config;

class DuitnowQR extends Config
{
/**
* @var string
*/
const CODE = 'omise_offsite_duitnowqr';

/**
* Backends identifier
* @var string
*/
const ID = 'duitnow_qr';
}
18 changes: 18 additions & 0 deletions Model/Config/MaybankQR.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php
namespace Omise\Payment\Model\Config;

use Omise\Payment\Model\Config\Config;

class MaybankQR extends Config
{
/**
* @var string
*/
const CODE = 'omise_offsite_maybankqr';

/**
* Backends identifier
* @var string
*/
const ID = 'maybank_qr';
}
18 changes: 18 additions & 0 deletions Model/Config/Shopeepay.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php
namespace Omise\Payment\Model\Config;

use Omise\Payment\Model\Config\Config;

class Shopeepay extends Config
{
/**
* @var string
*/
const CODE = 'omise_offsite_shopeepay';

/**
* Backends identifier
* @var string
*/
const ID = 'shopeepay';
}
18 changes: 18 additions & 0 deletions Model/Config/Touchngo.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php
namespace Omise\Payment\Model\Config;

use Omise\Payment\Model\Config\Config;

class Touchngo extends Config
{
/**
* @var string
*/
const CODE = 'omise_offsite_touchngo';

/**
* Backends identifier
* @var string
*/
const ID = 'touch_n_go';
}
18 changes: 18 additions & 0 deletions Observer/DuitnowOBWDataAssignObserver.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

namespace Omise\Payment\Observer;

class DuitnowOBWDataAssignObserver extends OffsiteDataAssignObserver
{
/**
* @var string
*/
const BANK = 'bank';

/**
* @var array
*/
protected $additionalInformationList = [
self::BANK
];
}
Loading