Merge branch 'release/1.1.11'

Author: Aunshon

.github/workflows/deploy.yml

@@ -0,0 +1,42 @@
+name: Deploy and Release Plugin to WP.org
+
+on:
+    push:
+        tags:
+            - "*"
+jobs:
+    releaseToWPOrg:
+        name: Release to WordPress.org
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+            - name: Setup PHP 7.4
+              uses: shivammathur/setup-php@v2
+              with:
+                php-version: '7.4'
+                coverage: none
+                tools: composer:v2
+            - name: Build
+              run: |
+                npm install
+                npm run build
+            - name: Install SVN ( Subversion )
+              run: |
+                sudo apt-get update
+                sudo apt-get install subversion
+            - name: WordPress Plugin Deploy
+              id: deploy
+              uses: 10up/action-wordpress-plugin-deploy@stable
+              with:
+                generate-zip: true
+              env:
+                SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
+                SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+                SLUG: dokan-wpml
+            - name: Create GitHub release
+              uses: softprops/action-gh-release@v2
+              with:
+                files: ${{steps.deploy.outputs.zip-path}}
+              env:
+                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,9 +1,9 @@
 node_modules
 build
+dist
 npm-debug.log
 .DS_Store
 includes/.DS_Store
-.DS_Store
 .idea
 plugin-deploy.sh
 secret.json

.svnignore

@@ -1,5 +1,7 @@
 bin
 node_modules
+src
+.github
 tests
 nbproject
 Gruntfile.js
@@ -13,4 +15,4 @@ debug.log
 phpunit.xml
 .svnignore
 README.md
-plugin-deploy.sh
+plugin-deploy.sh

bin/zip.js

