Changeset 2436825

Timestamp:

12/10/2020 06:22:03 PM (5 years ago)

Author:

yuansfer

Message:

Version 3.0.0

Location:

woo-yuansfer/trunk

Files:

• README.md (modified) (2 diffs)
• assets/css/yuansfer-storefront-styles.css (modified) (1 diff)
• assets/css/yuansfer-styles.css (modified) (1 diff)
• assets/css/yuansfer-twentyseventeen-styles.css (modified) (1 diff)
• assets/images/creditcard.png (added)
• assets/images/paypal.svg (added)
• assets/images/venmo.svg (added)
• includes/abstracts/abstract-wc-yuansfer-payment-gateway.php (modified) (22 diffs)
• includes/admin/class-wc-yuansfer-admin-notices.php (modified) (2 diffs)
• includes/admin/yuansfer-alipay-settings.php (modified) (1 diff)
• includes/admin/yuansfer-creditcard-settings.php (added)
• includes/admin/yuansfer-paypal-settings.php (added)
• includes/admin/yuansfer-settings.php (modified) (1 diff)
• includes/admin/yuansfer-venmo-settings.php (added)
• includes/admin/yuansfer-wechatpay-settings.php (modified) (1 diff)
• includes/class-wc-gateway-yuansfer.php (modified) (5 diffs)
• includes/class-wc-yuansfer-api.php (modified) (4 diffs)
• includes/class-wc-yuansfer-customer.php (modified) (2 diffs)
• includes/class-wc-yuansfer-helper.php (modified) (9 diffs)
• includes/class-wc-yuansfer-mobile-detect.php (added)
• includes/class-wc-yuansfer-order-handler.php (modified) (4 diffs)
• includes/class-wc-yuansfer-webhook-handler.php (modified) (4 diffs)
• includes/compat/class-wc-yuansfer-pre-orders-compat.php (modified) (2 diffs)
• includes/payment-methods/class-wc-gateway-yuansfer-alipay.php (modified) (6 diffs)
• includes/payment-methods/class-wc-gateway-yuansfer-creditcard.php (added)
• includes/payment-methods/class-wc-gateway-yuansfer-paypal.php (added)
• includes/payment-methods/class-wc-gateway-yuansfer-venmo.php (added)
• includes/payment-methods/class-wc-gateway-yuansfer-wechatpay.php (modified) (4 diffs)
• uninstall.php (modified) (1 diff)
• woocommerce-yuansfer.php (modified) (6 diffs)

woo-yuansfer/trunk/README.md

