pagantis / woocommerce

controllers/paymentController.php

Indentation +3 added lines, -3 removed lines

@@ -299,9 +299,9 @@
                 if ($promotedProduct == 'true') {
                     $promotedAmount+=$product->getAmount();
                     $promotedMessage = 'Promoted Item: ' . $wcProduct->get_name() .
-                                       ' - Price: ' . $item->get_total() .
-                                       ' - Qty: ' . $product->getQuantity() .
-                                       ' - Item ID: ' . $item['id_product'];
+                                        ' - Price: ' . $item->get_total() .
+                                        ' - Qty: ' . $product->getQuantity() .
+                                        ' - Item ID: ' . $item['id_product'];
                     $promotedMessage = substr($promotedMessage, 0, 999);
                     $metadataOrder->addMetadata('promotedProduct', $promotedMessage);
                 }

Spacing +48 added lines, -51 removed lines

@@ -56,9 +56,9 @@ 
         $this->method_title = ucfirst($this->id);
 
         //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=='') {
@@ -67,25 +67,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);
     }
 
@@ -97,8 +97,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;
     }
@@ -132,24 +132,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');
         }
 
@@ -182,7 +182,7 @@ 
 
             $shippingAddress = $order->get_address('shipping');
             $billingAddress = $order->get_address('billing');
-            if ($shippingAddress['address_1'] == '') {
+            if ($shippingAddress['address_1']=='') {
                 $shippingAddress = $billingAddress;
             }
 
@@ -209,7 +209,7 @@ 
                 ->setNationalId($national_id)
                 ->setTaxId($tax_id)
             ;
-            $orderBillingAddress =  new Address();
+            $orderBillingAddress = new Address();
             $orderBillingAddress
                 ->setZipCode($billingAddress['postcode'])
                 ->setFullName($billingAddress['first_name']." ".$billingAddress['last_name'])
@@ -282,12 +282,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);
                 }
@@ -333,9 +333,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
@@ -377,7 +375,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);
@@ -392,7 +390,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();
@@ -431,10 +429,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';
             }
         }
@@ -460,8 +458,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;
@@ -494,7 +492,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(
@@ -502,7 +500,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();
         }
     }
@@ -571,7 +569,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) {
@@ -619,11 +617,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);
 
@@ -668,7 +665,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];
             }
         }
@@ -683,12 +680,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;
     }
 }

controllers/notifyController.php

Indentation +4 added lines, -4 removed lines

