Changeset 2252529

Timestamp:

03/01/2020 09:06:06 AM (6 years ago)

Author:

Mofsy

Message:

New - 3.0.2

Location:

wc-robokassa/trunk

Files:

• gatework (deleted)
• includes/class-wc-robokassa-logger.php (added)
• includes/class-wc-robokassa-method.php (modified) (3 diffs)
• includes/class-wc-robokassa.php (modified) (7 diffs)
• includes/functions-wc-robokassa.php (modified) (1 diff)
• readme.txt (modified) (1 diff)
• wc-robokassa.php (modified) (2 diffs)

wc-robokassa/trunk/includes/class-wc-robokassa-method.php

@@ -1475 +1475 @@
     public function process_payment($order_id)
     {
-        /**
-         * Get order object
-         */
         $order = wc_get_order($order_id);
-        
-        /**
-         * Order fail
-         */
+
         if($order === false)
         {
@@ -1495 +1489 @@
 
         // hook
-        do_action('wc_robokassa_process_payment_start', $order_id, $order);
-
-        /**
-         * Add order note
-         */
+        do_action('wc_robokassa_before_process_payment', $order_id, $order);
+
+        WC_Robokassa()->get_logger()->debug('process_payment: order', $order);
+
         if(method_exists($order, 'add_order_note'))
         {
@@ -1505 +1498 @@
         }
 
-        /**
-         * Page skipping enabled
-         */
         if($this->get_page_skipping() === 'yes')
         {

wc-robokassa/trunk/includes/class-wc-robokassa.php

@@ -19 +19 @@
      * Logger
      *
-     * @var WC_Gatework_Logger
+     * @var WC_Robokassa_Logger
      */
     public $logger = false;
@@ -275 +275 @@
     public function load_currency()
     {
-        $wc_currency = gatework_get_wc_currency();
+        $wc_currency = wc_robokassa_get_wc_currency();
 
         /**
@@ -301 +301 @@
     public function load_wc_version()
     {
-        $wc_version = gatework_get_wc_version();
+        $wc_version = wc_robokassa_get_wc_version();
 
         // log
@@ -376 +376 @@
         try
         {
-            $logger = new WC_Gatework_Logger();
+            $logger = new WC_Robokassa_Logger();
         }
         catch(Exception $e)
@@ -416 +416 @@
      * Get logger
      *
-     * @return WC_Gatework_Logger|null
+     * @return WC_Robokassa_Logger|null
      */
     public function get_logger()
@@ -458 +458 @@
     public function wc_robokassa_admin_notices()
     {
+        $section = '';
+        if(isset($_GET['section']))
+        {
+            $section = $_GET['section'];
+        }
+
         $settings_version = get_option('wc_robokassa_last_settings_update_version');
 
@@ -463 +469 @@
          * Global notice: Require update settings
          */
-        if(get_option('wc_robokassa_last_settings_update_version') !== false && $settings_version < WC_ROBOKASSA_VERSION && $_GET['section'] !== 'robokassa')
+        if(get_option('wc_robokassa_last_settings_update_version') !== false
+           && $settings_version < WC_ROBOKASSA_VERSION
+           && $section !== 'robokassa')
         {
         }

wc-robokassa/trunk/includes/functions-wc-robokassa.php

@@ -15 +15 @@
     return false;
 }
+
+/**
+ * Get current version WooCommerce
+ *
+ * @since 3.0.2
+ */
+function wc_robokassa_get_wc_version()
+{
+    if(function_exists('is_woocommerce_active') && is_woocommerce_active())
+    {
+        global $woocommerce;
+
+        if(isset($woocommerce->version))
+        {
+            return $woocommerce->version;
+        }
+    }
+
+    if(!function_exists('get_plugins'))
+    {
+        require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+    }
+
+    $plugin_folder = get_plugins('/woocommerce');
+    $plugin_file = 'woocommerce.php';
+
+    if(isset($plugin_folder[$plugin_file]['Version']))
+    {
+        return $plugin_folder[$plugin_file]['Version'];
+    }
+
+    return null;
+}
+
+/**
+ * Get WooCommerce currency code
+ *
+ * @since 3.0.2
+ *
+ * @return string
+ */
+function wc_robokassa_get_wc_currency()
+{
+    return get_woocommerce_currency();
+}

wc-robokassa/trunk/readme.txt

@@ -46 +46 @@
 
 == Changelog ==
+
+= 3.0.2 =
+* Remove gatework
 
 = 3.0.1 =

wc-robokassa/trunk/wc-robokassa.php

@@ -4 +4 @@
  * Description: Integration Robokassa in WooCommerce as payment gateway plugin.
  * Plugin URI: https://mofsy.ru/projects/wc-robokassa
- * Version: 3.0.1
+ * Version: 3.0.2
  * WC requires at least: 3.0
  * WC tested up to: 3.9
@@ -19 +19 @@
 defined('ABSPATH') || exit;
 
-if(defined('WC_ROBOKASSA_VERSION') !== true)
+if(class_exists('WC_Robokassa') !== true)
 {
     $plugin_data = get_file_data(__FILE__, array('Version' => 'Version'));
     define('WC_ROBOKASSA_VERSION', $plugin_data['Version']);
-}
 
-if(defined('WC_ROBOKASSA_URL') !== true)
-{
     define('WC_ROBOKASSA_URL', plugin_dir_url(__FILE__));
-}
+    define('WC_ROBOKASSA_PLUGIN_DIR', plugin_dir_path(__FILE__));
+    define('WC_ROBOKASSA_PLUGIN_NAME', plugin_basename(__FILE__));
 
-if(defined('WC_ROBOKASSA_PLUGIN_DIR') !== true)
-{
-    define('WC_ROBOKASSA_PLUGIN_DIR', plugin_dir_path(__FILE__));
-}
-
-if(defined('WC_ROBOKASSA_PLUGIN_NAME') !== true)
-{
-    define('WC_ROBOKASSA_PLUGIN_NAME', plugin_basename(__FILE__));
-}
-
-/**
- * GateWork
- */
-include_once __DIR__ . '/gatework/init.php';
-
-/**
- * Gateway class
- */
-if(class_exists('WC_Robokassa') !== true)
-{
     include_once __DIR__ . '/includes/functions-wc-robokassa.php';
+    include_once __DIR__ . '/includes/class-wc-robokassa-logger.php';
     include_once __DIR__ . '/includes/class-wc-robokassa.php';
 }
 
-/**
- * Run
- */
 add_action('plugins_loaded', 'WC_Robokassa', 5);