Merge branch 'release/3.13.0' into develop

getdokan · Nov 6, 2024 · 059cd02 · 059cd02
2 parents a3bae94 + 435f672
commit 059cd02
Show file tree

Hide file tree

Showing 42 changed files with 95 additions and 78 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@
 **WC requires at least:** 8.0.0  
 **WC tested up to:** 9.3.3  
 **Requires PHP:** 7.4  
-**Stable tag:** 3.12.6  
+**Stable tag:** 3.13.0  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -347,6 +347,11 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 ## Changelog ##
 
+### v3.13.0 ( Nov 06, 2024 ) ###
+
+- **feat:** Replaced the Dokan array container with the League Container, ensuring backward compatibility for seamless performance and enhanced flexibility.
+- **feat:** Updated Dokan to be fully compatible with WooCommerce Analytics Reports
+
 ### v3.12.6 ( Oct 24, 2024 ) ###
 
 - **fix:** Fixed js error on frontend pages.

diff --git a/appsero.json b/appsero.json
@@ -31,6 +31,11 @@
         "package.json",
         ".php_cs",
         ".babelrc",
-        ".editorconfig"
+        ".editorconfig",
+        ".eslintrc",
+        "postcss.config.js",
+        "webpack.config.js",
+        "tailwind.config.js",
+        ".prettierrc.js"
     ]
 }
diff --git a/bin/version-replace.js b/bin/version-replace.js
@@ -8,6 +8,7 @@ const pluginFiles = [
     'templates/**/*',
     'src/**/*',
     'dokan.php',
+    'dokan-class.php',
     'uninstall.php',
 ];
 

diff --git a/bin/zip.js b/bin/zip.js
@@ -15,6 +15,7 @@ const pluginFiles = [
     'CHANGELOG.md',
     'readme.txt',
     'dokan.php',
+    'dokan-class.php',
     'uninstall.php',
     'composer.json',
 ];