@@ -2 +2 @@
 
 ```
-Contributors: yuansfer-team
-Tags: yuansfer, payment request, unionpay, alipay, wechat pay, woocommerce, automattic
+Contributors: yuansfer
+Tags: yuansfer, payment request, unionpay, alipay, wechat pay, credit card, paypal, venmo, woocommerce, automattic
 Requires at least: 4.4
-Tested up to: 4.9
+Tested up to: 5.4
 Requires PHP: 5.6
-Stable tag: 4.1.7
+Stable tag: 3.0.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -102 +102 @@
 == Changelog ==
 
+= 3.0.0 - 2020-11-07 =
+* Update to v3 API
+* Add payment method: paypal, venmo  
+
+= 2.0.1 - 2020-11-06 =
+* Fix WeChat Pay terminal settings
+
+= 2.0.0 - 2020-11-06 =
+* Change version for consistency
+* Add mobile detect
+
+= 1.2.3 - 2020-10-22 =
+* Remove useless parameters for refund
+
+= 1.2.2 - 2020-08-02 =
+* Add CNY support
+
+= 1.2.1 - 2020-07-20 =
+* Fix retry error of update customer
+* Skip customerNo when disable create account of credit card
+
+= 1.2.0 - 2020-07-19 =
+* Update to new version of Yuansfer API
+* Add create customer for credit card
+* WC require up to 3.0
+
+= 1.1.0 - 2020-07-14 =
+* Add payment method: credit card
+* Add support for new API parameter: rmbAmount
+* Fix status error after order creation
+
 = 1.0.0 - 2019-05-30 =
 First Release

woo-yuansfer/trunk/assets/css/yuansfer-storefront-styles.css

@@ -3 +3 @@
 #add_payment_method #payment .payment_method_yuansfer_wechatpay label[for=payment_method_yuansfer_wechatpay] { display: block; padding-left: 1.41575em; }
 #add_payment_method #payment .payment_method_yuansfer_lakalapay label[for=payment_method_yuansfer_lakalapay] { display: block; padding-left: 1.41575em; }
+#add_payment_method #payment .payment_method_yuansfer_creditcard label[for=payment_method_yuansfer_creditcard] { display: block; padding-left: 1.41575em; }
+#add_payment_method #payment .payment_method_yuansfer_paypal label[for=payment_method_yuansfer_paypal] { display: block; padding-left: 1.41575em; }
+#add_payment_method #payment .payment_method_yuansfer_venmo label[for=payment_method_yuansfer_venmo] { display: block; padding-left: 1.41575em; }

woo-yuansfer/trunk/assets/css/yuansfer-styles.css

@@ -14 +14 @@
 #add_payment_method #payment .payment_method_yuansfer_alipay { position: relative; }
 #add_payment_method #payment .payment_method_yuansfer_wechatpay { position: relative; }
+#add_payment_method #payment .payment_method_yuansfer_creditcard { position: relative; }
+#add_payment_method #payment .payment_method_yuansfer_paypal { position: relative; }
+#add_payment_method #payment .payment_method_yuansfer_venmo { position: relative; }
 #add_payment_method #payment input#payment_method_yuansfer { position: absolute; top: 6px; }
 #add_payment_method #payment input#payment_method_yuansfer_alipay { position: absolute; top: 6px; }
 #add_payment_method #payment input#payment_method_yuansfer_wechatpay { position: absolute; top: 6px; }
+#add_payment_method #payment input#payment_method_yuansfer_creditcard { position: absolute; top: 6px; }
+#add_payment_method #payment input#payment_method_yuansfer_paypal { position: absolute; top: 6px; }
+#add_payment_method #payment input#payment_method_yuansfer_venmo { position: absolute; top: 6px; }
 #add_payment_method #payment .payment_method_yuansfer label[for=payment_method_yuansfer] { display: block; padding-left: 20px; }
 #add_payment_method #payment .payment_method_yuansfer_alipay label[for=payment_method_yuansfer_alipay] { display: block; padding-left: 20px; }
 #add_payment_method #payment .payment_method_yuansfer_wechatpay label[for=payment_method_yuansfer_wechatpay] { display: block; padding-left: 20px; }
+#add_payment_method #payment .payment_method_yuansfer_creditcard label[for=payment_method_yuansfer_creditcard] { display: block; padding-left: 20px; }
+#add_payment_method #payment .payment_method_yuansfer_paypal label[for=payment_method_yuansfer_paypal] { display: block; padding-left: 20px; }
+#add_payment_method #payment .payment_method_yuansfer_venmo label[for=payment_method_yuansfer_venmo] { display: block; padding-left: 20px; }
 #add_payment_method #payment ul.payment_methods li img.yuansfer-icon { float: right; max-width: 40px; padding-left: 3px; margin: 0; }
 #add_payment_method #payment ul.payment_methods li img.yuansfer-alipay-icon { max-width: 50px; }
 #add_payment_method #payment ul.payment_methods li img.yuansfer-wechatpay-icon { max-width: 50px; }
+#add_payment_method #payment ul.payment_methods li img.yuansfer-creditcard-icon { max-width: 50px; }
+#add_payment_method #payment ul.payment_methods li img.yuansfer-paypal-icon { max-width: 50px; }
+#add_payment_method #payment ul.payment_methods li img.yuansfer-venmo-icon { max-width: 50px; }
 #add_payment_method #payment ul.payment_methods .yuansfer-card-group { position: relative; }

woo-yuansfer/trunk/assets/css/yuansfer-twentyseventeen-styles.css

@@ -2 +2 @@
 #add_payment_method #payment .payment_method_yuansfer_alipay label[for=payment_method_yuansfer_alipay] { display: block; padding-left: 20px; }
 #add_payment_method #payment .payment_method_yuansfer_wechatpay label[for=payment_method_yuansfer_wechatpay] { display: block; padding-left: 20px; }
+#add_payment_method #payment .payment_method_yuansfer_creditcard label[for=payment_method_yuansfer_creditcard] { display: block; padding-left: 20px; }
+#add_payment_method #payment .payment_method_yuansfer_paypal label[for=payment_method_yuansfer_paypal] { display: block; padding-left: 20px; }
+#add_payment_method #payment .payment_method_yuansfer_venmo label[for=payment_method_yuansfer_venmo] { display: block; padding-left: 20px; }
 
 .woocommerce-PaymentMethods li { list-style-type: none; }

woo-yuansfer/trunk/includes/abstracts/abstract-wc-yuansfer-payment-gateway.php

@@ -39 +39 @@
     public $merchant_no;
     public $store_no;
-    public $manager_no;
-    public $manager_password;
+
+    protected $detect;
 
     /**
@@ -69 +69 @@
         $this->statement_descriptor = !empty($main_settings['statement_descriptor']) ? $main_settings['statement_descriptor'] : '';
 
-        $this->manager_no           = !empty($main_settings['manager_no']) ? $main_settings['manager_no'] : '';
-        $this->manager_password     = !empty($main_settings['manager_password']) ? $main_settings['manager_password'] : '';
-
         if ($this->testmode) {
             $this->api_token        = !empty($main_settings['test_api_token']) ? $main_settings['test_api_token'] : '';
@@ -78 +75 @@
         add_action('woocommerce_update_options_payment_gateways_' . $this->id, array($this, 'process_admin_options'));
         add_action('wp_enqueue_scripts', array($this, 'payment_scripts'));
+
+        $this->detect = new WC_Yuansfer_Mobile_Detect();
+    }
+
+    protected function get_terminal($wechat = false)
+    {
+        if ($this->detect->isMobile()) {
+            if ($wechat) {
+                return $this->detect->is('WeChat') ? 'WAP' : 'MWEB';
+            }
+
+            return 'WAP';
+        }
+
+        return 'ONLINE';
     }
 
@@ -86 +98 @@
      */
     public function get_supported_currency() {
-        return apply_filters('wc_yuansfer_alipay_supported_currencies', array(
+        return apply_filters('wc_yuansfer_supported_currencies', array(
             'USD',
-            'CAD',
-            //          'EUR',
-            //          'AUD',
-            //          'GBP',
-            //          'HKD',
-            //          'JPY',
-            //          'NZD',
-            //          'SGD',
-
+            'CNY',
         ));
     }
@@ -299 +303 @@
             'alipay'        => '<img src="' . WC_YUANSFER_PLUGIN_URL . '/assets/images/alipay.svg" class="yuansfer-alipay-icon yuansfer-icon" alt="Alipay" width="52" />',
             'wechatpay'     => '<img src="' . WC_YUANSFER_PLUGIN_URL . '/assets/images/wechatpay.png" class="yuansfer-wechatpay-icon yuansfer-icon" alt="Wechat Pay" width="90" />',
+            'creditcard'    => '<img src="' . WC_YUANSFER_PLUGIN_URL . '/assets/images/creditcard.png" class="yuansfer-creditcard-icon yuansfer-icon" alt="Credit Card" width="90" />',
+            'paypal'        => '<img src="' . WC_YUANSFER_PLUGIN_URL . '/assets/images/paypal.svg" class="yuansfer-paypal-icon yuansfer-icon" alt="PayPal" width="90" />',
+            'venmo'         => '<img src="' . WC_YUANSFER_PLUGIN_URL . '/assets/images/venmo.svg" class="yuansfer-venmo-icon yuansfer-icon" alt="Venmo" width="90" />',
         ) );
     }
@@ -332 +339 @@
      */
     public function get_yuansfer_customer_id($order) {
-        $customer = get_user_meta(WC_Yuansfer_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id(), '_yuansfer_customer_id', true);
+        $customer = get_user_meta($order->get_customer_id(), '_yuansfer_customer_id', true);
 
         if (empty($customer)) {
             // Try to get it via the order.
-            if (WC_Yuansfer_Helper::is_pre_30()) {
-                return get_post_meta($order->id, '_yuansfer_customer_id', true);
-            } else {
-                return $order->get_meta('_yuansfer_customer_id', true);
-            }
-        } else {
-            return $customer;
-        }
+            return $order->get_meta('_yuansfer_customer_id', true);
+        }
+
+        return $customer;
     }
 
@@ -354 +357 @@
     public function get_yuansfer_return_url($order = null) {
         if (is_object($order)) {
-            $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
+            $order_id = $order->get_id();
             $args = array(
                 'utm_nooverride' => '1',
@@ -386 +389 @@
         $statement_descriptor              = ! empty($settings['statement_descriptor']) ? str_replace("'", '', $settings['statement_descriptor']) : '';
         $post_data                         = array();
-        $post_data['currency']             = strtolower(WC_Yuansfer_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency());
+        $post_data['currency']             = strtolower($order->get_currency());
         $post_data['amount']               = WC_Yuansfer_Helper::get_yuansfer_amount($order->get_total(), $post_data['currency']);
         $post_data['description']          = sprintf(__('%1$s - Order %2$s', 'woocommerce-yuansfer'), wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES), $order->get_order_number());
-        $billing_email      = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_email : $order->get_billing_email();
-        $billing_first_name = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_first_name : $order->get_billing_first_name();
-        $billing_last_name  = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_last_name : $order->get_billing_last_name();
+        $billing_email      = $order->get_billing_email();
+        $billing_first_name = $order->get_billing_first_name();
+        $billing_last_name  = $order->get_billing_last_name();
 
         if (!empty($billing_email) && apply_filters('wc_yuansfer_send_yuansfer_receipt', false)) {
@@ -397 +400 @@
         }
 
-        switch (WC_Yuansfer_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method()) {
+        switch ($order->get_payment_method()) {
             case 'yuansfer':
                 if (!empty($statement_descriptor)) {
@@ -414 +417 @@
         );
 
-        if ($this->has_subscription(WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id())) {
+        if ($this->has_subscription($order->get_id())) {
             $metadata += array(
                 'payment_type' => 'recurring',
@@ -447 +450 @@
         WC_Yuansfer_Logger::log('Processing response: ' . print_r($response, true));
 
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
+        $order_id = $order->get_id();
 
         $captured = (isset($response->captured) && $response->captured) ? 'yes' : 'no';
 
         // Store charge data.
-        WC_Yuansfer_Helper::is_pre_30() ? update_post_meta($order_id, '_yuansfer_charge_captured', $captured) : $order->update_meta_data('_yuansfer_charge_captured', $captured);
+        $order->update_meta_data('_yuansfer_charge_captured', $captured);
 
         // Store other data such as fees.
@@ -475 +478 @@
              */
             if ('pending' === $response->status) {
-                $order_stock_reduced = WC_Yuansfer_Helper::is_pre_30() ? get_post_meta($order_id, '_order_stock_reduced', true) : $order->get_meta('_order_stock_reduced', true);
+                $order_stock_reduced = $order->get_meta('_order_stock_reduced', true);
 
                 if (!$order_stock_reduced) {
-                    WC_Yuansfer_Helper::is_pre_30() ? $order->reduce_order_stock() : wc_reduce_stock_levels($order_id);
+                    wc_reduce_stock_levels($order_id);
                 }
 
-                WC_Yuansfer_Helper::is_pre_30() ? update_post_meta($order_id, '_transaction_id', $response->id) : $order->set_transaction_id($response->id);
+                $order->set_transaction_id($response->id);
                 /* translators: transaction id */
                 $order->update_status('on-hold', sprintf(__('Yuansfer charge awaiting payment: %s.', 'woocommerce-yuansfer'), $response->id));
@@ -500 +503 @@
             }
         } else {
-            WC_Yuansfer_Helper::is_pre_30() ? update_post_meta($order_id, '_transaction_id', $response->id) : $order->set_transaction_id($response->id);
+            $order->set_transaction_id($response->id);
 
             if ($order->has_status(array('pending', 'failed'))) {
-                WC_Yuansfer_Helper::is_pre_30() ? $order->reduce_order_stock() : wc_reduce_stock_levels($order_id);
+                wc_reduce_stock_levels($order_id);
             }
 
@@ -536 +539 @@
      *
      * @param object $order
-     * @return object $details
+     * @return array $details
      */
     public function get_owner_details($order) {
-        $billing_first_name = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_first_name : $order->get_billing_first_name();
-        $billing_last_name  = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_last_name : $order->get_billing_last_name();
-
-        $details = array();
-
-        $name  = $billing_first_name . ' ' . $billing_last_name;
-        $email = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_email : $order->get_billing_email();
-        $phone = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_phone : $order->get_billing_phone();
+        $details = array(
+            'firstName'     => $order->get_billing_first_name(),
+            'lastName'      => $order->get_billing_last_name(),
+            'customerCode'  => $order->get_customer_id(),
+            'street'        => $order->get_billing_address_1() . ' ' . $order->get_billing_address_2(),
+            'city'          => $order->get_billing_city(),
+            'state'         => $order->get_billing_state(),
+            'country'       => $order->get_billing_country(),
+            'zip'           => $order->get_billing_postcode(),
+        );
+
+        $email   = $order->get_billing_email();
+        $phone   = $order->get_billing_phone();
+        $company = $order->get_billing_company();
+
+        if (!empty($email)) {
+            $details['email'] = $email;
+        }
 
         if (!empty($phone)) {
-            $details['phone'] = $phone;
-        }
-
-        if (!empty($name)) {
-            $details['name'] = $name;
-        }
-
-        if (!empty($email)) {
-            $details['email'] = $email;
-        }
-
-        $details['address']['line1']       = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_address_1 : $order->get_billing_address_1();
-        $details['address']['line2']       = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_address_2 : $order->get_billing_address_2();
-        $details['address']['state']       = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_state : $order->get_billing_state();
-        $details['address']['city']        = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_city : $order->get_billing_city();
-        $details['address']['postal_code'] = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_postcode : $order->get_billing_postcode();
-        $details['address']['country']     = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_country : $order->get_billing_country();
-
-        return (object) apply_filters('wc_yuansfer_owner_details', $details, $order);
+            $details['phone'] = $phone;
+        }
+
+        if (!empty($company)) {
+            $details['company'] = $company;
+        }
+
+
+
+        return $details;
     }
 
@@ -694 +698 @@
 
         if ($order) {
-            $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
+            $order_id = $order->get_id();
 
             $yuansfer_customer_id = get_post_meta($order_id, '_yuansfer_customer_id', true);
@@ -702 +706 @@
             }
 
-            $source_id = WC_Yuansfer_Helper::is_pre_30() ? get_post_meta($order_id, '_yuansfer_source_id', true) : $order->get_meta('_yuansfer_source_id', true);
+            $source_id = $order->get_meta('_yuansfer_source_id', true);
 
             // Since 4.0.0, we changed card to source so we need to account for that.
             if (empty($source_id)) {
-                $source_id = WC_Yuansfer_Helper::is_pre_30() ? get_post_meta($order_id, '_yuansfer_card_id', true) : $order->get_meta('_yuansfer_card_id', true);
+                $source_id = $order->get_meta('_yuansfer_card_id', true);
 
                 // Take this opportunity to update the key name.
-                WC_Yuansfer_Helper::is_pre_30() ? update_post_meta($order_id, '_yuansfer_source_id', $source_id) : $order->update_meta_data('_yuansfer_source_id', $source_id);
+                $order->update_meta_data('_yuansfer_source_id', $source_id);
 
                 if (is_callable(array($order, 'save'))) {
@@ -743 +747 @@
      */
     public function save_source_to_order($order, $source) {
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
-
         // Store source in the order.
         if ($source->customer) {
-            if (WC_Yuansfer_Helper::is_pre_30()) {
-                update_post_meta($order_id, '_yuansfer_customer_id', $source->customer);
-            } else {
-                $order->update_meta_data('_yuansfer_customer_id', $source->customer);
-            }
-        }
-
-        if ($source->source) {
-            if (WC_Yuansfer_Helper::is_pre_30()) {
-                update_post_meta($order_id, '_yuansfer_source_id', $source->source);
-            } else {
-                $order->update_meta_data('_yuansfer_source_id', $source->source);
-            }
+            $order->update_meta_data('_yuansfer_customer_id', $source->customer);
         }
 
@@ -775 +765 @@
      */
     public function update_fees($order, $balance_transaction_id) {
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
+        $order_id = $order->get_id();
 
         $balance_transaction = WC_Yuansfer_API::retrieve('balance/history/' . $balance_transaction_id);
@@ -813 +803 @@
      */
     public function update_currency($order, $balance_transaction_id) {
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
+        $order_id = $order->get_id();
 
         $balance_transaction = WC_Yuansfer_API::retrieve('balance/history/' . $balance_transaction_id);
@@ -848 +838 @@
         $request['storeNo'] = $this->store_no;
 
-        if (WC_Yuansfer_Helper::is_pre_30()) {
-            $request['reference'] = get_post_meta($order_id, '_yuansfer_reference', true);
-            $order_currency = get_post_meta($order_id, '_order_currency', true);
-        } else {
-            $request['reference'] = $order->get_meta('_yuansfer_reference', true);
-            $order_currency = $order->get_currency();
-        }
-
-        if (!is_null($amount)) {
-            $request['amount'] = WC_Yuansfer_Helper::get_yuansfer_amount($amount, $order_currency);
-        }
-
-        if (!empty($this->manager_no)) {
-            $request['managerAccountNo'] = $this->manager_no;
-            $request['password'] = $this->manager_password;
+        $request['reference'] = $order->get_meta('_yuansfer_reference', true);
+        $currency = $order->get_currency();
+        if (!$currency) {
+            $currency = get_woocommerce_currency();
         }
+        $request['currency'] = $currency;
+
+        if (is_null($amount)) {
+            $amount = $order->get_total();
+        }
+        $request['refundAmount'] = WC_Yuansfer_Helper::get_yuansfer_amount($amount, $currency);
 
         WC_Yuansfer_Logger::log("Info: Beginning refund for order {$order->get_transaction_id()} for the amount of {$amount}");
@@ -869 +854 @@
         $request = apply_filters('wc_yuansfer_refund_request', $request, $order);
 
-        $response = WC_Yuansfer_API::request($request, 'securepayRefund');
+        $response = WC_Yuansfer_API::request($request, WC_Yuansfer_API::REFUND);
 
         if (empty($response->ret_code) || $response->ret_code !== '000100') {
@@ -879 +864 @@
         if (!empty($response->result->refundTransactionId)) {
             $newId = $response->result->refundTransactionId;
-            WC_Yuansfer_Helper::is_pre_30() ? update_post_meta($order_id, '_yuansfer_refund_id', $newId) : $order->update_meta_data('_yuansfer_refund_id', $newId);
+            $order->update_meta_data('_yuansfer_refund_id', $newId);
 
             /* translators: 1) dollar amount 2) transaction id 3) refund message */

woo-yuansfer/trunk/includes/admin/class-wc-yuansfer-admin-notices.php

@@ -70 +70 @@
         return array(
             'Alipay'        => 'WC_Gateway_Yuansfer_Alipay',
-            'WechatPay'     => 'WC_Gateway_Yuansfer_Wechatpay',
+            'WechatPay'     => 'WC_Gateway_Yuansfer_Wechatpay',
+            'CreditCard'    => 'WC_Gateway_Yuansfer_Creditcard',
+            'PayPal'        => 'WC_Gateway_Yuansfer_Paypal',
+            'Venmo'         => 'WC_Gateway_Yuansfer_Venmo',
         );
     }
@@ -187 +190 @@
                     update_option('wc_yuansfer_show_alipay_notice', 'no');
                     break;
-                case 'WechatPay':
-                    update_option('wc_yuansfer_show_wechatpay_notice', 'no');
+                case 'WechatPay':
+                    update_option('wc_yuansfer_show_wechatpay_notice', 'no');
+                    break;
+                case 'CreditCard':
+                    update_option('wc_yuansfer_show_creditcard_notice', 'no');
+                    break;
+                case 'PayPal':
+                    update_option('wc_yuansfer_show_paypal_notice', 'no');
+                    break;
+                case 'Venmo':
+                    update_option('wc_yuansfer_show_venmo_notice', 'no');
                     break;
             }

woo-yuansfer/trunk/includes/admin/yuansfer-alipay-settings.php

@@ -35 +35 @@
             'desc_tip'    => true,
         ),
+        'settle_currency' => array(
+            'title'       => __('Settle currency for CNY', 'woocommerce-yuansfer'),
+            'type'        => 'select',
+            'description' => __('If the payment currency is "CNY", which currency is used for settlement.', 'woocommerce-yuansfer'),
+            'default'     => 'USD',
+            'desc_tip'    => true,
+            'options'     => array(
+                'USD' => 'USD',
+                'GBP' => 'GBP',
+            ),
+        ),
     )
 );

woo-yuansfer/trunk/includes/admin/yuansfer-settings.php

@@ -70 +70 @@
             'desc_tip'    => true,
         ),
-        'manager_no' => array(
-            'title'       => __('Store Manager No', 'woocommerce-yuansfer'),
-            'type'        => 'text',
-            'description' => __('Required when store manager validation is set for refund', 'woocommerce-yuansfer'),
-            'default'     => '',
-            'desc_tip'    => true,
-        ),
-        'manager_password' => array(
-            'title'       => __('Store Manager Password', 'woocommerce-yuansfer'),
-            'type'        => 'password',
-            'description' => __('Store manager validation password.', 'woocommerce-yuansfer'),
-            'default'     => '',
-            'desc_tip'    => true,
-        ),
         'logging' => array(
             'title'       => __('Logging', 'woocommerce-yuansfer'),

woo-yuansfer/trunk/includes/admin/yuansfer-wechatpay-settings.php

@@ -25 +25 @@
             'type'        => 'text',
             'description' => __('This controls the title which the user sees during checkout.', 'woocommerce-yuansfer'),
-            'default'     => __('Wechat Pay (Yuansfer)', 'woocommerce-yuansfer'),
+            'default'     => __('WeChat Pay (Yuansfer)', 'woocommerce-yuansfer'),
             'desc_tip'    => true,
         ),

woo-yuansfer/trunk/includes/class-wc-gateway-yuansfer.php

@@ -73 +73 @@
             $order      = wc_get_order(wc_get_order_id_by_order_key(wc_clean($_GET['key'])));
             $total      = $order->get_total();
-            $user_email = WC_Yuansfer_Helper::is_pre_30() ? $order->billing_email : $order->get_billing_email();
+            $user_email = $order->get_billing_email();
         } else {
             if ($user->ID) {
@@ -168 +168 @@
      */
     public function create_source($order) {
-        $currency                 = WC_Yuansfer_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
-        $order_id                 = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
+        $currency                 = $order->get_currency();
+        if (!$currency) {
+            $currency = get_woocommerce_currency();
+        }
+        $order_id                 = $order->get_id();
         $return_url               = $this->get_yuansfer_return_url($order);
         $post_data                = array();
         $post_data['merchantNo']  = $this->merchant_no;
         $post_data['storeNo']     = $this->store_no;
-        $post_data['amount']      = WC_Yuansfer_Helper::get_yuansfer_amount($order->get_total(), $currency);
-        $post_data['currency']    = strtoupper($currency);
-        $post_data['vendor']      = 'unionpay';
-        $post_data['reference']   = $order_id . ':' . uniqid('unionpay:');
-        $post_data['ipnUrl']      = WC_Yuansfer_Helper::get_webhook_url();
-        $post_data['callbackUrl'] = $return_url;
-        $post_data['terminal']    = 'ONLINE';
+        $currency = strtoupper($currency);
+
+        $supportedCurrency = $this->get_supported_currency();
+        if (!in_array($currency, $supportedCurrency, true)) {
+            throw new WC_Yuansfer_Exception('Union Pay only support "' . implode('", "', $supportedCurrency). '" for currency');
+        }
+
+        $post_data['amount']         = WC_Yuansfer_Helper::get_yuansfer_amount($order->get_total(), $currency);
+        $post_data['currency']       = $currency;
+        $post_data['settleCurrency'] = 'USD';
+        $post_data['vendor']         = 'unionpay';
+        $post_data['reference']      = $order_id . ':' . uniqid('unionpay:');
+        $post_data['ipnUrl']         = WC_Yuansfer_Helper::get_webhook_url();
+        $post_data['callbackUrl']    = $return_url;
+        $post_data['terminal']       = $this->get_terminal();
+
+        if ($post_data['terminal'] === 'WAP') {
+            $post_data['osType'] = $this->detect->is('iOS') ? 'IOS' : 'ANDROID';
+        }
 
         if (!empty($this->statement_descriptor)) {
@@ -188 +203 @@
         WC_Yuansfer_Logger::log('Info: Begin creating UnionPay source');
 
-        return WC_Yuansfer_API::request(apply_filters('wc_yuansfer_unionpay_source', $post_data, $order), 'securepay');
+        return WC_Yuansfer_API::request(apply_filters('wc_yuansfer_unionpay_source', $post_data, $order), WC_Yuansfer_API::SECURE_PAY);
     }
 
@@ -209 +224 @@
             $this->validate_minimum_order_amount($order);
 
-            // This comes from the create account checkbox in the checkout page.
-            $create_account = !empty($_POST['createaccount']) ? true : false;
-
-            if ($create_account) {
-                $new_customer_id     = WC_Yuansfer_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-                $new_yuansfer_customer = new WC_Yuansfer_Customer($new_customer_id);
-                $new_yuansfer_customer->create_customer();
+            $response = $this->create_source($order);
+
+            if (empty($response->ret_code) || $response->ret_code !== '000100') {
+                $order->add_order_note($response->ret_msg);
+
+                throw new WC_Yuansfer_Exception($response->ret_msg);
             }
-
-            $response = $this->create_source($order);
-
-            if (\strpos($response, 'error') === 0) {
-                $order->add_order_note($response);
-
-                throw new WC_Yuansfer_Exception($response, $response);
-            }
-
-            if (WC_Yuansfer_Helper::is_pre_30()) {
-                update_post_meta($order_id, '_yuansfer_response', $response);
-            } else {
-                $order->update_meta_data('_yuansfer_response', $response);
-                $order->save();
-            }
-            
-            $order->payment_complete();
 
             WC_Yuansfer_Logger::log('Info: Redirecting to UnionPay...');
@@ -239 +236 @@
             return array(
                 'result'   => 'success',
-                'redirect' => WC_Yuansfer_Helper::get_redirect_url($order_id),
+                'redirect' => $response->result->cashierUrl,
             );
         } catch (WC_Yuansfer_Exception $e) {

woo-yuansfer/trunk/includes/class-wc-yuansfer-api.php

@@ -12 +12 @@
 
     const KEY = 'verifySign';
-    const VERSION = 'v2';
+
+    const SECURE_PAY = '/online/v3/secure-pay';
+    const REFUND = '/app-data-search/v3/refund';
+    const CUSTOMER_ADD = '/creditpay/v2/customer/add';
+    const CUSTOMER_EDIT = '/creditpay/v2/customer/edit';
 
     /**
      * Yuansfer API URL
      */
-    const PRODUCTION_URL = 'https://mapi.yuansfer.com/appTransaction';
-    const TEST_URL = 'https://mapi.yuansfer.yunkeguan.com/appTransaction';
+    const PRODUCTION_URL = 'https://mapi.yuansfer.com';
+    const TEST_URL = 'https://mapi.yuansfer.yunkeguan.com';
 
     /**
@@ -122 +126 @@
 
         $verifySign = $params[static::KEY];
+        unset($params[static::KEY]);
 
         return $verifySign === static::generate_sign($params);
@@ -142 +147 @@
 
         $response = wp_safe_remote_post(
-            self::get_url() . '/' . self::VERSION . '/' . $api,
+            self::get_url() . $api,
             array(
                 'method'  => $method,
@@ -157 +162 @@
             throw new WC_Yuansfer_Exception(print_r($response, true), __('There was a problem connecting to the Yuansfer API endpoint.', 'woocommerce-yuansfer'));
         }
-
-        if ($api === 'securepay') {
-            if (WC_Yuansfer_Helper::is_html((string)$response['body'])) {
-                return $response['body'];
-            } else {
-                WC_Yuansfer_Logger::log('Error Response: ' . print_r($response['body']) . PHP_EOL . PHP_EOL . 'Failed request: ' . print_r(array(
-                        'api'             => $api,
-                        'request'         => $request,
-                    ), true ));
-
-                if (WC_Yuansfer_Helper::is_json((string)$response['body'])) {
-                    $res_json = json_decode((string)$response['body']);
-                    $errmsg = $res_json->retMsg;
-                } else {
-                    $errmsg = __('Internal Server Error.', 'woocommerce-yuansfer');
-                }
-                throw new WC_Yuansfer_Exception(print_r($response, true), $errmsg);
-            }
-        }
 
         return json_decode($response['body']);

woo-yuansfer/trunk/includes/class-wc-yuansfer-customer.php

@@ -1 +1 @@
 <?php
-if (!defined('ABSPATH')) {
-    exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
 }
 
@@ -11 +11 @@
 class WC_Yuansfer_Customer {
 
-    /**
-     * Yuansfer customer ID
-     * @var string
-     */
-    private $id = '';
-
-    /**
-     * WP User ID
-     * @var integer
-     */
-    private $user_id = 0;
-
-    /**
-     * Data from API
-     * @var array
-     */
-    private $customer_data = array();
-
-    /**
-     * Constructor
-     * @param int $user_id The WP user ID
-     */
-    public function __construct($user_id = 0) {
-        if ($user_id) {
-            $this->set_user_id($user_id);
-            $this->set_id(get_user_meta($user_id, '_yuansfer_customer_id', true));
-        }
-    }
-
-    /**
-     * Get Yuansfer customer ID.
-     * @return string
-     */
-    public function get_id() {
-        return $this->id;
-    }
-
-    /**
-     * Set Yuansfer customer ID.
-     * @param [type] $id [description]
-     */
-    public function set_id($id) {
-        // Backwards compat for customer ID stored in array format. (Pre 3.0)
-        if (is_array($id) && isset($id['customer_id'])) {
-            $id = $id['customer_id'];
-
-            update_user_meta($this->get_user_id(), '_yuansfer_customer_id', $id);
-        }
-
-        $this->id = wc_clean($id);
-    }
-
-    /**
-     * User ID in WordPress.
-     * @return int
-     */
-    public function get_user_id() {
-        return absint($this->user_id);
-    }
-
-    /**
-     * Set User ID used by WordPress.
-     * @param int $user_id
-     */
-    public function set_user_id($user_id) {
-        $this->user_id = absint($user_id);
-    }
-
-    /**
-     * Get user object.
-     * @return WP_User
-     */
-    protected function get_user() {
-        return $this->get_user_id() ? get_user_by('id', $this->get_user_id()) : false;
-    }
-
-    /**
-     * Store data from the Yuansfer API about this customer
-     */
-    public function set_customer_data($data) {
-        $this->customer_data = $data;
-    }
-
-    /**
-     * Create a customer via API.
-     * @param array $args
-     * @return WP_Error|int
-     */
-    public function create_customer($args = array()) {
-        $billing_email = isset($_POST['billing_email']) ? filter_var($_POST['billing_email'], FILTER_SANITIZE_EMAIL) : '';
-        $user          = $this->get_user();
-
-        if ($user) {
-            $billing_first_name = get_user_meta($user->ID, 'billing_first_name', true);
-            $billing_last_name  = get_user_meta($user->ID, 'billing_last_name', true);
-            $description        = __('Name', 'woocommerce-yuansfer') . ': ' . $billing_first_name . ' ' . $billing_last_name . ' ' . __('Username', 'woocommerce-yuansfer') . ': ' . $user->user_login;
-
-            $defaults = array(
-                'email'       => $user->user_email,
-                'description' => $description,
-            );
-        } else {
-            $defaults = array(
-                'email'       => $billing_email,
-                'description' => '',
-            );
-        }
-
-        $metadata = array();
-
-        $defaults['metadata'] = apply_filters('wc_yuansfer_customer_metadata', $metadata, $user);
-
-        $args     = wp_parse_args($args, $defaults);
-        $response = WC_Yuansfer_API::request(apply_filters('wc_yuansfer_create_customer_args', $args), 'customers');
-
-        if (!empty($response->error)) {
-            throw new WC_Yuansfer_Exception(print_r($response, true), $response->error->message);
-        }
-
-        $this->set_id($response->id);
-        $this->clear_cache();
-        $this->set_customer_data($response);
-
-        if ($this->get_user_id()) {
-            update_user_meta($this->get_user_id(), '_yuansfer_customer_id', $response->id);
-        }
-
-        do_action('woocommerce_yuansfer_add_customer', $args, $response);
-
-        return $response->id;
-    }
-
-    /**
-     * Checks to see if error is of invalid request
-     * error and it is no such customer.
-     *
-     * @param array $error
-     */
-    public function is_no_such_customer_error($error) {
-        return (
-            $error &&
-            'invalid_request_error' === $error->type &&
-            preg_match('/No such customer/i', $error->message)
-        );
-    }
-
-    /**
-     * Add a source for this yuansfer customer.
-     * @param string $source_id
-     * @param bool $retry
-     * @return WP_Error|int
-     */
-    public function add_source($source_id, $retry = true) {
-        if (!$this->get_id()) {
-            $this->set_id($this->create_customer());
-        }
-
-        $response = WC_Yuansfer_API::request(array(
-            'source' => $source_id,
-        ), 'customers/' . $this->get_id() . '/sources');
-
-        $wc_token = false;
-
-        if (!empty($response->error)) {
-            // It is possible the WC user once was linked to a customer on Yuansfer
-            // but no longer exists. Instead of failing, lets try to create a
-            // new customer.
-            if ($this->is_no_such_customer_error($response->error)) {
-                delete_user_meta($this->get_user_id(), '_yuansfer_customer_id');
-                $this->create_customer();
-                return $this->add_source($source_id, false);
-            } else {
-                return $response;
-            }
-        } elseif (empty($response->id)) {
-            return new WP_Error('error', __('Unable to add payment source.', 'woocommerce-yuansfer'));
-        }
-
-        // Add token to WooCommerce.
-        if ($this->get_user_id() && class_exists('WC_Payment_Token_CC')) {
-            if (!empty($response->type)) {
-                switch ($response->type) {
-                    case 'alipay':
-                        break;
-                    default:
-                        if ('source' === $response->object && 'card' === $response->type) {
-                            $wc_token = new WC_Payment_Token_CC();
-                            $wc_token->set_token($response->id);
-                            $wc_token->set_gateway_id('yuansfer');
-                            $wc_token->set_card_type(strtolower($response->card->brand));
-                            $wc_token->set_last4($response->card->last4);
-                            $wc_token->set_expiry_month($response->card->exp_month);
-                            $wc_token->set_expiry_year($response->card->exp_year);
-                        }
-                        break;
-                }
-            } else {
-                // Legacy.
-                $wc_token = new WC_Payment_Token_CC();
-                $wc_token->set_token($response->id);
-                $wc_token->set_gateway_id('yuansfer');
-                $wc_token->set_card_type(strtolower($response->brand));
-                $wc_token->set_last4($response->last4);
-                $wc_token->set_expiry_month($response->exp_month);
-                $wc_token->set_expiry_year($response->exp_year);
-            }
-
-            $wc_token->set_user_id($this->get_user_id());
-            $wc_token->save();
-        }
-
-        $this->clear_cache();
-
-        do_action('woocommerce_yuansfer_add_source', $this->get_id(), $wc_token, $response, $source_id);
-
-        return $response->id;
-    }
-
-    /**
-     * Get a customers saved sources using their Yuansfer ID.
-     *
-     * @param  string $customer_id
-     * @return array
-     */
-    public function get_sources() {
-        if (!$this->get_id()) {
-            return array();
-        }
-
-        $sources = get_transient('yuansfer_sources_' . $this->get_id());
-
-        $response = WC_Yuansfer_API::request(array(
-            'limit'       => 100,
-        ), 'customers/' . $this->get_id() . '/sources', 'GET');
-
-        if (!empty($response->error)) {
-            return array();
-        }
-
-        if (is_array($response->data)) {
-            $sources = $response->data;
-        }
-
-        return empty($sources) ? array() : $sources;
-    }
-
-    /**
-     * Delete a source from yuansfer.
-     * @param string $source_id
-     */
-    public function delete_source($source_id) {
-        if (!$this->get_id()) {
-            return false;
-        }
-
-        $response = WC_Yuansfer_API::request(array(), 'customers/' . $this->get_id() . '/sources/' . sanitize_text_field($source_id), 'DELETE');
-
-        $this->clear_cache();
-
-        if (empty($response->error)) {
-            do_action('wc_yuansfer_delete_source', $this->get_id(), $response);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Set default source in Yuansfer
-     * @param string $source_id
-     */
-    public function set_default_source($source_id) {
-        $response = WC_Yuansfer_API::request(array(
-            'default_source' => sanitize_text_field($source_id),
-        ), 'customers/' . $this->get_id(), 'POST');
-
-        $this->clear_cache();
-
-        if (empty($response->error)) {
-            do_action('wc_yuansfer_set_default_source', $this->get_id(), $response);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Deletes caches for this users cards.
-     */
-    public function clear_cache() {
-        delete_transient('yuansfer_sources_' . $this->get_id());
-        delete_transient('yuansfer_customer_' . $this->get_id());
-        $this->customer_data = array();
-    }
+    /**
+     * Yuansfer customer ID
+     * @var string
+     */
+    private $id = '';
+
+    /**
+     * WP User ID
+     * @var integer
+     */
+    private $user_id = 0;
+
+    /**
+     * Data from API
+     * @var array
+     */
+    private $customer_data = array();
+
+    public $merchant_no;
+    public $store_no;
+
+    /**
+     * Constructor
+     * @param int $user_id The WP user ID
+     */
+    public function __construct( $user_id = 0 ) {
+        if ( $user_id ) {
+            $this->set_user_id( $user_id );
+            $this->set_id( $this->get_id_from_meta( $user_id ) );
+        }
+
+        $main_settings     = get_option('woocommerce_yuansfer_settings');
+        $this->merchant_no = !empty($main_settings['merchant_no']) ? $main_settings['merchant_no'] : '';
+        $this->store_no    = !empty($main_settings['store_no']) ? $main_settings['store_no'] : '';
+    }
+
+    /**
+     * Get Yuansfer customer ID.
+     * @return string
+     */
+    public function get_id() {
+        return $this->id;
+    }
+
+    /**
+     * Set Yuansfer customer ID.
+     * @param [type] $id [description]
+     */
+    public function set_id( $id ) {
+        // Backwards compat for customer ID stored in array format. (Pre 3.0)
+        if ( is_array( $id ) && isset( $id['customer_id'] ) ) {
+            $id = $id['customer_id'];
+
+            $this->update_id_in_meta( $id );
+        }
+
+        $this->id = wc_clean( $id );
+    }
+
+    /**
+     * User ID in WordPress.
+     * @return int
+     */
+    public function get_user_id() {
+        return absint( $this->user_id );
+    }
+
+    /**
+     * Set User ID used by WordPress.
+     * @param int $user_id
+     */
+    public function set_user_id( $user_id ) {
+        $this->user_id = absint( $user_id );
+    }
+
+    /**
+     * Get user object.
+     * @return WP_User
+     */
+    protected function get_user() {
+        return $this->get_user_id() ? get_user_by( 'id', $this->get_user_id() ) : false;
+    }
+
+    /**
+     * Store data from the Yuansfer API about this customer
+     */
+    public function set_customer_data( $data ) {
+        $this->customer_data = $data;
+    }
+
+    /**
+     * Generates the customer request, used for both creating and updating customers.
+     *
+     * @param  array $args Additional arguments (optional).
+     * @return array
+     */
+    protected function generate_customer_request( $args = array() ) {
+        $args += array(
+            'merchantNo'    => $this->merchant_no,
+            'storeNo'       => $this->store_no,
+        );
+
+        return $args;
+    }
+
+    /**
+     * Create a customer via API.
+     * @param array $args
+     * @return WP_Error|int
+     */
+    public function create_customer($args) {
+        $args['groupCode'] = 'HPP';
+        $args     = $this->generate_customer_request( $args );
+        $response = WC_Yuansfer_API::request( $args, WC_Yuansfer_API::CUSTOMER_ADD );
+
+        if ( empty( $response->ret_code ) || $response->ret_code !== '000100' ) {
+            throw new WC_Yuansfer_Exception( print_r( $response, true ), $response->error->message );
+        }
+
+        $customer = $response->customerInfo;
+
+        $this->set_id( $customer->customerNo );
+        $this->clear_cache();
+        $this->set_customer_data( $customer );
+
+        if ( $this->get_user_id() ) {
+            $this->update_id_in_meta( $customer->customerNo );
+        }
+
+        do_action( 'woocommerce_yuansfer_add_customer', $args, $response );
+
+        return $customer->customerNo;
+    }
+
+    /**
+     * Updates the Yuansfer customer through the API.
+     *
+     * @param array $args
+     * @param bool  $is_retry Whether the current call is a retry (optional, defaults to false). If true, then an exception will be thrown instead of further retries on error.
+     *
+     * @return string Customer ID
+     *
+     * @throws WC_Yuansfer_Exception
+     */
+    public function update_customer( $args, $is_retry = false ) {
+        if ( empty( $this->get_id() ) ) {
+            throw new WC_Yuansfer_Exception( 'id_required_to_update_user', __( 'Attempting to update a Yuansfer customer without a customer ID.', 'woocommerce-gateway-yuansfer' ) );
+        }
+
+        $args['customerNo'] = $this->get_id();
+        $args     = $this->generate_customer_request($args);
+        $response = WC_Yuansfer_API::request( $args, WC_Yuansfer_API::CUSTOMER_EDIT );
+
+        if ( empty( $response->ret_code ) || $response->ret_code !== '000100' ) {
+            if ( ! $is_retry && $this->is_no_such_customer_error( $response->ret_msg ) ) {
+                // This can happen when switching the main Yuansfer account or importing users from another site.
+                // If not already retrying, recreate the customer and then try updating it again.
+                $this->recreate_customer();
+                return $this->update_customer( $args, true );
+            }
+
+            throw new WC_Yuansfer_Exception( $response->ret_msg );
+        }
+
+        $this->clear_cache();
+        $this->set_customer_data( $response->customerInfo );
+
+        do_action( 'woocommerce_yuansfer_update_customer', $args, $response );
+
+        return $this->get_id();
+    }
+
+    /**
+     * Checks to see if error is of invalid request
+     * error and it is no such customer.
+     *
+     * @since 4.1.2
+     * @param array $error
+     */
+    public function is_no_such_customer_error( $error ) {
+        return (
+            $error &&
+            preg_match( '/No such customer/i', $error )
+        );
+    }
+
+    /**
+     * Deletes caches for this users cards.
+     */
+    public function clear_cache() {
+        delete_transient( 'yuansfer_customer_' . $this->get_id() );
+        $this->customer_data = array();
+    }
+
+    /**
+     * Retrieves the Yuansfer Customer ID from the user meta.
+     *
+     * @param  int $user_id The ID of the WordPress user.
+     * @return string|bool  Either the Yuansfer ID or false.
+     */
+    public function get_id_from_meta( $user_id ) {
+        return get_user_option( '_yuansfer_customer_id', $user_id );
+    }
+
+    /**
+     * Updates the current user with the right Yuansfer ID in the meta table.
+     *
+     * @param string $id The Yuansfer customer ID.
+     */
+    public function update_id_in_meta( $id ) {
+        update_user_option( $this->get_user_id(), '_yuansfer_customer_id', $id, false );
+    }
+
+    /**
+     * Deletes the user ID from the meta table with the right key.
+     */
+    public function delete_id_from_meta() {
+        delete_user_option( $this->get_user_id(), '_yuansfer_customer_id', false );
+    }
+
+    /**
+     * Recreates the customer for this user.
+     *
+     * @return string ID of the new Customer object.
+     */
+    private function recreate_customer() {
+        $this->delete_id_from_meta();
+        return $this->create_customer();
+    }
 }

woo-yuansfer/trunk/includes/class-wc-yuansfer-helper.php

@@ -25 +25 @@
         }
 
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
-
-        return WC_Yuansfer_Helper::is_pre_30() ? get_post_meta($order_id, self::META_NAME_YUANSFER_CURRENCY, true) : $order->get_meta(self::META_NAME_YUANSFER_CURRENCY, true);
+        return $order->get_meta(self::META_NAME_YUANSFER_CURRENCY, true);
     }
 
@@ -41 +39 @@
         }
 
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
-
-        WC_Yuansfer_Helper::is_pre_30() ? update_post_meta($order_id, self::META_NAME_YUANSFER_CURRENCY, $currency) : $order->update_meta_data(self::META_NAME_YUANSFER_CURRENCY, $currency);
+        $order->update_meta_data(self::META_NAME_YUANSFER_CURRENCY, $currency);
     }
 
@@ -57 +53 @@
         }
 
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
-
-        $amount = WC_Yuansfer_Helper::is_pre_30() ? get_post_meta($order_id, self::META_NAME_FEE, true) : $order->get_meta(self::META_NAME_FEE, true);
+        $amount = $order->get_meta(self::META_NAME_FEE, true);
 
         // If not found let's check for legacy name.
         if (empty($amount)) {
-            $amount = WC_Yuansfer_Helper::is_pre_30() ? get_post_meta($order_id, self::LEGACY_META_NAME_FEE, true) : $order->get_meta(self::LEGACY_META_NAME_FEE, true);
+            $amount = $order->get_meta(self::LEGACY_META_NAME_FEE, true);
 
             // If found update to new name.
@@ -85 +79 @@
         }
 
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
-
-        WC_Yuansfer_Helper::is_pre_30() ? update_post_meta($order_id, self::META_NAME_FEE, $amount) : $order->update_meta_data(self::META_NAME_FEE, $amount);
+        $order->update_meta_data(self::META_NAME_FEE, $amount);
     }
 
@@ -100 +92 @@
         }
 
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
+        $order_id = $order->get_id();
 
         delete_post_meta($order_id, self::META_NAME_FEE);
@@ -117 +109 @@
         }
 
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
-
-        $amount = WC_Yuansfer_Helper::is_pre_30() ? get_post_meta($order_id, self::META_NAME_NET, true) : $order->get_meta(self::META_NAME_NET, true);
+        $amount = $order->get_meta(self::META_NAME_NET, true);
 
         // If not found let's check for legacy name.
         if (empty($amount)) {
-            $amount = WC_Yuansfer_Helper::is_pre_30() ? get_post_meta($order_id, self::LEGACY_META_NAME_NET, true) : $order->get_meta(self::LEGACY_META_NAME_NET, true);
+            $amount = $order->get_meta(self::LEGACY_META_NAME_NET, true);
 
             // If found update to new name.
@@ -145 +135 @@
         }
 
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
-
-        WC_Yuansfer_Helper::is_pre_30() ? update_post_meta($order_id, self::META_NAME_NET, $amount) : $order->update_meta_data(self::META_NAME_NET, $amount);
+        $order->update_meta_data(self::META_NAME_NET, $amount);
     }
 
@@ -160 +148 @@
         }
 
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
+        $order_id = $order->get_id();
 
         delete_post_meta($order_id, self::META_NAME_NET);
@@ -320 +308 @@
     }
 
-    /**
-     * Check if WC version is pre 3.0.
-     *
-     * @return bool
-     */
-    public static function is_pre_30() {
-        return version_compare(WC_VERSION, '3.0.0', '<');
-    }
-
     /**
      * Checks if WC version is less than passed in version.

woo-yuansfer/trunk/includes/class-wc-yuansfer-order-handler.php

@@ -113 +113 @@
                 // Customer param wrong? The user may have been deleted on yuansfer's end. Remove customer_id. Can be retried without.
                 if ($this->is_no_such_customer_error($response->error)) {
-                    if (WC_Yuansfer_Helper::is_pre_30()) {
-                        delete_user_meta($order->customer_user, '_yuansfer_customer_id');
-                        delete_post_meta($order_id, '_yuansfer_customer_id');
-                    } else {
-                        delete_user_meta($order->get_customer_id(), '_yuansfer_customer_id');
-                        $order->delete_meta_data('_yuansfer_customer_id');
-                        $order->save();
-                    }
+                    delete_user_meta($order->get_customer_id(), '_yuansfer_customer_id');
+                    $order->delete_meta_data('_yuansfer_customer_id');
+                    $order->save();
                 }
 
@@ -206 +201 @@
         $order = wc_get_order($order_id);
 
-        if ('yuansfer' === (WC_Yuansfer_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method())) {
-            $charge   = WC_Yuansfer_Helper::is_pre_30() ? get_post_meta($order_id, '_transaction_id', true) : $order->get_transaction_id();
-            $captured = WC_Yuansfer_Helper::is_pre_30() ? get_post_meta($order_id, '_yuansfer_charge_captured', true) : $order->get_meta('_yuansfer_charge_captured', true);
+        if ('yuansfer' === $order->get_payment_method()) {
+            $charge   = $order->get_transaction_id();
+            $captured = $order->get_meta('_yuansfer_charge_captured', true);
 
             if ($charge && 'no' === $captured) {
@@ -228 +223 @@
                     /* translators: transaction id */
                     $order->add_order_note(sprintf(__('Yuansfer charge complete (Charge ID: %s)', 'woocommerce-yuansfer'), $result->id));
-                    WC_Yuansfer_Helper::is_pre_30() ? update_post_meta($order_id, '_yuansfer_charge_captured', 'yes') : $order->update_meta_data('_yuansfer_charge_captured', 'yes');
+                    $order->update_meta_data('_yuansfer_charge_captured', 'yes');
 
                     // Store other data such as fees
-                    WC_Yuansfer_Helper::is_pre_30() ? update_post_meta($order_id, '_transaction_id', $result->id) : $order->set_transaction_id($result->id);
+                    $order->set_transaction_id($result->id);
 
                     if (isset($result->balance_transaction) && isset($result->balance_transaction->fee)) {
@@ -261 +256 @@
         $order = wc_get_order($order_id);
 
-        if (strpos(WC_Yuansfer_Helper::is_pre_30() ? $order->payment_method : $order->get_payment_method(), 'yuansfer') === 0) {
+        if (strpos($order->get_payment_method(), 'yuansfer') === 0) {
             $this->process_refund($order_id);
 

woo-yuansfer/trunk/includes/class-wc-yuansfer-webhook-handler.php

@@ -60 +60 @@
             }
 
-            $response = WC_Yuansfer_Helper::is_pre_30() ? get_post_meta($order_id, '_yuansfer_response', true) : $order->get_meta('_yuansfer_response', true);
+            $response = $order->get_meta('_yuansfer_response', true);
 
             if (!$response) {
@@ -80 +80 @@
 
         if ($order) {
-            if (WC_Yuansfer_Helper::is_pre_30()) {
-                delete_post_meta($order_id, '_yuansfer_response');
-                update_post_meta($order_id, '_yuansfer_reference', $reference);
-            } else {
-                $order->delete_meta_data('_yuansfer_response');
-                $order->update_meta_data('_yuansfer_reference', $reference);
-                $order->save();
-            }
+            $order->delete_meta_data('_yuansfer_response');
+            $order->update_meta_data('_yuansfer_reference', $reference);
+            $order->save();
         }
 
@@ -152 +147 @@
         }
 
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
         $status = $order->get_status();
 
@@ -160 +154 @@
 
         // Store other data such as fees
-        WC_Yuansfer_Helper::is_pre_30() ? update_post_meta($order_id, '_transaction_id', $post['yuansferId']) : $order->set_transaction_id($post['yuansferId']);
+        $order->set_transaction_id($post['yuansferId']);
 
         $order->payment_complete($post['yuansferId']);
 
         /* translators: transaction id */
-        $order->add_order_note(sprintf(__('Yuansfer charge complete (Charge ID: %s)', 'woocommerce-yuansfer'), $post['yuansferId']));
+        $order->add_order_note(sprintf(__('Yuansfer payment complete (Transaction ID: %s)', 'woocommerce-yuansfer'), $post['yuansferId']));
 
         if (is_callable(array($order, 'save'))) {

woo-yuansfer/trunk/includes/compat/class-wc-yuansfer-pre-orders-compat.php

@@ -23 +23 @@
      */
     public function remove_order_source_before_retry($order) {
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
+        $order_id = $order->get_id();
         delete_post_meta($order_id, '_yuansfer_source_id');
         // For BW compat will remove in the future.
@@ -34 +34 @@
      */
     public function remove_order_customer_before_retry($order) {
-        $order_id = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
+        $order_id = $order->get_id();
         delete_post_meta($order_id, '_yuansfer_customer_id');
     }

woo-yuansfer/trunk/includes/payment-methods/class-wc-gateway-yuansfer-alipay.php

@@ -14 +14 @@
     const ICON = 'alipay';
 
+    protected $settle_currency_for_cny = 'USD';
+
     /**
      * Constructor
      */
     public function __construct() {
-        $this->id                   = 'yuansfer_alipay';
-        $this->method_title         = __('Yuansfer Alipay', 'woocommerce-yuansfer');
+        $this->id                      = 'yuansfer_alipay';
+        $this->method_title            = __('Yuansfer Alipay', 'woocommerce-yuansfer');
+        $this->settle_currency_for_cny = $this->get_option('settle_currency');
 
         parent::__construct();
@@ -88 +91 @@
     }
 
+    public function get_supported_currency() {
+        return apply_filters('wc_yuansfer_supported_currencies', array(
+            'USD', 'CNY', 'PHP', 'IDR', 'KRW', 'HKD', 'GBP'
+        ));
+    }
+
     /**
      * Creates the source for charge.
@@ -95 +104 @@
      */
     public function create_source($order) {
-        $currency                 = WC_Yuansfer_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
-        $order_id                 = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
+        $currency                 = $order->get_currency();
+        if (!$currency) {
+            $currency = get_woocommerce_currency();
+        }
+        $order_id                 = $order->get_id();
         $return_url               = $this->get_yuansfer_return_url($order);
         $post_data                = array();
-        $post_data['merchantNo']  = $this->merchant_no;
+        $post_data['merchantNo']  = $this->merchant_no;
         $post_data['storeNo']     = $this->store_no;
-        $post_data['amount']      = WC_Yuansfer_Helper::get_yuansfer_amount($order->get_total(), $currency);
-        $post_data['currency']    = strtoupper($currency);
-        $post_data['vendor']      = 'alipay';
-        $post_data['reference']   = $order_id . ':' . uniqid('alipay:');
-        $post_data['ipnUrl']      = WC_Yuansfer_Helper::get_webhook_url();
-        $post_data['callbackUrl'] = $return_url;
-        $post_data['terminal']    = 'ONLINE';
+        $currency = strtoupper($currency);
+        $supportedCurrency = $this->get_supported_currency();
+        if (in_array($currency, $supportedCurrency, true)) {
+            throw new WC_Yuansfer_Exception('Alipay only support "' . implode('", "', $supportedCurrency). '" for currency');
+        }
+
+        $settleCurrency = 'USD';
+        $amount = WC_Yuansfer_Helper::get_yuansfer_amount($order->get_total(), $currency);
+
+        switch ($currency) {
+            case 'PHP':
+                if ($amount < 1) {
+                    throw new WC_Yuansfer_Exception('The minimum value is 1PHP');
+                }
+                break;
+
+            case 'IDR':
+                if ($amount < 300) {
+                    throw new WC_Yuansfer_Exception('The minimum value is 300IDR');
+                }
+                break;
+
+            case 'KRW':
+                if ($amount < 50) {
+                    throw new WC_Yuansfer_Exception('The minimum value is 50KRW');
+                }
+                break;
+
+            case 'HKD':
+                if ($amount < 0.1) {
+                    throw new WC_Yuansfer_Exception('The minimum value is 0.1HKD');
+                }
+                break;
+
+            case 'GBP':
+                $settleCurrency = 'GBP';
+                break;
+
+            case 'CNY':
+                if (in_array($this->settle_currency_for_cny, array('USD', 'GBP'), true)) {
+                    $settleCurrency = $this->settle_currency_for_cny;
+                }
+                break;
+        }
+
+        $post_data['amount']         = $amount;
+        $post_data['currency']       = $currency;
+        $post_data['settleCurrency'] = $settleCurrency;
+        $post_data['vendor']         = 'alipay';
+        $post_data['reference']      = $order_id . ':' . uniqid('alipay:');
+        $post_data['ipnUrl']         = WC_Yuansfer_Helper::get_webhook_url();
+        $post_data['callbackUrl']    = $return_url;
+        $post_data['terminal']       = $this->get_terminal();
+
+        if ($post_data['terminal'] === 'WAP') {
+            $post_data['osType'] = $this->detect->is('iOS') ? 'IOS' : 'ANDROID';
+        }
 
         if (!empty($this->statement_descriptor)) {
@@ -115 +177 @@
         WC_Yuansfer_Logger::log('Info: Begin creating Alipay source');
 
-        return WC_Yuansfer_API::request(apply_filters('wc_yuansfer_alipay_source', $post_data, $order), 'securepay');
+        return WC_Yuansfer_API::request(apply_filters('wc_yuansfer_alipay_source', $post_data, $order), WC_Yuansfer_API::SECURE_PAY);
     }
 
@@ -136 +198 @@
             $this->validate_minimum_order_amount($order);
 
-            // This comes from the create account checkbox in the checkout page.
-            $create_account = !empty($_POST['createaccount']) ? true : false;
-
-            if ($create_account) {
-                $new_customer_id     = WC_Yuansfer_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-                $new_yuansfer_customer = new WC_Yuansfer_Customer($new_customer_id);
-                $new_yuansfer_customer->create_customer();
+            $response = $this->create_source($order);
+
+            if (empty($response->ret_code) || $response->ret_code !== '000100') {
+                $order->add_order_note($response->ret_msg);
+
+                throw new WC_Yuansfer_Exception($response->ret_msg);
             }
-
-            $response = $this->create_source($order);
-
-            if (\strpos($response, 'error') === 0) {
-                $order->add_order_note($response);
-
-                throw new WC_Yuansfer_Exception($response, $response);
-            }
-
-            if (WC_Yuansfer_Helper::is_pre_30()) {
-                update_post_meta($order_id, '_yuansfer_response', $response);
-            } else {
-                $order->update_meta_data('_yuansfer_response', $response);
-                $order->save();
-            }
-            
-            $order->payment_complete();
 
             WC_Yuansfer_Logger::log('Info: Redirecting to Alipay...');
@@ -166 +210 @@
             return array(
                 'result'   => 'success',
-                'redirect' => WC_Yuansfer_Helper::get_redirect_url($order_id),
+                'redirect' => $response->result->cashierUrl,
             );
         } catch (WC_Yuansfer_Exception $e) {

woo-yuansfer/trunk/includes/payment-methods/class-wc-gateway-yuansfer-wechatpay.php

@@ -93 +93 @@
      */
     public function create_source($order) {
-        $currency                 = WC_Yuansfer_Helper::is_pre_30() ? $order->get_order_currency() : $order->get_currency();
-        $order_id                 = WC_Yuansfer_Helper::is_pre_30() ? $order->id : $order->get_id();
+        $currency                 = $order->get_currency();
+        if (!$currency) {
+            $currency = get_woocommerce_currency();
+        }
+        $order_id                 = $order->get_id();
         $return_url               = $this->get_yuansfer_return_url($order);
         $post_data                = array();
         $post_data['merchantNo']  = $this->merchant_no;
         $post_data['storeNo']     = $this->store_no;
+        $currency = strtoupper($currency);
+        $supportedCurrency = $this->get_supported_currency();
+        if (!in_array($currency, $supportedCurrency, true)) {
+            throw new WC_Yuansfer_Exception('WeChat Pay only support "' . implode('", "', $supportedCurrency). '" for currency');
+        }
+
         $post_data['amount']      = WC_Yuansfer_Helper::get_yuansfer_amount($order->get_total(), $currency);
-        $post_data['currency']    = strtoupper($currency);
+        $post_data['currency']    = $currency;
+        $post_data['settleCurrency'] = 'USD';
         $post_data['vendor']      = 'wechatpay';
         $post_data['reference']   = $order_id . ':' . uniqid('wechatpay:');
         $post_data['ipnUrl']      = WC_Yuansfer_Helper::get_webhook_url();
         $post_data['callbackUrl'] = $return_url;
-        $post_data['terminal']    = 'ONLINE';
+        $post_data['terminal']    = $this->get_terminal(true);
+
+        if ($post_data['terminal'] === 'WAP' || $post_data['terminal'] === 'MWEB') {
+            $post_data['osType'] = $this->detect->is('iOS') ? 'IOS' : 'ANDROID';
+        }
 
         if (!empty($this->statement_descriptor)) {
@@ -113 +127 @@
         WC_Yuansfer_Logger::log('Info: Begin creating WeChat Pay source');
 
-        return WC_Yuansfer_API::request(apply_filters('wc_yuansfer_wechatpay_source', $post_data, $order), 'securepay');
+        return WC_Yuansfer_API::request(apply_filters('wc_yuansfer_wechatpay_source', $post_data, $order), WC_Yuansfer_API::SECURE_PAY);
     }
 
@@ -134 +148 @@
             $this->validate_minimum_order_amount($order);
 
-            // This comes from the create account checkbox in the checkout page.
-            $create_account = !empty($_POST['createaccount']) ? true : false;
-
-            if ($create_account) {
-                $new_customer_id     = WC_Yuansfer_Helper::is_pre_30() ? $order->customer_user : $order->get_customer_id();
-                $new_yuansfer_customer = new WC_Yuansfer_Customer($new_customer_id);
-                $new_yuansfer_customer->create_customer();
-            }
-
             $response = $this->create_source($order);
 
-            if (\strpos($response, 'error') === 0) {
-                $order->add_order_note($response);
+            if (empty($response->ret_code) || $response->ret_code !== '000100') {
+                $order->add_order_note($response->ret_msg);
 
-                throw new WC_Yuansfer_Exception($response, $response);
+                throw new WC_Yuansfer_Exception($response->ret_msg);
             }
-
-            if (WC_Yuansfer_Helper::is_pre_30()) {
-                update_post_meta($order_id, '_yuansfer_response', $response);
-            } else {
-                $order->update_meta_data('_yuansfer_response', $response);
-                $order->save();
-            }
-            
-            $order->payment_complete();
 
             WC_Yuansfer_Logger::log('Info: Redirecting to Wechat Pay...');
@@ -164 +160 @@
             return array(
                 'result'   => 'success',
-                'redirect' => WC_Yuansfer_Helper::get_redirect_url($order_id),
+                'redirect' => $response->result->cashierUrl,
             );
         } catch (WC_Yuansfer_Exception $e) {

woo-yuansfer/trunk/uninstall.php

@@ -21 +21 @@
     delete_option('wc_yuansfer_show_keys_notice');
     delete_option('wc_yuansfer_show_alipay_notice');
-    delete_option('wc_yuansfer_show_wechatpay_notice');
+    delete_option('wc_yuansfer_show_wechatpay_notice');
+    delete_option('wc_yuansfer_show_creditcard_notice');
+    delete_option('wc_yuansfer_show_paypal_notice');
+    delete_option('wc_yuansfer_show_venmo_notice');
     delete_option('wc_yuansfer_version');
     delete_option('woocommerce_yuansfer_alipay_settings');
-    delete_option('woocommerce_yuansfer_wechatpay_settings');
+    delete_option('woocommerce_yuansfer_wechatpay_settings');
+    delete_option('woocommerce_yuansfer_creditcard_settings');
+    delete_option('woocommerce_yuansfer_paypal_settings');
+    delete_option('woocommerce_yuansfer_venmo_settings');
 }

woo-yuansfer/trunk/woocommerce-yuansfer.php

@@ -2 +2 @@
 /*
  * Plugin Name: WooCommerce Yuansfer
- * Plugin URI: https://wordpress.org/plugins/woocommerce-yuansfer/
+ * Plugin URI: https://wordpress.org/plugins/woo-yuansfer/
  * Description: Provides a Yuansfer Payment Gateway
- * Author: FlyingHail
- * Author URI: https://www.flyinghail.net/
- * Version: 1.0.0
- * WC requires at least: 2.6
- * WC tested up to: 3.4
+ * Author: Yuansfer
+ * Author URI: https://www.yuansfer.com/
+ * Version: 3.0.0
+ * WC requires at least: 3.0
+ * WC tested up to: 4.3
  */
 
@@ -35 +35 @@
      * Required minimums and constants
      */
-    define('WC_YUANSFER_VERSION', '1.0.0');
+    define('WC_YUANSFER_VERSION', '3.0.0');
     define('WC_YUANSFER_MIN_PHP_VER', '5.6.0');
-    define('WC_YUANSFER_MIN_WC_VER', '2.6.0');
+    define('WC_YUANSFER_MIN_WC_VER', '3.0');
     define('WC_YUANSFER_MAIN_FILE', __FILE__);
     define('WC_YUANSFER_PLUGIN_URL', untrailingslashit(plugins_url(basename(plugin_dir_path(__FILE__)), basename(__FILE__))));
@@ -112 +112 @@
         require_once __DIR__ . '/includes/payment-methods/class-wc-gateway-yuansfer-alipay.php';
         require_once __DIR__ . '/includes/payment-methods/class-wc-gateway-yuansfer-wechatpay.php';
+        require_once __DIR__ . '/includes/payment-methods/class-wc-gateway-yuansfer-creditcard.php';
+        require_once __DIR__ . '/includes/payment-methods/class-wc-gateway-yuansfer-paypal.php';
+        require_once __DIR__ . '/includes/payment-methods/class-wc-gateway-yuansfer-venmo.php';
         require_once __DIR__ . '/includes/class-wc-yuansfer-order-handler.php';
         require_once __DIR__ . '/includes/class-wc-yuansfer-payment-tokens.php';
         require_once __DIR__ . '/includes/class-wc-yuansfer-customer.php';
+        require_once __DIR__ . '/includes/class-wc-yuansfer-mobile-detect.php';
 
         if (is_admin()) {
@@ -180 +184 @@
         $methods[] = 'WC_Gateway_Yuansfer_Alipay';
         $methods[] = 'WC_Gateway_Yuansfer_Wechatpay';
-
+        $methods[] = 'WC_Gateway_Yuansfer_Creditcard';
+        $methods[] = 'WC_Gateway_Yuansfer_Paypal';
+        $methods[] = 'WC_Gateway_Yuansfer_Venmo';
         return $methods;
     }
@@ -192 +198 @@
             $sections['yuansfer'],
             $sections['yuansfer_alipay'],
-            $sections['yuansfer_wechatpay']
+            $sections['yuansfer_wechatpay'],
+            $sections['yuansfer_creditcard'],
+            $sections['yuansfer_paypal'],
+            $sections['yuansfer_venmo']
         );
 
@@ -198 +207 @@
         $sections['yuansfer_alipay'] = __('Yuansfer Alipay', 'woocommerce-yuansfer');
         $sections['yuansfer_wechatpay'] = __('Yuansfer WeChat Pay', 'woocommerce-yuansfer');
+        $sections['yuansfer_creditcard'] = __('Yuansfer Credit Card', 'woocommerce-yuansfer');
+        $sections['yuansfer_paypal'] = __('Yuansfer PayPal', 'woocommerce-yuansfer');
+        $sections['yuansfer_venmo'] = __('Yuansfer Venmo', 'woocommerce-yuansfer');
 
         return $sections;