From fe946dd7d4cb104c1cdd4753dc0332e8211421f1 Mon Sep 17 00:00:00 2001
From: Sameer Ababneh <sameer@pointcheckout.com>
Date: Thu, 22 Apr 2021 02:14:12 +0300
Subject: [PATCH] Bugs relating to latest WooCommerce plugin + minor default
 text rewrite

---
 .../class-woocommerce-pointcheckout-card.php  | 36 ++++----
 .../includes/lib/class-pc-config.php          |  4 +-
 .../includes/lib/class-pc-payment-service.php |  6 +-
 ...lass-woocommerce-pointcheckout-rewards.php | 87 ++++++++++---------
 .../includes/lib/class-pc-config.php          | 28 +++---
 .../includes/lib/class-pc-parent.php          |  3 +-
 .../includes/lib/class-pc-payment-service.php |  2 +-
 .../includes/lib/class-pc-utils.php           | 14 +--
 .../woocommerce-pointcheckout-rewards.php     |  2 +-
 9 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/pointcheckout_payment_card/includes/class-woocommerce-pointcheckout-card.php b/pointcheckout_payment_card/includes/class-woocommerce-pointcheckout-card.php
index 04660b4..12c02bd 100755
--- a/pointcheckout_payment_card/includes/class-woocommerce-pointcheckout-card.php
+++ b/pointcheckout_payment_card/includes/class-woocommerce-pointcheckout-card.php
@@ -23,7 +23,7 @@ public function __construct()
         $this->description = PointCheckout_Card_Config::getInstance()->getDescription();
         $this->paymentService = PointCheckout_Card_Payment::getInstance();
         $this->config = PointCheckout_Card_Config::getInstance();