@@ -198,10 +198,10 @@
 
         if (!$this->woocommerceOrder->has_status($isValidStatus)) { // TO CONFIRM
             $logMessage = "WARNING checkMerchantOrderStatus." .
-                          " Merchant order id:".$this->woocommerceOrder->get_id().
-                          " Merchant order status:".$this->woocommerceOrder->get_status().
-                          " Pagantis order id:".$this->pagantisOrder->getStatus().
-                          " Pagantis order status:".$this->pagantisOrder->getId();
+                            " Merchant order id:".$this->woocommerceOrder->get_id().
+                            " Merchant order status:".$this->woocommerceOrder->get_status().
+                            " Pagantis order id:".$this->pagantisOrder->getStatus().
+                            " Pagantis order status:".$this->pagantisOrder->getId();
 
             $this->insertLog(null, $logMessage);
             $this->woocommerceOrder->add_order_note($logMessage);

Spacing +22 added lines, -22 removed lines

@@ -65,7 +65,7 @@ 
         try {
             require_once(__ROOT__.'/vendor/autoload.php');
             try {
-                if ($_SERVER['REQUEST_METHOD'] == 'GET' && $_GET['origin'] == 'notification') {
+                if ($_SERVER['REQUEST_METHOD']=='GET' && $_GET['origin']=='notification') {
                     return $this->buildResponse();
                 }
                 $this->checkConcurrency();
@@ -114,7 +114,7 @@ 
     private function checkConcurrency()
     {
         $this->woocommerceOrderId = $_GET['order-received'];
-        if ($this->woocommerceOrderId == '') {
+        if ($this->woocommerceOrderId=='') {
             throw new QuoteNotFoundException();
         }
 
@@ -127,7 +127,7 @@ 
      */
     private function getProductType()
     {
-        if ($_GET['product'] == '') {
+        if ($_GET['product']=='') {
             $this->setProduct(WcPagantisGateway::METHOD_ID);
         } else {
             $this->setProduct($_GET['product']);
@@ -158,7 +158,7 @@ 
         $queryResult = $wpdb->get_row("select order_id from $tableName where id='".$this->woocommerceOrderId."'");
         $this->pagantisOrderId = $queryResult->order_id;
 
-        if ($this->pagantisOrderId == '') {
+        if ($this->pagantisOrderId=='') {
             throw new NoIdentificationException();
         }
     }
@@ -201,7 +201,7 @@ 
                 $status = '-';
             }
 
-            if ($status === Order::STATUS_CONFIRMED) {
+            if ($status===Order::STATUS_CONFIRMED) {
                 return true;
             }
             throw new WrongStatusException($status);
@@ -222,7 +222,7 @@ 
         );
 
         if (!$this->woocommerceOrder->has_status($isValidStatus)) { // TO CONFIRM
-            $logMessage = "WARNING checkMerchantOrderStatus." .
+            $logMessage = "WARNING checkMerchantOrderStatus.".
                           " Merchant order id:".$this->woocommerceOrder->get_id().
                           " Merchant order status:".$this->woocommerceOrder->get_status().
                           " Pagantis order id:".$this->pagantisOrder->getStatus().
@@ -244,7 +244,7 @@ 
     {
         $pagantisAmount = $this->pagantisOrder->getShoppingCart()->getTotalAmount();
         $wcAmount = intval(strval(100 * $this->woocommerceOrder->get_total()));
-        if ($pagantisAmount != $wcAmount) {
+        if ($pagantisAmount!=$wcAmount) {
             throw new AmountMismatchException($pagantisAmount, $wcAmount);
         }
     }
@@ -268,7 +268,7 @@ 
             $this->pagantisOrder = $this->orderClient->confirmOrder($this->pagantisOrderId);
         } catch (\Exception $e) {
             $this->pagantisOrder = $this->orderClient->getOrder($this->pagantisOrderId);
-            if ($this->pagantisOrder->getStatus() !== Order::STATUS_CONFIRMED) {
+            if ($this->pagantisOrder->getStatus()!==Order::STATUS_CONFIRMED) {
                 throw new UnknownException($e->getMessage());
             } else {
                 $logMessage = 'Concurrency issue: Order_id '.$this->pagantisOrderId.' was confirmed by other process';
@@ -292,7 +292,7 @@ 
         global $wpdb;
         $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 $tableName (id int, order_id varchar(50), wc_order_id varchar(50), 
                   UNIQUE KEY id (id)) $charset_collate";
@@ -310,7 +310,7 @@ 
         global $wpdb;
         $tableName = $wpdb->prefix.PG_LOGS_TABLE_NAME;
 
-        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 $tableName ( id int NOT NULL AUTO_INCREMENT, log text NOT NULL, 
                     createdAt timestamp DEFAULT CURRENT_TIMESTAMP, UNIQUE KEY id (id)) $charset_collate";
@@ -367,12 +367,12 @@ 
             $metadataOrder = $this->pagantisOrder->getMetadata();
             $metadataInfo = null;
             foreach ($metadataOrder as $metadataKey => $metadataValue) {
-                if ($metadataKey == 'promotedProduct') {
-                    $metadataInfo.= "/Producto promocionado = $metadataValue";
+                if ($metadataKey=='promotedProduct') {
+                    $metadataInfo .= "/Producto promocionado = $metadataValue";
                 }
             }
 
-            if ($metadataInfo != null) {
+            if ($metadataInfo!=null) {
                 $this->woocommerceOrder->add_order_note($metadataInfo);
             }
 
@@ -441,13 +441,13 @@ 
     {
         global $wpdb;
         $tableName = $wpdb->prefix.PG_CONCURRENCY_TABLE_NAME;
-        if ($orderId == null) {
+        if ($orderId==null) {
             $query = "DELETE FROM $tableName WHERE createdAt<(NOW()- INTERVAL ".self::CONCURRENCY_TIMEOUT." SECOND)";
         } else {
             $query = "DELETE FROM $tableName WHERE order_id = $orderId";
         }
         $resultDelete = $wpdb->query($query);
-        if ($resultDelete === false) {
+        if ($resultDelete===false) {
             throw new ConcurrencyException();
         }
     }
@@ -462,8 +462,8 @@ 
         global $wpdb;
         $tableName = $wpdb->prefix.PG_CONCURRENCY_TABLE_NAME;
         $insertResult = $wpdb->insert($tableName, array('order_id' => $orderId));
-        if ($insertResult === false) {
-            if ($this->getOrigin() == 'Notify') {
+        if ($insertResult===false) {
+            if ($this->getOrigin()=='Notify') {
                 throw new ConcurrencyException();
             } else {
                 $query = sprintf(
@@ -474,8 +474,8 @@ 
                 );
                 $resultSeconds = $wpdb->get_row($query);
                 $restSeconds = isset($resultSeconds) ? ($resultSeconds->rest) : 0;
-                $secondsToExpire = ($restSeconds>self::CONCURRENCY_TIMEOUT) ? self::CONCURRENCY_TIMEOUT : $restSeconds;
-                sleep($secondsToExpire+1);
+                $secondsToExpire = ($restSeconds > self::CONCURRENCY_TIMEOUT) ? self::CONCURRENCY_TIMEOUT : $restSeconds;
+                sleep($secondsToExpire + 1);
 
                 $logMessage = sprintf(
                     "User waiting %s seconds, default seconds %s, bd time to expire %s seconds",
@@ -499,7 +499,7 @@ 
     {
         $this->unblockConcurrency($this->woocommerceOrderId);
 
-        if ($exception == null) {
+        if ($exception==null) {
             $jsonResponse = new JsonSuccessResponse();
         } else {
             $jsonResponse = new JsonExceptionResponse();
@@ -509,7 +509,7 @@ 
         $jsonResponse->setMerchantOrderId($this->woocommerceOrderId);
         $jsonResponse->setPagantisOrderId($this->pagantisOrderId);
 
-        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+        if ($_SERVER['REQUEST_METHOD']=='POST') {
             $jsonResponse->printResponse();
         } else {
             return $jsonResponse;
@@ -541,7 +541,7 @@ 
      */
     private function isProduct4x()
     {
-        return ($this->product === Ucfirst(WcPagantis4xGateway::METHOD_ID));
+        return ($this->product===Ucfirst(WcPagantis4xGateway::METHOD_ID));
     }
 
     /**

WC_Pagantis.php

Indentation +1 added lines, -1 removed lines

@@ -613,7 +613,7 @@
         if ($file == plugin_basename(__FILE__)) {
             $links[] = '<a href="'.WcPagantis::GIT_HUB_URL.'" target="_blank">'.__('Documentation', 'pagantis').'</a>';
             $links[] = '<a href="'.WcPagantis::PAGANTIS_DOC_URL.'" target="_blank">'.
-                       __('API documentation', 'pagantis').'</a>';
+                        __('API documentation', 'pagantis').'</a>';
             $links[] = '<a href="'.WcPagantis::SUPPORT_EML.'">'.__('Support', 'pagantis').'</a>';
 
             return $links;

Spacing +41 added lines, -41 removed lines

@@ -19,7 +19,7 @@ 
 }
 
 
-require_once(__DIR__ . '/includes/pg-functions.php');
+require_once(__DIR__.'/includes/pg-functions.php');
 
 /**
  * Required minimums and constants
@@ -81,7 +81,7 @@ 
     public function __construct()
     {
         require_once(plugin_dir_path(__FILE__).'/vendor/autoload.php');
-        require_once(PG_ABSPATH . '/includes/pg-functions.php');
+        require_once(PG_ABSPATH.'/includes/pg-functions.php');
         $this->template_path = plugin_dir_path(__FILE__).'/templates/';
 
         $this->pagantisActivation();
@@ -97,15 +97,15 @@ 
         add_action('init', array($this, 'checkWcPriceSettings'), 10);
         add_action('woocommerce_after_template_part', array($this, 'pagantisAddSimulatorHtmlDiv'), 10);
         add_action('woocommerce_single_product_summary', array($this, 'pagantisInitProductSimulator'), 20);
-        add_action('woocommerce_single_variation', array($this,'pagantisAddProductSnippetForVariations'), 30);
+        add_action('woocommerce_single_variation', array($this, 'pagantisAddProductSnippetForVariations'), 30);
         add_action('wp_enqueue_scripts', 'add_pagantis_widget_js');
         add_action('rest_api_init', array($this, 'pagantisRegisterEndpoint')); //Endpoint
         add_filter('load_textdomain_mofile', array($this, 'loadPagantisTranslation'), 10, 2);
         register_activation_hook(__FILE__, array($this, 'pagantisActivation'));
         add_action('woocommerce_product_options_general_product_data', array($this, 'pagantisPromotedProductTpl'));
         add_action('woocommerce_process_product_meta', array($this, 'pagantisPromotedVarSave'));
-        add_action('woocommerce_product_bulk_edit_start', array($this,'pagantisPromotedBulkTemplate'));
-        add_action('woocommerce_product_bulk_edit_save', array($this,'pagantisPromotedBulkTemplateSave'));
+        add_action('woocommerce_product_bulk_edit_start', array($this, 'pagantisPromotedBulkTemplate'));
+        add_action('woocommerce_product_bulk_edit_save', array($this, 'pagantisPromotedBulkTemplateSave'));
     }
 
     /**
@@ -131,7 +131,7 @@ 
     {
         $post_id = $product->get_id();
         $pagantis_promoted_value = $_REQUEST['pagantis_promoted'];
-        if ($pagantis_promoted_value === 'on') {
+        if ($pagantis_promoted_value==='on') {
             $pagantis_promoted_value = 'yes';
         } else {
             $pagantis_promoted_value = 'no';
@@ -165,7 +165,7 @@ 
     public function pagantisPromotedVarSave($post_id)
     {
         $pagantis_promoted_value = $_POST['pagantis_promoted'];
-        if ($pagantis_promoted_value !== 'yes') {
+        if ($pagantis_promoted_value!=='yes') {
             $pagantis_promoted_value = 'no';
         }
 
@@ -179,8 +179,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;
     }
@@ -193,7 +193,7 @@ 
         global $wpdb;
 
         $tableName = $wpdb->prefix.PG_CONCURRENCY_TABLE_NAME;
-        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 $tableName ( order_id int NOT NULL,  
                     createdAt timestamp DEFAULT CURRENT_TIMESTAMP, UNIQUE KEY id (order_id)) $charset_collate";
@@ -204,7 +204,7 @@ 
         $tableName = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
 
         //Check if table exists
-        $tableExists = $wpdb->get_var("SHOW TABLES LIKE '$tableName'") != $tableName;
+        $tableExists = $wpdb->get_var("SHOW TABLES LIKE '$tableName'")!=$tableName;
         if ($tableExists) {
             $charset_collate = $wpdb->get_charset_collate();
             $sql = "CREATE TABLE IF NOT EXISTS $tableName (
@@ -219,7 +219,7 @@ 
             //Updated value field to adapt to new length < v8.0.1
             $query = "select COLUMN_TYPE FROM information_schema.COLUMNS where TABLE_NAME='$tableName' AND COLUMN_NAME='value'";
             $results = $wpdb->get_results($query, ARRAY_A);
-            if ($results['0']['COLUMN_TYPE'] == 'varchar(100)') {
+            if ($results['0']['COLUMN_TYPE']=='varchar(100)') {
                 $sql = "ALTER TABLE $tableName MODIFY value varchar(1000)";
                 $wpdb->query($sql);
             }
@@ -229,9 +229,9 @@ 
                                or config='PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'";
             $dbCurrentConfig = $wpdb->get_results($query, ARRAY_A);
             foreach ($dbCurrentConfig as $item) {
-                if ($item['config'] == 'PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR') {
+                if ($item['config']=='PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR') {
                     $css_price_selector = $this->preparePriceSelector($item['value']);
-                    if ($item['value'] != $css_price_selector) {
+                    if ($item['value']!=$css_price_selector) {
                         $wpdb->update(
                             $tableName,
                             array('value' => stripslashes($css_price_selector)),
@@ -240,9 +240,9 @@ 
                             array('%s')
                         );
                     }
-                } elseif ($item['config'] == 'PAGANTIS_SIMULATOR_CSS_QUANTITY_SELECTOR') {
+                } elseif ($item['config']=='PAGANTIS_SIMULATOR_CSS_QUANTITY_SELECTOR') {
                     $css_quantity_selector = $this->prepareQuantitySelector($item['value']);
-                    if ($item['value'] != $css_quantity_selector) {
+                    if ($item['value']!=$css_quantity_selector) {
                         $wpdb->update(
                             $tableName,
                             array('value' => stripslashes($css_quantity_selector)),
@@ -256,7 +256,7 @@ 
         }
 
         // Making sure DB tables are created < v8.6.9
-        if (!isPgTableCreated(PG_LOGS_TABLE_NAME)){
+        if (!isPgTableCreated(PG_LOGS_TABLE_NAME)) {
             createLogsTable();
         }
         checkCartProcessTable();
@@ -265,7 +265,7 @@ 
         $tableName = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
         $query = "select * from $tableName where config='PAGANTIS_SIMULATOR_THOUSANDS_SEPARATOR'";
         $results = $wpdb->get_results($query, ARRAY_A);
-        if (count($results) == 0) {
+        if (count($results)==0) {
             $wpdb->insert($tableName, array('config' => 'PAGANTIS_SIMULATOR_THOUSANDS_SEPARATOR', 'value'  => '.'), array('%s', '%s'));
             $wpdb->insert($tableName, array('config' => 'PAGANTIS_SIMULATOR_DECIMAL_SEPARATOR', 'value'  => ','), array('%s', '%s'));
         }
@@ -274,7 +274,7 @@ 
         $tableName = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
         $query = "select * from $tableName where config='PAGANTIS_DISPLAY_MAX_AMOUNT'";
         $results = $wpdb->get_results($query, ARRAY_A);
-        if (count($results) == 0) {
+        if (count($results)==0) {
             $wpdb->insert($tableName, array('config' => 'PAGANTIS_DISPLAY_MAX_AMOUNT', 'value'  => '0'), array('%s', '%s'));
         }
 
@@ -282,7 +282,7 @@ 
         $tableName = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
         $query = "select * from $tableName where config='PAGANTIS_SIMULATOR_DISPLAY_SITUATION'";
         $results = $wpdb->get_results($query, ARRAY_A);
-        if (count($results) == 0) {
+        if (count($results)==0) {
             $wpdb->insert($tableName, array('config' => 'PAGANTIS_SIMULATOR_DISPLAY_SITUATION', 'value'  => 'default'), array('%s', '%s'));
             $wpdb->insert($tableName, array('config' => 'PAGANTIS_SIMULATOR_SELECTOR_VARIATION', 'value'  => 'default'), array('%s', '%s'));
         }
@@ -292,17 +292,17 @@ 
         $tableName = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
         $query = "select * from $tableName where config='PAGANTIS_SIMULATOR_DISPLAY_TYPE_CHECKOUT'";
         $results = $wpdb->get_results($query, ARRAY_A);
-        if (count($results) == 0) {
+        if (count($results)==0) {
             $wpdb->insert($tableName, array('config' => 'PAGANTIS_SIMULATOR_DISPLAY_TYPE_CHECKOUT', 'value'  => 'sdk.simulator.types.CHECKOUT_PAGE'), array('%s', '%s'));
             $wpdb->update($tableName, array('value' => 'sdk.simulator.types.PRODUCT_PAGE'), array('config' => 'PAGANTIS_SIMULATOR_DISPLAY_TYPE'), array('%s'), array('%s'));
         }
 
         //Adapting to variable selector < v8.3.6
-        $variableSelector="div.summary div.woocommerce-variation.single_variation > div.woocommerce-variation-price span.price";
+        $variableSelector = "div.summary div.woocommerce-variation.single_variation > div.woocommerce-variation-price span.price";
         $tableName = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
         $query = "select * from $tableName where config='PAGANTIS_SIMULATOR_SELECTOR_VARIATION' and value='default'";
         $results = $wpdb->get_results($query, ARRAY_A);
-        if (count($results) == 0) {
+        if (count($results)==0) {
             $wpdb->update($tableName, array('value' => $variableSelector), array('config' => 'PAGANTIS_SIMULATOR_SELECTOR_VARIATION'), array('%s'), array('%s'));
         }
 
@@ -310,7 +310,7 @@ 
         $tableName = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
         $query = "select * from $tableName where config='PAGANTIS_TITLE_4x'";
         $results = $wpdb->get_results($query, ARRAY_A);
-        if (count($results) == 0) {
+        if (count($results)==0) {
             $wpdb->insert($tableName, array('config' => 'PAGANTIS_TITLE_4x', 'value'  => 'Until 4 installments, without fees'), array('%s', '%s'));
             $wpdb->insert($tableName, array('config' => 'PAGANTIS_DISPLAY_MIN_AMOUNT_4x', 'value'  => 1), array('%s', '%s'));
             $wpdb->insert($tableName, array('config' => 'PAGANTIS_DISPLAY_MAX_AMOUNT_4x', 'value'  => 800), array('%s', '%s'));
@@ -323,7 +323,7 @@ 
         $tableName = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
         $query = "select * from $tableName where config='PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR_4X'";
         $results = $wpdb->get_results($query, ARRAY_A);
-        if (count($results) == 0) {
+        if (count($results)==0) {
             $wpdb->insert($tableName, array('config' => 'PAGANTIS_SIMULATOR_CSS_POSITION_SELECTOR_4X', 'value'  => 'default'), array('%s', '%s'));
         }
 
@@ -339,7 +339,7 @@ 
         $tableName = $wpdb->prefix.PG_CONFIG_TABLE_NAME;
         $query = "select * from $tableName where config='PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'";
         $results = $wpdb->get_results($query, ARRAY_A);
-        if (count($results) == 0) {
+        if (count($results)==0) {
             $wpdb->update($tableName, array('value' => 'a:4:{i:0;s:52:"div.summary *:not(del)>.woocommerce-Price-amount bdi";i:1;s:48:"div.summary *:not(del)>.woocommerce-Price-amount";i:2;s:54:"div.entry-summary *:not(del)>.woocommerce-Price-amount";i:3;s:36:"*:not(del)>.woocommerce-Price-amount";}'), array('config' => 'PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'), array('%s'), array('%s'));
         }
 
@@ -432,7 +432,7 @@ 
         $isAtcTplPresent = isTemplatePresent(
             $template_name,
             array('single-product/add-to-cart/variation-add-to-cart-button.php',
-                'single-product/add-to-cart/variation.php','single-product/add-to-cart/simple.php')
+                'single-product/add-to-cart/variation.php', 'single-product/add-to-cart/simple.php')
         );
 
         $html = apply_filters('pagantis_simulator_selector_html', '<div class="mainPagantisSimulator"></div><div class="pagantisSimulator"></div>');
@@ -444,10 +444,10 @@ 
         }
 
         $pagantisSimulator4x = 'enabled';
-        if (!isPluginEnabled4x() || !areMerchantKeysSet4x()  || !isCountryShopContextValid() || !isProductAmountValid4x()) {
+        if (!isPluginEnabled4x() || !areMerchantKeysSet4x() || !isCountryShopContextValid() || !isProductAmountValid4x()) {
             $pagantisSimulator4x = 'disabled';
         }
-        if ($pagantisSimulator === 'disabled' && $pagantisSimulator4x === 'disabled') {
+        if ($pagantisSimulator==='disabled' && $pagantisSimulator4x==='disabled') {
             return;
         }
 
@@ -503,12 +503,12 @@ 
             $pagantisSimulator4x = 'disabled';
         }
 
-        if ($pagantisSimulator === 'disabled' && $pagantisSimulator4x === 'disabled') {
+        if ($pagantisSimulator==='disabled' && $pagantisSimulator4x==='disabled') {
             return;
         }
 
         $totalPrice = $product->get_price();
-        $formattedInstallments = number_format($totalPrice/4, 2);
+        $formattedInstallments = number_format($totalPrice / 4, 2);
         $simulatorMessage = sprintf(__('or 4 installments of %s€, without fees, with ', 'pagantis'), $formattedInstallments);
         $post_id = $product->get_id();
         $simulatorData = array(
@@ -550,7 +550,7 @@ 
      */
     public function addPagantisGateway($methods)
     {
-        if (! class_exists('WC_Payment_Gateway')) {
+        if (!class_exists('WC_Payment_Gateway')) {
             return $methods;
         }
 
@@ -615,7 +615,7 @@ 
      */
     public function pagantisRowMeta($links, $file)
     {
-        if ($file == plugin_basename(__FILE__)) {
+        if ($file==plugin_basename(__FILE__)) {
             $links[] = '<a href="'.WcPagantis::GIT_HUB_URL.'" target="_blank">'.__('Documentation', 'pagantis').'</a>';
             $links[] = '<a href="'.WcPagantis::PAGANTIS_DOC_URL.'" target="_blank">'.
                        __('API documentation', 'pagantis').'</a>';
@@ -644,7 +644,7 @@ 
         $tableName = $wpdb->prefix.PG_LOGS_TABLE_NAME;
         $query = "select * from $tableName where createdAt>$from and createdAt<$to order by createdAt desc";
         $results = $wpdb->get_results($query);
-        if (isset($results) && ($privateKey == $secretKey || $privateKey4x == $secretKey)) {
+        if (isset($results) && ($privateKey==$secretKey || $privateKey4x==$secretKey)) {
             foreach ($results as $key => $result) {
                 $response[$key]['timestamp'] = $result->createdAt;
                 $response[$key]['log']       = json_decode($result->log);
@@ -671,13 +671,13 @@ 
 
         $filters   = ($data->get_params());
         $secretKey = $filters['secret'];
-        $cfg  = get_option('woocommerce_pagantis_settings');
+        $cfg = get_option('woocommerce_pagantis_settings');
         $privateKey   = isset($cfg['pagantis_private_key']) ? $cfg['pagantis_private_key'] : null;
         $privateKey4x = isset($cfg['pagantis_private_key_4x']) ? $cfg['pagantis_private_key_4x'] : null;
-        if ($privateKey != $secretKey && $privateKey4x != $secretKey) {
+        if ($privateKey!=$secretKey && $privateKey4x!=$secretKey) {
             $response['status'] = 401;
             $response['result'] = 'Unauthorized';
-        } elseif ($_SERVER['REQUEST_METHOD'] == 'POST') {
+        } elseif ($_SERVER['REQUEST_METHOD']=='POST') {
             if (count($_POST)) {
                 foreach ($_POST as $config => $value) {
                     if (isset($this->defaultConfigs[$config]) && $response['status']==null) {
@@ -738,7 +738,7 @@ 
                   and tn.post_date<'".$to->format("Y-m-d")."' order by tn.post_date desc";
         $results = $wpdb->get_results($query);
 
-        if (isset($results) && ($privateKey == $secretKey || $privateKey4x == $secretKey)) {
+        if (isset($results) && ($privateKey==$secretKey || $privateKey4x==$secretKey)) {
             foreach ($results as $result) {
                 $key = $result->ID;
                 $response['message'][$key]['timestamp'] = $result->post_date;
@@ -811,7 +811,7 @@ 
      */
     private function prepareQuantitySelector($css_quantity_selector)
     {
-        if ($css_quantity_selector == 'default' || $css_quantity_selector == '') {
+        if ($css_quantity_selector=='default' || $css_quantity_selector=='') {
             $css_quantity_selector = $this->defaultConfigs['PAGANTIS_SIMULATOR_CSS_QUANTITY_SELECTOR'];
         } elseif (!unserialize($css_quantity_selector)) { //in the case of a custom string selector, we keep it
             $css_quantity_selector = serialize(array($css_quantity_selector));
@@ -827,7 +827,7 @@ 
      */
     private function preparePriceSelector($css_price_selector)
     {
-        if ($css_price_selector == 'default' || $css_price_selector == '') {
+        if ($css_price_selector=='default' || $css_price_selector=='') {
             $css_price_selector = $this->defaultConfigs['PAGANTIS_SIMULATOR_CSS_PRICE_SELECTOR'];
         } elseif (!unserialize($css_price_selector)) { //in the case of a custom string selector, we keep it
             $css_price_selector = serialize(array($css_price_selector));
@@ -845,7 +845,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';
     }
 
     /**

controllers/paymentController4x.php

Indentation +6 added lines, -6 removed lines

@@ -245,9 +245,9 @@ 
                 if ($promotedProduct == 'true') {
                     $promotedAmount+=$product->getAmount();
                     $promotedMessage = 'Promoted Item: ' . $wcProduct->get_name() .
-                                       ' - Price: ' . $item->get_total() .
-                                       ' - Qty: ' . $product->getQuantity() .
-                                       ' - Item ID: ' . $item['id_product'];
+                                        ' - Price: ' . $item->get_total() .
+                                        ' - Qty: ' . $product->getQuantity() .
+                                        ' - Item ID: ' . $item['id_product'];
                     $promotedMessage = substr($promotedMessage, 0, 999);
                     $metadataOrder->addMetadata('promotedProduct', $promotedMessage);
                 }
@@ -263,9 +263,9 @@ 
             $orderConfigurationUrls = new Urls();
             $cancelUrl = $this->getKoUrl($order);
             $callback_arg = array('wc-api'=>'wcpagantisgateway',
-                                  'key'=>$order->get_order_key(),
-                                  'order-received'=>$order->get_id(),
-                                  'origin' => ''
+                                    'key'=>$order->get_order_key(),
+                                    'order-received'=>$order->get_id(),
+                                    'origin' => ''
             );
 
             $callback_arg_user = $callback_arg;

Spacing +38 added lines, -41 removed lines

@@ -60,9 +60,9 @@ 
         $this->method_title = ucfirst($this->id);
 
         //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=='') {
@@ -71,24 +71,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);
     }
 
@@ -100,8 +100,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;
     }
@@ -150,7 +150,7 @@ 
 
             $shippingAddress = $order->get_address('shipping');
             $billingAddress = $order->get_address('billing');
-            if ($shippingAddress['address_1'] == '') {
+            if ($shippingAddress['address_1']=='') {
                 $shippingAddress = $billingAddress;
             }
 
@@ -177,7 +177,7 @@ 
                 ->setNationalId($national_id)
                 ->setTaxId($tax_id)
             ;
-            $orderBillingAddress =  new Address();
+            $orderBillingAddress = new Address();
             $orderBillingAddress
                 ->setZipCode($billingAddress['postcode'])
                 ->setFullName($billingAddress['first_name']." ".$billingAddress['last_name'])
@@ -250,12 +250,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);
                 }
@@ -301,9 +301,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
@@ -347,7 +345,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);
@@ -363,7 +361,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();
@@ -402,10 +400,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';
             }
         }
@@ -434,8 +432,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;
@@ -470,7 +468,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(
@@ -478,7 +476,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();
         }
     }
@@ -549,7 +547,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) {
@@ -597,11 +595,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);
 
@@ -646,7 +643,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];
             }
         }
@@ -661,12 +658,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;
     }
 }

includes/pg-functions.php

Spacing +43 added lines, -43 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 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');
     }
 }
 
@@ -20,7 +20,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;
@@ -37,8 +37,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;
     }
 
@@ -51,12 +51,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);
 }
 
@@ -64,14 +64,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);
 }
 
@@ -82,7 +82,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();
@@ -91,7 +91,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()));
 }
 
@@ -102,7 +102,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;
@@ -117,7 +117,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;
@@ -130,7 +130,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);
 
@@ -143,7 +143,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);
 
@@ -156,7 +156,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,
@@ -173,7 +173,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,
@@ -193,7 +193,7 @@ 
  */
 function isSimulatorTypeValid($simulatorType, $validSimulatorTypes)
 {
-    if (! in_array($simulatorType, $validSimulatorTypes)) {
+    if (!in_array($simulatorType, $validSimulatorTypes)) {
         return false;
     }
 
@@ -220,8 +220,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;
     }
@@ -232,8 +232,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;
     }
@@ -244,7 +244,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;
     }
 
@@ -255,13 +255,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']);
 }
 
 
@@ -269,7 +269,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;
     }
 
@@ -286,7 +286,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;
         }
@@ -305,7 +305,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;
         }
@@ -324,7 +324,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) {
@@ -337,7 +337,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;
 }
@@ -350,9 +350,9 @@ 
  */
 function getNationalId($order)
 {
-    foreach ((array)$order->get_meta_data() as $mdObject) {
+    foreach ((array) $order->get_meta_data() as $mdObject) {
         $data = $mdObject->get_data();
-        if ($data['key'] == 'vat_number') {
+        if ($data['key']=='vat_number') {
             return $data['value'];
         }
     }
@@ -367,9 +367,9 @@ 
  */
 function getTaxId($order)
 {
-    foreach ((array)$order->get_meta_data() as $mdObject) {
+    foreach ((array) $order->get_meta_data() as $mdObject) {
         $data = $mdObject->get_data();
-        if ($data['key'] == 'billing_cfpiva') {
+        if ($data['key']=='billing_cfpiva') {
             return $data['value'];
         }
     }
@@ -386,7 +386,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';
 }
 
 /**
@@ -397,7 +397,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'];
         }
     }
@@ -415,12 +415,12 @@ 
 {
     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='$orderId'");
     $countResults  = count($resultsSelect);
-    if ($countResults == 0) {
+    if ($countResults==0) {
         $wpdb->insert($tableName, array('id' => $orderId, 'order_id' => $pagantisOrderId), array('%d', '%s'));
     } else {
         $wpdb->update($tableName, array('order_id' => $pagantisOrderId), array('id' => $orderId), array('%s'), array('%d'));
@@ -433,14 +433,14 @@ 
 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 $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);
     }
 }
@@ -483,7 +483,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);
             }
         }
@@ -494,5 +494,5 @@ 
 
 function isPagePaymentPage()
 {
-    return (is_checkout() && ! is_order_received_page()) || is_checkout_pay_page();
+    return (is_checkout() && !is_order_received_page()) || is_checkout_pay_page();
 }