@@ -6,6 +6,7 @@ const _ = require( 'lodash' );
 
 const pluginFiles = [
     'languages/',
+    'build',
     'changelog.txt',
     'readme.txt',
     'dokan-wpml.php',
@@ -22,7 +23,7 @@ const { version } = JSON.parse( fs.readFileSync( 'package.json' ) );
 exec(
     'rm -rf *',
     {
-        cwd: 'build',
+        cwd: 'dist',
     },
     ( error ) => {
         if ( error ) {
@@ -37,10 +38,10 @@ exec(
                 )
             );
             // Making build folder.
-            fs.mkdirp( 'build' );
+            fs.mkdirp( 'dist' );
         }
 
-        const dest = 'build/dokan-wpml'; // Temporary folder name after coping all the files here.
+        const dest = 'dist/dokan-wpml'; // Temporary folder name after coping all the files here.
         fs.mkdirp( dest );
 
         console.log( `🗜 Started making the zip ...` );
@@ -72,7 +73,7 @@ exec(
         exec(
             `zip ${ zipFile } dokan-wpml -rq`,
             {
-                cwd: 'build'
+                cwd: 'dist'
             },
             ( error ) => {
                 if ( error ) {

changelog.txt

@@ -1,3 +1,8 @@
+v1.1.11 -> Sep 30, 2025
+---------------------------
+- **update:** Language switching support for vendor dashboard hash routing added.
+- **update:** Added support for zone_id and instance_id parameters for dokan shipping URL.
+
 v1.1.10 -> Aug 27, 2025
 ---------------------------
 - **fix:** Settings submenu URL translation issue with language switcher.

dokan-wpml.php

@@ -3,12 +3,12 @@
  * Plugin Name: Dokan - WPML Integration
  * Plugin URI: https://wedevs.com/
  * Description: WPML and Dokan compatible package
- * Version: 1.1.10
+ * Version: 1.1.11
  * Author: weDevs
  * Author URI: https://wedevs.com/
  * Text Domain: dokan-wpml
  * WC requires at least: 8.5.0
- * WC tested up to: 9.7.0
+ * WC tested up to: 10.2.2
  * Domain Path: /languages/
  * License: GPL2
  */
@@ -204,6 +204,8 @@ public function plugins_loaded() {
 
 		add_action( 'dokan_product_delete', [ $this, 'before_product_delete' ] );
 		add_action( 'dokan_product_bulk_delete', [ $this, 'before_product_delete' ] );
+
+        add_action( 'wp_enqueue_scripts', [ $this, 'enqueue' ] );
 	}
 
 	/**
@@ -656,6 +658,8 @@ public function set_language_switcher_copy_param( $params ) {
             'ticket_keyword',
             'ticket_status',
             'dokan-support-listing-search-nonce',
+	        'zone_id',
+	        'instance_id',
         ];
 
         return array_merge( $params, $dokan_params );
@@ -1816,19 +1820,44 @@ public function get_original_string_using_translated_string_id( string $translat
         );
     }
 
-		/**
-		 * Support WPML delete post actions on the frontend dashboard.
-		 *
-		 * @since 1.1.7
-		 *
-		 * @return void
-		 */
-		public function before_product_delete() {
-			if ( class_exists( 'WPML_Frontend_Post_Actions' ) ) {
-				global $wpml_post_translations;
-				add_action( 'delete_post', [ $wpml_post_translations, 'delete_post_actions' ] );
-			}
-		}
+    /**
+     * Support WPML delete post actions on the frontend dashboard.
+     *
+     * @since 1.1.7
+     *
+     * @return void
+     */
+    public function before_product_delete() {
+        if ( class_exists( 'WPML_Frontend_Post_Actions' ) ) {
+            global $wpml_post_translations;
+            add_action( 'delete_post', [ $wpml_post_translations, 'delete_post_actions' ] );
+        }
+    }
+
+    /**
+     * Enqueue scripts for the seller dashboard.
+     *
+     * This method enqueues the necessary JavaScript files required for the
+     * seller dashboard if the current page is the seller dashboard.
+     *
+     * @return void
+     */
+    public function enqueue() {
+        if (! dokan_is_seller_dashboard() ) {
+            return;
+        }
+
+        $scripts_file = include( plugin_dir_path( __FILE__ ) . 'build/index.asset.php' );
+
+        wp_enqueue_script(
+            'dokan-wpml-switcher',
+            plugin_dir_url( __FILE__ ) . 'build/index.js',
+            $scripts_file['dependencies'],
+            $scripts_file['version'],
+            true
+        );
+    }
+
     /**
      * Filter language switcher URLs for Dokan store and dashboard pages
      *

languages/dokan-wpml.pot

@@ -2,16 +2,16 @@
 # This file is distributed under the GPL2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Dokan - WPML Integration 1.1.10\n"
+"Project-Id-Version: Dokan - WPML Integration 1.1.11\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/dokan-wpml\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2025-08-27T11:46:31+00:00\n"
+"POT-Creation-Date: 2025-09-30T04:45:29+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.11.0\n"
+"X-Generator: WP-CLI 2.12.0\n"
 "X-Domain: dokan-wpml\n"
 
 #. Plugin Name of the plugin
@@ -36,15 +36,18 @@ msgid "weDevs"
 msgstr ""
 
 #. translators: %1$s: opening anchor tag, %2$s: closing anchor tag
-#: dokan-wpml.php:251
+#: dokan-wpml.php:253
+#, php-format
 msgid "<b>Dokan - WPML Integration</b> requires %1$s Dokan plugin %2$s to be installed & activated!"
 msgstr ""
 
 #. translators: %1$s: opening anchor tag, %2$s: closing anchor tag
-#: dokan-wpml.php:257
+#: dokan-wpml.php:259
+#, php-format
 msgid "<b>Dokan - WPML Integration</b> requires %1$s WPML Multilingual CMS %2$s to be installed & activated!"
 msgstr ""
 
-#: dokan-wpml.php:1696
+#: dokan-wpml.php:1700
+#, php-format
 msgid "Dokan WPML - Error on registering vendor store URL endpoint: %s"
 msgstr ""