Merge branch 'release/4.1.1'

Author: Aunshon

CHANGELOG.md

@@ -1,3 +1,7 @@
+### v4.1.1 ( Oct 09, 2025 ) ###
+- **update:** Added method to retrieve vendor earnings excluding admin subsidy.
+- **update:** Admin gateway fee calculation now checks an order-level meta value before using the previous fallback logic.
+
 ### v4.1.0 ( Sep 30, 2025 ) ###
 - **feat:** New React-based Admin Dashboard with enhanced metrics and rank boards.
 - **update:** Migrated Pro Features page from Vue to React with enhanced UI.

assets/js/vue-admin.js

@@ -25,7 +25,7 @@ final class WeDevs_Dokan {
      *
      * @var string
      */
-    public $version = '4.1.0';
+    public $version = '4.1.1';
 
     /**
      * Instance of self

dokan-class.php

@@ -3,13 +3,13 @@
  * Plugin Name: Dokan
  * Plugin URI: https://dokan.co/wordpress/
  * Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
- * Version: 4.1.0
+ * Version: 4.1.1
  * Author: Dokan Inc.
  * Author URI: https://dokan.co/wordpress/
  * Text Domain: dokan-lite
  * Requires Plugins: woocommerce
  * WC requires at least: 8.5.0
- * WC tested up to: 10.2.1
+ * WC tested up to: 10.2.2
  * Domain Path: /languages/
  * License: GPL2
  */

dokan.php

@@ -245,6 +245,46 @@ public function get_earning_by_order( $order, $context = 'seller' ) {
         return apply_filters( 'dokan_get_earning_by_order', $earning_or_commission, $order, $context );
     }
 
+    /*
+     * Get vendor earning sub-total
+     *
+     * @param int|WC_Order $order Order.
+     *
+     * @since DOKAN_SINCE
+     *
+     * @return float|int
+     */
+    public function get_vendor_earning_subtotal_by_order( $order ) {
+        if ( is_numeric( $order ) ) {
+            $order = wc_get_order( $order );
+        }
+
+        if ( ! $order ) {
+            return new WP_Error( 'invalid_order', __( 'Order not found', 'dokan-lite' ), [ 'status' => 404 ] );
+        }
+
+        if ( $order->get_meta( 'has_sub_order' ) ) {
+            return null;
+        }
+
+        try {
+            $order_commission = dokan_get_container()->get( OrderCommission::class );
+            $order_commission->set_order( $order );
+            $order_commission->calculate();
+        } catch ( \Exception $exception ) {
+            return new WP_Error( 'commission_calculation_failed', __( 'Commission calculation failed', 'dokan-lite' ), [ 'status' => 500 ] );
+        }
+        $earning = $order_commission->get_vendor_earning_subtotal();
+
+        /**
+         * Vendor earning without subsidy for a given order.
+         *
+         * @param float    $earning Calculated earning (without subsidy).
+         * @param WC_Order $order   Order object.
+         */
+        return apply_filters( 'dokan_get_vendor_earning_subtotal_by_order', $earning, $order );
+    }
+
     /**
      * Validate commission rate
      *

includes/Commission.php

@@ -237,6 +237,12 @@ public function get_admin_gateway_fee(): float {
             return floatval( $gateway_fee['fee'] );
         }
 
+        // if order has admin gateway fee, return it
+        $admin_gateway_fee = $this->order->get_meta( 'dokan_admin_gateway_fee', true );
+        if ( ! empty( $admin_gateway_fee ) ) {
+            return floatval( $admin_gateway_fee );
+        }
+
         return 0;
     }
 
@@ -296,6 +302,32 @@ public function get_vendor_earning(): float {
         return $this->get_vendor_net_earning() + $this->get_total_vendor_fees();
     }
 
+    /**
+     * Vendor payout subtotal based on customer's actual payment.
+     *
+     * Returns the vendor’s payable subtotal (excludes admin subsidy) and caps it
+     * to the amount actually paid by the customer (net of refunds) to avoid overpay during payment.
+     *
+     * Formula:
+     * - admin < 0 → vendor_adj = vendor - abs(admin)
+     * - admin ≥ 0 → vendor_adj = vendor
+     *
+     * @since DOKAN_SINCE
+     *
+     * @return float|int
+     */
+    public function get_vendor_earning_subtotal(): float {
+
+        $admin_commission = $this->get_admin_commission();
+
+        // If admin commission is negative, it means admin has subsidized the vendor.
+        if ( $admin_commission < 0 ) {
+            return $this->get_vendor_earning() - abs( $admin_commission );
+        }
+
+        return $this->get_vendor_earning();
+    }
+
     /**
      * Get dokan gateway fee.
      *

includes/Commission/OrderCommission.php

@@ -51,7 +51,7 @@ public function handle_order_edit( int $order_id, WC_Abstract_Order $order ) {
             $order_commission_calculator->set_should_adjust_refund( false );
             $order_commission_calculator->calculate();
 
-            $vendor_earning = $order_commission_calculator->get_vendor_earning();
+            $vendor_earning = $order_commission_calculator->get_vendor_earning() + $order_commission_calculator->get_vendor_gateway_fee();
         } catch ( Exception $e ) {
             error_log( sprintf( 'Dokan: Order %d commission calculation failed. Error: %s', $order_id, $e->getMessage() ) );
             return;

includes/Order/VendorBalanceUpdateHandler.php

@@ -1,6 +1,6 @@
 {
   "name": "dokan",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "A WordPress marketplace plugin",
   "author": "Dokan Inc.",
   "license": "GPL",

package-lock.json

@@ -3,11 +3,11 @@ Contributors: tareq1988, dokaninc, wedevs, nizamuddinbabu
 Donate Link: https://dokan.co/wordpress/pricing/
 Tags: WooCommerce multivendor marketplace, multi seller, multi vendor, multivendor, multivendor marketplace
 Requires at least: 6.6
-Tested up to: 6.8.2
+Tested up to: 6.8.3
 WC requires at least: 8.5.0
-WC tested up to: 10.2.1
+WC tested up to: 10.2.2
 Requires PHP: 7.4
-Stable tag: 4.1.0
+Stable tag: 4.1.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -349,6 +349,10 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 == Changelog ==
 
+= v4.1.1 ( Oct 09, 2025 ) =
+- **update:** Added method to retrieve vendor earnings excluding admin subsidy.
+- **update:** Admin gateway fee calculation now checks an order-level meta value before using the previous fallback logic.
+
 = v4.1.0 ( Sep 30, 2025 ) =
 - **feat:** New React-based Admin Dashboard with enhanced metrics and rank boards.
 - **update:** Migrated Pro Features page from Vue to React with enhanced UI.
@@ -366,9 +370,3 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 = v4.0.7 ( Sep 01, 2025 ) =
 - **fix:** Enhanced security controls for vendor account credentials management.
-
-= v4.0.6 ( Aug 29, 2025 ) =
-- **update:** Added translation support for dashboard analytics report scripts to improve internationalization (i18n).
-- **fix:** Resolved an issue in the AdminNotice Vue component by applying the Mixin utility for improved functionality.
-- **fix:** Added async search in store category in vendor edit.
-- **fix:** Admin not receiving withdrawal request email notifications.