diff --git a/dokan-class.php b/dokan-class.php
@@ -23,7 +23,7 @@ final class WeDevs_Dokan {
      *
      * @var string
      */
-    public $version = '3.12.6';
+    public $version = '3.13.0';
 
     /**
      * Instance of self
@@ -479,7 +479,7 @@ public function get_db_version_key() {
     /**
      * Retrieve the container instance.
      *
-     * @since DOKAN_SINCE
+     * @since 3.13.0
      *
      * @return Container
      */

diff --git a/dokan.php b/dokan.php
@@ -3,7 +3,7 @@
  * Plugin Name: Dokan
  * Plugin URI: https://dokan.co/wordpress/
  * Description: An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs.
- * Version: 3.12.6
+ * Version: 3.13.0
  * Author: weDevs
  * Author URI: https://dokan.co/
  * Text Domain: dokan-lite
@@ -50,7 +50,7 @@
 /**
  * Include file for loading the WeDevs_Dokan class.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 require_once __DIR__ . '/dokan-class.php';
 
@@ -72,7 +72,7 @@
 /**
  * Get the container.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  *
  * @return Container The global container instance.
  */

diff --git a/includes/Analytics/Reports/BaseQueryFilter.php b/includes/Analytics/Reports/BaseQueryFilter.php
@@ -11,7 +11,7 @@
  *
  * Filters and modifies WooCommerce analytics queries for Dokan orders.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 abstract class BaseQueryFilter implements Hookable {
     protected $wc_table = 'wc_order_stats';

diff --git a/includes/Analytics/Reports/Categories/QueryFilter.php b/includes/Analytics/Reports/Categories/QueryFilter.php
@@ -9,7 +9,7 @@
  *
  * Filters and modifies WooCommerce analytics queries for Categories.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends BaseQueryFilter {
     protected $wc_table = 'wc_order_product_lookup';

diff --git a/includes/Analytics/Reports/Coupons/QueryFilter.php b/includes/Analytics/Reports/Coupons/QueryFilter.php
@@ -10,7 +10,7 @@
  *
  * Filters and modifies WooCommerce analytics queries for Dokan orders.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends BaseQueryFilter {
     /**

diff --git a/includes/Analytics/Reports/Coupons/Stats/QueryFilter.php b/includes/Analytics/Reports/Coupons/Stats/QueryFilter.php
@@ -10,7 +10,7 @@
  * Extends the OrdersQueryFilter class to customize WooCommerce Analytics reports
  * for Dokan orders stats by adding additional subqueries and modifying report columns.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends OrdersQueryFilter {
     /**

diff --git a/includes/Analytics/Reports/Coupons/Stats/WcDataStore.php b/includes/Analytics/Reports/Coupons/Stats/WcDataStore.php
@@ -8,7 +8,7 @@
 /**
  * WC DataStore class to override the default handling of SQL clauses.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class WcDataStore extends OrdersStateDataStore {
 	/**

diff --git a/includes/Analytics/Reports/Customers/QueryFilter.php b/includes/Analytics/Reports/Customers/QueryFilter.php
@@ -9,7 +9,7 @@
  *
  * Filters and modifies WooCommerce analytics queries for Dokan orders.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends BaseQueryFilter {
     /**

diff --git a/includes/Analytics/Reports/Customers/Stats/QueryFilter.php b/includes/Analytics/Reports/Customers/Stats/QueryFilter.php
@@ -7,7 +7,7 @@
 /**
  * Class QueryFilter
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends CustomersQueryFilter {
 	protected $context = 'customers_stats';

diff --git a/includes/Analytics/Reports/DataStoreModifier.php b/includes/Analytics/Reports/DataStoreModifier.php
@@ -7,7 +7,7 @@
 /**
  * WC default data store modifier.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class DataStoreModifier implements Hookable {
     /**

diff --git a/includes/Analytics/Reports/OrderType.php b/includes/Analytics/Reports/OrderType.php
@@ -9,7 +9,7 @@
  *
  * Defines constants and methods to handle different types of Dokan orders and refunds.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class OrderType {
     // Order type constants

diff --git a/includes/Analytics/Reports/Orders/QueryFilter.php b/includes/Analytics/Reports/Orders/QueryFilter.php
@@ -10,7 +10,7 @@
  *
  * Filters and modifies WooCommerce analytics queries for Dokan orders.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends BaseQueryFilter {
     /**

diff --git a/includes/Analytics/Reports/Orders/Stats/DataStore.php b/includes/Analytics/Reports/Orders/Stats/DataStore.php
@@ -14,7 +14,7 @@
 /**
  * Dokan Orders stats data synchronizer.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class DataStore extends ReportsDataStore implements DataStoreInterface {
 	/**
@@ -140,7 +140,7 @@ public static function update( $order ) {
 		 * @param array $data Data written to order stats lookup table.
 		 * @param WC_Order $order  Order object.
 		 *
-		 * @since DOKAN_SINCE
+		 * @since 3.13.0
 		 */
 		$data = apply_filters(
 			'dokan_analytics_update_order_stats_data',
@@ -188,7 +188,7 @@ public static function update( $order ) {
 		 *
 		 * @param int $order_id Order ID.
 		 *
-		 * @since DOKAN_SINCE
+		 * @since 3.13.0
 		 */
 		do_action( 'dokan_analytics_update_order_stats', $order->get_id() );
 
@@ -222,7 +222,7 @@ public static function delete_order( $post_id ) {
 		 * @param int $order_id Order ID.
 		 * @param int $customer_id Customer ID.
 		 *
-		 * @since DOKAN_SINCE
+		 * @since 3.13.0
 		 */
 		do_action( 'dokan_analytics_delete_order_stats', $order_id, $customer_id );
 	}

diff --git a/includes/Analytics/Reports/Orders/Stats/QueryFilter.php b/includes/Analytics/Reports/Orders/Stats/QueryFilter.php
@@ -11,7 +11,7 @@
  * Extends the OrdersQueryFilter class to customize WooCommerce Analytics reports
  * for Dokan orders stats by adding additional subqueries and modifying report columns.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends OrdersQueryFilter {
     /**

diff --git a/includes/Analytics/Reports/Orders/Stats/ScheduleListener.php b/includes/Analytics/Reports/Orders/Stats/ScheduleListener.php
@@ -9,7 +9,7 @@
  *
  * Listens to WooCommerce schedule events and triggers Dokan order synchronization and deletion.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class ScheduleListener implements Hookable {
     /**

diff --git a/includes/Analytics/Reports/Orders/Stats/WcDataStore.php b/includes/Analytics/Reports/Orders/Stats/WcDataStore.php
@@ -8,7 +8,7 @@
 /**
  * DataStore class to override the default handling of WC SQL clauses.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class WcDataStore extends OrdersStateDataStore {
 	/**

diff --git a/includes/Analytics/Reports/Products/QueryFilter.php b/includes/Analytics/Reports/Products/QueryFilter.php
@@ -9,7 +9,7 @@
  *
  * Filters and modifies WooCommerce analytics queries for Dokan Products.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends BaseQueryFilter {
     protected $wc_table = 'wc_order_product_lookup';

diff --git a/includes/Analytics/Reports/Products/Stats/QueryFilter.php b/includes/Analytics/Reports/Products/Stats/QueryFilter.php
@@ -7,7 +7,7 @@
 /**
  * Filters and modifies WooCommerce analytics queries for Dokan Products Stats.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends ProductsQueryFilter {
 	protected $context = 'products_stats';

diff --git a/includes/Analytics/Reports/Products/Stats/WcDataStore.php b/includes/Analytics/Reports/Products/Stats/WcDataStore.php
@@ -8,7 +8,7 @@
 /**
  * DataStore class to override the default handling of WC SQL clauses.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class WcDataStore extends ProductStatsDataStore {
 	/**

diff --git a/includes/Analytics/Reports/Stock/QueryFilter.php b/includes/Analytics/Reports/Stock/QueryFilter.php
@@ -11,7 +11,7 @@
  *
  * Filters and modifies WooCommerce analytics queries for Product Stock.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends BaseQueryFilter {
     protected $should_removed_where_filter = true;

diff --git a/includes/Analytics/Reports/Stock/Stats/WcDataStore.php b/includes/Analytics/Reports/Stock/Stats/WcDataStore.php
@@ -10,7 +10,7 @@
  *
  * Filters and modifies WooCommerce analytics queries for Stock Stats.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class WcDataStore extends StockStatsDataStore {
 	/**

diff --git a/includes/Analytics/Reports/Taxes/QueryFilter.php b/includes/Analytics/Reports/Taxes/QueryFilter.php
@@ -10,7 +10,7 @@
  *
  * Filters and modifies WooCommerce analytics queries for Taxes.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends BaseQueryFilter {
     protected $wc_table = 'wc_order_tax_lookup';

diff --git a/includes/Analytics/Reports/Taxes/Stats/QueryFilter.php b/includes/Analytics/Reports/Taxes/Stats/QueryFilter.php
@@ -9,7 +9,7 @@
  *
  * Filters and modifies WooCommerce analytics queries for Tax Stats.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends TaxesQueryFilter {
 	protected $context = 'taxes_stats';

diff --git a/includes/Analytics/Reports/Taxes/Stats/WcDataStore.php b/includes/Analytics/Reports/Taxes/Stats/WcDataStore.php
@@ -8,7 +8,7 @@
 /**
  * WC DataStore class to override the default handling of SQL clauses.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class WcDataStore extends TaxesStateDataStore {
 	/**

diff --git a/includes/Analytics/Reports/Variations/QueryFilter.php b/includes/Analytics/Reports/Variations/QueryFilter.php
@@ -10,7 +10,7 @@
  *
  * Filters and modifies WooCommerce analytics queries for variations.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends BaseQueryFilter {
     protected $wc_table = 'wc_order_product_lookup';

diff --git a/includes/Analytics/Reports/Variations/Stats/QueryFilter.php b/includes/Analytics/Reports/Variations/Stats/QueryFilter.php
@@ -9,7 +9,7 @@
  *
  * Filters and modifies WooCommerce analytics queries for variations.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class QueryFilter extends ProductsQueryFilter {
 	protected $context = 'variations_stats';

diff --git a/includes/Analytics/Reports/WcSqlQuery.php b/includes/Analytics/Reports/WcSqlQuery.php
@@ -7,7 +7,7 @@
 /**
  * WC SqlQuery class to override the default handling of SQL clauses.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class WcSqlQuery extends SqlQuery {
     /**

diff --git a/includes/DependencyManagement/BaseServiceProvider.php b/includes/DependencyManagement/BaseServiceProvider.php
@@ -16,7 +16,7 @@
  * Note that `AbstractInterfaceServiceProvider` likely serves as a better base class for service providers
  * tasked with registering classes that implement interfaces.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 abstract class BaseServiceProvider extends AbstractServiceProvider {
 	protected $services = [];

diff --git a/includes/DependencyManagement/BootableServiceProvider.php b/includes/DependencyManagement/BootableServiceProvider.php
@@ -15,7 +15,7 @@
  * Note that `AbstractInterfaceServiceProvider` likely serves as a better base class for service providers
  * tasked with registering classes that implement interfaces.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 abstract class BootableServiceProvider extends BaseServiceProvider implements BootableServiceProviderInterface {
 }
diff --git a/includes/DependencyManagement/Container.php b/includes/DependencyManagement/Container.php
@@ -11,7 +11,7 @@
  * This class extends the original League's Container object by adding some functionality
  * that we need for Dokan.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class Container extends BaseContainer {
 

diff --git a/includes/DependencyManagement/ContainerException.php b/includes/DependencyManagement/ContainerException.php
@@ -9,7 +9,7 @@
  * Class ContainerException.
  * Used to signal error conditions related to the dependency injection container.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class ContainerException extends \Exception {
 	/**

diff --git a/includes/DependencyManagement/Providers/ServiceProvider.php b/includes/DependencyManagement/Providers/ServiceProvider.php
@@ -11,7 +11,7 @@
  * This service provider handles the core services with the Dokan's
  * dependency injection container.
  *
- * @since DOKAN_SINCE
+ * @since 3.13.0
  */
 class ServiceProvider extends BootableServiceProvider {
 	/**