-	      $this->icon = plugin_dir_url(__FILE__) . '../assets/images/mc-visa-network-logos.png';
+        $this->icon = plugin_dir_url(__FILE__) . '../assets/images/mc-visa-network-logos.png';
 
         if ( !$this->config->isLiveMode() ) {
           $this->description .= ' ' . sprintf( __( 'TEST MODE ENABLED. You can use test cards only. ' .
@@ -61,13 +61,15 @@ public function is_available()
         $valid = true;
         if ($this->config->isSpecificUserRoles()) {
             $valid = false;
-            $user_id = WC()->customer->get_id();
-            $user = new WP_User($user_id);
-            if (!empty($user->roles) && is_array($user->roles)) {
-                foreach ($user->roles as $user_role) {
-                    foreach ($this->config->getSpecificUserRoles() as $role) {
-                        if ($role == $user_role) {
-                            $valid = true;
+            if(WC()->customer != null) {
+                $user_id = WC()->customer->get_id();
+                $user = new WP_User($user_id);
+                if (!empty($user->roles) && is_array($user->roles)) {
+                    foreach ($user->roles as $user_role) {
+                        foreach ($this->config->getSpecificUserRoles() as $role) {
+                            if ($role == $user_role) {
+                                $valid = true;
+                            }
                         }
                     }
                 }
@@ -76,12 +78,14 @@ public function is_available()
 
         if ($valid && $this->config->isSpecificCountries()) {
             $valid = false;
-            $billingCountry = WC()->customer->get_billing_country();
+            if(WC()->customer != null) {
+                $billingCountry = WC()->customer->get_billing_country();
 
-            if (!$billingCountry == null) {
-                foreach ($this->config->getSpecificCountries() as $country) {
-                    if ($country == $billingCountry) {
-                        $valid = true;
+                if (!$billingCountry == null) {
+                    foreach ($this->config->getSpecificCountries() as $country) {
+                        if ($country == $billingCountry) {
+                            $valid = true;
+                        }
                     }
                 }
             }
@@ -185,11 +189,11 @@ function init_form_fields()
                 'type'        => 'select',
                 'options'     => $staging_enabled ? array(
                     '1' => __('Live', 'pointcheckout_card'),
-                    '0' => __('Test', 'pointcheckout_card'),
+                    '0' => __('Testing', 'pointcheckout_card'),
                     '2' => __('Staging', 'pointcheckout_card'),
                 ) : array(
-                    '1' => 'Live',
-                    '0' => 'Test',
+                    '1' => __('Live', 'pointcheckout_card'),
+                    '0' => __('Testing', 'pointcheckout_card'),
                 ),
                 'default'     => '0',
                 'desc_tip'    => true,
diff --git a/pointcheckout_payment_card/includes/lib/class-pc-config.php b/pointcheckout_payment_card/includes/lib/class-pc-config.php
index 81296f5..c391156 100755
--- a/pointcheckout_payment_card/includes/lib/class-pc-config.php
+++ b/pointcheckout_payment_card/includes/lib/class-pc-config.php
@@ -4,8 +4,8 @@ class PointCheckout_Card_Config extends PointCheckout_Card_Parent
 {
 
     private static $instance;
-    private $api_Secret;
-    private $api_Key;
+    private $api_secret;
+    private $api_key;
     private $Mode;
     private $orderPlacement;
     private $allowSpecific;
diff --git a/pointcheckout_payment_card/includes/lib/class-pc-payment-service.php b/pointcheckout_payment_card/includes/lib/class-pc-payment-service.php
index 14edb09..7c8767d 100755
--- a/pointcheckout_payment_card/includes/lib/class-pc-payment-service.php
+++ b/pointcheckout_payment_card/includes/lib/class-pc-payment-service.php
@@ -1,5 +1,5 @@
 <?php
-define("PC_EXT_VERSION", "WooCommerce-Card-2.0.3");
+define("PC_EXT_VERSION", "WooCommerce-Card-2.0.4");
 
 class PointCheckout_Card_Payment extends PointCheckout_Card_Parent
 {
@@ -127,7 +127,7 @@ public function getPaymentRequestForm()
         $this->pcOrder->clearSessionCurrentOrder();
         $form = '<form style="display:none" name="frm_pointcheckout_card_payment" id="frm_pointcheckout_card_payment" method="GET" action="' . $actionUrl . '">';
         $form .= '<input type="submit">';
-        
+
         return array(
             'form' => $form,
             'response' => $response
@@ -137,7 +137,7 @@ public function getPaymentRequestForm()
 
     public function postCheckout($paymentRequestParams)
     {
-        return $this->pcUtils->apiCall("/", $paymentRequestParams);
+        return $this->pcUtils->apiCall("", $paymentRequestParams);
     }
 
 
diff --git a/pointcheckout_payment_rewards/includes/class-woocommerce-pointcheckout-rewards.php b/pointcheckout_payment_rewards/includes/class-woocommerce-pointcheckout-rewards.php
index ae92ff1..77ea392 100755
--- a/pointcheckout_payment_rewards/includes/class-woocommerce-pointcheckout-rewards.php
+++ b/pointcheckout_payment_rewards/includes/class-woocommerce-pointcheckout-rewards.php
@@ -10,18 +10,27 @@ class WC_Gateway_PointCheckout_Rewards extends PointCheckout_Rewards_Parent
     public function __construct()
     {
         $this->has_fields = false;
-        $this->icon       = apply_filters('woocommerce_POINTCHECKOUT_icon', 'https://www.pointcheckout.com/en/image/logo.png');
         if (is_admin()) {
             $this->has_fields = true;
             $this->init_form_fields();
+            $this->init_settings();
         }
 
         // Define user set variables
-        $this->method_title = __('PointCheckout', 'woocommerce');
+        $this->method_title = __('PointCheckout Rewards Pay', 'woocommerce');
         $this->title = 'PointCheckout';
         $this->description = 'Pay using your loyalty points with PointCheckout';
         $this->paymentService = PointCheckout_Rewards_Payment::getInstance();
         $this->config = PointCheckout_Rewards_Config::getInstance();
+        $this->description = $this->config->getDescription();
+        $this->icon       = apply_filters('woocommerce_POINTCHECKOUT_icon', 'https://www.pointcheckout.com/en/image/logo.png');
+
+        if ( !$this->config->isLiveMode() ) {
+          $this->description .= ' ' . sprintf( __( 'TEST MODE ENABLED.' .
+              'See the <a href="%s" target="_blank">PointCheckout WooCommerce Guide</a> for more details.', 'woocommerce' ),
+              'https://docs.pointcheckout.com/guides/woocommerce' );
+          $this->description  = trim( $this->description );
+        }
 
         // Actions
         add_action('woocommerce_receipt_' . $this->id, array($this, 'receipt_page'));
@@ -36,7 +45,7 @@ function process_admin_options()
     {
         $result = parent::process_admin_options();
         $settings = $this->settings;
-        $settings['enabled']  = isset($settings['enabled']) ? $settings['enabled'] : 0;
+        $settings['enabled']  = isset($settings['enabled']) ? $settings['enabled'] : 'no';
 
         update_option('woocommerce_pointcheckout_rewards_settings', apply_filters('woocommerce_settings_api_sanitized_fields_pointcheckout_rewards', $settings));
         return $result;
@@ -52,13 +61,15 @@ public function is_available()
         $valid = true;
         if ($this->config->isSpecificUserRoles()) {
             $valid = false;
-            $user_id = WC()->customer->get_id();
-            $user = new WP_User($user_id);
-            if (!empty($user->roles) && is_array($user->roles)) {
-                foreach ($user->roles as $user_role) {
-                    foreach ($this->config->getSpecificUserRoles() as $role) {
-                        if ($role == $user_role) {
-                            $valid = true;
+            if(WC()->customer != null) {
+                $user_id = WC()->customer->get_id();
+                $user = new WP_User($user_id);
+                if (!empty($user->roles) && is_array($user->roles)) {
+                    foreach ($user->roles as $user_role) {
+                        foreach ($this->config->getSpecificUserRoles() as $role) {
+                            if ($role == $user_role) {
+                                $valid = true;
+                            }
                         }
                     }
                 }
@@ -67,12 +78,14 @@ public function is_available()
 
         if ($valid && $this->config->isSpecificCountries()) {
             $valid = false;
-            $billingCountry = WC()->customer->get_billing_country();
+            if(WC()->customer != null) {
+                $billingCountry = WC()->customer->get_billing_country();
 
-            if (!$billingCountry == null) {
-                foreach ($this->config->getSpecificCountries() as $country) {
-                    if ($country == $billingCountry) {
-                        $valid = true;
+                if (!$billingCountry == null) {
+                    foreach ($this->config->getSpecificCountries() as $country) {
+                        if ($country == $billingCountry) {
+                            $valid = true;
+                        }
                     }
                 }
             }
@@ -102,8 +115,8 @@ function payment_scripts()
     public function admin_options()
     {
 ?>
-        <h3><?php _e('PointCheckout', 'pointcheckout_rewards'); ?></h3>
-        <p><?php _e('Please fill in the below section to start accepting payments on your site! You can find all the required information in your <a href="https://www.pointcheckout.com/" target="_blank">PointCheckout website</a>.', 'pointcheckout_rewards'); ?></p>
+        <h3><?php _e('PointCheckout Rewards Payment', 'pointcheckout_rewards'); ?></h3>
+        <p><?php _e('Please fill in the below section to start accepting payments on your site via PointCheckout! Learn more at <a href="https://docs.pointcheckout.com/" target="_blank">PointCheckout</a>." target="_blank">PointCheckout website</a>.', 'pointcheckout_rewards'); ?></p>
 
 
         <table class="form-table">
@@ -114,23 +127,23 @@ public function admin_options()
             <script>
                 jQuery(document).ready(function() {
                     jQuery('[name=save]').click(function() {
-                        if (!jQuery('#woocommerce_pointcheckout_rewards_Api_Key').val()) {
-                            alert('Please enter your Api Key!');
+                        if (!jQuery('#woocommerce_pointcheckout_rewards_api_key').val()) {
+                            alert('API key not configured');
                             return false;
                         }
-                        if (!jQuery('#woocommerce_pointcheckout_rewards_Api_Secret').val()) {
-                            alert('Please enter your Api Secret!');
+                        if (!jQuery('#woocommerce_pointcheckout_rewards_api_secret').val()) {
+                            alert('API secret not configured');
                             return false;
                         }
                         if (jQuery('#woocommerce_pointcheckout_rewards_allow_specific').val() == 1) {
                             if (!jQuery('#woocommerce_pointcheckout_rewards_specific_countries').val()) {
-                                alert('You select to specifiy for applicable countries but you did not select any!');
+                                alert('You enabled PointCheckout for specific countries but you did not select any');
                                 return false;
                             }
                         }
                         if (jQuery('#woocommerce_pointcheckout_rewards_allow_user_specific').val() == 1) {
                             if (!jQuery('#woocommerce_pointcheckout_rewards_specific_user_roles').val()) {
-                                alert('You select to specifiy for applicable user roles but you did not select any!');
+                                alert('You enabled PointCheckout for speficic user roles but you did not select any');
                                 return false;
                             }
                         }
@@ -153,15 +166,11 @@ function init_form_fields()
     {
         $staging_enabled = false;
         $this->form_fields = array(
-            'enabled'             => array(
+            'enabled'     => array(
                 'title'   => __('Enable/Disable', 'pointcheckout_rewards'),
-                'type'    => 'select',
-                'label'   => __('Enable the PointCheckout gateway', 'pointcheckout_rewards'),
-                'default' => '0',
-                'options' => array(
-                    '1' => __('Enabled', 'pointcheckout_rewards'),
-                    '0' => __('Disabled', 'pointcheckout_rewards'),
-                )
+                'type'    => 'checkbox',
+                'label'   => __('Enable rewards payments via PointCheckout', 'pointcheckout_rewards'),
+                'default' => 'no'
             ),
             'description'         => array(
                 'title'       => __('Description', 'pointcheckout_rewards'),
@@ -173,12 +182,12 @@ function init_form_fields()
                 'title'       => __('Mode', 'pointcheckout_rewards'),
                 'type'        => 'select',
                 'options'     => $staging_enabled ? array(
-                    '1' => __('live', 'pointcheckout_rewards'),
-                    '0' => __('testing', 'pointcheckout_rewards'),
+                    '1' => __('Live', 'pointcheckout_rewards'),
+                    '0' => __('Testing', 'pointcheckout_rewards'),
                     '2' => __('Staging', 'pointcheckout_rewards'),
                 ) : array(
-                    '1' => __('live', 'pointcheckout_rewards'),
-                    '0' => __('testing', 'pointcheckout_rewards'),
+                    '1' => __('Live', 'pointcheckout_rewards'),
+                    '0' => __('Testing', 'pointcheckout_rewards'),
                 ),
                 'default'     => '0',
                 'desc_tip'    => true,
@@ -186,16 +195,16 @@ function init_form_fields()
                 'placeholder' => '',
                 'class'       => 'wc-enhanced-select',
             ),
-            'Api_Key'         => array(
-                'title'       => __('Api Key', 'pointcheckout_rewards'),
+            'api_key'         => array(
+                'title'       => __('API Key', 'pointcheckout_rewards'),
                 'type'        => 'text',
                 'description' => __('Your Api Key, you can find in your PointCheckout account  settings.', 'pointcheckout_rewards'),
                 'default'     => '',
                 'desc_tip'    => true,
                 'placeholder' => ''
             ),
-            'Api_Secret'         => array(
-                'title'       => __('Api Secret', 'pointcheckout_rewards'),
+            'api_secret'         => array(
+                'title'       => __('API Secret', 'pointcheckout_rewards'),
                 'type'        => 'text',
                 'description' => __('Your Api Secret, you can find in your PointCheckout account  settings.', 'pointcheckout_rewards'),
                 'default'     => '',
diff --git a/pointcheckout_payment_rewards/includes/lib/class-pc-config.php b/pointcheckout_payment_rewards/includes/lib/class-pc-config.php
index 5eccaae..a3956e9 100755
--- a/pointcheckout_payment_rewards/includes/lib/class-pc-config.php
+++ b/pointcheckout_payment_rewards/includes/lib/class-pc-config.php
@@ -6,8 +6,8 @@ class PointCheckout_Rewards_Config extends PointCheckout_Rewards_Parent
 {
 
     private static $instance;
-    private $Api_Secret;
-    private $Api_Key;
+    private $api_secret;
+    private $api_key;
     private $Mode;
     private $orderPlacement;
     private $allowSpecific;
@@ -15,6 +15,7 @@ class PointCheckout_Rewards_Config extends PointCheckout_Rewards_Parent
     private $allowUserSpecific;
     private $specific_uesr_roles;
     private $new_order_status;
+    public $description;
 
 
     public function __construct()
@@ -22,9 +23,9 @@ public function __construct()
         parent::__construct();
         $this->language                              = $this->_getShoppingCartConfig('language');
         $this->enabled                               = $this->_getShoppingCartConfig('enabled');
-        $this->Api_Key                               = $this->_getShoppingCartConfig('Api_Key');
+        $this->api_key                               = $this->_getShoppingCartConfig('api_key');
         $this->command                               = $this->_getShoppingCartConfig('command');
-        $this->Api_Secret                            = $this->_getShoppingCartConfig('Api_Secret');
+        $this->api_secret                            = $this->_getShoppingCartConfig('api_secret');
         $this->Mode                                  = $this->_getShoppingCartConfig('mode');
         $this->orderPlacement                        = $this->_getShoppingCartConfig('order_placement');
         $this->allowSpecific                         = $this->_getShoppingCartConfig('allow_specific');
@@ -55,8 +56,6 @@ public function getLanguage()
         return 'en';
     }
 
-
-
     public function getEnabled()
     {
         return $this->enabled;
@@ -67,17 +66,11 @@ public function getMode()
         return $this->Mode;
     }
 
-
-
-
-
     public function getSuccessOrderStatusId()
     {
         return $this->successOrderStatusId;
     }
 
-
-
     public function isActive()
     {
         if ($this->active) {
@@ -137,17 +130,17 @@ public function orderPlacementIsOnSuccess()
 
     public function isEnabled()
     {
-        return $this->enabled == 1 ? true : false;
+        return $this->enabled === 'yes';
     }
 
     public function getApiKey()
     {
-        return $this->Api_Key;
+        return $this->api_key;
     }
 
     public function getApiSecret()
     {
-        return $this->Api_Secret;
+        return $this->api_secret;
     }
 
     public function isLiveMode()
@@ -159,4 +152,9 @@ public function isStagingMode()
     {
         return $this->Mode == 2 ? true : false;
     }
+
+    public function getDescription()
+    {
+        return $this->description;
+    }
 }
diff --git a/pointcheckout_payment_rewards/includes/lib/class-pc-parent.php b/pointcheckout_payment_rewards/includes/lib/class-pc-parent.php
index 6b5b2a2..29212d2 100755
--- a/pointcheckout_payment_rewards/includes/lib/class-pc-parent.php
+++ b/pointcheckout_payment_rewards/includes/lib/class-pc-parent.php
@@ -3,8 +3,7 @@
 class PointCheckout_Rewards_Parent extends WC_Payment_Gateway
 {
     public $id = 'pointcheckout_rewards';
-    public function __construct()
-    {
+    public function __construct() {
         // NO INTITALIZATION REQuIRED
     }
 }
diff --git a/pointcheckout_payment_rewards/includes/lib/class-pc-payment-service.php b/pointcheckout_payment_rewards/includes/lib/class-pc-payment-service.php
index 0e04a4a..9605e26 100755
--- a/pointcheckout_payment_rewards/includes/lib/class-pc-payment-service.php
+++ b/pointcheckout_payment_rewards/includes/lib/class-pc-payment-service.php
@@ -1,5 +1,5 @@
 <?php
-define("PC_EXT_VERSION", "WooCommerce-Card-2.0.3");
+define("PC_EXT_VERSION", "WooCommerce-Rewards-2.0.4");
 
 
 class PointCheckout_Rewards_Payment extends PointCheckout_Rewards_Parent
diff --git a/pointcheckout_payment_rewards/includes/lib/class-pc-utils.php b/pointcheckout_payment_rewards/includes/lib/class-pc-utils.php
index 2baa110..edec29c 100755
--- a/pointcheckout_payment_rewards/includes/lib/class-pc-utils.php
+++ b/pointcheckout_payment_rewards/includes/lib/class-pc-utils.php
@@ -3,7 +3,6 @@
 class PointCheckout_Rewards_Utils extends PointCheckout_Rewards_Parent
 {
 
-    private $logger;
     private $pcConfig;
 
     public function __construct()
@@ -13,16 +12,6 @@ public function __construct()
         $this->pcConfig = PointCheckout_Rewards_Config::getInstance();
     }
 
-    public function getLogger()
-    {
-        include_once('class-wc-logger.php');
-
-        if (self::$logger === null) {
-            self::$logger = new WC_Logger();
-        }
-        return self::$logger;
-    }
-
     public function apiCall($url, $body)
     {
         try {
@@ -54,7 +43,8 @@ public function apiCall($url, $body)
 
     public function log($messages)
     {
-        $this->getLogger()->add('pointcheckout_rewards', $messages);
+        $logger = wc_get_logger();
+        $logger->error('pointcheckout_rewards', $messages);
     }
 
     public function getApiBaseUrl()
diff --git a/pointcheckout_payment_rewards/woocommerce-pointcheckout-rewards.php b/pointcheckout_payment_rewards/woocommerce-pointcheckout-rewards.php
index f5b27a2..e8aa35c 100755
--- a/pointcheckout_payment_rewards/woocommerce-pointcheckout-rewards.php
+++ b/pointcheckout_payment_rewards/woocommerce-pointcheckout-rewards.php
@@ -4,7 +4,7 @@
  * Description: PointCheckout payment allows your customer to pay for there cart using reward programs
  * Version:     1.0.0
  * Author:      PointCheckout
- * Author URI:  https://www.pointcheckout.com/
+ * Author URI:  https://docs.pointcheckout.com/guides/woocommerce
  */
 $active_plugins = apply_filters('active_plugins', get_option('active_plugins'));
 if (in_array('woocommerce/woocommerce.php', $active_plugins)) {