Skip to content

Commit

Permalink
1.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
dyd committed Dec 7, 2023
1 parent ff2fd1c commit deb2dc1
Show file tree
Hide file tree
Showing 89 changed files with 3,088 additions and 294 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Requirements
------------

* OpenCart 4.0.2.X (due to architectural changes, this module is __incompatible__ with older OpenCart versions)
* [GenesisPHP v1.21.11](https://github.com/GenesisGateway/genesis_php/tree/1.21.11) - (Integrated in Module)
* [GenesisPHP v1.24.0](https://github.com/GenesisGateway/genesis_php/tree/1.24.0) - (Integrated in Module)
* PCI-certified server in order to use ```emerchantpay Direct```

GenesisPHP Requirements
Expand Down Expand Up @@ -95,6 +95,7 @@ Supported Transactions & Payment Methods
* __Online Banking__
* __Interac Combined Pay-in (CPI)__
* __Bancontact (BCT)__
* __Blik One Click (BLK)__
* __OXXO__
* __P24__
* __Pago Facil__
Expand Down
2 changes: 1 addition & 1 deletion admin/model/payment/emerchantpay_checkout.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class EmerchantpayCheckout extends Model
*
* @var string
*/
protected $module_version = '1.1.1';
protected $module_version = '1.1.3';

/**
* Perform installation logic
Expand Down
2 changes: 1 addition & 1 deletion admin/model/payment/emerchantpay_direct.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class EmerchantpayDirect extends Model
*
* @var string
*/
protected $module_version = '1.1.1';
protected $module_version = '1.1.3';

/**
* Perform installation logic
Expand Down
2 changes: 1 addition & 1 deletion catalog/controller/payment/emerchantpay_checkout.php
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ function ($value) {
'language' => $this->model_extension_emerchantpay_payment_emerchantpay_checkout->getLanguage(),

'currency' => $this->model_extension_emerchantpay_payment_emerchantpay_checkout->getCurrencyCode(),
'amount' => $order_info['total'],
'amount' => (float)$order_info['total'],

'customer_email' => $order_info['email'],
'customer_phone' => $order_info['telephone'],
Expand Down
2 changes: 1 addition & 1 deletion catalog/controller/payment/emerchantpay_direct.php
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public function send(): void
),

'currency' => $this->model_extension_emerchantpay_payment_emerchantpay_direct->getCurrencyCode(),
'amount' => $order_info['total'],
'amount' => (float)$order_info['total'],

'customer_email' => $order_info['email'],
'customer_phone' => $order_info['telephone'],
Expand Down
8 changes: 8 additions & 0 deletions catalog/model/payment/emerchantpay_checkout.php
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,14 @@ function ($value) {
);
}
break;
case Types::PAYSAFECARD:
$user_id = $order['additional']['user_id'];
$customer_id = ($user_id > 0) ? $user_id : $order['additional']['user_hash'];
$parameters = array(
'customer_id' => $customer_id
);
break;

}

return $parameters;
Expand Down
2 changes: 1 addition & 1 deletion catalog/view/javascript/emerchantpay/card.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "emerchantpay Gateway Module for OpenCart",
"type": "opencart-module",
"license": "GPL-2.0",
"version": "1.1.1",
"version": "1.1.3",
"authors": [
{
"name": "emerchantpay",
Expand Down
2 changes: 1 addition & 1 deletion install.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "emerchantpay Payments",
"version": "1.1.1",
"version": "1.1.3",
"author": "emerchantpay Ltd.",
"link": "https://emerchantpay.com"
}
3 changes: 2 additions & 1 deletion system/emerchantpay_helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ public static function getAvailableBankCodes(): array
{
return [
Banks::CPI => 'Interac Combined Pay-in',
Banks::BCT => 'Bancontact'
Banks::BCT => 'Bancontact',
Banks::BLK => 'Blik One Click'
];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -561,26 +561,16 @@ class Banks
*/
const PC = 'PC';

/**
* ALTO, Prima, ATM Bersama
*/
const ATMVA = 'ATMVA';

/**
* Bank Central Asia
*/
const BCA_IDR = 'BCA_IDR';
const DK_BCA_IB = 'DK_BCA_IB';

/**
* Bank Rakyat Indonesia
*/
const BRI_IDR = 'BRI_IDR';

/**
* Bank Negara Indonesia
*/
const BNI_IDR = 'BNI_IDR';

const DK_BRI_IB = 'DK_BRI_IB';

/**
* BTN Bank
*/
Expand All @@ -589,12 +579,12 @@ class Banks
/**
* CIMB Clicks Indonesia
*/
const CIMB_IDR = 'CIMB_IDR';
const DK_CIMBCLICKS_IB = 'DK_CIMBCLICKS_IB';

/**
* Danamon Bank
*/
const DMN_IDR = 'DMB_IDR';
const DK_DANAMON_IB = 'DK_DANAMON_IB';

/**
* Mandiri Bank
Expand All @@ -604,7 +594,7 @@ class Banks
/**
* Permata Bank
*/
const PMB_IDR = 'PMB_IDR';
const DK_PERMATANET_IB = 'DK_PERMATANET_IB';

/**
* Virtual Account Bank
Expand Down Expand Up @@ -788,41 +778,27 @@ class Banks
/**
* Bangkok Bank
*/
const BBL_THB = 'BBL_THB';
const TH_PB_BBLPN = 'TH_PB_BBLPN';
const BBL_IB_U = 'BBL_IB_U';

/**
* Kasikorn Bank
* Kasikornbank PAYPLUS
*/
const KKB_THB = 'KKB_THB';
const KBANK_PAYPLUS = 'KBANK_PAYPLUS';

/**
* Krungsri (Bank of Ayudhya Public Company Limited)
* Bank of Ayudhya (Krungsri)
*/
const BAY_THB = 'BAY_THB';
const TH_PB_BAYPN = 'TH_PB_BAYPN';
const BAY_IB_U = 'BAY_IB_U';

/**
* Krung Thai Bank
*/
const KTB_THB = 'KTB_THB';
const TH_PB_KTBPN = 'TH_PB_KTBPN';

/**
* OMISE_TL
*/
const OMISE_TL_PHP = 'OMISE_TL.php';
const KTB_IB_U = 'KTB_IB_U';

/**
* Siam Commercial Bank
*/
const SCB_THB = 'SCB_THB';
const TH_PB_SCBPN = 'TH_PB_SCBPN';

/**
* UOBT
*/
const UOB_THB = 'UOB_THB';
const SCB_IB_U = 'SCB_IB_U';

/**
* Abitab
Expand All @@ -845,7 +821,7 @@ class Banks
const SINGPOST_PHP = 'singpost.php';

/**
* VTC-Pay
* VTC-Pay VPBank
*/
const VTCP_VPBANK = 'VTCP_VPBANK';
/**
Expand Down Expand Up @@ -950,7 +926,7 @@ class Banks
/**
* VTC-Pay SaigonBank
*/
const VTCP_SAIGON_BANK = 'VTCP-SAIGON_BANK';
const VTCP_SAIGONBANK = 'VTCP-SAIGONBANK';

/**
* VTC-Pay SeaABank
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
<?php
/**
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* @author emerchantpay
* @copyright Copyright (C) 2015-2023 emerchantpay Ltd.
* @license http://opensource.org/licenses/MIT The MIT License
*/

namespace Genesis\API\Constants\NonFinancial\KYC;

use Genesis\Utils\Common;

/**
* class VerificationAddressesTypes
* @package Genesis\API\Constants\NonFinancial\KYC
*/
class VerificationAddressesTypes
{
/**
* Verification Address type ID Card
*
* @var string
*/
const ID_CARD = 'id_card';

/**
* Verification Address type Passport
*
* @var string
*/
const PASSPORT = 'passport';

/**
* Verification Address type Driving License
*
* @var string
*/
const DRIVING_LICENSE = 'driving_license';

/**
* Verification Address type Utility bill
*
* @var string
*/
const UTILITY_BILL = 'utility_bill';

/**
* Verification Address type Bank Statement
*
* @var string
*/
const BANK_STATEMENT = 'bank_statement';

/**
* Verification Address type Rent Agreement
*
* @var string
*/
const RENT_AGREEMENT = 'rent_agreement';

/**
* Verification Address type Employer Letter
*
* @var string
*/
const EMPLOYER_LETTER = 'employer_letter';

/**
* Verification Address type Insurance Agreement
*
* @var string
*/
const INSURANCE_AGREEMENT = 'insurance_agreement';

/**
* Verification Address type Tax Bill
*
* @var string
*/
const TAX_BILL = 'tax_bill';

/**
* Verification Address type Envelope
*
* @var string
*/
const ENVELOPE = 'envelope';

/**
* Verification Address type CPR/Smart Card Reader
*
* @var string
*/
const CPR_SMART_CARD_READER = 'cpr_smart_card_reader_copy';

/**
* Read and return all constants as array
*
* @return array
*/
public static function getAll()
{
return Common::getClassConstants(self::class);
}
}
Loading

0 comments on commit deb2dc1

Please sign in to comment.