Changeset 2876857

Timestamp:

03/09/2023 02:03:23 AM (3 years ago)

Author:

omise

Message:

Update to version 4.29.0 from GitHub

Location:

omise

Files:

• tags/4.29.0 (copied) (copied from omise/trunk)
• tags/4.29.0/CHANGELOG.md (modified) (1 diff)
• tags/4.29.0/assets/css/omise-css.css (modified) (1 diff)
• tags/4.29.0/assets/images/ktb-m.png (added)
• tags/4.29.0/includes/admin/class-omise-admin-page.php (modified) (1 diff)
• tags/4.29.0/includes/admin/views/omise-page-settings.php (modified) (1 diff)
• tags/4.29.0/includes/backends/class-omise-backend-mobile-banking.php (modified) (1 diff)
• tags/4.29.0/includes/class-omise-callback.php (modified) (1 diff)
• tags/4.29.0/includes/class-omise-money.php (modified) (1 diff)
• tags/4.29.0/includes/class-omise-rest-webhooks-controller.php (modified) (4 diffs)
• tags/4.29.0/includes/events/class-omise-event-charge-capture.php (modified) (1 diff)
• tags/4.29.0/includes/events/class-omise-event-charge-complete.php (modified) (6 diffs)
• tags/4.29.0/includes/gateway/abstract-omise-payment-base-card.php (modified) (1 diff)
• tags/4.29.0/includes/gateway/class-omise-payment-touch-n-go.php (modified) (4 diffs)
• tags/4.29.0/includes/gateway/class-omise-payment.php (modified) (5 diffs)
• tags/4.29.0/includes/gateway/traits (added)
• tags/4.29.0/includes/gateway/traits/sync-order-trait.php (added)
• tags/4.29.0/includes/libraries/omise-plugin/helpers/charge.php (modified) (2 diffs)
• tags/4.29.0/includes/libraries/omise-plugin/helpers/mailer.php (modified) (1 diff)
• tags/4.29.0/omise-woocommerce.php (modified) (3 diffs)
• tags/4.29.0/readme.txt (modified) (2 diffs)
• tags/4.29.0/templates/payment/form-fpx.php (modified) (1 diff)
• trunk/CHANGELOG.md (modified) (1 diff)
• trunk/assets/css/omise-css.css (modified) (1 diff)
• trunk/assets/images/ktb-m.png (added)
• trunk/includes/admin/class-omise-admin-page.php (modified) (1 diff)
• trunk/includes/admin/views/omise-page-settings.php (modified) (1 diff)
• trunk/includes/backends/class-omise-backend-mobile-banking.php (modified) (1 diff)
• trunk/includes/class-omise-callback.php (modified) (1 diff)
• trunk/includes/class-omise-money.php (modified) (1 diff)
• trunk/includes/class-omise-rest-webhooks-controller.php (modified) (4 diffs)
• trunk/includes/events/class-omise-event-charge-capture.php (modified) (1 diff)
• trunk/includes/events/class-omise-event-charge-complete.php (modified) (6 diffs)
• trunk/includes/gateway/abstract-omise-payment-base-card.php (modified) (1 diff)
• trunk/includes/gateway/class-omise-payment-touch-n-go.php (modified) (4 diffs)
• trunk/includes/gateway/class-omise-payment.php (modified) (5 diffs)
• trunk/includes/gateway/traits (added)
• trunk/includes/gateway/traits/sync-order-trait.php (added)
• trunk/includes/libraries/omise-plugin/helpers/charge.php (modified) (2 diffs)
• trunk/includes/libraries/omise-plugin/helpers/mailer.php (modified) (1 diff)
• trunk/omise-woocommerce.php (modified) (3 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/templates/payment/form-fpx.php (modified) (1 diff)

omise/tags/4.29.0/CHANGELOG.md

@@ -1 +1 @@
 # CHANGELOG
+
+### [v4.29.0 _(Mar 8, 2023)_](https://github.com/omise/omise-woocommerce/releases/tag/v4.29.0)
+- Added Krungthai NEXT mobile banking (PR [#347](https://github.com/omise/omise-woocommerce/pull/347))
 
 ### [v4.28.1 _(Jan 25, 2023)_](https://github.com/omise/omise-woocommerce/releases/tag/v4.28.1)

omise/tags/4.29.0/assets/css/omise-css.css

@@ -437 +437 @@
 }
 
+/** KTB **/
+.mobile-banking-logo.ktb {
+    background: url('../images/ktb-m.png');
+    background-size: cover;
+}
 
 /**

omise/tags/4.29.0/includes/admin/class-omise-admin-page.php

@@ -26 +26 @@
                 $this->errors[] = $message;
                 break;
-
-            case 'message':
+            default:
                 $this->messages[] = $message;
                 break;

omise/tags/4.29.0/includes/admin/views/omise-page-settings.php

@@ -196 +196 @@
                                                         </td>';
                                                         break;
+
+                                                    default:
+                                                        break;
                                                 }
                                             endforeach;

omise/tags/4.29.0/includes/backends/class-omise-backend-mobile-banking.php

@@ -27 +27 @@
                 'title'              => __( 'Bualuang mBanking', 'omise' ),
                 'logo'               => 'bbl',
+            ),
+            'mobile_banking_ktb' => array(
+                'title'              => __( 'Krungthai NEXT', 'omise' ),
+                'logo'               => 'ktb',
             )
         );

omise/tags/4.29.0/includes/class-omise-callback.php

@@ -22 +22 @@
     public function __construct( $order ) {
         $this->order = $order;
-        if ( ! $this->order || ! $this->order instanceof WC_Abstract_Order ) $this->invalid_result();
+        if ( ! $this->order || ! $this->order instanceof WC_Abstract_Order ) {
+            $this->invalid_result();
+        }
     }
 

omise/tags/4.29.0/includes/class-omise-money.php

@@ -50 +50 @@
 
     /**
+     * convert omise amount to human readable amount.
+     */
+    public static function convert_currency_unit( $amount, $currency ) {
+        $amount   = self::purify_amount( $amount );
+        $currency = strtoupper( $currency );
+
+        if ( ! isset( self::$subunit_multiplier[ $currency ] ) ) {
+            throw new Exception( __( 'We do not support the currency you are using.', 'omise' ) );
+        }
+
+        return $amount / self::$subunit_multiplier[ $currency ];
+    }
+
+    /**
      * @param  int|float $amount
      *

omise/tags/4.29.0/includes/class-omise-rest-webhooks-controller.php

@@ -30 +30 @@
 
     /**
+     * @var string
+     */
+    const RETURN_TRUE = '__return_true';
+
+    /**
      * Register the routes for webhooks.
      */
@@ -39 +44 @@
                 'methods' => WP_REST_Server::EDITABLE,
                 'callback' => array( $this, 'callback' ),
-                'permission_callback' => '__return_true'
+                'permission_callback' => self::RETURN_TRUE
             )
         );
