Changeset 1755146

Timestamp:

10/30/2017 11:21:24 AM (8 years ago)

Author:

aics

Message:

modified the merchant key confusion on gateway class

Location:

aics-ipay88-woocommerce/trunk

Files:

• aics-ipay-gateway.php (modified) (1 diff)
• libs/faiz-gateway-class.php (modified) (5 diffs)

aics-ipay88-woocommerce/trunk/aics-ipay-gateway.php

@@ -6 +6 @@
 Author: AiCS
 Author URI: http://aics.my/
-Version: 1.0.5
+Version: 1.1.0
 */
 defined( 'ABSPATH' ) or die( 'nope.. just nope' );

aics-ipay88-woocommerce/trunk/libs/faiz-gateway-class.php

@@ -10 +10 @@
 class Aics_ipay_gateway extends WC_Payment_Gateway{
     private $merchantID;
-    private $merchantCode;
+    private $merchantKey;
     public $pageID;
     
@@ -25 +25 @@
         $this->title = 'ipay88 Payment Gateway';
         $this->merchantID = $this->get_option( 'merchantID' );
-        $this->merchantCode = $this->get_option('merchantCode');
+        $this->merchantKey = $this->get_option('merchantKey');
         $this->pageID = $this->get_option('paymentPageID');
         
@@ -55 +55 @@
                                                       'title' => __( 'Testing/Live', 'aics' ),
                                                       'type' => 'checkbox',
-                                                      'label' => __( 'Testing payment or live payment', 'aics' ),
+                                                      'label' => __( 'Testing payment? (check if testing)', 'aics' ),
                                                       'default' => 'no'
                                                     ),
                                    'merchantID' => array(
-                                                          'title' => __( 'Merchant Code', 'aics' ),
+                                                          'title' => __( 'Merchant ID', 'aics' ),
                                                           'type' => 'text',
                                                           'default' => '0000000'
                                                         ),
-                                   'merchantCode' => array(
+                                   'merchantKey' => array(
                                                           'title' => __( 'Merchant Key', 'aics' ),
                                                           'type' => 'text',
@@ -114 +114 @@
         
         $format_amt = $this->formatAmount($amount);
-        $the_string = $this->merchantCode.$this->merchantID.$order_id.$format_amt.$currency;
+        $the_string = $this->merchantKey.$this->merchantID.$order_id.$format_amt.$currency;
         //echo 'str: <b>'.$the_string.'</b>';
         $the_hash = $this->iPay88_signature($the_string);
@@ -187 +187 @@
             $amnt = str_replace(',', '', $amt_txt);
             $amnt_final = str_replace('.', '', $amnt);
-            $combined = $this->merchantCode.$this->merchantID.$payid.$refno.$amnt_final.$cur.$status;
+            $combined = $this->merchantKey.$this->merchantID.$payid.$refno.$amnt_final.$cur.$status;
             $signed = $this->iPay88_signature($combined);