Changeset 2199347

Timestamp:

11/23/2019 09:14:56 AM (6 years ago)

Author:

sabbir1991

Message:

Deploy version 1.0.2

Location:

dokan-wpml/trunk

Files:

• dokan-wpml.php (modified) (7 diffs)
• languages/dokan-wpml.pot (modified) (3 diffs)
• readme.txt (modified) (2 diffs)

dokan-wpml/trunk/dokan-wpml.php

@@ -4 +4 @@
 Plugin URI: https://wedevs.com/
 Description: WPML and Dokan compitable package
-Version: 1.0.1
+Version: 1.0.2
 Author: weDevs
 Author URI: https://wedevs.com/
+Text Domain: dokan-wpml
+WC requires at least: 3.0
+WC tested up to: 3.8.0
+Domain Path: /languages/
 License: GPL2
 */
@@ -74 +78 @@
         add_filter( 'dokan_get_navigation_url', array( $this, 'load_translated_url' ), 10 ,2 );
         add_filter( 'body_class', array( $this, 'add_dashboard_template_class_if_wpml' ), 99 );
+        add_filter( 'dokan_get_current_page_id', [ $this, 'dokan_set_current_page_id' ] );
     }
 
@@ -147 +152 @@
      */
     function load_translated_url( $url, $name ) {
-        if ( function_exists('wpml_object_id_filter') ) {
-            $page_id = dokan_get_option( 'dashboard', 'dokan_pages' );
-
-            if ( ! empty( $name ) ) {
-                $url = $this->get_dokan_url_for_language( ICL_LANGUAGE_CODE ).$name.'/';
-            } else {
-                $url = $this->get_dokan_url_for_language( ICL_LANGUAGE_CODE );
-            }
+        if ( ! function_exists( 'wpml_object_id_filter' ) ) {
             return $url;
         }
 
+        if ( ! empty( $name ) ) {
+            $url = $this->get_dokan_url_for_language( ICL_LANGUAGE_CODE ).$name.'/';
+        } else {
+            $url = $this->get_dokan_url_for_language( ICL_LANGUAGE_CODE );
+        }
+
         return $url;
     }
@@ -169 +173 @@
     **/
     public function reflect_page_url( $url, $page_id, $context ) {
+        if ( ! function_exists( 'wpml_object_id_filter' ) ) {
+            return $url;
+        }
+
+        $page_id = wpml_object_id_filter( $page_id , 'page', true, ICL_LANGUAGE_CODE );
+
+        return get_permalink( $page_id );
+    }
+
+    /**
+    * Get terms and condition page url
+    *
+    * @since 1.0.1
+    *
+    * @return url
+    **/
+    public function get_terms_condition_url( $url, $page_id ) {
+        if ( ! function_exists( 'wpml_object_id_filter' ) ) {
+            return $url;
+        }
+
+        $page_id = wpml_object_id_filter( $page_id , 'page', true, ICL_LANGUAGE_CODE );
+
+        return get_permalink( $page_id );
+    }
+
+    /**
+    * Redirect if not login
+    *
+    * @since 1.0.1
+    *
+    * @return void
+    **/
+    public function redirect_if_not_login( $url ) {
+        if ( ! function_exists( 'wpml_object_id_filter' ) ) {
+            return $url;
+        }
+
+        $page_id      = wc_get_page_id( 'myaccount' );
         $lang_post_id = wpml_object_id_filter( $page_id , 'page', true, ICL_LANGUAGE_CODE );
+
         return get_permalink( $lang_post_id );
     }
 
     /**
-    * Get terms and condition page url
+    * undocumented function
     *
     * @since 1.0.1
     *
-    * @return url
-    **/
-    public function get_terms_condition_url( $url, $page_id ) {
-        $page_id = wpml_object_id_filter( $page_id , 'page', true, ICL_LANGUAGE_CODE );
-
-        return get_permalink( $page_id );
-    }
-
-    /**
-    * Redirect if not login
-    *
-    * @since 1.0.1
-    *
     * @return void
     **/
-    public function redirect_if_not_login( $url ) {
-        $page_id = wc_get_page_id( 'myaccount' );
-        $lang_post_id = wpml_object_id_filter( $page_id , 'page', true, ICL_LANGUAGE_CODE );
-        return get_permalink( $lang_post_id );
-    }
-
-    /**
-    * undocumented function
-    *
-    * @since 1.0.1
-    *
-    * @return void
-    **/
     public function force_redirect_page( $flag, $page_id ) {
+        if ( ! function_exists( 'wpml_object_id_filter' ) ) {
+            return false;
+        }
+
         $lang_post_id = wpml_object_id_filter( $page_id , 'page', true, ICL_LANGUAGE_CODE );
 
@@ -226 +248 @@
      */
     public function get_dokan_url_for_language( $language ) {
-        $post_id = dokan_get_option( 'dashboard', 'dokan_pages' );
-        $lang_post_id = wpml_object_id_filter( $post_id , 'page', true, $language );
+        $post_id      = $this->get_raw_option( 'dashboard', 'dokan_pages' );
+        $lang_post_id = '';
+
+        if ( function_exists( 'wpml_object_id_filter' ) ) {
+            $lang_post_id = wpml_object_id_filter( $post_id , 'page', true, $language );
+        }
 
         $url = "";
-        if ($lang_post_id != 0) {
+
+        if ( $lang_post_id != 0 ) {
             $url = get_permalink( $lang_post_id );
         } else {
-            // No page found, it's most likely the homepage
             $url = apply_filters( 'wpml_home_url', get_option( 'home' ) );
-
-        }
+        }
+
         return $url;
     }
@@ -248 +274 @@
      */
     public function add_dashboard_template_class_if_wpml( $classes ) {
-        if ( function_exists('wpml_object_id_filter') ) {
-            global $post;
-
-            if( !$post ) {
-                return $classes;
-            }
-
-            $default_lang = apply_filters('wpml_default_language', NULL );
-
-            $current_page_id = wpml_object_id_filter( $post->ID,'page',false, $default_lang );
-            $page_id         = dokan_get_option( 'dashboard', 'dokan_pages' );
-
-            if ( ( $current_page_id == $page_id ) ) {
-                $classes[] = 'dokan-dashboard';
-            }
-        }
+        if ( ! function_exists( 'wpml_object_id_filter' ) ) {
+            return $classes;
+        }
+
+        global $post;
+
+        if ( ! is_object( $post ) ) {
+            return $classes;
+        }
+
+        $page_id         = $this->get_raw_option( 'dashboard', 'dokan_pages' );
+        $current_page_id = wpml_object_id_filter( $post->ID, 'page', true, wpml_get_default_language() );
+
+        if ( ( $current_page_id == $page_id ) ) {
+            $classes[] = 'dokan-dashboard';
+        }
+
         return $classes;
     }
@@ -275 +302 @@
      */
     public function load_scripts_and_style() {
-        if ( function_exists('wpml_object_id_filter') ) {
-            global $post;
-
-            if( !$post ) {
-                return false;
-            }
-
-            $default_lang    = apply_filters('wpml_default_language', NULL );
-            $current_page_id = wpml_object_id_filter( $post->ID,'page',false, $default_lang );
-            $page_id         = dokan_get_option( 'dashboard', 'dokan_pages' );
-
-            if ( ( $current_page_id == $page_id ) || ( get_query_var( 'edit' ) && is_singular( 'product' ) ) ) {
-                return true;
-            }
-        }
-
-        return false;
+        if ( ! function_exists( 'wpml_object_id_filter' ) ) {
+            return false;
+        }
+
+        global $post;
+
+        if ( ! is_object( $post ) ) {
+            return false;
+        }
+
+        $page_id         = $this->get_raw_option( 'dashboard', 'dokan_pages' );
+        $current_page_id = wpml_object_id_filter( $post->ID, 'page', true, wpml_get_default_language() );
+
+        if ( ( $current_page_id == $page_id ) || ( get_query_var( 'edit' ) && is_singular( 'product' ) ) ) {
+            return true;
+        }
+    }
+
+    /**
+     * Dokan set current page id
+     *
+     * @since 1.0.2
+     *
+     * @param  int page_id
+     *
+     * @return int
+     */
+    public function dokan_set_current_page_id( $page_id ) {
+        if ( ! function_exists( 'wpml_object_id_filter' ) ) {
+            return $page_id;
+        }
+
+        return wpml_object_id_filter( $page_id, 'page', true, wpml_get_default_language() );
+    }
+
+    /**
+     * Get raw value from database
+     *
+     * @since  DOKAN_WPML_SINCE
+     *
+     * @param  string $option
+     * @param  string $section
+     * @param  mix $default
+     *
+     * @return mix
+     */
+    public function get_raw_option( $option, $section, $default = '' ) {
+        if ( ! class_exists( 'WPML_Multilingual_Options_Utils' ) ) {
+            return dokan_get_option( $option, $section, $default );
+        }
+
+        global $wpdb;
+
+        $util    = new WPML_Multilingual_Options_Utils( $wpdb );
+        $options = $util->get_option_without_filtering( $section );
+
+        return isset( $options[ $option ] ) ? $options[ $option ] : $default;
     }
 

dokan-wpml/trunk/languages/dokan-wpml.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Dokan - WPML Integration 1.0.1\n"
+"Project-Id-Version: Dokan - WPML Integration 1.0.2\n"
 "Report-Msgid-Bugs-To: http://wedevs.com/support/\n"
-"POT-Creation-Date: 2019-06-20 03:55:12+00:00\n"
+"POT-Creation-Date: 2019-11-23 09:12:29+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -14 +14 @@
 "X-Generator: grunt-wp-i18n 0.4.9\n"
 
-#: dokan-wpml.php:105
+#: dokan-wpml.php:110
 msgid ""
 "<b>Dokan - WPML Integration</b> requires %sDokan plugin%s to be installed & "
@@ -20 +20 @@
 msgstr ""
 
-#: dokan-wpml.php:111
+#: dokan-wpml.php:116
 msgid ""
 "<b>Dokan - WPML Integration</b> requires %sWPML Multilingual CMS%s to be "

dokan-wpml/trunk/readme.txt

@@ -4 +4 @@
 Donate link: https://tareq.co/donate
 Requires at least: 4.7
-Tested up to: 5.2.2
+Tested up to: 5.3.0
 WC requires at least: 3.0
-WC tested up to: 3.6.4
+WC tested up to: 3.8.0
 Requires PHP: 5.6
 Stable tag: trunk
@@ -53 +53 @@
 == Changelog ==
 
+v1.0.2 -> November 23, 2019
+---------------------------
+ - [Fix]   Color customizer and order page is not loading
+ - [Fix]   Undefined function calling error
+ - [Fix]   wpml is not working when string translation is enabled
+ - [Tweak] Add get_raw_option functions for getting raw value from database
+
 v1.0.1 -> June 20, 2019
 ------------------------