pagantis / woocommerce

includes/pg-functions.php

Spacing +44 added lines, -44 removed lines

@@ -2,8 +2,8 @@ 
 
 function requireWPPluginFunctions()
 {
-    if (! function_exists('is_plugin_active')) {
-        require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+    if (!function_exists('is_plugin_active')) {
+        require_once(ABSPATH.'wp-admin/includes/plugin.php');
     }
 }
 
@@ -21,7 +21,7 @@ 
 function getConfigValue($configKey)
 {
     global $wpdb;
-    $tableName = $wpdb->prefix . PG_CONFIG_TABLE_NAME;
+    $tableName = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
     $value     = $wpdb->get_var($wpdb->prepare("SELECT value FROM $tableName WHERE config= %s ", $configKey));
 
     return $value;
@@ -38,8 +38,8 @@ 
 function isPgTableCreated($tableToCheck)
 {
     global $wpdb;
-    $tableName = $wpdb->prefix . $tableToCheck;
-    if ($wpdb->get_var("SHOW TABLES LIKE '$tableName'") == $tableName) {
+    $tableName = $wpdb->prefix.$tableToCheck;
+    if ($wpdb->get_var("SHOW TABLES LIKE '$tableName'")==$tableName) {
         return true;
     }
 
@@ -52,12 +52,12 @@ 
 function createPgCartTable()
 {
     global $wpdb;
-    $tableName       = $wpdb->prefix . PG_CART_PROCESS_TABLE;
+    $tableName       = $wpdb->prefix.PG_CART_PROCESS_TABLE;
     $charset_collate = $wpdb->get_charset_collate();
     $sql             = "CREATE TABLE $tableName ( id int, order_id varchar(50), wc_order_id varchar(50),  
                   UNIQUE KEY id (id)) $charset_collate";
 
-    require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+    require_once(ABSPATH.'wp-admin/includes/upgrade.php');
     dbDelta($sql);
 }
 
@@ -65,14 +65,14 @@ 
 {
     global $wpdb;
     $charset_collate = $wpdb->get_charset_collate();
-    $LogsTableName   = $wpdb->prefix . PG_LOGS_TABLE_NAME;
+    $LogsTableName   = $wpdb->prefix.PG_LOGS_TABLE_NAME;
     $sqlQuery        = "CREATE TABLE $LogsTableName ( 
     id int NOT NULL AUTO_INCREMENT,
     log text NOT NULL, 
     createdAt timestamp DEFAULT CURRENT_TIMESTAMP,
     UNIQUE KEY id (id)) 
     $charset_collate";
-    require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+    require_once(ABSPATH.'wp-admin/includes/upgrade.php');
     dbDelta($sqlQuery);
 }
 
@@ -83,7 +83,7 @@ 
 function insertLogEntry($exception = null, $message = null)
 {
     global $wpdb;
-    if (! isPgTableCreated(PG_LOGS_TABLE_NAME)) {
+    if (!isPgTableCreated(PG_LOGS_TABLE_NAME)) {
         createLogsTable();
     }
     $logEntry = new Pagantis\ModuleUtils\Model\Log\LogEntry();
@@ -92,7 +92,7 @@ 
     } else {
         $logEntry = $logEntry->info($message);
     }
-    $tableName = $wpdb->prefix . PG_LOGS_TABLE_NAME;
+    $tableName = $wpdb->prefix.PG_LOGS_TABLE_NAME;
     $wpdb->insert($tableName, array('log' => $logEntry->toJson()));
 }
 
@@ -103,7 +103,7 @@ 
 {
     $pgDecimalSeparator = getPgSimulatorDecimalSeparatorConfig();
     $wc_decimal_sep     = get_option('woocommerce_price_decimal_sep');
-    if (stripslashes($wc_decimal_sep) == stripslashes($pgDecimalSeparator)) {
+    if (stripslashes($wc_decimal_sep)==stripslashes($pgDecimalSeparator)) {
         return true;
     } else {
         return false;
@@ -118,7 +118,7 @@ 
 {
     $pgThousandSeparator = getPgSimulatorThousandsSeparator();
     $wc_price_thousand   = get_option('woocommerce_price_thousand_sep');
-    if (stripslashes($wc_price_thousand) == stripslashes($pgThousandSeparator)) {
+    if (stripslashes($wc_price_thousand)==stripslashes($pgThousandSeparator)) {
         return true;
     } else {
         return false;
@@ -131,7 +131,7 @@ 
 function getPgSimulatorThousandsSeparator()
 {
     global $wpdb;
-    $tableName = $wpdb->prefix . PG_CONFIG_TABLE_NAME;
+    $tableName = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
     $query     = "SELECT value FROM $tableName WHERE config='PAGANTIS_SIMULATOR_THOUSANDS_SEPARATOR'";
     $result    = $wpdb->get_row($query, ARRAY_A);
 
@@ -144,7 +144,7 @@ 
 function getPgSimulatorDecimalSeparatorConfig()
 {
     global $wpdb;
-    $tableName = $wpdb->prefix . PG_CONFIG_TABLE_NAME;
+    $tableName = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
     $query     = "SELECT value FROM $tableName WHERE config='PAGANTIS_SIMULATOR_DECIMAL_SEPARATOR'";
     $result    = $wpdb->get_row($query, ARRAY_A);
 
@@ -157,7 +157,7 @@ 
     if (areThousandsSeparatorEqual()) {
         return;
     }
-    $tableName         = $wpdb->prefix . PG_CONFIG_TABLE_NAME;
+    $tableName         = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
     $thousandSeparator = get_option('woocommerce_price_thousand_sep');
     $wpdb->update(
         $tableName,
@@ -174,7 +174,7 @@ 
     if (areDecimalSeparatorEqual()) {
         return;
     }
-    $tableName        = $wpdb->prefix . PG_CONFIG_TABLE_NAME;
+    $tableName        = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
     $decimalSeparator = get_option('woocommerce_price_decimal_sep');
     $wpdb->update(
         $tableName,
@@ -194,7 +194,7 @@ 
  */
 function isSimulatorTypeValid($simulatorType, $validSimulatorTypes)
 {
-    if (! in_array($simulatorType, $validSimulatorTypes)) {
+    if (!in_array($simulatorType, $validSimulatorTypes)) {
         return false;
     }
 
@@ -221,8 +221,8 @@ 
 function areMerchantKeysSet()
 {
     $settings   = get_option('woocommerce_pagantis_settings');
-    $publicKey  = ! empty($settings['pagantis_public_key']) ? $settings['pagantis_public_key'] : '';
-    $privateKey = ! empty($settings['pagantis_private_key']) ? $settings['pagantis_private_key'] : '';
+    $publicKey  = !empty($settings['pagantis_public_key']) ? $settings['pagantis_public_key'] : '';
+    $privateKey = !empty($settings['pagantis_private_key']) ? $settings['pagantis_private_key'] : '';
     if ((empty($publicKey) && empty($privateKey)) || (empty($publicKey) || empty($privateKey))) {
         return false;
     }
@@ -233,8 +233,8 @@ 
 function areMerchantKeysSet4x()
 {
     $settings   = get_option('woocommerce_pagantis_settings');
-    $publicKey  = ! empty($settings['pagantis_public_key_4x']) ? $settings['pagantis_public_key_4x'] : '';
-    $privateKey = ! empty($settings['pagantis_private_key_4x']) ? $settings['pagantis_private_key_4x'] : '';
+    $publicKey  = !empty($settings['pagantis_public_key_4x']) ? $settings['pagantis_public_key_4x'] : '';
+    $privateKey = !empty($settings['pagantis_private_key_4x']) ? $settings['pagantis_private_key_4x'] : '';
     if ((empty($publicKey) && empty($privateKey)) || (empty($publicKey) || empty($privateKey))) {
         return false;
     }
@@ -245,7 +245,7 @@ 
 function isSimulatorEnabled()
 {
     $settings = get_option('woocommerce_pagantis_settings');
-    if ((! empty($settings['simulator']) && 'yes' === $settings['simulator']) ? true : false) {
+    if ((!empty($settings['simulator']) && 'yes'===$settings['simulator']) ? true : false) {
         return true;
     }
 
@@ -256,13 +256,13 @@ 
 {
     $settings = get_option('woocommerce_pagantis_settings');
 
-    return (! empty($settings['enabled']) && 'yes' === $settings['enabled']);
+    return (!empty($settings['enabled']) && 'yes'===$settings['enabled']);
 }
 
 function isPluginEnabled4x()
 {
     $settings = get_option('woocommerce_pagantis_settings');
-    return (! empty($settings['enabled_4x']) && 'yes' === $settings['enabled_4x']);
+    return (!empty($settings['enabled_4x']) && 'yes'===$settings['enabled_4x']);
 }
 
 
@@ -270,7 +270,7 @@ 
 {
     $locale           = strtolower(strstr(get_locale(), '_', true));
     $allowedCountries = maybe_unserialize(getConfigValue('PAGANTIS_ALLOWED_COUNTRIES'));
-    if (! in_array(strtolower($locale), $allowedCountries)) {
+    if (!in_array(strtolower($locale), $allowedCountries)) {
         return false;
     }
 
@@ -287,7 +287,7 @@ 
     global $product;
     if (method_exists($product, 'get_price')) {
         $productPrice = $product->get_price();
-        $validAmount  = ($productPrice >= $minAmount && ($productPrice <= $maxAmount || $maxAmount == '0'));
+        $validAmount  = ($productPrice >= $minAmount && ($productPrice <= $maxAmount || $maxAmount=='0'));
         if ($validAmount) {
             return true;
         }
@@ -306,7 +306,7 @@ 
     global $product;
     if (method_exists($product, 'get_price')) {
         $productPrice = $product->get_price();
-        $validAmount  = ($productPrice >= $minAmount && ($productPrice <= $maxAmount || $maxAmount == '0'));
+        $validAmount  = ($productPrice >= $minAmount && ($productPrice <= $maxAmount || $maxAmount=='0'));
         if ($validAmount) {
             return true;
         }
@@ -325,7 +325,7 @@ 
 function getExtraConfig()
 {
     global $wpdb;
-    $tableName = $wpdb->prefix . PG_CONFIG_TABLE_NAME;
+    $tableName = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
     $response  = array();
     $dbResult  = $wpdb->get_results("select config, value from $tableName", ARRAY_A);
     foreach ($dbResult as $value) {
@@ -338,7 +338,7 @@ 
 function getModuleVersion()
 {
 
-    $mainFile = plugin_dir_path(PG_WC_MAIN_FILE). '/WC_Pagantis.php';
+    $mainFile = plugin_dir_path(PG_WC_MAIN_FILE).'/WC_Pagantis.php';
     $version = get_file_data($mainFile, array('Version' => 'Version'), false);
     return $version['Version'];
 }
@@ -471,7 +471,7 @@ 
     );
 
         foreach ($metaKeys as $key) {
-            $date = empty($customer->get_meta($key)) ? $customer->get_meta($key) : get_user_meta( $customerID, '_automatewoo_birthday_full', true );
+            $date = empty($customer->get_meta($key)) ? $customer->get_meta($key) : get_user_meta($customerID, '_automatewoo_birthday_full', true);
         }
 
     }
@@ -489,7 +489,7 @@ 
     $metaProduct = get_post_meta($product_id);
 
     return (array_key_exists('custom_product_pagantis_promoted', $metaProduct)
-            && $metaProduct['custom_product_pagantis_promoted']['0'] === 'yes') ? 'true' : 'false';
+            && $metaProduct['custom_product_pagantis_promoted']['0']==='yes') ? 'true' : 'false';
 }
 
 /**
@@ -500,7 +500,7 @@ 
     $promotedAmount = 0;
     foreach (WC()->cart->get_cart() as $key => $item) {
         $promotedProduct = isProductPromoted($item['product_id']);
-        if ($promotedProduct == 'true') {
+        if ($promotedProduct=='true') {
             $promotedAmount += $item['line_total'] + $item['line_tax'];
         }
     }
@@ -514,24 +514,24 @@ 
  * @param $urlToken
  * @param $methodID
  */
-function addOrderToProcessingQueue($pagantisOrderId, $wcOrderID, $urlToken ,$methodID)
+function addOrderToProcessingQueue($pagantisOrderId, $wcOrderID, $urlToken, $methodID)
 {
     global $wpdb;
     checkCartProcessTable();
-    $tableName = $wpdb->prefix . PG_CART_PROCESS_TABLE;
+    $tableName = $wpdb->prefix.PG_CART_PROCESS_TABLE;
 
     //Check if id exists
     $resultsSelect = $wpdb->get_results("SELECT * FROM $tableName WHERE id='$pagantisOrderId'");
     $countResults  = count($resultsSelect);
 
-    if ($countResults == 0) {
+    if ($countResults==0) {
         $wpdb->insert($tableName, array(
             'order_id' => $pagantisOrderId,
             'wc_order_id' => $wcOrderID,
             'token'       => $urlToken
         ), array('%s', '%s', '%s'));
 
-        $logEntry = "Cart Added to Processing Queue" .
+        $logEntry = "Cart Added to Processing Queue".
             " cart hash: ".WC()->cart->get_cart_hash().
             " Merchant order id: ".$wcOrderID.
             " Pagantis order id: ".$pagantisOrderId.
@@ -540,7 +540,7 @@ 
         insertLogEntry(null, $logEntry);
     } else {
         $wpdb->update($tableName,
-            array('order_id' => $pagantisOrderId,'token' => $urlToken),
+            array('order_id' => $pagantisOrderId, 'token' => $urlToken),
             array('wc_order_id' => $wcOrderID),
             array('%s,%s'),
             array('%s'));
@@ -551,8 +551,8 @@ 
 function alterCartProcessTable()
 {
     global $wpdb;
-    $tableName = $wpdb->prefix . PG_CART_PROCESS_TABLE;
-    if (! $wpdb->get_var( "SHOW COLUMNS FROM `{$tableName}` LIKE 'token';" ) ) {
+    $tableName = $wpdb->prefix.PG_CART_PROCESS_TABLE;
+    if (!$wpdb->get_var("SHOW COLUMNS FROM `{$tableName}` LIKE 'token';")) {
         $wpdb->query("ALTER TABLE $tableName ADD COLUMN `token` VARCHAR(32) NOT NULL AFTER `order_id`");
         $wpdb->query("ALTER TABLE $tableName DROP PRIMARY KEY, ADD PRIMARY KEY(order_id)");
         // OLDER VERSIONS OF MODULE USE UNIQUE KEY ON `id` MEANING THIS VALUE WAS NULLABLE
@@ -566,9 +566,9 @@ 
 function checkCartProcessTable()
 {
     global $wpdb;
-    $tableName = $wpdb->prefix . PG_CART_PROCESS_TABLE;
+    $tableName = $wpdb->prefix.PG_CART_PROCESS_TABLE;
 
-    if ($wpdb->get_var("SHOW TABLES LIKE '$tableName'") != $tableName) {
+    if ($wpdb->get_var("SHOW TABLES LIKE '$tableName'")!=$tableName) {
 
         $charset_collate = $wpdb->get_charset_collate();
         $sql = "CREATE TABLE IF NOT EXISTS $tableName(
@@ -579,7 +579,7 @@ 
              PRIMARY KEY (`id`, `order_id`)
             )$charset_collate";
 
-        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+        require_once(ABSPATH.'wp-admin/includes/upgrade.php');
         dbDelta($sql);
     }
 }
@@ -622,7 +622,7 @@ 
             'post_status' => array('wc-completed', 'wc-processing', 'wc-refunded'),
         ));
         foreach ($customer_orders as $customer_order) {
-            if (trim($sign_up) == '' || strtotime(substr($customer_order->post_date, 0, 10)) <= strtotime($sign_up)) {
+            if (trim($sign_up)=='' || strtotime(substr($customer_order->post_date, 0, 10)) <= strtotime($sign_up)) {
                 $sign_up = substr($customer_order->post_date, 0, 10);
             }
         }

controllers/paymentController.php

Spacing +51 added lines, -54 removed lines

@@ -63,9 +63,9 @@ 
         $this->urlToken = strtoupper(md5(uniqid(rand(), true)));
 
         //Useful vars
-        $this->template_path = plugin_dir_path(__FILE__) . '../templates/';
+        $this->template_path = plugin_dir_path(__FILE__).'../templates/';
         $this->allowed_currencies = getAllowedCurrencies();
-        $this->mainFileLocation = dirname(plugin_dir_path(__FILE__)) . '/WC_Pagantis.php';
+        $this->mainFileLocation = dirname(plugin_dir_path(__FILE__)).'/WC_Pagantis.php';
         $this->plugin_info = get_file_data($this->mainFileLocation, array('Version' => 'Version'), false);
         $this->language = strstr(get_locale(), '_', true);
         if ($this->language=='') {
@@ -74,25 +74,25 @@ 
         $this->icon = 'https://cdn.digitalorigin.com/assets/master/logos/pg-130x30.svg';
 
         //Panel form fields
-        $this->form_fields = include(plugin_dir_path(__FILE__).'../includes/settings-pagantis.php');//Panel options
+        $this->form_fields = include(plugin_dir_path(__FILE__).'../includes/settings-pagantis.php'); //Panel options
         $this->init_settings();
 
         $this->extraConfig = getExtraConfig();
         $this->title = __($this->extraConfig['PAGANTIS_TITLE'], 'pagantis');
         $this->method_description = "Financial Payment Gateway. Enable the possibility for your customers to pay their order in confortable installments with Pagantis.";
 
-        $this->settings['ok_url'] = ($this->extraConfig['PAGANTIS_URL_OK']!='')?$this->extraConfig['PAGANTIS_URL_OK']:$this->generateOkUrl();
-        $this->settings['ko_url'] = ($this->extraConfig['PAGANTIS_URL_KO']!='')?$this->extraConfig['PAGANTIS_URL_KO']:$this->generateKoUrl();
+        $this->settings['ok_url'] = ($this->extraConfig['PAGANTIS_URL_OK']!='') ? $this->extraConfig['PAGANTIS_URL_OK'] : $this->generateOkUrl();
+        $this->settings['ko_url'] = ($this->extraConfig['PAGANTIS_URL_KO']!='') ? $this->extraConfig['PAGANTIS_URL_KO'] : $this->generateKoUrl();
         foreach ($this->settings as $setting_key => $setting_value) {
             $this->$setting_key = $setting_value;
         }
 
         //Hooks
-        add_action('woocommerce_update_options_payment_gateways_'.$this->id, array($this,'process_admin_options')); //Save plugin options
-        add_action('admin_notices', array($this, 'pagantisCheckFields'));                          //Check config fields
-        add_action('woocommerce_receipt_'.$this->id, array($this, 'pagantisReceiptPage'));          //Pagantis form
-        add_action('woocommerce_api_wcpagantisgateway', array($this, 'pagantisNotification'));      //Json Notification
-        add_filter('woocommerce_payment_complete_order_status', array($this,'pagantisCompleteStatus'), 10, 3);
+        add_action('woocommerce_update_options_payment_gateways_'.$this->id, array($this, 'process_admin_options')); //Save plugin options
+        add_action('admin_notices', array($this, 'pagantisCheckFields')); //Check config fields
+        add_action('woocommerce_receipt_'.$this->id, array($this, 'pagantisReceiptPage')); //Pagantis form
+        add_action('woocommerce_api_wcpagantisgateway', array($this, 'pagantisNotification')); //Json Notification
+        add_filter('woocommerce_payment_complete_order_status', array($this, 'pagantisCompleteStatus'), 10, 3);
         add_filter('load_textdomain_mofile', array($this, 'loadPagantisTranslation'), 10, 2);
     }
 
@@ -104,8 +104,8 @@ 
      */
     public function loadPagantisTranslation($mofile, $domain)
     {
-        if ('pagantis' === $domain) {
-            $mofile = WP_LANG_DIR . '/../plugins/pagantis/languages/pagantis-' . get_locale() . '.mo';
+        if ('pagantis'===$domain) {
+            $mofile = WP_LANG_DIR.'/../plugins/pagantis/languages/pagantis-'.get_locale().'.mo';
         }
         return $mofile;
     }
@@ -139,24 +139,24 @@ 
     public function pagantisCheckFields()
     {
         $error_string = '';
-        if ($this->settings['enabled'] !== 'yes') {
+        if ($this->settings['enabled']!=='yes') {
             return;
         } elseif (!version_compare(phpversion(), '5.3.0', '>=')) {
-            $error_string =  __(' is not compatible with your php and/or curl version', 'pagantis');
+            $error_string = __(' is not compatible with your php and/or curl version', 'pagantis');
             $this->settings['enabled'] = 'no';
-        } elseif (($this->settings['pagantis_public_key']=="" || $this->settings['pagantis_private_key']=="")  && (empty($this->settings['pagantis_public_key_4x']) || empty($this->settings['pagantis_private_key_4x']))) {
+        } elseif (($this->settings['pagantis_public_key']=="" || $this->settings['pagantis_private_key']=="") && (empty($this->settings['pagantis_public_key_4x']) || empty($this->settings['pagantis_private_key_4x']))) {
             $error_string = __(' is not configured correctly, the fields Public Key and Secret Key are mandatory for use this plugin', 'pagantis');
             $this->settings['enabled'] = 'no';
         } elseif (!in_array(get_woocommerce_currency(), $this->allowed_currencies)) {
-            $error_string =  __(' only can be used in Euros', 'pagantis');
+            $error_string = __(' only can be used in Euros', 'pagantis');
             $this->settings['enabled'] = 'no';
-        } elseif ($this->extraConfig['PAGANTIS_SIMULATOR_MAX_INSTALLMENTS']<'2'
-                  || $this->extraConfig['PAGANTIS_SIMULATOR_MAX_INSTALLMENTS']>'12') {
+        } elseif ($this->extraConfig['PAGANTIS_SIMULATOR_MAX_INSTALLMENTS'] < '2'
+                  || $this->extraConfig['PAGANTIS_SIMULATOR_MAX_INSTALLMENTS'] > '12') {
             $error_string = __(' only can be payed from 2 to 12 installments', 'pagantis');
-        } elseif ($this->extraConfig['PAGANTIS_SIMULATOR_START_INSTALLMENTS']<'2'
-                  || $this->extraConfig['PAGANTIS_SIMULATOR_START_INSTALLMENTS']>'12') {
+        } elseif ($this->extraConfig['PAGANTIS_SIMULATOR_START_INSTALLMENTS'] < '2'
+                  || $this->extraConfig['PAGANTIS_SIMULATOR_START_INSTALLMENTS'] > '12') {
             $error_string = __(' only can be payed from 2 to 12 installments', 'pagantis');
-        } elseif ($this->extraConfig['PAGANTIS_DISPLAY_MIN_AMOUNT']<0) {
+        } elseif ($this->extraConfig['PAGANTIS_DISPLAY_MIN_AMOUNT'] < 0) {
             $error_string = __(' can not have a minimum amount less than 0', 'pagantis');
         }
 
@@ -189,14 +189,14 @@ 
 
             $shippingAddress = $order->get_address('shipping');
             $billingAddress = $order->get_address('billing');
-            if ($shippingAddress['address_1'] == '') {
+            if ($shippingAddress['address_1']=='') {
                 $shippingAddress = $billingAddress;
             }
 
             $customer_id = $order->get_customer_id();
-            $national_id = maybeGetIDNumber($order , $customer_id);
-            $tax_id = maybeGetTaxIDNumber($order , $customer_id);
-            $phoneNumber = maybeGetPhoneNumber($order , $customer_id);
+            $national_id = maybeGetIDNumber($order, $customer_id);
+            $tax_id = maybeGetTaxIDNumber($order, $customer_id);
+            $phoneNumber = maybeGetPhoneNumber($order, $customer_id);
 
             $userAddress = new Address();
             $userAddress
@@ -218,7 +218,7 @@ 
                 ->setNationalId($national_id)
                 ->setTaxId($tax_id)
             ;
-            $orderBillingAddress =  new Address();
+            $orderBillingAddress = new Address();
             $orderBillingAddress
                 ->setZipCode($billingAddress['postcode'])
                 ->setFullName($billingAddress['first_name']." ".$billingAddress['last_name'])
@@ -294,12 +294,12 @@ 
                 $details->addProduct($product);
 
                 $promotedProduct = isProductPromoted($item->get_product_id());
-                if ($promotedProduct == 'true') {
-                    $promotedAmount+=$product->getAmount();
-                    $promotedMessage = 'Promoted Item: ' . $wcProduct->get_name() .
-                                       ' - Price: ' . $item->get_total() .
-                                       ' - Qty: ' . $product->getQuantity() .
-                                       ' - Item ID: ' . $item['id_product'];
+                if ($promotedProduct=='true') {
+                    $promotedAmount += $product->getAmount();
+                    $promotedMessage = 'Promoted Item: '.$wcProduct->get_name().
+                                       ' - Price: '.$item->get_total().
+                                       ' - Qty: '.$product->getQuantity().
+                                       ' - Item ID: '.$item['id_product'];
                     $promotedMessage = substr($promotedMessage, 0, 999);
                     $metadataOrder->addMetadata('promotedProduct', $promotedMessage);
                 }
@@ -346,9 +346,7 @@ 
 
             $allowedCountries = unserialize($this->extraConfig['PAGANTIS_ALLOWED_COUNTRIES']);
             $purchaseCountry =
-                in_array(strtolower($this->language), $allowedCountries) ? $this->language :
-                in_array(strtolower($shippingAddress['country']), $allowedCountries) ? $shippingAddress['country'] :
-                in_array(strtolower($billingAddress['country']), $allowedCountries) ? $billingAddress['country'] : null;
+                in_array(strtolower($this->language), $allowedCountries) ? $this->language : in_array(strtolower($shippingAddress['country']), $allowedCountries) ? $shippingAddress['country'] : in_array(strtolower($billingAddress['country']), $allowedCountries) ? $billingAddress['country'] : null;
 
             $orderConfiguration = new Configuration();
             $orderConfiguration
@@ -390,7 +388,7 @@ 
                 wc_get_template('iframe.php', $template_fields, '', $this->template_path);
             }
         } catch (\Exception $exception) {
-            wc_add_notice(__('Payment error ', 'pagantis') . $exception->getMessage(), 'error');
+            wc_add_notice(__('Payment error ', 'pagantis').$exception->getMessage(), 'error');
             insertLogEntry($exception);
             $checkout_url = get_permalink(wc_get_page_id('checkout'));
             wp_redirect($checkout_url);
@@ -405,7 +403,7 @@ 
     public function pagantisNotification()
     {
         try {
-            $origin = ($_SERVER['REQUEST_METHOD'] == 'POST') ? 'Notify' : 'Order';
+            $origin = ($_SERVER['REQUEST_METHOD']=='POST') ? 'Notify' : 'Order';
 
             include_once('notifyController.php');
             $notify = new WcPagantisNotify();
@@ -444,10 +442,10 @@ 
      */
     public function pagantisCompleteStatus($status, $order_id, $order)
     {
-        if ($order->get_payment_method() == WcPagantisGateway::METHOD_ID) {
-            if ($order->get_status() == 'failed') {
+        if ($order->get_payment_method()==WcPagantisGateway::METHOD_ID) {
+            if ($order->get_status()=='failed') {
                 $status = 'processing';
-            } elseif ($order->get_status() == 'pending' && $status=='completed') {
+            } elseif ($order->get_status()=='pending' && $status=='completed') {
                 $status = 'processing';
             }
         }
@@ -473,8 +471,8 @@ 
         $allowedCountry = (in_array(strtolower($locale), $allowedCountries));
         $minAmount = $this->extraConfig['PAGANTIS_DISPLAY_MIN_AMOUNT'];
         $maxAmount = $this->extraConfig['PAGANTIS_DISPLAY_MAX_AMOUNT'];
-        $totalPrice = (int)$this->get_order_total();
-        $validAmount = ($totalPrice>=$minAmount && ($totalPrice<=$maxAmount || $maxAmount=='0'));
+        $totalPrice = (int) $this->get_order_total();
+        $validAmount = ($totalPrice >= $minAmount && ($totalPrice <= $maxAmount || $maxAmount=='0'));
         if ($this->enabled==='yes' && $this->pagantis_public_key!='' && $this->pagantis_private_key!='' &&
             $validAmount && $allowedCountry) {
             return true;
@@ -507,7 +505,7 @@ 
 
             $redirectUrl = $order->get_checkout_payment_url(true); //pagantisReceiptPage function
             if (strpos($redirectUrl, 'order-pay=')===false) {
-                $redirectUrl.="&order-pay=".$order_id;
+                $redirectUrl .= "&order-pay=".$order_id;
             }
 
             return array(
@@ -515,7 +513,7 @@ 
                 'redirect' => $redirectUrl
             );
         } catch (Exception $e) {
-            wc_add_notice(__('Payment error ', 'pagantis') . $e->getMessage(), 'error');
+            wc_add_notice(__('Payment error ', 'pagantis').$e->getMessage(), 'error');
             return array();
         }
     }
@@ -584,7 +582,7 @@ 
     private function generateUrl($url)
     {
         $parsed_url = parse_url($url);
-        if ($parsed_url !== false) {
+        if ($parsed_url!==false) {
             $parsed_url['query'] = !isset($parsed_url['query']) ? '' : $parsed_url['query'];
             parse_str($parsed_url['query'], $arrayParams);
             foreach ($arrayParams as $keyParam => $valueParam) {
@@ -632,11 +630,10 @@ 
     private function getKeysUrl($order, $url)
     {
         $defaultFields = (get_class($order)=='WC_Order') ?
-            array('order-received'=>$order->get_id(), 'key'=>$order->get_order_key()) :
-            array();
+            array('order-received'=>$order->get_id(), 'key'=>$order->get_order_key()) : array();
 
         $parsedUrl = parse_url($url);
-        if ($parsedUrl !== false) {
+        if ($parsedUrl!==false) {
             //Replace parameters from url
             $parsedUrl['query'] = $this->getKeysParametersUrl($parsedUrl['query'], $defaultFields);
 
@@ -681,7 +678,7 @@ 
         foreach ($arrayParams as $keyParam => $valueParam) {
             preg_match('#\{{.*?}\}#', $valueParam, $match);
             if (count($match)) {
-                $key = str_replace(array('{{','}}'), array('',''), $match[0]);
+                $key = str_replace(array('{{', '}}'), array('', ''), $match[0]);
                 $arrayParams[$keyParam] = $defaultFields[$key];
             }
         }
@@ -696,13 +693,13 @@ 
      */
     private function unparseUrl($parsed_url)
     {
-        $scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
+        $scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'].'://' : '';
         $host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
-        $port     = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
-        $query    = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
-        $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
+        $port     = isset($parsed_url['port']) ? ':'.$parsed_url['port'] : '';
+        $query    = isset($parsed_url['query']) ? '?'.$parsed_url['query'] : '';
+        $fragment = isset($parsed_url['fragment']) ? '#'.$parsed_url['fragment'] : '';
         $path     = $parsed_url['path'];
-        return $scheme . $host . $port . $path . $query . $fragment;
+        return $scheme.$host.$port.$path.$query.$fragment;
     }
 
 }

controllers/paymentController4x.php

Spacing +41 added lines, -44 removed lines

@@ -66,7 +66,7 @@ 
         $this->urlToken4x = strtoupper(md5(uniqid(rand(), true)));
 
         //Useful vars
-        $this->template_path = plugin_dir_path(__FILE__) . '../templates/';
+        $this->template_path = plugin_dir_path(__FILE__).'../templates/';
         $this->allowed_currencies = getAllowedCurrencies();
         $this->language = strstr(get_locale(), '_', true);
         if ($this->language=='') {
@@ -75,24 +75,24 @@ 
         $this->icon = 'https://cdn.digitalorigin.com/assets/master/logos/pg-130x30.svg';
 
         //Panel form fields
-        $this->form_fields = include(plugin_dir_path(__FILE__).'../includes/settings-pagantis.php');//Panel options
+        $this->form_fields = include(plugin_dir_path(__FILE__).'../includes/settings-pagantis.php'); //Panel options
         $this->init_settings();
 
         $this->extraConfig = getExtraConfig();
         $this->title = __($this->extraConfig['PAGANTIS_TITLE_4x'], 'pagantis');
         $this->method_description = "Financial Payment Gateway. Enable the possibility for your customers to pay their order in confortable installments with Pagantis.";
 
-        $this->settings['ok_url'] = ($this->extraConfig['PAGANTIS_URL_OK']!='')?$this->extraConfig['PAGANTIS_URL_OK']:$this->generateOkUrl();
-        $this->settings['ko_url'] = ($this->extraConfig['PAGANTIS_URL_KO']!='')?$this->extraConfig['PAGANTIS_URL_KO']:$this->generateKoUrl();
+        $this->settings['ok_url'] = ($this->extraConfig['PAGANTIS_URL_OK']!='') ? $this->extraConfig['PAGANTIS_URL_OK'] : $this->generateOkUrl();
+        $this->settings['ko_url'] = ($this->extraConfig['PAGANTIS_URL_KO']!='') ? $this->extraConfig['PAGANTIS_URL_KO'] : $this->generateKoUrl();
         foreach ($this->settings as $setting_key => $setting_value) {
             $this->$setting_key = $setting_value;
         }
 
         //Hooks
-        add_action('woocommerce_update_options_payment_gateways_'.$this->id, array($this,'process_admin_options')); //Save plugin options
-        add_action('woocommerce_receipt_'.$this->id, array($this, 'pagantisReceiptPage'));          //Pagantis form
-        add_action('woocommerce_api_wcpagantisgateway', array($this, 'pagantisNotification'));      //Json Notification
-        add_filter('woocommerce_payment_complete_order_status', array($this,'pagantisCompleteStatus'), 10, 3);
+        add_action('woocommerce_update_options_payment_gateways_'.$this->id, array($this, 'process_admin_options')); //Save plugin options
+        add_action('woocommerce_receipt_'.$this->id, array($this, 'pagantisReceiptPage')); //Pagantis form
+        add_action('woocommerce_api_wcpagantisgateway', array($this, 'pagantisNotification')); //Json Notification
+        add_filter('woocommerce_payment_complete_order_status', array($this, 'pagantisCompleteStatus'), 10, 3);
         add_filter('load_textdomain_mofile', array($this, 'loadPagantisTranslation'), 10, 2);
     }
 
@@ -104,8 +104,8 @@ 
      */
     public function loadPagantisTranslation($mofile, $domain)
     {
-        if ('pagantis' === $domain) {
-            $mofile = WP_LANG_DIR . '/../plugins/pagantis/languages/pagantis-' . get_locale() . '.mo';
+        if ('pagantis'===$domain) {
+            $mofile = WP_LANG_DIR.'/../plugins/pagantis/languages/pagantis-'.get_locale().'.mo';
         }
         return $mofile;
     }
@@ -154,14 +154,14 @@ 
 
             $shippingAddress = $order->get_address('shipping');
             $billingAddress = $order->get_address('billing');
-            if ($shippingAddress['address_1'] == '') {
+            if ($shippingAddress['address_1']=='') {
                 $shippingAddress = $billingAddress;
             }
 
             $customer_id = $order->get_customer_id();
-            $national_id = maybeGetIDNumber($order , $customer_id);
-            $tax_id = maybeGetTaxIDNumber($order , $customer_id);
-            $phoneNumber = maybeGetPhoneNumber($order , $customer_id);
+            $national_id = maybeGetIDNumber($order, $customer_id);
+            $tax_id = maybeGetTaxIDNumber($order, $customer_id);
+            $phoneNumber = maybeGetPhoneNumber($order, $customer_id);
 
 
             $userAddress = new Address();
@@ -184,7 +184,7 @@ 
                 ->setNationalId($national_id)
                 ->setTaxId($tax_id)
             ;
-            $orderBillingAddress =  new Address();
+            $orderBillingAddress = new Address();
             $orderBillingAddress
                 ->setZipCode($billingAddress['postcode'])
                 ->setFullName($billingAddress['first_name']." ".$billingAddress['last_name'])
@@ -261,12 +261,12 @@ 
                 $details->addProduct($product);
 
                 $promotedProduct = isProductPromoted($item->get_product_id());
-                if ($promotedProduct == 'true') {
-                    $promotedAmount+=$product->getAmount();
-                    $promotedMessage = 'Promoted Item: ' . $wcProduct->get_name() .
-                                       ' - Price: ' . $item->get_total() .
-                                       ' - Qty: ' . $product->getQuantity() .
-                                       ' - Item ID: ' . $item['id_product'];
+                if ($promotedProduct=='true') {
+                    $promotedAmount += $product->getAmount();
+                    $promotedMessage = 'Promoted Item: '.$wcProduct->get_name().
+                                       ' - Price: '.$item->get_total().
+                                       ' - Qty: '.$product->getQuantity().
+                                       ' - Item ID: '.$item['id_product'];
                     $promotedMessage = substr($promotedMessage, 0, 999);
                     $metadataOrder->addMetadata('promotedProduct', $promotedMessage);
                 }
@@ -314,9 +314,7 @@ 
 
             $allowedCountries = unserialize($this->extraConfig['PAGANTIS_ALLOWED_COUNTRIES']);
             $purchaseCountry =
-                in_array(strtolower($this->language), $allowedCountries) ? $this->language :
-                    in_array(strtolower($shippingAddress['country']), $allowedCountries) ? $shippingAddress['country'] :
-                        in_array(strtolower($billingAddress['country']), $allowedCountries) ? $billingAddress['country'] : null;
+                in_array(strtolower($this->language), $allowedCountries) ? $this->language : in_array(strtolower($shippingAddress['country']), $allowedCountries) ? $shippingAddress['country'] : in_array(strtolower($billingAddress['country']), $allowedCountries) ? $billingAddress['country'] : null;
 
             $orderConfiguration = new Configuration();
             $orderConfiguration
@@ -341,7 +339,7 @@ 
             $pagantisOrder = $orderClient->createOrder($orderApiClient);
             if ($pagantisOrder instanceof \Pagantis\OrdersApiClient\Model\Order) {
                 $url = $pagantisOrder->getActionUrls()->getForm();
-                addOrderToProcessingQueue($pagantisOrder->getId(), $order->get_id(), $this->urlToken4x,self::METHOD_ID);
+                addOrderToProcessingQueue($pagantisOrder->getId(), $order->get_id(), $this->urlToken4x, self::METHOD_ID);
             } else {
                 throw new OrderNotFoundException();
             }
@@ -360,7 +358,7 @@ 
                 wc_get_template('iframe.php', $template_fields, '', $this->template_path);
             }
         } catch (\Exception $exception) {
-            wc_add_notice(__('Payment error ', 'pagantis') . $exception->getMessage(), 'error');
+            wc_add_notice(__('Payment error ', 'pagantis').$exception->getMessage(), 'error');
             insertLogEntry($exception);
             $checkout_url = get_permalink(wc_get_page_id('checkout'));
             wp_redirect($checkout_url);
@@ -376,7 +374,7 @@ 
     public function pagantisNotification()
     {
         try {
-            $origin = ($_SERVER['REQUEST_METHOD'] == 'POST') ? 'Notify' : 'Order';
+            $origin = ($_SERVER['REQUEST_METHOD']=='POST') ? 'Notify' : 'Order';
 
             include_once('notifyController.php');
             $notify = new WcPagantisNotify();
@@ -415,10 +413,10 @@ 
      */
     public function pagantisCompleteStatus($status, $order_id, $order)
     {
-        if ($order->get_payment_method() == WcPagantis4xGateway::METHOD_ID) {
-            if ($order->get_status() == 'failed') {
+        if ($order->get_payment_method()==WcPagantis4xGateway::METHOD_ID) {
+            if ($order->get_status()=='failed') {
                 $status = 'processing';
-            } elseif ($order->get_status() == 'pending' && $status=='completed') {
+            } elseif ($order->get_status()=='pending' && $status=='completed') {
                 $status = 'processing';
             }
         }
@@ -447,8 +445,8 @@ 
         $allowedCountry = (in_array(strtolower($locale), $allowedCountries));
         $minAmount = $this->extraConfig['PAGANTIS_DISPLAY_MIN_AMOUNT_4x'];
         $maxAmount = $this->extraConfig['PAGANTIS_DISPLAY_MAX_AMOUNT_4x'];
-        $totalPrice = (int)$this->get_order_total();
-        $validAmount = ($totalPrice>=$minAmount && ($totalPrice<=$maxAmount || $maxAmount=='0'));
+        $totalPrice = (int) $this->get_order_total();
+        $validAmount = ($totalPrice >= $minAmount && ($totalPrice <= $maxAmount || $maxAmount=='0'));
         if ($cfg['enabled_4x']==='yes' && $cfg['pagantis_public_key_4x']!='' && $cfg['pagantis_private_key_4x']!='' &&
             $validAmount && $allowedCountry) {
             return true;
@@ -483,7 +481,7 @@ 
 
             $redirectUrl = $order->get_checkout_payment_url(true); //pagantisReceiptPage function
             if (strpos($redirectUrl, 'order-pay=')===false) {
-                $redirectUrl.="&order-pay=".$order_id;
+                $redirectUrl .= "&order-pay=".$order_id;
             }
 
             return array(
@@ -491,7 +489,7 @@ 
                 'redirect' => $redirectUrl
             );
         } catch (Exception $e) {
-            wc_add_notice(__('Payment error ', 'pagantis') . $e->getMessage(), 'error');
+            wc_add_notice(__('Payment error ', 'pagantis').$e->getMessage(), 'error');
             return array();
         }
     }
@@ -562,7 +560,7 @@ 
     private function generateUrl($url)
     {
         $parsed_url = parse_url($url);
-        if ($parsed_url !== false) {
+        if ($parsed_url!==false) {
             $parsed_url['query'] = !isset($parsed_url['query']) ? '' : $parsed_url['query'];
             parse_str($parsed_url['query'], $arrayParams);
             foreach ($arrayParams as $keyParam => $valueParam) {
@@ -610,11 +608,10 @@ 
     private function getKeysUrl($order, $url)
     {
         $defaultFields = (get_class($order)=='WC_Order') ?
-            array('order-received'=>$order->get_id(), 'key'=>$order->get_order_key()) :
-            array();
+            array('order-received'=>$order->get_id(), 'key'=>$order->get_order_key()) : array();
 
         $parsedUrl = parse_url($url);
-        if ($parsedUrl !== false) {
+        if ($parsedUrl!==false) {
             //Replace parameters from url
             $parsedUrl['query'] = $this->getKeysParametersUrl($parsedUrl['query'], $defaultFields);
 
@@ -659,7 +656,7 @@ 
         foreach ($arrayParams as $keyParam => $valueParam) {
             preg_match('#\{{.*?}\}#', $valueParam, $match);
             if (count($match)) {
-                $key = str_replace(array('{{','}}'), array('',''), $match[0]);
+                $key = str_replace(array('{{', '}}'), array('', ''), $match[0]);
                 $arrayParams[$keyParam] = $defaultFields[$key];
             }
         }
@@ -674,12 +671,12 @@ 
      */
     private function unparseUrl($parsed_url)
     {
-        $scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
+        $scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'].'://' : '';
         $host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
-        $port     = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';
-        $query    = isset($parsed_url['query']) ? '?' . $parsed_url['query'] : '';
-        $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : '';
+        $port     = isset($parsed_url['port']) ? ':'.$parsed_url['port'] : '';
+        $query    = isset($parsed_url['query']) ? '?'.$parsed_url['query'] : '';
+        $fragment = isset($parsed_url['fragment']) ? '#'.$parsed_url['fragment'] : '';
         $path     = $parsed_url['path'];
-        return $scheme . $host . $port . $path . $query . $fragment;
+        return $scheme.$host.$port.$path.$query.$fragment;
     }
 }