Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b7f7750

Browse files
FhanOmiseFhanOmise
authoredAug 18, 2022
Merge pull request #294 from omise/fix-v4.23
Fix v4.23
2 parents 07d3cf8 + 097938a commit b7f7750

32 files changed

+922
-62
lines changed
 

‎assets/images/boost.png

10.3 KB
Loading

‎assets/images/duitnow-obw.png

6.21 KB
Loading

‎assets/images/duitnow-qr.png

11 KB
Loading

‎assets/images/grabpay.png

4.67 KB
Loading

‎assets/images/maybank-qr.png

12.2 KB
Loading

‎assets/images/shopeepay.png

9.76 KB
Loading

‎assets/images/touch-n-go.png

11.1 KB
Loading

‎assets/javascripts/omise-payment-form-handler.js

+25-13
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
}
2323

2424
$form.prepend( $ulError );
25-
$("html, body").animate({
26-
scrollTop:0
27-
},"slow");
25+
$("html, body").animate({ scrollTop:0 },"slow");
2826
}
2927

3028
function omiseFormHandler(){
@@ -70,19 +68,30 @@
7068
}
7169
});
7270

73-
let errors = [],
74-
omise_card = {},
71+
let errors = [],
72+
omise_card = {},
7573
omise_card_number_field = 'number',
76-
omise_card_fields = {
77-
'name' : $( '#omise_card_name' ),
78-
'number' : $( '#omise_card_number' ),
74+
omise_card_state_field = 'state',
75+
omise_card_fields = {
76+
'name' : $( '#omise_card_name' ),
77+
'number' : $( '#omise_card_number' ),
7978
'expiration_month' : $( '#omise_card_expiration_month' ),
80-
'expiration_year' : $( '#omise_card_expiration_year' ),
81-
'security_code' : $( '#omise_card_security_code' )
79+
'expiration_year' : $( '#omise_card_expiration_year' ),
80+
'security_code' : $( '#omise_card_security_code' ),
81+
'city' : $( '#billing_city' ),
82+
'state' : $( '#billing_state' ),
83+
'country' : $( '#billing_country' ),
84+
'postal_code' : $( '#billing_postcode' ),
85+
'street1' : $( '#billing_address_1' )
8286
};
8387

8488
$.each( omise_card_fields, function( index, field ) {
85-
omise_card[ index ] = (index === omise_card_number_field) ? field.val().replace(/\s/g, '') : field.val();
89+
if (index === omise_card_state_field) {
90+
omise_card[ index ] = field.find(":selected").text();
91+
} else {
92+
omise_card[ index ] = (index === omise_card_number_field) ? field.val().replace(/\s/g, '') : field.val();
93+
}
94+
8695
if ( "" === omise_card[ index ] ) {
8796
errors.push( omise_params[ 'required_card_' + index ] );
8897
}
@@ -101,15 +110,18 @@
101110
Omise.createToken("card", omise_card, function (statusCode, response) {
102111
if (statusCode == 200) {
103112
$.each( omise_card_fields, function( index, field ) {
104-
field.val( '' );
113+
const sensitiveDataIndex = ['name', 'number', 'expiration_year', 'expiration_month', 'security_code'];
114+
if (sensitiveDataIndex.includes(index)) {
115+
field.val( '' );
116+
}
105117
} );
106118
$form.append( '<input type="hidden" class="omise_token" name="omise_token" value="' + response.id + '"/>' );
107119
$form.submit();
108120
} else {
109121
handleTokensApiError(response);
110122
};
111123
});
112-
}else{
124+
} else {
113125
showError( omise_params.cannot_load_omisejs + '<br/>' + omise_params.check_internet_connection );
114126
$form.unblock();
115127
}

‎includes/backends/class-omise-backend-fpx.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@ public function initiate() {
1818
* @return array of an available banks
1919
*/
2020
public function get_available_banks() {
21-
$providers = $this->capabilities()->getFPXBanks();
21+
$capabilities = $this->capabilities();
22+
23+
if ( !$capabilities ){
24+
return null;
25+
}
26+
27+
$providers = $capabilities->getFPXBanks();
2228
$first_value = reset($providers);
2329

2430
// Preventing the following error:

‎includes/backends/class-omise-backend-installment.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,15 @@ public function initiate() {
9797
* @return array of an available installment providers
9898
*/
9999
public function get_available_providers( $currency, $purchase_amount ) {
100+
$capabilities = $this->capabilities();
101+
102+
if ( !$capabilities ){
103+
return null;
104+
}
105+
100106
// Note: As installment payment at the moment only supports THB and MYR currency, the
101107
// $purchase_amount is multiplied with 100 to convert the amount into subunit (satang and sen).
102-
$providers = $this->capabilities()->getInstallmentBackends( $currency, ( $purchase_amount * 100 ) );
108+
$providers = $capabilities->getInstallmentBackends( $currency, ( $purchase_amount * 100 ) );
103109

104110
foreach ( $providers as &$provider ) {
105111
$provider_detail = self::$providers[ $provider->_id ];

‎includes/backends/class-omise-backend-mobile-banking.php

+11-9
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,21 @@ public function initiate() {
3535
* @return array of an available mobile banking providers
3636
*/
3737
public function get_available_providers( $currency ) {
38-
39-
$providers = $this->capabilities()->getBackends( $currency );
40-
4138
$mobile_banking_providers = array();
39+
$capabilities = $this->capabilities();
40+
41+
if ( $capabilities ){
42+
$providers = $capabilities->getBackends( $currency );
4243

43-
foreach ( $providers as &$provider ) {
44-
if(isset(self::$providers[ $provider->_id ])){
44+
foreach ( $providers as &$provider ) {
45+
if(isset(self::$providers[ $provider->_id ])){
4546

46-
$provider_detail = self::$providers[ $provider->_id ];
47-
$provider->provider_name = $provider_detail['title'];
48-
$provider->provider_logo = $provider_detail['logo'];
47+
$provider_detail = self::$providers[ $provider->_id ];
48+
$provider->provider_name = $provider_detail['title'];
49+
$provider->provider_logo = $provider_detail['logo'];
4950

50-
array_push($mobile_banking_providers, $provider);
51+
array_push($mobile_banking_providers, $provider);
52+
}
5153
}
5254
}
5355

‎includes/backends/class-omise-backend-touch-n-go.php

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?php
2+
/**
3+
*
4+
* @method public initiate
5+
* @method public get_provider
6+
*/
7+
class Omise_Backend_TouchNGo extends Omise_Backend {
8+
/**
9+
* @var array of known providers.
10+
*/
11+
protected static $providers = array();
12+
13+
public function initiate() {
14+
self::$providers = array();
15+
}
16+
17+
/**
18+
* @return string of touch n go provider
19+
*/
20+
public function get_provider() {
21+
$capabilities = $this->capabilities();
22+
23+
if ( !$capabilities ){
24+
return null;
25+
}
26+
27+
$tng = $capabilities->getTouchNGoBackends();
28+
$first_value = reset($tng);
29+
30+
// Preventing the following error:
31+
// Uncaught TypeError: property_exists(): Argument #1 must be of type object|string, bool given
32+
$typeofFirstValue = gettype($first_value);
33+
$isObjectOrString = 'object' === $typeofFirstValue || 'string' === $typeofFirstValue;
34+
35+
$provider = null;
36+
if ($isObjectOrString && property_exists($first_value, 'provider')) {
37+
$provider = $first_value->provider;
38+
}
39+
return $provider;
40+
}
41+
}

‎includes/class-omise-callback.php

+10-6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ public function __construct( $order ) {
2525
}
2626

2727
public static function execute() {
28+
if(RequestHelper::isUserOriginated()) {
29+
return wp_redirect( wc_get_checkout_url() );
30+
}
31+
2832
$order_id = isset( $_GET['order_id'] ) ? sanitize_text_field( $_GET['order_id'] ) : null;
2933

3034
$callback = new self( wc_get_order( $order_id ) );
@@ -67,8 +71,8 @@ public function validate() {
6771
protected function invalid_result() {
6872
$message = __(
6973
'<strong>We cannot validate your payment result:</strong><br/>
70-
Note that your payment may have already been processed.<br/>
71-
Please contact our support team if you have any questions.',
74+
Note that your payment may have already been processed.<br/>
75+
Please contact our support team if you have any questions.',
7276
'omise'
7377
);
7478

@@ -108,7 +112,7 @@ protected function payment_pending() {
108112
// Card authorized case.
109113
$message = __(
110114
'Omise: The payment is being processed.<br/>
111-
An amount %1$s %2$s has been authorized.',
115+
An amount %1$s %2$s has been authorized.',
112116
'omise'
113117
);
114118

@@ -134,8 +138,8 @@ protected function payment_pending() {
134138
// Offsite case.
135139
$message = __(
136140
'Omise: The payment is being processed.<br/>
137-
Depending on the payment provider, this may take some time to process.<br/>
138-
Please do a manual \'Sync Payment Status\' action from the <strong>Order Actions</strong> panel, or check the payment status directly at the Omise Dashboard later.',
141+
Depending on the payment provider, this may take some time to process.<br/>
142+
Please do a manual \'Sync Payment Status\' action from the <strong>Order Actions</strong> panel, or check the payment status directly at the Omise Dashboard later.',
139143
'omise'
140144
);
141145

@@ -152,7 +156,7 @@ protected function payment_pending() {
152156
* Resolving a case of charge status: failed.
153157
*/
154158
protected function payment_failed() {
155-
$message = __( "It seems we've been unable to process your payment properly:<br/>%s", 'omise' );
159+
$message = __( "It seems we've been unable to process your payment properly:<br/>%s", 'omise' );
156160
$failure_message = Omise()->translate( $this->charge['failure_message'] ) . ' (code: ' . $this->charge['failure_code'] . ')';
157161

158162
$this->order->add_order_note( sprintf( wp_kses( __( 'OMISE: Payment failed.<br/>%s', 'omise' ), array( 'br' => array() ) ), $failure_message ) );

‎includes/class-omise-capabilities.php

+21-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,17 @@ class Omise_Capabilities {
2020
*/
2121
public static function retrieve() {
2222
if ( ! self::$the_instance ) {
23+
try {
24+
$capabilities = OmiseCapabilities::retrieve();
25+
} catch(\Exception $e) {
26+
// suppressing error on the admin dashboard
27+
return null;
28+
}
29+
2330
self::$the_instance = new self();
24-
self::$the_instance->capabilities = OmiseCapabilities::retrieve();
31+
self::$the_instance->capabilities = $capabilities;
2532
}
26-
33+
2734
return self::$the_instance;
2835
}
2936

@@ -61,6 +68,18 @@ public function getBackends( $currency = '' ) {
6168
return $this->capabilities->getBackends( $params );
6269
}
6370

71+
/**
72+
* Retrieves details of Touch n Go payment backends from capabilities.
73+
*
74+
* @return string
75+
*/
76+
public function getTouchNGoBackends() {
77+
$params = array();
78+
$params[] = $this->capabilities->backendFilter['type']('touch_n_go');
79+
80+
return $this->capabilities->getBackends( $params );
81+
}
82+
6483
/**
6584
* Retrieves details of fpx bank list from capabilities.
6685
*

‎includes/class-omise-payment-factory.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ class Omise_Payment_Factory {
3333
'Omise_Payment_RabbitLinePay',
3434
'Omise_Payment_OCBC_PAO',
3535
'Omise_Payment_GrabPay',
36-
'Omise_Payment_GooglePay'
36+
'Omise_Payment_GooglePay',
37+
'Omise_Payment_Boost',
38+
'Omise_Payment_ShopeePay',
39+
'Omise_Payment_Maybank_QR',
40+
'Omise_Payment_DuitNow_QR',
41+
'Omise_Payment_DuitNow_OBW'
3742
);
3843

3944
/**

‎includes/gateway/class-omise-payment-alipayplus.php

-9
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,3 @@ public function __construct() {
147147
parent::__construct( $source, $title, $countries );
148148
}
149149
}
150-
151-
class Omise_Payment_TouchNGo extends Omise_Payment_Alipayplus {
152-
public function __construct() {
153-
$source = 'touch_n_go';
154-
$title = 'TNG eWallet';
155-
$countries = array( 'SG' );
156-
parent::__construct( $source, $title, $countries );
157-
}
158-
}

‎includes/gateway/class-omise-payment-boost.php

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
<?php
2+
defined( 'ABSPATH' ) or die( 'No direct script access allowed.' );
3+
4+
class Omise_Payment_Boost extends Omise_Payment_Offsite {
5+
public function __construct() {
6+
parent::__construct();
7+
8+
$this->id = 'omise_boost';
9+
$this->has_fields = false;
10+
$this->method_title = __( 'Omise Boost', 'omise' );
11+
$this->method_description = __( 'Accept payment through <strong>Boost</strong> via Omise payment gateway.', 'omise' );
12+
$this->supports = array( 'products', 'refunds' );
13+
14+
$this->init_form_fields();
15+
$this->init_settings();
16+
17+
$this->title = $this->get_option( 'title' );
18+
$this->description = $this->get_option( 'description' );
19+
$this->restricted_countries = array( 'MY' );
20+
21+
add_action( 'woocommerce_api_' . $this->id . '_callback', 'Omise_Callback::execute' );
22+
add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
23+
add_action( 'woocommerce_order_action_' . $this->id . '_sync_payment', array( $this, 'sync_payment' ) );
24+
}
25+
26+
/**
27+
* @see WC_Settings_API::init_form_fields()
28+
* @see woocommerce/includes/abstracts/abstract-wc-settings-api.php
29+
*/
30+
public function init_form_fields() {
31+
$this->form_fields = array(
32+
'enabled' => array(
33+
'title' => __( 'Enable/Disable', 'omise' ),
34+
'type' => 'checkbox',
35+
'label' => __( 'Enable Omise Boost Payment', 'omise' ),
36+
'default' => 'no'
37+
),
38+
39+
'title' => array(
40+
'title' => __( 'Title', 'omise' ),
41+
'type' => 'text',
42+
'description' => __( 'This controls the title the user sees during checkout.', 'omise' ),
43+
'default' => __( 'Boost', 'omise' ),
44+
),
45+
46+
'description' => array(
47+
'title' => __( 'Description', 'omise' ),
48+
'type' => 'textarea',
49+
'description' => __( 'This controls the description the user sees during checkout.', 'omise' )
50+
),
51+
);
52+
}
53+
54+
/**
55+
* @inheritdoc
56+
*/
57+
public function charge( $order_id, $order ) {
58+
$metadata = array_merge(
59+
apply_filters( 'omise_charge_params_metadata', array(), $order ),
60+
array( 'order_id' => $order_id ) // override order_id as a reference for webhook handlers.
61+
);
62+
63+
$return_uri = add_query_arg(
64+
array(
65+
'wc-api' => 'omise_boost_callback',
66+
'order_id' => $order_id
67+
),
68+
home_url()
69+
);
70+
71+
return OmiseCharge::create( array(
72+
'amount' => Omise_Money::to_subunit( $order->get_total(), $order->get_currency() ),
73+
'currency' => $order->get_currency(),
74+
'description' => apply_filters( 'omise_charge_params_description', 'WooCommerce Order id ' . $order_id, $order ),
75+
'source' => array( 'type' => 'boost' ),
76+
'return_uri' => $return_uri,
77+
'metadata' => $metadata
78+
) );
79+
}
80+
81+
/**
82+
* Get icons
83+
*
84+
* @see WC_Payment_Gateway::get_icon()
85+
*/
86+
public function get_icon() {
87+
$icon = Omise_Image::get_image( array(
88+
'file' => 'boost.png',
89+
'alternate_text' => 'Boost',
90+
));
91+
return apply_filters( 'woocommerce_gateway_icon', $icon, $this->id );
92+
}
93+
}
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.