@@ -49 +54 @@
                 'methods' => WP_REST_Server::READABLE,
                 'callback' => array( $this, 'callback_paynow_payment_status' ),
-                'permission_callback' => '__return_true'
+                'permission_callback' => self::RETURN_TRUE
             )
         );
@@ -59 +64 @@
                 'methods' => WP_REST_Server::READABLE,
                 'callback' => array( $this, 'callback_ocbc_pao_callback' ),
-                'permission_callback' => '__return_true'
+                'permission_callback' => self::RETURN_TRUE
             )
         );

omise/tags/4.29.0/includes/events/class-omise-event-charge-capture.php

@@ -79 +79 @@
                     $this->order->update_status( 'processing' );
                 }
-            break;
+                break;
+
+            default:
+                throw new Exception('invalid charge status');
+                break;
         }
 

omise/tags/4.29.0/includes/events/class-omise-event-charge-complete.php

@@ -1 +1 @@
 <?php
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-class Omise_Event_Charge_Complete extends Omise_Event {
+class Omise_Event_Charge_Complete extends Omise_Event
+{
     /**
      * @var string  of an event name.
@@ -12 +13 @@
      * @inheritdoc
      */
-    public function validate() {
-        if ( 'charge' !== $this->data['object'] || ! isset( $this->data['metadata']['order_id'] ) ) {
+    public function validate()
+    {
+        if ('charge' !== $this->data['object'] || !isset($this->data['metadata']['order_id'])) {
             return false;
         }
 
-        if ( ! $this->order = wc_get_order( $this->data['metadata']['order_id'] ) ) {
+        if (!$this->order = wc_get_order($this->data['metadata']['order_id'])) {
             return false;
         }
 
         // Making sure that an event's charge id is identical with an order transaction id.
-        if ( $this->order->get_transaction_id() !== $this->data['id'] ) {
+        if ($this->order->get_transaction_id() !== $this->data['id']) {
             return false;
         }
@@ -29 +31 @@
     }
 
-    public function is_resolvable() {
-        if ( 'yes' === $this->order->get_meta( 'is_omise_payment_resolved' ) || $this->is_attempt_limit_exceeded() ) {
+    public function is_resolvable()
+    {
+        if ('yes' === $this->order->get_meta('is_omise_payment_resolved') || $this->is_attempt_limit_exceeded()) {
             return true;
         }
@@ -36 +39 @@
         $schedule_action = 'omise_async_webhook_event_handler';
         $schedule_group  = 'omise_async_webhook';
-        $data            = array( 'key' => self::EVENT_NAME, 'data' => serialize( $this->data ) );
-        $this->schedule_single( $schedule_action, $data, $schedule_group );
+        $data            = array('key' => self::EVENT_NAME, 'data' => serialize($this->data));
+        $this->schedule_single($schedule_action, $data, $schedule_group);
         return false;
     }
@@ -73 +76 @@
      * @return void
      */
-    public function resolve() {
-        if ( ! $this->is_resolvable() ) return;
+    public function resolve()
+    {
+        if (!$this->is_resolvable()) {
+            return;
+        }
 
-        $this->order->add_order_note( __( 'Opn Payments: Received charge.complete webhook event.', 'omise' ) );
+        $this->order->add_order_note(
+            $this->allow_br('Opn Payments: Received charge.complete webhook event.'));
 
-        switch ( $this->data['status'] ) {
+        switch ($this->data['status']) {
             case 'failed':
-                if ( $this->order->has_status( 'failed' ) ) {
-                    return;
-                }
-
-                $message         = __( 'Opn Payments: Payment failed.<br/>%s', 'omise' );
-                $failure_message = Omise()->translate( $this->data['failure_message'] ) . ' (code: ' . $this->data['failure_code'] . ')';
-                $this->order->add_order_note(
-                    sprintf(
-                        wp_kses( $message, array( 'br' => array() ) ),
-                        $failure_message
-                    )
-                );
-                $this->order->update_status( 'failed' );
+                $this->handle_failed_charge();
                 break;
-
             case 'successful':
-                if ( $this->order->has_status( 'processing' ) ) {
-                    return;
-                }
-
-                $message = __( 'Opn Payments: Payment successful.<br/>An amount %1$s %2$s has been paid', 'omise' );
-
-                $this->order->add_order_note(
-                    sprintf(
-                        wp_kses( $message, array( 'br' => array() ) ),
-                        $this->order->get_total(),
-                        $this->order->get_currency()
-                    )
-                );
-                $this->order->payment_complete();
+                $this->handle_successful_charge();
                 break;
-            
             case 'pending':
-                if ( $this->order->has_status( 'processing' ) ) {
-                    return;
-                }
-
-                // Credit Card 3-D Secure with 'authorize only' payment action case.
-                if ( $this->data['authorized'] ) {
-                    $this->order->update_meta_data( 'is_awaiting_capture', 'yes' );
-                    $this->order->update_status( 'processing' );
-                    $this->order->save();
-                }
+                $this->handle_pending_charge();
+                break;
+            default:
                 break;
         }
@@ -128 +101 @@
         return;
     }
+
+    /**
+     * handler failed charge
+     */
+    private function handle_failed_charge()
+    {
+        if ($this->order->has_status('failed')) {
+            return;
+        }
+
+        $failure_message = sprintf(
+            '%s  (code: %s)',
+            Omise()->translate($this->data['failure_message']),
+            $this->data['failure_code']
+        );
+
+        $this->order->add_order_note(
+            sprintf(
+                $this->allow_br('Opn Payments: Payment failed.<br/>%s'),
+                $failure_message
+            )
+        );
+
+        $this->order->update_status(Omise_Payment::STATUS_FAILED);
+    }
+
+    /**
+     * handler successful charge
+     */
+    private function handle_successful_charge()
+    {
+        if ($this->order->has_status('processing')) {
+            return;
+        }
+        $this->order->add_order_note(
+            sprintf(
+                $this->allow_br('Opn Payments: Payment successful.<br/>An amount %1$s %2$s has been paid'),
+                $this->order->get_total(),
+                $this->order->get_currency()
+            )
+        );
+        $this->order->payment_complete();
+    }
+
+    /**
+     * handler pending charge
+     */
+    private function handle_pending_charge()
+    {
+        if ($this->order->has_status('processing')) {
+            return;
+        }
+        // Credit Card 3-D Secure with 'authorize only' payment action case.
+        if ($this->data['authorized']) {
+            $this->order->update_meta_data('is_awaiting_capture', 'yes');
+            $this->order->update_status('processing');
+            $this->order->save();
+        }
+    }
+
+    /**
+     * allow br from the message.
+     */
+    private function  allow_br($message)
+    {
+        return wp_kses(__($message, 'omise'), ['br' => []]);
+    }
 }

omise/tags/4.29.0/includes/gateway/abstract-omise-payment-base-card.php

@@ -205 +205 @@
 
                 // Then, check is authorized after if the first condition is false.
-                if ( ! $success )
+                if ( ! $success ) {
                     $success = Omise_Charge::is_authorized( $charge );
-
+                }
+                    
                 break;
         }

omise/tags/4.29.0/includes/gateway/class-omise-payment-touch-n-go.php

@@ -3 +3 @@
 
 class Omise_Payment_TouchNGo extends Omise_Payment_Offsite {
+
+    private $touch_and_go_wallet_title = 'Touch \'n Go eWallet';
+
     public function __construct() {
         parent::__construct();
@@ -31 +34 @@
      */
     public function init_form_fields() {
-        $method_title = 'Touch \'n Go eWallet';
-        $default_title = 'Touch \'n Go eWallet';
+        $method_title = $this->touch_and_go_wallet_title;
+        $default_title = $this->touch_and_go_wallet_title;
 
         if ($this->provider === 'Alipay_plus') {
@@ -67 +70 @@
         }
         
-        return 'Touch \'n Go eWallet';
+        return $this->touch_and_go_wallet_title;
     }
 
@@ -94 +97 @@
         $icon = Omise_Image::get_image([
             'file' => 'touch-n-go.png',
-            'alternate_text' => 'Touch \'n Go eWallet',
+            'alternate_text' => $this->touch_and_go_wallet_title,
         ]);
         return apply_filters( 'woocommerce_gateway_icon', $icon, $this->id );

omise/tags/4.29.0/includes/gateway/class-omise-payment.php

@@ -11 +11 @@
 
 abstract class Omise_Payment extends WC_Payment_Gateway {
+    use Sync_Order;
+
+    const WC_VERSION3 = '3.0.0';
+
     /** Omise charge id post meta key. */
     const CHARGE_ID = 'omise_charge_id';
@@ -420 +424 @@
 
     /**
-     * Retrieve a charge by a given charge id (that attach to an order).
-     * Find some diff, then merge it back to WooCommerce system.
-     *
-     * @param  WC_Order $order WooCommerce's order object
-     *
-     * @return void
-     *
-     * @see    WC_Meta_Box_Order_Actions::save( $post_id, $post )
-     * @see    woocommerce/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php
-     */
-    public function sync_payment( $order ) {
-        $this->load_order( $order );
-
-        try {
-            $charge = OmiseCharge::retrieve( $this->get_charge_id_from_order() );
-
-            /**
-             * Backward compatible with WooCommerce v2.x series
-             * This case is likely not going to happen anymore as this was provided back then
-             * when Omise-WooCommerce was introducing of adding charge.id into WC Order transaction id.
-             **/
-            if ( ! $this->order()->get_transaction_id() ) {
-                $this->set_order_transaction_id( $charge['id'] );
-            }
-
-            switch ( $charge['status'] ) {
-                case self::STATUS_SUCCESSFUL:
-                    $this->delete_capture_metadata();
-
-                    // Omise API 2017-11-02 uses `refunded`, Omise API 2019-05-29 uses `refunded_amount`.
-                    $refunded_amount = isset( $charge['refunded_amount'] ) ? $charge['refunded_amount'] : $charge['refunded'];
-                    if ( $charge['funding_amount'] == $refunded_amount ) {
-                        if ( ! $this->order()->has_status( self::STATUS_REFUNDED ) ) {
-                            $this->order()->update_status( self::STATUS_REFUNDED );
-                        }
-
-                        $message = wp_kses( __(
-                            'Opn Payments: Payment refunded.<br/>An amount %1$s %2$s has been refunded (manual sync).', 'omise' ),
-                            array( 'br' => array() )
-                        );
-                        $this->order()->add_order_note( sprintf( $message, $this->order()->get_total(), $this->order()->get_currency() ) );
-                    } else {
-                        $message = wp_kses( __(
-                            'Opn Payments: Payment successful.<br/>An amount %1$s %2$s has been paid (manual sync).', 'omise' ),
-                            array( 'br' => array() )
-                        );
-                        $this->order()->add_order_note( sprintf( $message, $this->order()->get_total(), $this->order()->get_currency() ) );
-
-                        if ( ! $this->order()->is_paid() ) {
-                            $this->order()->payment_complete();
-                        }
-                    }
-                    break;
-
-                case self::STATUS_FAILED:
-                    $this->delete_capture_metadata();
-
-                    $message = wp_kses(
-                        __( 'Opn Payments: Payment failed.<br/>%s (code: %s) (manual sync).', 'omise' ),
-                        array( 'br' => array() )
-                    );
-                    $this->order()->add_order_note( sprintf( $message, Omise()->translate( $charge['failure_message'] ), $charge['failure_code'] ) );
-
-                    if ( ! $this->order()->has_status( self::STATUS_FAILED ) ) {
-                        $this->order()->update_status( self::STATUS_FAILED );
-                    }
-                    break;
-
-                case self::STATUS_PENDING:
-                    $message = wp_kses( __(
-                        'Opn Payments: Payment is still in progress.<br/>
-                        You might wait for a moment before click sync the status again or contact Opn Payments support team at [email protected] if you have any questions (manual sync).',
-                        'omise'
-                    ), array( 'br' => array() ) );
-
-                    $this->order()->add_order_note( $message );
-                    break;
-
-                case self::STATUS_EXPIRED:
-                    $this->delete_capture_metadata();
-
-                    $message = wp_kses( __( 'Opn Payments: Payment expired. (manual sync).', 'omise' ), array( 'br' => array() ) );
-                    $this->order()->add_order_note( $message );
-
-                    if ( ! $this->order()->has_status( self::STATUS_CANCELLED ) ) {
-                        $this->order()->update_status( self::STATUS_CANCELLED );
-                    }
-                    break;
-
-                case self::STATUS_REVERSED:
-                    $this->delete_capture_metadata();
-
-                    $message = wp_kses( __( 'Opn Payments: Payment reversed. (manual sync).', 'omise' ), array( 'br' => array() ) );
-                    $this->order()->add_order_note( $message );
-
-                    if ( ! $this->order()->has_status( self::STATUS_CANCELLED ) ) {
-                        $this->order()->update_status( self::STATUS_CANCELLED );
-                    }
-                    break;
-
-                default:
-                    throw new Exception(
-                        __( 'Cannot read the payment status. Please try sync again or contact Opn Payments support team at [email protected] if you have any questions.', 'omise' )
-                    );
-                    break;
-            }
-        } catch ( Exception $e ) {
-            $message = wp_kses(
-                __( 'Opn Payments: Sync failed (manual sync).<br/>%s.', 'omise' ),
-                array( 'br' => array() )
-            );
-
-            $order->add_order_note( sprintf( $message, $e->getMessage() ) );
-        }
-    }
-
-    /**
      * Set an order transaction id
      *
@@ -543 +430 @@
     protected function set_order_transaction_id( $transaction_id ) {
         /** backward compatible with WooCommerce v2.x series **/
-        if ( version_compare( WC()->version, '3.0.0', '>=' ) ) {
+        if ( version_compare( WC()->version, self::WC_VERSION3, '>=' ) ) {
             $this->order()->set_transaction_id( $transaction_id );
             $this->order()->save();
@@ -599 +486 @@
          */
         // Backward compatible for Omise v3.0 - v3.3
-        $order_id  = version_compare( WC()->version, '3.0.0', '>=' ) ? $this->order()->get_id() : $this->order()->id;
+        $order_id  = version_compare( WC()->version, self::WC_VERSION3, '>=' ) ? $this->order()->get_id() : $this->order()->id;
         $charge_id = get_post_meta( $order_id, self::CHARGE_ID, true );
 
@@ -632 +519 @@
     protected function deprecated_get_charge_id_from_post() {
         /** backward compatible with WooCommerce v2.x series **/
-        $order_id  = version_compare( WC()->version, '3.0.0', '>=' ) ? $this->order()->get_id() : $this->order()->id;
+        $order_id  = version_compare( WC()->version, self::WC_VERSION3, '>=' ) ? $this->order()->get_id() : $this->order()->id;
 
         $posts = get_posts(

omise/tags/4.29.0/includes/libraries/omise-plugin/helpers/charge.php

@@ -9 +9 @@
         public static function isChargeObject($charge)
         {
-            if (! isset($charge['object']) || $charge['object'] !== 'charge')
+            if (! isset($charge['object']) || $charge['object'] !== 'charge') {
                 return false;
-
+            }
             return true;
         }
@@ -39 +39 @@
         public static function isFailed($charge)
         {
-            if (! self::isChargeObject($charge))
+            if (! self::isChargeObject($charge)) {
                 return true;
+            }
+                
+            if ((! is_null($charge['failure_code']) && $charge['failure_code'] !== "")
+                || (! is_null($charge['failure_message']) && $charge['failure_message'] !== "")) {
+                return true;
+            }
 
-            if ((! is_null($charge['failure_code']) && $charge['failure_code'] !== "")
-                || (! is_null($charge['failure_message']) && $charge['failure_message'] !== ""))
+            if (strtoupper($charge['status']) === 'FAILED') {
                 return true;
-
-            if (strtoupper($charge['status']) === 'FAILED')
-                return true;
+            }
 
             return false;

omise/tags/4.29.0/includes/libraries/omise-plugin/helpers/mailer.php

@@ -23 +23 @@
         public static function disable_merchant_order_on_hold( $recipient, $order ) {
             $payment_gateway = wc_get_payment_gateway_by_order( $order );
-            if (is_a($order, 'WC_Order') && is_a( $payment_gateway, 'Omise_Payment' ) &&
-                $order->get_status() == 'on-hold' ) $recipient = '';
+            if (is_a($order, 'WC_Order') && 
+                is_a( $payment_gateway, 'Omise_Payment' ) &&
+                $order->get_status() == 'on-hold' 
+            ) {
+                $recipient = '';
+            }
             return $recipient;
         }

omise/tags/4.29.0/omise-woocommerce.php

@@ -5 +5 @@
  * Plugin URI:  https://www.omise.co/woocommerce
  * Description: Opn Payments is a WordPress plugin designed specifically for WooCommerce. The plugin adds support for Opn Payments Payment Gateway's payment methods to WooCommerce.
- * Version:     4.28.1
+ * Version:     4.29.0
  * Author:      Opn Payments and contributors
  * Author URI:  https://github.com/omise/omise-woocommerce/graphs/contributors
@@ -23 +23 @@
      * @var string
      */
-    public $version = '4.28.1';
+    public $version = '4.29.0';
 
     /**
@@ -149 +149 @@
         require_once OMISE_WOOCOMMERCE_PLUGIN_PATH . '/includes/events/class-omise-event-charge-complete.php';
         require_once OMISE_WOOCOMMERCE_PLUGIN_PATH . '/includes/events/class-omise-event-charge-create.php';
+        require_once OMISE_WOOCOMMERCE_PLUGIN_PATH . '/includes/gateway/traits/sync-order-trait.php';
         require_once OMISE_WOOCOMMERCE_PLUGIN_PATH . '/includes/gateway/abstract-omise-payment-offline.php';
         require_once OMISE_WOOCOMMERCE_PLUGIN_PATH . '/includes/gateway/abstract-omise-payment-offsite.php';

omise/tags/4.29.0/readme.txt

@@ -4 +4 @@
 Requires at least: 4.3.1
 Tested up to: 6.0.2
-Stable tag: 4.28.1
+Stable tag: 4.29.0
 License: MIT
 License URI: https://opensource.org/licenses/MIT
@@ -34 +34 @@
 
 == Changelog ==
+
+= 4.29.0 =
+
+- Added Krungthai NEXT mobile banking (PR [#347](https://github.com/omise/omise-woocommerce/pull/347))
 
 = 4.28.1 =

omise/tags/4.29.0/templates/payment/form-fpx.php

@@ -9 +9 @@
                         class="<?php echo $bank["code"];?>" 
                         value="<?php echo $bank["code"]; ?>"
-                        <?= $bank['active'] ?: "disabled" ?>
+                        <?php $bank['active'] ?: "disabled" ?>
                     >
                             <?php echo $bank["name"]; ?> 
-                            <?php if (!$bank['active']) echo " (offline)" ; ?>
+                            <?php if (!$bank['active']) { echo " (offline)"; } ?>
                     </option>
             <?php endforeach; ?>

omise/trunk/CHANGELOG.md

@@ -1 +1 @@
 # CHANGELOG
+
+### [v4.29.0 _(Mar 8, 2023)_](https://github.com/omise/omise-woocommerce/releases/tag/v4.29.0)
+- Added Krungthai NEXT mobile banking (PR [#347](https://github.com/omise/omise-woocommerce/pull/347))
 
 ### [v4.28.1 _(Jan 25, 2023)_](https://github.com/omise/omise-woocommerce/releases/tag/v4.28.1)

omise/trunk/assets/css/omise-css.css

@@ -437 +437 @@
 }
 
+/** KTB **/
+.mobile-banking-logo.ktb {
+    background: url('../images/ktb-m.png');
+    background-size: cover;
+}
 
 /**

omise/trunk/includes/admin/class-omise-admin-page.php

@@ -26 +26 @@
                 $this->errors[] = $message;
                 break;
-
-            case 'message':
+            default:
                 $this->messages[] = $message;
                 break;

omise/trunk/includes/admin/views/omise-page-settings.php

@@ -196 +196 @@
                                                         </td>';
                                                         break;
+
+                                                    default:
+                                                        break;
                                                 }
                                             endforeach;

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

@@ -27 +27 @@
                 'title'              => __( 'Bualuang mBanking', 'omise' ),
                 'logo'               => 'bbl',
+            ),
+            'mobile_banking_ktb' => array(
+                'title'              => __( 'Krungthai NEXT', 'omise' ),
+                'logo'               => 'ktb',
             )
         );

omise/trunk/includes/class-omise-callback.php

@@ -22 +22 @@
     public function __construct( $order ) {
         $this->order = $order;
-        if ( ! $this->order || ! $this->order instanceof WC_Abstract_Order ) $this->invalid_result();
+        if ( ! $this->order || ! $this->order instanceof WC_Abstract_Order ) {
+            $this->invalid_result();
+        }
     }
 

omise/trunk/includes/class-omise-money.php

@@ -50 +50 @@
 
     /**
+     * convert omise amount to human readable amount.
+     */
+    public static function convert_currency_unit( $amount, $currency ) {
+        $amount   = self::purify_amount( $amount );
+        $currency = strtoupper( $currency );
+
+        if ( ! isset( self::$subunit_multiplier[ $currency ] ) ) {
+            throw new Exception( __( 'We do not support the currency you are using.', 'omise' ) );
+        }
+
+        return $amount / self::$subunit_multiplier[ $currency ];
+    }
+
+    /**
      * @param  int|float $amount
      *

omise/trunk/includes/class-omise-rest-webhooks-controller.php

@@ -30 +30 @@
 
     /**
+     * @var string
+     */
+    const RETURN_TRUE = '__return_true';
+
+    /**
      * Register the routes for webhooks.
      */
@@ -39 +44 @@
                 'methods' => WP_REST_Server::EDITABLE,
                 'callback' => array( $this, 'callback' ),
-                'permission_callback' => '__return_true'
+                'permission_callback' => self::RETURN_TRUE
             )
         );
@@ -49 +54 @@
                 'methods' => WP_REST_Server::READABLE,
                 'callback' => array( $this, 'callback_paynow_payment_status' ),
-                'permission_callback' => '__return_true'
+                'permission_callback' => self::RETURN_TRUE
             )
         );
@@ -59 +64 @@
                 'methods' => WP_REST_Server::READABLE,
                 'callback' => array( $this, 'callback_ocbc_pao_callback' ),
-                'permission_callback' => '__return_true'
+                'permission_callback' => self::RETURN_TRUE
             )
         );

omise/trunk/includes/events/class-omise-event-charge-capture.php

@@ -79 +79 @@
                     $this->order->update_status( 'processing' );
                 }
-            break;
+                break;
+
+            default:
+                throw new Exception('invalid charge status');
+                break;
         }
 

omise/trunk/includes/events/class-omise-event-charge-complete.php

@@ -1 +1 @@
 <?php
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-class Omise_Event_Charge_Complete extends Omise_Event {
+class Omise_Event_Charge_Complete extends Omise_Event
+{
     /**
      * @var string  of an event name.
@@ -12 +13 @@
      * @inheritdoc
      */
-    public function validate() {
-        if ( 'charge' !== $this->data['object'] || ! isset( $this->data['metadata']['order_id'] ) ) {
+    public function validate()
+    {
+        if ('charge' !== $this->data['object'] || !isset($this->data['metadata']['order_id'])) {
             return false;
         }
 
-        if ( ! $this->order = wc_get_order( $this->data['metadata']['order_id'] ) ) {
+        if (!$this->order = wc_get_order($this->data['metadata']['order_id'])) {
             return false;
         }
 
         // Making sure that an event's charge id is identical with an order transaction id.
-        if ( $this->order->get_transaction_id() !== $this->data['id'] ) {
+        if ($this->order->get_transaction_id() !== $this->data['id']) {
             return false;
         }
@@ -29 +31 @@
     }
 
-    public function is_resolvable() {
-        if ( 'yes' === $this->order->get_meta( 'is_omise_payment_resolved' ) || $this->is_attempt_limit_exceeded() ) {
+    public function is_resolvable()
+    {
+        if ('yes' === $this->order->get_meta('is_omise_payment_resolved') || $this->is_attempt_limit_exceeded()) {
             return true;
         }
@@ -36 +39 @@
         $schedule_action = 'omise_async_webhook_event_handler';
         $schedule_group  = 'omise_async_webhook';
-        $data            = array( 'key' => self::EVENT_NAME, 'data' => serialize( $this->data ) );
-        $this->schedule_single( $schedule_action, $data, $schedule_group );
+        $data            = array('key' => self::EVENT_NAME, 'data' => serialize($this->data));
+        $this->schedule_single($schedule_action, $data, $schedule_group);
         return false;
     }
@@ -73 +76 @@
      * @return void
      */
-    public function resolve() {
-        if ( ! $this->is_resolvable() ) return;
+    public function resolve()
+    {
+        if (!$this->is_resolvable()) {
+            return;
+        }
 
-        $this->order->add_order_note( __( 'Opn Payments: Received charge.complete webhook event.', 'omise' ) );
+        $this->order->add_order_note(
+            $this->allow_br('Opn Payments: Received charge.complete webhook event.'));
 
-        switch ( $this->data['status'] ) {
+        switch ($this->data['status']) {
             case 'failed':
-                if ( $this->order->has_status( 'failed' ) ) {
-                    return;
-                }
-
-                $message         = __( 'Opn Payments: Payment failed.<br/>%s', 'omise' );
-                $failure_message = Omise()->translate( $this->data['failure_message'] ) . ' (code: ' . $this->data['failure_code'] . ')';
-                $this->order->add_order_note(
-                    sprintf(
-                        wp_kses( $message, array( 'br' => array() ) ),
-                        $failure_message
-                    )
-                );
-                $this->order->update_status( 'failed' );
+                $this->handle_failed_charge();
                 break;
-
             case 'successful':
-                if ( $this->order->has_status( 'processing' ) ) {
-                    return;
-                }
-
-                $message = __( 'Opn Payments: Payment successful.<br/>An amount %1$s %2$s has been paid', 'omise' );
-
-                $this->order->add_order_note(
-                    sprintf(
-                        wp_kses( $message, array( 'br' => array() ) ),
-                        $this->order->get_total(),
-                        $this->order->get_currency()
-                    )
-                );
-                $this->order->payment_complete();
+                $this->handle_successful_charge();
                 break;
-            
             case 'pending':
-                if ( $this->order->has_status( 'processing' ) ) {
-                    return;
-                }
-
-                // Credit Card 3-D Secure with 'authorize only' payment action case.
-                if ( $this->data['authorized'] ) {
-                    $this->order->update_meta_data( 'is_awaiting_capture', 'yes' );
-                    $this->order->update_status( 'processing' );
-                    $this->order->save();
-                }
+                $this->handle_pending_charge();
+                break;
+            default:
                 break;
         }
@@ -128 +101 @@
         return;
     }
+
+    /**
+     * handler failed charge
+     */
+    private function handle_failed_charge()
+    {
+        if ($this->order->has_status('failed')) {
+            return;
+        }
+
+        $failure_message = sprintf(
+            '%s  (code: %s)',
+            Omise()->translate($this->data['failure_message']),
+            $this->data['failure_code']
+        );
+
+        $this->order->add_order_note(
+            sprintf(
+                $this->allow_br('Opn Payments: Payment failed.<br/>%s'),
+                $failure_message
+            )
+        );
+
+        $this->order->update_status(Omise_Payment::STATUS_FAILED);
+    }
+
+    /**
+     * handler successful charge
+     */
+    private function handle_successful_charge()
+    {
+        if ($this->order->has_status('processing')) {
+            return;
+        }
+        $this->order->add_order_note(
+            sprintf(
+                $this->allow_br('Opn Payments: Payment successful.<br/>An amount %1$s %2$s has been paid'),
+                $this->order->get_total(),
+                $this->order->get_currency()
+            )
+        );
+        $this->order->payment_complete();
+    }
+
+    /**
+     * handler pending charge
+     */
+    private function handle_pending_charge()
+    {
+        if ($this->order->has_status('processing')) {
+            return;
+        }
+        // Credit Card 3-D Secure with 'authorize only' payment action case.
+        if ($this->data['authorized']) {
+            $this->order->update_meta_data('is_awaiting_capture', 'yes');
+            $this->order->update_status('processing');
+            $this->order->save();
+        }
+    }
+
+    /**
+     * allow br from the message.
+     */
+    private function  allow_br($message)
+    {
+        return wp_kses(__($message, 'omise'), ['br' => []]);
+    }
 }

omise/trunk/includes/gateway/abstract-omise-payment-base-card.php

@@ -205 +205 @@
 
                 // Then, check is authorized after if the first condition is false.
-                if ( ! $success )
+                if ( ! $success ) {
                     $success = Omise_Charge::is_authorized( $charge );
-
+                }
+                    
                 break;
         }

omise/trunk/includes/gateway/class-omise-payment-touch-n-go.php

@@ -3 +3 @@
 
 class Omise_Payment_TouchNGo extends Omise_Payment_Offsite {
+
+    private $touch_and_go_wallet_title = 'Touch \'n Go eWallet';
+
     public function __construct() {
         parent::__construct();
@@ -31 +34 @@
      */
     public function init_form_fields() {
-        $method_title = 'Touch \'n Go eWallet';
-        $default_title = 'Touch \'n Go eWallet';
+        $method_title = $this->touch_and_go_wallet_title;
+        $default_title = $this->touch_and_go_wallet_title;
 
         if ($this->provider === 'Alipay_plus') {
@@ -67 +70 @@
         }
         
-        return 'Touch \'n Go eWallet';
+        return $this->touch_and_go_wallet_title;
     }
 
@@ -94 +97 @@
         $icon = Omise_Image::get_image([
             'file' => 'touch-n-go.png',
-            'alternate_text' => 'Touch \'n Go eWallet',
+            'alternate_text' => $this->touch_and_go_wallet_title,
         ]);
         return apply_filters( 'woocommerce_gateway_icon', $icon, $this->id );

omise/trunk/includes/gateway/class-omise-payment.php

@@ -11 +11 @@
 
 abstract class Omise_Payment extends WC_Payment_Gateway {
+    use Sync_Order;
+
+    const WC_VERSION3 = '3.0.0';
+
     /** Omise charge id post meta key. */
     const CHARGE_ID = 'omise_charge_id';
@@ -420 +424 @@
 
     /**
-     * Retrieve a charge by a given charge id (that attach to an order).
-     * Find some diff, then merge it back to WooCommerce system.
-     *
-     * @param  WC_Order $order WooCommerce's order object
-     *
-     * @return void
-     *
-     * @see    WC_Meta_Box_Order_Actions::save( $post_id, $post )
-     * @see    woocommerce/includes/admin/meta-boxes/class-wc-meta-box-order-actions.php
-     */
-    public function sync_payment( $order ) {
-        $this->load_order( $order );
-
-        try {
-            $charge = OmiseCharge::retrieve( $this->get_charge_id_from_order() );
-
-            /**
-             * Backward compatible with WooCommerce v2.x series
-             * This case is likely not going to happen anymore as this was provided back then
-             * when Omise-WooCommerce was introducing of adding charge.id into WC Order transaction id.
-             **/
-            if ( ! $this->order()->get_transaction_id() ) {
-                $this->set_order_transaction_id( $charge['id'] );
-            }
-
-            switch ( $charge['status'] ) {
-                case self::STATUS_SUCCESSFUL:
-                    $this->delete_capture_metadata();
-
-                    // Omise API 2017-11-02 uses `refunded`, Omise API 2019-05-29 uses `refunded_amount`.
-                    $refunded_amount = isset( $charge['refunded_amount'] ) ? $charge['refunded_amount'] : $charge['refunded'];
-                    if ( $charge['funding_amount'] == $refunded_amount ) {
-                        if ( ! $this->order()->has_status( self::STATUS_REFUNDED ) ) {
-                            $this->order()->update_status( self::STATUS_REFUNDED );
-                        }
-
-                        $message = wp_kses( __(
-                            'Opn Payments: Payment refunded.<br/>An amount %1$s %2$s has been refunded (manual sync).', 'omise' ),
-                            array( 'br' => array() )
-                        );
-                        $this->order()->add_order_note( sprintf( $message, $this->order()->get_total(), $this->order()->get_currency() ) );
-                    } else {
-                        $message = wp_kses( __(
-                            'Opn Payments: Payment successful.<br/>An amount %1$s %2$s has been paid (manual sync).', 'omise' ),
-                            array( 'br' => array() )
-                        );
-                        $this->order()->add_order_note( sprintf( $message, $this->order()->get_total(), $this->order()->get_currency() ) );
-
-                        if ( ! $this->order()->is_paid() ) {
-                            $this->order()->payment_complete();
-                        }
-                    }
-                    break;
-
-                case self::STATUS_FAILED:
-                    $this->delete_capture_metadata();
-
-                    $message = wp_kses(
-                        __( 'Opn Payments: Payment failed.<br/>%s (code: %s) (manual sync).', 'omise' ),
-                        array( 'br' => array() )
-                    );
-                    $this->order()->add_order_note( sprintf( $message, Omise()->translate( $charge['failure_message'] ), $charge['failure_code'] ) );
-
-                    if ( ! $this->order()->has_status( self::STATUS_FAILED ) ) {
-                        $this->order()->update_status( self::STATUS_FAILED );
-                    }
-                    break;
-
-                case self::STATUS_PENDING:
-                    $message = wp_kses( __(
-                        'Opn Payments: Payment is still in progress.<br/>
-                        You might wait for a moment before click sync the status again or contact Opn Payments support team at [email protected] if you have any questions (manual sync).',
-                        'omise'
-                    ), array( 'br' => array() ) );
-
-                    $this->order()->add_order_note( $message );
-                    break;
-
-                case self::STATUS_EXPIRED:
-                    $this->delete_capture_metadata();
-
-                    $message = wp_kses( __( 'Opn Payments: Payment expired. (manual sync).', 'omise' ), array( 'br' => array() ) );
-                    $this->order()->add_order_note( $message );
-
-                    if ( ! $this->order()->has_status( self::STATUS_CANCELLED ) ) {
-                        $this->order()->update_status( self::STATUS_CANCELLED );
-                    }
-                    break;
-
-                case self::STATUS_REVERSED:
-                    $this->delete_capture_metadata();
-
-                    $message = wp_kses( __( 'Opn Payments: Payment reversed. (manual sync).', 'omise' ), array( 'br' => array() ) );
-                    $this->order()->add_order_note( $message );
-
-                    if ( ! $this->order()->has_status( self::STATUS_CANCELLED ) ) {
-                        $this->order()->update_status( self::STATUS_CANCELLED );
-                    }
-                    break;
-
-                default:
-                    throw new Exception(
-                        __( 'Cannot read the payment status. Please try sync again or contact Opn Payments support team at [email protected] if you have any questions.', 'omise' )
-                    );
-                    break;
-            }
-        } catch ( Exception $e ) {
-            $message = wp_kses(
-                __( 'Opn Payments: Sync failed (manual sync).<br/>%s.', 'omise' ),
-                array( 'br' => array() )
-            );
-
-            $order->add_order_note( sprintf( $message, $e->getMessage() ) );
-        }
-    }
-
-    /**
      * Set an order transaction id
      *
@@ -543 +430 @@
     protected function set_order_transaction_id( $transaction_id ) {
         /** backward compatible with WooCommerce v2.x series **/
-        if ( version_compare( WC()->version, '3.0.0', '>=' ) ) {
+        if ( version_compare( WC()->version, self::WC_VERSION3, '>=' ) ) {
             $this->order()->set_transaction_id( $transaction_id );
             $this->order()->save();
@@ -599 +486 @@
          */
         // Backward compatible for Omise v3.0 - v3.3
-        $order_id  = version_compare( WC()->version, '3.0.0', '>=' ) ? $this->order()->get_id() : $this->order()->id;
+        $order_id  = version_compare( WC()->version, self::WC_VERSION3, '>=' ) ? $this->order()->get_id() : $this->order()->id;
         $charge_id = get_post_meta( $order_id, self::CHARGE_ID, true );
 
@@ -632 +519 @@
     protected function deprecated_get_charge_id_from_post() {
         /** backward compatible with WooCommerce v2.x series **/
-        $order_id  = version_compare( WC()->version, '3.0.0', '>=' ) ? $this->order()->get_id() : $this->order()->id;
+        $order_id  = version_compare( WC()->version, self::WC_VERSION3, '>=' ) ? $this->order()->get_id() : $this->order()->id;
 
         $posts = get_posts(

omise/trunk/includes/libraries/omise-plugin/helpers/charge.php

@@ -9 +9 @@
         public static function isChargeObject($charge)
         {
-            if (! isset($charge['object']) || $charge['object'] !== 'charge')
+            if (! isset($charge['object']) || $charge['object'] !== 'charge') {
                 return false;
-
+            }
             return true;
         }
@@ -39 +39 @@
         public static function isFailed($charge)
         {
-            if (! self::isChargeObject($charge))
+            if (! self::isChargeObject($charge)) {
                 return true;
+            }
+                
+            if ((! is_null($charge['failure_code']) && $charge['failure_code'] !== "")
+                || (! is_null($charge['failure_message']) && $charge['failure_message'] !== "")) {
+                return true;
+            }
 
-            if ((! is_null($charge['failure_code']) && $charge['failure_code'] !== "")
-                || (! is_null($charge['failure_message']) && $charge['failure_message'] !== ""))
+            if (strtoupper($charge['status']) === 'FAILED') {
                 return true;
-
-            if (strtoupper($charge['status']) === 'FAILED')
-                return true;
+            }
 
             return false;

omise/trunk/includes/libraries/omise-plugin/helpers/mailer.php

@@ -23 +23 @@
         public static function disable_merchant_order_on_hold( $recipient, $order ) {
             $payment_gateway = wc_get_payment_gateway_by_order( $order );
-            if (is_a($order, 'WC_Order') && is_a( $payment_gateway, 'Omise_Payment' ) &&
-                $order->get_status() == 'on-hold' ) $recipient = '';
+            if (is_a($order, 'WC_Order') && 
+                is_a( $payment_gateway, 'Omise_Payment' ) &&
+                $order->get_status() == 'on-hold' 
+            ) {
+                $recipient = '';
+            }
             return $recipient;
         }

omise/trunk/omise-woocommerce.php

@@ -5 +5 @@
  * Plugin URI:  https://www.omise.co/woocommerce
  * Description: Opn Payments is a WordPress plugin designed specifically for WooCommerce. The plugin adds support for Opn Payments Payment Gateway's payment methods to WooCommerce.
- * Version:     4.28.1
+ * Version:     4.29.0
  * Author:      Opn Payments and contributors
  * Author URI:  https://github.com/omise/omise-woocommerce/graphs/contributors
@@ -23 +23 @@
      * @var string
      */
-    public $version = '4.28.1';
+    public $version = '4.29.0';
 
     /**
@@ -149 +149 @@
         require_once OMISE_WOOCOMMERCE_PLUGIN_PATH . '/includes/events/class-omise-event-charge-complete.php';
         require_once OMISE_WOOCOMMERCE_PLUGIN_PATH . '/includes/events/class-omise-event-charge-create.php';
+        require_once OMISE_WOOCOMMERCE_PLUGIN_PATH . '/includes/gateway/traits/sync-order-trait.php';
         require_once OMISE_WOOCOMMERCE_PLUGIN_PATH . '/includes/gateway/abstract-omise-payment-offline.php';
         require_once OMISE_WOOCOMMERCE_PLUGIN_PATH . '/includes/gateway/abstract-omise-payment-offsite.php';

omise/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.3.1
 Tested up to: 6.0.2
-Stable tag: 4.28.1
+Stable tag: 4.29.0
 License: MIT
 License URI: https://opensource.org/licenses/MIT
@@ -34 +34 @@
 
 == Changelog ==
+
+= 4.29.0 =
+
+- Added Krungthai NEXT mobile banking (PR [#347](https://github.com/omise/omise-woocommerce/pull/347))
 
 = 4.28.1 =

omise/trunk/templates/payment/form-fpx.php

@@ -9 +9 @@
                         class="<?php echo $bank["code"];?>" 
                         value="<?php echo $bank["code"]; ?>"
-                        <?= $bank['active'] ?: "disabled" ?>
+                        <?php $bank['active'] ?: "disabled" ?>
                     >
                             <?php echo $bank["name"]; ?> 
-                            <?php if (!$bank['active']) echo " (offline)" ; ?>
+                            <?php if (!$bank['active']) { echo " (offline)"; } ?>
                     </option>
             <?php endforeach; ?>