From 491ce93ac0e89c3c6785a7dcc16c3cbfb708d2d0 Mon Sep 17 00:00:00 2001 From: Shazahanul Islam Shohag Date: Mon, 28 Oct 2024 21:03:17 +0600 Subject: [PATCH 1/2] chore: Release Version 3.13.0 --- README.md | 7 +- appsero.json | 7 +- assets/js/dokan-admin-analytics.asset.php | 1 + assets/js/dokan-admin-analytics.js | 1 + bin/version-replace.js | 1 + bin/zip.js | 1 + dokan-class.php | 4 +- dokan.php | 6 +- .../Analytics/Reports/BaseQueryFilter.php | 2 +- .../Reports/Categories/QueryFilter.php | 2 +- .../Analytics/Reports/Coupons/QueryFilter.php | 2 +- .../Reports/Coupons/Stats/QueryFilter.php | 2 +- .../Reports/Coupons/Stats/WcDataStore.php | 2 +- .../Reports/Customers/QueryFilter.php | 2 +- .../Reports/Customers/Stats/QueryFilter.php | 2 +- .../Analytics/Reports/DataStoreModifier.php | 2 +- includes/Analytics/Reports/OrderType.php | 2 +- .../Analytics/Reports/Orders/QueryFilter.php | 2 +- .../Reports/Orders/Stats/DataStore.php | 8 +- .../Reports/Orders/Stats/QueryFilter.php | 2 +- .../Reports/Orders/Stats/ScheduleListener.php | 2 +- .../Reports/Orders/Stats/WcDataStore.php | 2 +- .../Reports/Products/QueryFilter.php | 2 +- .../Reports/Products/Stats/QueryFilter.php | 2 +- .../Reports/Products/Stats/WcDataStore.php | 2 +- .../Analytics/Reports/Stock/QueryFilter.php | 2 +- .../Reports/Stock/Stats/WcDataStore.php | 2 +- .../Analytics/Reports/Taxes/QueryFilter.php | 2 +- .../Reports/Taxes/Stats/QueryFilter.php | 2 +- .../Reports/Taxes/Stats/WcDataStore.php | 2 +- .../Reports/Variations/QueryFilter.php | 2 +- .../Reports/Variations/Stats/QueryFilter.php | 2 +- includes/Analytics/Reports/WcSqlQuery.php | 2 +- .../BaseServiceProvider.php | 2 +- .../BootableServiceProvider.php | 2 +- includes/DependencyManagement/Container.php | 2 +- .../ContainerException.php | 2 +- .../Providers/ServiceProvider.php | 2 +- languages/dokan-lite.pot | 301 +++++++++--------- package-lock.json | 4 +- package.json | 2 +- readme.txt | 7 +- templates/whats-new.php | 16 + .../Reports/StockStatsQueryFilterTest.php | 2 +- 44 files changed, 225 insertions(+), 201 deletions(-) create mode 100644 assets/js/dokan-admin-analytics.asset.php create mode 100644 assets/js/dokan-admin-analytics.js diff --git a/README.md b/README.md index 14e2b3194c..35feab89dc 100644 --- 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 ( Oct 28, 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 index 011b247974..4ccf068ba6 100644 --- 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/assets/js/dokan-admin-analytics.asset.php b/assets/js/dokan-admin-analytics.asset.php new file mode 100644 index 0000000000..c7b380e547 --- /dev/null +++ b/assets/js/dokan-admin-analytics.asset.php @@ -0,0 +1 @@ + array(), 'version' => '33fd710a64e86a40d022'); diff --git a/assets/js/dokan-admin-analytics.js b/assets/js/dokan-admin-analytics.js new file mode 100644 index 0000000000..f4e3c812d2 --- /dev/null +++ b/assets/js/dokan-admin-analytics.js @@ -0,0 +1 @@ +wp.hooks.addFilter("woocommerce_admin_revenue_report_charts","dokan/remove-woocommerce-revenue-coupon-data-from/callback",(e=>e.filter((e=>"coupons"!==e.key)))); \ No newline at end of file diff --git a/bin/version-replace.js b/bin/version-replace.js index 41dafc8ac8..0550986012 100644 --- 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 index 6397080e7c..e589689161 100644 --- 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 index 1bba87b2fa..6c960286c4 100755 --- a/dokan-class.php +++ b/dokan-class.php @@ -23,7 +23,7 @@ final class WeDevs_Dokan { * * @var string */ - public $version = '3.11.3'; + 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 index e970bfa08e..b3482c3574 100755 --- 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 index a9ad0e1751..c5e4f58be4 100644 --- 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 index 269767e383..2aed675880 100644 --- 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 index 91dccaf043..990c1cc9c1 100644 --- 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 index 8bef1b03f3..03bebebd6d 100644 --- 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 index d0b80ae120..8daf44ef96 100644 --- 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 index d0c710b568..f03afe9cf5 100644 --- 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 index 4b080e0922..d59e3b9525 100644 --- 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 index 97d6168bf8..a7171c8a69 100644 --- 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 index 027eb70255..e396838ace 100644 --- 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 index 4160eb9f45..315b0fa72f 100644 --- 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 index 6fa523bfc4..7662b164e9 100644 --- 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 index 3a242d4b79..9253f92fb4 100644 --- a/includes/Analytics/Reports/Orders/Stats/QueryFilter.php +++ b/includes/Analytics/Reports/Orders/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/Orders/Stats/ScheduleListener.php b/includes/Analytics/Reports/Orders/Stats/ScheduleListener.php index 0a87972638..645d60d41e 100644 --- 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 index a249be8aac..c410c65173 100644 --- 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 index bac90ca7e3..c56062ae77 100644 --- 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 index a8ce4eee1c..9b32520f10 100644 --- 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 index 03dd9b45e9..48b875ca9d 100644 --- 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 index 940f3d6940..1abee9f339 100644 --- 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 index b96224e1aa..4c7e359678 100644 --- 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 index efde648f4f..aa6b6d27c6 100644 --- 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 index 1b99d4a3f1..53467b638d 100644 --- 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 index 23b53c60a2..a76a5d052a 100644 --- 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 index 91a2e76fd7..d17f32b94b 100644 --- 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 index 9b7d058b40..b2d24cd660 100644 --- 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 index 3d5b2fd4e1..1289ae7628 100644 --- 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 index e8b1c6e4e9..0ad0ae078e 100644 --- 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 index ba73e8a12c..7216b5bead 100644 --- 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 index 3e039a1f78..97fefb13f2 100644 --- 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 index 04b0f6e1b3..1c493187ed 100644 --- 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 index b46c23dead..19c5e1696d 100644 --- 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 { /** diff --git a/languages/dokan-lite.pot b/languages/dokan-lite.pot index c24a72117b..74c9a11426 100644 --- a/languages/dokan-lite.pot +++ b/languages/dokan-lite.pot @@ -1,14 +1,14 @@ # Copyright (c) 2024 weDevs Pte. Ltd. All Rights Reserved. msgid "" msgstr "" -"Project-Id-Version: Dokan 3.12.6\n" +"Project-Id-Version: Dokan 3.13.0\n" "Report-Msgid-Bugs-To: https://dokan.co/contact/\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2024-10-24T07:08:11+00:00\n" +"POT-Creation-Date: 2024-10-28T14:59:30+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.11.0\n" "X-Domain: dokan-lite\n" @@ -42,31 +42,6 @@ msgstr "" msgid "https://dokan.co/" msgstr "" -#. translators: 1: Required PHP Version 2: Running php version -#: dokan.php:203 -msgid "The Minimum PHP Version Requirement for Dokan is %1$s. You are Running PHP %2$s" -msgstr "" - -#: dokan.php:512 -msgid "Get Pro" -msgstr "" - -#: dokan.php:515 -#: includes/Admin/AdminBar.php:81 -#: includes/Admin/Menu.php:68 -#: includes/Dashboard/Templates/Settings.php:60 -#: includes/Dashboard/Templates/Settings.php:67 -#: includes/functions-dashboard-navigation.php:58 -#: assets/js/vue-admin.js:2 -msgid "Settings" -msgstr "" - -#: dokan.php:516 -#: templates/admin-header.php:63 -#: assets/js/vue-admin.js:2 -msgid "Documentation" -msgstr "" - #. translators: 1) interval period #: includes/Abstracts/DokanBackgroundProcesses.php:87 msgid "Every %d Minutes" @@ -149,6 +124,15 @@ msgstr "" msgid "PRO Features" msgstr "" +#: includes/Admin/AdminBar.php:81 +#: includes/Admin/Menu.php:68 +#: includes/Dashboard/Templates/Settings.php:60 +#: includes/Dashboard/Templates/Settings.php:67 +#: includes/functions-dashboard-navigation.php:58 +#: assets/js/vue-admin.js:2 +msgid "Settings" +msgstr "" + #: includes/Admin/AdminBar.php:136 msgid "Visit Shop" msgstr "" @@ -1407,14 +1391,14 @@ msgstr "" #: includes/Admin/UserProfile.php:38 #: includes/Ajax.php:142 -#: includes/Assets.php:588 +#: includes/Assets.php:596 #: assets/js/vue-admin.js:2 #: assets/js/vue-bootstrap.js:2 msgid "Available" msgstr "" #: includes/Admin/UserProfile.php:39 -#: includes/Assets.php:589 +#: includes/Assets.php:597 #: assets/js/vue-admin.js:2 #: assets/js/vue-bootstrap.js:2 msgid "Not Available" @@ -1838,23 +1822,23 @@ msgstr "" msgid "id param is required" msgstr "" -#: includes/Assets.php:148 +#: includes/Assets.php:151 msgid "Could not find any vendor." msgstr "" -#: includes/Assets.php:149 +#: includes/Assets.php:152 msgid "Searching vendors" msgstr "" -#: includes/Assets.php:150 +#: includes/Assets.php:153 msgid "Search vendors" msgstr "" -#: includes/Assets.php:151 +#: includes/Assets.php:154 msgid "Are you sure ?" msgstr "" -#: includes/Assets.php:591 +#: includes/Assets.php:599 #: includes/Product/functions.php:504 #: templates/products/products-listing.php:109 #: assets/js/dokan-promo-notice.js:2 @@ -1863,76 +1847,76 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: includes/Assets.php:592 +#: includes/Assets.php:600 msgid "Something went wrong. Please try again." msgstr "" -#: includes/Assets.php:606 +#: includes/Assets.php:614 msgid "Are you sure you want to revoke access to this download?" msgstr "" -#: includes/Assets.php:607 +#: includes/Assets.php:615 msgid "Could not grant access - the user may already have permission for this file or billing email is not set. Ensure the billing email is set, and the order has been saved." msgstr "" -#: includes/Assets.php:737 +#: includes/Assets.php:745 msgctxt "time constant" msgid "am" msgstr "" -#: includes/Assets.php:738 +#: includes/Assets.php:746 msgctxt "time constant" msgid "pm" msgstr "" -#: includes/Assets.php:739 +#: includes/Assets.php:747 msgctxt "time constant" msgid "AM" msgstr "" -#: includes/Assets.php:740 +#: includes/Assets.php:748 msgctxt "time constant" msgid "PM" msgstr "" -#: includes/Assets.php:741 +#: includes/Assets.php:749 msgctxt "time constant" msgid "hr" msgstr "" -#: includes/Assets.php:742 +#: includes/Assets.php:750 msgctxt "time constant" msgid "hrs" msgstr "" -#: includes/Assets.php:743 +#: includes/Assets.php:751 msgctxt "time constant" msgid "mins" msgstr "" -#: includes/Assets.php:746 +#: includes/Assets.php:754 #: templates/products/edit-product-single.php:306 #: templates/products/new-product.php:252 #: templates/products/tmpl-add-product-popup.php:88 msgid "To" msgstr "" -#: includes/Assets.php:748 +#: includes/Assets.php:756 #: templates/products/edit-product-single.php:299 #: templates/products/new-product.php:245 #: templates/products/tmpl-add-product-popup.php:81 msgid "From" msgstr "" -#: includes/Assets.php:749 +#: includes/Assets.php:757 msgid " - " msgstr "" -#: includes/Assets.php:750 +#: includes/Assets.php:758 msgid "W" msgstr "" -#: includes/Assets.php:751 +#: includes/Assets.php:759 #: templates/orders/listing.php:20 #: templates/products/products-listing.php:108 #: templates/store-lists-filter.php:84 @@ -1940,94 +1924,94 @@ msgstr "" msgid "Apply" msgstr "" -#: includes/Assets.php:752 +#: includes/Assets.php:760 #: assets/js/vue-admin.js:2 msgid "Clear" msgstr "" -#: includes/Assets.php:753 +#: includes/Assets.php:761 #: includes/Withdraw/Hooks.php:68 msgid "Custom" msgstr "" -#: includes/Assets.php:755 +#: includes/Assets.php:763 msgid "Su" msgstr "" -#: includes/Assets.php:756 +#: includes/Assets.php:764 msgid "Mo" msgstr "" -#: includes/Assets.php:757 +#: includes/Assets.php:765 msgid "Tu" msgstr "" -#: includes/Assets.php:758 +#: includes/Assets.php:766 msgid "We" msgstr "" -#: includes/Assets.php:759 +#: includes/Assets.php:767 msgid "Th" msgstr "" -#: includes/Assets.php:760 +#: includes/Assets.php:768 msgid "Fr" msgstr "" -#: includes/Assets.php:761 +#: includes/Assets.php:769 msgid "Sa" msgstr "" -#: includes/Assets.php:764 +#: includes/Assets.php:772 msgid "January" msgstr "" -#: includes/Assets.php:765 +#: includes/Assets.php:773 msgid "February" msgstr "" -#: includes/Assets.php:766 +#: includes/Assets.php:774 msgid "March" msgstr "" -#: includes/Assets.php:767 +#: includes/Assets.php:775 msgid "April" msgstr "" -#: includes/Assets.php:768 +#: includes/Assets.php:776 msgid "May" msgstr "" -#: includes/Assets.php:769 +#: includes/Assets.php:777 msgid "June" msgstr "" -#: includes/Assets.php:770 +#: includes/Assets.php:778 msgid "July" msgstr "" -#: includes/Assets.php:771 +#: includes/Assets.php:779 msgid "August" msgstr "" -#: includes/Assets.php:772 +#: includes/Assets.php:780 msgid "September" msgstr "" -#: includes/Assets.php:773 +#: includes/Assets.php:781 msgid "October" msgstr "" -#: includes/Assets.php:774 +#: includes/Assets.php:782 msgid "November" msgstr "" -#: includes/Assets.php:775 +#: includes/Assets.php:783 msgid "December" msgstr "" -#: includes/Assets.php:779 -#: includes/Assets.php:1051 +#: includes/Assets.php:787 +#: includes/Assets.php:1059 #: includes/Product/functions.php:310 #: templates/my-orders.php:95 #: templates/orders/details.php:196 @@ -2047,19 +2031,19 @@ msgstr "" msgid "Cancel" msgstr "" -#: includes/Assets.php:780 +#: includes/Assets.php:788 #: includes/Product/functions.php:321 #: templates/orders/details.php:347 #: templates/settings/store-form.php:38 msgid "Close" msgstr "" -#: includes/Assets.php:781 -#: includes/Assets.php:1050 +#: includes/Assets.php:789 +#: includes/Assets.php:1058 msgid "OK" msgstr "" -#: includes/Assets.php:782 +#: includes/Assets.php:790 #: includes/Vendor/SettingsApi/Settings/Pages/Store.php:283 #: includes/Vendor/SettingsApi/Settings/Pages/Store.php:430 #: includes/Vendor/SettingsApi/Settings/Pages/Store.php:446 @@ -2069,312 +2053,312 @@ msgstr "" msgid "No" msgstr "" -#: includes/Assets.php:783 +#: includes/Assets.php:791 msgid "Close this dialog" msgstr "" -#: includes/Assets.php:798 +#: includes/Assets.php:806 msgid "This field is required" msgstr "" -#: includes/Assets.php:799 +#: includes/Assets.php:807 msgid "Please fix this field." msgstr "" -#: includes/Assets.php:800 +#: includes/Assets.php:808 msgid "Please enter a valid email address." msgstr "" -#: includes/Assets.php:801 +#: includes/Assets.php:809 msgid "Please enter a valid URL." msgstr "" -#: includes/Assets.php:802 +#: includes/Assets.php:810 msgid "Please enter a valid date." msgstr "" -#: includes/Assets.php:803 +#: includes/Assets.php:811 msgid "Please enter a valid date (ISO)." msgstr "" -#: includes/Assets.php:804 +#: includes/Assets.php:812 msgid "Please enter a valid number." msgstr "" -#: includes/Assets.php:805 +#: includes/Assets.php:813 msgid "Please enter only digits." msgstr "" -#: includes/Assets.php:806 +#: includes/Assets.php:814 msgid "Please enter a valid credit card number." msgstr "" -#: includes/Assets.php:807 +#: includes/Assets.php:815 msgid "Please enter the same value again." msgstr "" -#: includes/Assets.php:808 +#: includes/Assets.php:816 msgid "Please enter no more than {0} characters." msgstr "" -#: includes/Assets.php:809 +#: includes/Assets.php:817 msgid "Please enter at least {0} characters." msgstr "" -#: includes/Assets.php:810 +#: includes/Assets.php:818 msgid "Please enter a value between {0} and {1} characters long." msgstr "" -#: includes/Assets.php:811 +#: includes/Assets.php:819 msgid "Please enter a value between {0} and {1}." msgstr "" -#: includes/Assets.php:812 +#: includes/Assets.php:820 msgid "Please enter a value less than or equal to {0}." msgstr "" -#: includes/Assets.php:813 +#: includes/Assets.php:821 msgid "Please enter a value greater than or equal to {0}." msgstr "" -#: includes/Assets.php:975 +#: includes/Assets.php:983 msgid "Upload featured image" msgstr "" -#: includes/Assets.php:976 +#: includes/Assets.php:984 msgid "Choose a file" msgstr "" -#: includes/Assets.php:977 +#: includes/Assets.php:985 msgid "Add Images to Product Gallery" msgstr "" -#: includes/Assets.php:978 +#: includes/Assets.php:986 msgid "Set featured image" msgstr "" -#: includes/Assets.php:979 +#: includes/Assets.php:987 #: includes/woo-views/html-product-download.php:8 msgid "Insert file URL" msgstr "" -#: includes/Assets.php:980 +#: includes/Assets.php:988 msgid "Add to gallery" msgstr "" -#: includes/Assets.php:981 +#: includes/Assets.php:989 msgid "Sorry, this attribute option already exists, Try a different one." msgstr "" -#: includes/Assets.php:982 +#: includes/Assets.php:990 msgid "Warning! This product will not have any variations if this option is not checked." msgstr "" -#: includes/Assets.php:983 +#: includes/Assets.php:991 msgid "Enter a name for the new attribute term:" msgstr "" -#: includes/Assets.php:984 +#: includes/Assets.php:992 msgid "Remove this attribute?" msgstr "" #. translators: %d: max linked variation. -#: includes/Assets.php:993 +#: includes/Assets.php:1001 msgid "Are you sure you want to link all variations? This will create a new variation for each and every possible combination of variation attributes (max %d per run)." msgstr "" -#: includes/Assets.php:994 +#: includes/Assets.php:1002 msgid "Enter a value" msgstr "" -#: includes/Assets.php:995 +#: includes/Assets.php:1003 msgid "Variation menu order (determines position in the list of variations)" msgstr "" -#: includes/Assets.php:996 +#: includes/Assets.php:1004 msgid "Enter a value (fixed or %)" msgstr "" -#: includes/Assets.php:997 +#: includes/Assets.php:1005 msgid "Are you sure you want to delete all variations? This cannot be undone." msgstr "" -#: includes/Assets.php:998 +#: includes/Assets.php:1006 msgid "Last warning, are you sure?" msgstr "" -#: includes/Assets.php:999 +#: includes/Assets.php:1007 msgid "Choose an image" msgstr "" -#: includes/Assets.php:1000 +#: includes/Assets.php:1008 msgid "Set variation image" msgstr "" -#: includes/Assets.php:1001 +#: includes/Assets.php:1009 msgid "variation added" msgstr "" -#: includes/Assets.php:1002 +#: includes/Assets.php:1010 msgid "variations added" msgstr "" -#: includes/Assets.php:1003 +#: includes/Assets.php:1011 msgid "No variations added" msgstr "" -#: includes/Assets.php:1004 +#: includes/Assets.php:1012 msgid "Are you sure you want to remove this variation?" msgstr "" -#: includes/Assets.php:1005 +#: includes/Assets.php:1013 msgid "Sale start date (YYYY-MM-DD format or leave blank)" msgstr "" -#: includes/Assets.php:1006 +#: includes/Assets.php:1014 msgid "Sale end date (YYYY-MM-DD format or leave blank)" msgstr "" -#: includes/Assets.php:1007 +#: includes/Assets.php:1015 msgid "Save changes before changing page?" msgstr "" -#: includes/Assets.php:1008 +#: includes/Assets.php:1016 msgid "%qty% variation" msgstr "" -#: includes/Assets.php:1009 +#: includes/Assets.php:1017 msgid "%qty% variations" msgstr "" -#: includes/Assets.php:1010 +#: includes/Assets.php:1018 msgid "No Result Found" msgstr "" -#: includes/Assets.php:1011 +#: includes/Assets.php:1019 msgid "Please insert value less than the regular price!" msgstr "" #. translators: %s: decimal -#: includes/Assets.php:1013 -#: includes/Assets.php:1193 +#: includes/Assets.php:1021 +#: includes/Assets.php:1201 msgid "Please enter with one decimal point (%s) without thousand separators." msgstr "" #. translators: %s: price decimal separator -#: includes/Assets.php:1015 -#: includes/Assets.php:1195 +#: includes/Assets.php:1023 +#: includes/Assets.php:1203 msgid "Please enter with one monetary decimal point (%s) without thousand separators and currency symbols." msgstr "" -#: includes/Assets.php:1016 -#: includes/Assets.php:1196 +#: includes/Assets.php:1024 +#: includes/Assets.php:1204 msgid "Please enter in country code with two capital letters." msgstr "" -#: includes/Assets.php:1017 -#: includes/Assets.php:1197 +#: includes/Assets.php:1025 +#: includes/Assets.php:1205 msgid "Please enter in a value less than the regular price." msgstr "" -#: includes/Assets.php:1018 -#: includes/Assets.php:1198 +#: includes/Assets.php:1026 +#: includes/Assets.php:1206 msgid "This product has produced sales and may be linked to existing orders. Are you sure you want to delete it?" msgstr "" -#: includes/Assets.php:1019 -#: includes/Assets.php:1199 +#: includes/Assets.php:1027 +#: includes/Assets.php:1207 msgid "This action cannot be reversed. Are you sure you wish to erase personal data from the selected orders?" msgstr "" -#: includes/Assets.php:1029 +#: includes/Assets.php:1037 msgid "Select and Crop" msgstr "" -#: includes/Assets.php:1030 +#: includes/Assets.php:1038 msgid "Choose Image" msgstr "" -#: includes/Assets.php:1031 +#: includes/Assets.php:1039 msgid "Product title is required" msgstr "" -#: includes/Assets.php:1032 +#: includes/Assets.php:1040 msgid "Product category is required" msgstr "" -#: includes/Assets.php:1033 +#: includes/Assets.php:1041 msgid "Product created successfully" msgstr "" -#: includes/Assets.php:1037 +#: includes/Assets.php:1045 msgid "One result is available, press enter to select it." msgstr "" -#: includes/Assets.php:1038 +#: includes/Assets.php:1046 msgid "%qty% results are available, use up and down arrow keys to navigate." msgstr "" -#: includes/Assets.php:1039 +#: includes/Assets.php:1047 msgid "No matches found" msgstr "" -#: includes/Assets.php:1040 +#: includes/Assets.php:1048 msgid "Loading failed" msgstr "" -#: includes/Assets.php:1041 +#: includes/Assets.php:1049 msgid "Please enter 1 or more characters" msgstr "" -#: includes/Assets.php:1042 +#: includes/Assets.php:1050 msgid "Please enter %qty% or more characters" msgstr "" -#: includes/Assets.php:1043 +#: includes/Assets.php:1051 msgid "Please delete 1 character" msgstr "" -#: includes/Assets.php:1044 +#: includes/Assets.php:1052 msgid "Please delete %qty% characters" msgstr "" -#: includes/Assets.php:1045 +#: includes/Assets.php:1053 msgid "You can only select 1 item" msgstr "" -#: includes/Assets.php:1046 +#: includes/Assets.php:1054 msgid "You can only select %qty% items" msgstr "" -#: includes/Assets.php:1047 +#: includes/Assets.php:1055 msgid "Loading more results…" msgstr "" -#: includes/Assets.php:1048 +#: includes/Assets.php:1056 msgid "Searching…" msgstr "" -#: includes/Assets.php:1049 +#: includes/Assets.php:1057 msgid "Calculating" msgstr "" -#: includes/Assets.php:1052 +#: includes/Assets.php:1060 msgid "Attribute Name" msgstr "" -#: includes/Assets.php:1054 +#: includes/Assets.php:1062 msgid "Are you sure? You have uploaded banner but didn't click the Update Settings button!" msgstr "" -#: includes/Assets.php:1055 +#: includes/Assets.php:1063 #: templates/settings/header.php:20 #: templates/settings/payment-manage.php:48 #: templates/settings/store-form.php:270 msgid "Update Settings" msgstr "" -#: includes/Assets.php:1057 +#: includes/Assets.php:1065 msgid "Please enter 3 or more characters" msgstr "" @@ -7765,6 +7749,11 @@ msgstr "" msgid "Community" msgstr "" +#: templates/admin-header.php:63 +#: assets/js/vue-admin.js:2 +msgid "Documentation" +msgstr "" + #: templates/admin-header.php:72 msgid "FAQ" msgstr "" diff --git a/package-lock.json b/package-lock.json index 8fb169b256..79eec343fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dokan", - "version": "3.12.6", + "version": "3.13.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dokan", - "version": "3.12.6", + "version": "3.13.0", "license": "GPL", "dependencies": { "@wordpress/i18n": "^5.8.0" diff --git a/package.json b/package.json index 64d4f9b513..e5fc546734 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dokan", - "version": "3.12.6", + "version": "3.13.0", "description": "A WordPress marketplace plugin", "author": "weDevs", "license": "GPL", diff --git a/readme.txt b/readme.txt index 8fa46277be..d3fd9f452f 100644 --- a/readme.txt +++ b/readme.txt @@ -7,7 +7,7 @@ Tested up to: 6.6.2 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 ( Oct 28, 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/templates/whats-new.php b/templates/whats-new.php index 6377769361..03ff8ac398 100644 --- a/templates/whats-new.php +++ b/templates/whats-new.php @@ -3,6 +3,22 @@ * When you are adding new version please follow this sequence for changes: New Feature, New, Improvement, Fix... */ $changelog = [ + [ + 'version' => 'Version 3.13.0', + 'released' => '2024-10-28', + 'changes' => [ + 'New' => [ + [ + 'title' => 'Replaced the Dokan array container with the League Container, ensuring backward compatibility for seamless performance and enhanced flexibility.', + 'description' => '', + ], + [ + 'title' => 'Updated Dokan to be fully compatible with WooCommerce Analytics Reports', + 'description' => '', + ], + ], + ], + ], [ 'version' => 'Version 3.12.6', 'released' => '2024-10-24', diff --git a/tests/php/src/Analytics/Reports/StockStatsQueryFilterTest.php b/tests/php/src/Analytics/Reports/StockStatsQueryFilterTest.php index 29e34b7093..7c1db3ae04 100644 --- a/tests/php/src/Analytics/Reports/StockStatsQueryFilterTest.php +++ b/tests/php/src/Analytics/Reports/StockStatsQueryFilterTest.php @@ -1,6 +1,6 @@ Date: Wed, 6 Nov 2024 09:54:09 +0600 Subject: [PATCH 2/2] chore: Release Version 3.13.0 --- README.md | 2 +- assets/js/dokan-admin-analytics.asset.php | 1 - assets/js/dokan-admin-analytics.js | 1 - languages/dokan-lite.pot | 267 +++++++++++----------- readme.txt | 2 +- templates/whats-new.php | 2 +- 6 files changed, 134 insertions(+), 141 deletions(-) delete mode 100644 assets/js/dokan-admin-analytics.asset.php delete mode 100644 assets/js/dokan-admin-analytics.js diff --git a/README.md b/README.md index 35feab89dc..c5a23d1324 100644 --- a/README.md +++ b/README.md @@ -347,7 +347,7 @@ A. Just install and activate the PRO version without deleting the free plugin. A ## Changelog ## -### v3.13.0 ( Oct 28, 2024 ) ### +### 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 diff --git a/assets/js/dokan-admin-analytics.asset.php b/assets/js/dokan-admin-analytics.asset.php deleted file mode 100644 index c7b380e547..0000000000 --- a/assets/js/dokan-admin-analytics.asset.php +++ /dev/null @@ -1 +0,0 @@ - array(), 'version' => '33fd710a64e86a40d022'); diff --git a/assets/js/dokan-admin-analytics.js b/assets/js/dokan-admin-analytics.js deleted file mode 100644 index f4e3c812d2..0000000000 --- a/assets/js/dokan-admin-analytics.js +++ /dev/null @@ -1 +0,0 @@ -wp.hooks.addFilter("woocommerce_admin_revenue_report_charts","dokan/remove-woocommerce-revenue-coupon-data-from/callback",(e=>e.filter((e=>"coupons"!==e.key)))); \ No newline at end of file diff --git a/languages/dokan-lite.pot b/languages/dokan-lite.pot index 74c9a11426..ce658c3cb3 100644 --- a/languages/dokan-lite.pot +++ b/languages/dokan-lite.pot @@ -8,13 +8,12 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2024-10-28T14:59:30+00:00\n" +"POT-Creation-Date: 2024-11-06T03:51:16+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.9.0\n" "X-Domain: dokan-lite\n" #. Plugin Name of the plugin -#: dokan.php #: includes/Admin/AdminBar.php:44 #: includes/Admin/Menu.php:43 #: includes/Customizer.php:56 @@ -23,22 +22,18 @@ msgid "Dokan" msgstr "" #. Plugin URI of the plugin -#: dokan.php msgid "https://dokan.co/wordpress/" msgstr "" #. Description of the plugin -#: dokan.php msgid "An e-commerce marketplace plugin for WordPress. Powered by WooCommerce and weDevs." msgstr "" #. Author of the plugin -#: dokan.php msgid "weDevs" msgstr "" #. Author URI of the plugin -#: dokan.php msgid "https://dokan.co/" msgstr "" @@ -1391,14 +1386,14 @@ msgstr "" #: includes/Admin/UserProfile.php:38 #: includes/Ajax.php:142 -#: includes/Assets.php:596 +#: includes/Assets.php:588 #: assets/js/vue-admin.js:2 #: assets/js/vue-bootstrap.js:2 msgid "Available" msgstr "" #: includes/Admin/UserProfile.php:39 -#: includes/Assets.php:597 +#: includes/Assets.php:589 #: assets/js/vue-admin.js:2 #: assets/js/vue-bootstrap.js:2 msgid "Not Available" @@ -1822,23 +1817,23 @@ msgstr "" msgid "id param is required" msgstr "" -#: includes/Assets.php:151 +#: includes/Assets.php:148 msgid "Could not find any vendor." msgstr "" -#: includes/Assets.php:152 +#: includes/Assets.php:149 msgid "Searching vendors" msgstr "" -#: includes/Assets.php:153 +#: includes/Assets.php:150 msgid "Search vendors" msgstr "" -#: includes/Assets.php:154 +#: includes/Assets.php:151 msgid "Are you sure ?" msgstr "" -#: includes/Assets.php:599 +#: includes/Assets.php:591 #: includes/Product/functions.php:504 #: templates/products/products-listing.php:109 #: assets/js/dokan-promo-notice.js:2 @@ -1847,76 +1842,76 @@ msgstr "" msgid "Are you sure?" msgstr "" -#: includes/Assets.php:600 +#: includes/Assets.php:592 msgid "Something went wrong. Please try again." msgstr "" -#: includes/Assets.php:614 +#: includes/Assets.php:606 msgid "Are you sure you want to revoke access to this download?" msgstr "" -#: includes/Assets.php:615 +#: includes/Assets.php:607 msgid "Could not grant access - the user may already have permission for this file or billing email is not set. Ensure the billing email is set, and the order has been saved." msgstr "" -#: includes/Assets.php:745 +#: includes/Assets.php:737 msgctxt "time constant" msgid "am" msgstr "" -#: includes/Assets.php:746 +#: includes/Assets.php:738 msgctxt "time constant" msgid "pm" msgstr "" -#: includes/Assets.php:747 +#: includes/Assets.php:739 msgctxt "time constant" msgid "AM" msgstr "" -#: includes/Assets.php:748 +#: includes/Assets.php:740 msgctxt "time constant" msgid "PM" msgstr "" -#: includes/Assets.php:749 +#: includes/Assets.php:741 msgctxt "time constant" msgid "hr" msgstr "" -#: includes/Assets.php:750 +#: includes/Assets.php:742 msgctxt "time constant" msgid "hrs" msgstr "" -#: includes/Assets.php:751 +#: includes/Assets.php:743 msgctxt "time constant" msgid "mins" msgstr "" -#: includes/Assets.php:754 +#: includes/Assets.php:746 #: templates/products/edit-product-single.php:306 #: templates/products/new-product.php:252 #: templates/products/tmpl-add-product-popup.php:88 msgid "To" msgstr "" -#: includes/Assets.php:756 +#: includes/Assets.php:748 #: templates/products/edit-product-single.php:299 #: templates/products/new-product.php:245 #: templates/products/tmpl-add-product-popup.php:81 msgid "From" msgstr "" -#: includes/Assets.php:757 +#: includes/Assets.php:749 msgid " - " msgstr "" -#: includes/Assets.php:758 +#: includes/Assets.php:750 msgid "W" msgstr "" -#: includes/Assets.php:759 +#: includes/Assets.php:751 #: templates/orders/listing.php:20 #: templates/products/products-listing.php:108 #: templates/store-lists-filter.php:84 @@ -1924,94 +1919,94 @@ msgstr "" msgid "Apply" msgstr "" -#: includes/Assets.php:760 +#: includes/Assets.php:752 #: assets/js/vue-admin.js:2 msgid "Clear" msgstr "" -#: includes/Assets.php:761 +#: includes/Assets.php:753 #: includes/Withdraw/Hooks.php:68 msgid "Custom" msgstr "" -#: includes/Assets.php:763 +#: includes/Assets.php:755 msgid "Su" msgstr "" -#: includes/Assets.php:764 +#: includes/Assets.php:756 msgid "Mo" msgstr "" -#: includes/Assets.php:765 +#: includes/Assets.php:757 msgid "Tu" msgstr "" -#: includes/Assets.php:766 +#: includes/Assets.php:758 msgid "We" msgstr "" -#: includes/Assets.php:767 +#: includes/Assets.php:759 msgid "Th" msgstr "" -#: includes/Assets.php:768 +#: includes/Assets.php:760 msgid "Fr" msgstr "" -#: includes/Assets.php:769 +#: includes/Assets.php:761 msgid "Sa" msgstr "" -#: includes/Assets.php:772 +#: includes/Assets.php:764 msgid "January" msgstr "" -#: includes/Assets.php:773 +#: includes/Assets.php:765 msgid "February" msgstr "" -#: includes/Assets.php:774 +#: includes/Assets.php:766 msgid "March" msgstr "" -#: includes/Assets.php:775 +#: includes/Assets.php:767 msgid "April" msgstr "" -#: includes/Assets.php:776 +#: includes/Assets.php:768 msgid "May" msgstr "" -#: includes/Assets.php:777 +#: includes/Assets.php:769 msgid "June" msgstr "" -#: includes/Assets.php:778 +#: includes/Assets.php:770 msgid "July" msgstr "" -#: includes/Assets.php:779 +#: includes/Assets.php:771 msgid "August" msgstr "" -#: includes/Assets.php:780 +#: includes/Assets.php:772 msgid "September" msgstr "" -#: includes/Assets.php:781 +#: includes/Assets.php:773 msgid "October" msgstr "" -#: includes/Assets.php:782 +#: includes/Assets.php:774 msgid "November" msgstr "" -#: includes/Assets.php:783 +#: includes/Assets.php:775 msgid "December" msgstr "" -#: includes/Assets.php:787 -#: includes/Assets.php:1059 +#: includes/Assets.php:779 +#: includes/Assets.php:1051 #: includes/Product/functions.php:310 #: templates/my-orders.php:95 #: templates/orders/details.php:196 @@ -2031,19 +2026,19 @@ msgstr "" msgid "Cancel" msgstr "" -#: includes/Assets.php:788 +#: includes/Assets.php:780 #: includes/Product/functions.php:321 #: templates/orders/details.php:347 #: templates/settings/store-form.php:38 msgid "Close" msgstr "" -#: includes/Assets.php:789 -#: includes/Assets.php:1058 +#: includes/Assets.php:781 +#: includes/Assets.php:1050 msgid "OK" msgstr "" -#: includes/Assets.php:790 +#: includes/Assets.php:782 #: includes/Vendor/SettingsApi/Settings/Pages/Store.php:283 #: includes/Vendor/SettingsApi/Settings/Pages/Store.php:430 #: includes/Vendor/SettingsApi/Settings/Pages/Store.php:446 @@ -2053,312 +2048,312 @@ msgstr "" msgid "No" msgstr "" -#: includes/Assets.php:791 +#: includes/Assets.php:783 msgid "Close this dialog" msgstr "" -#: includes/Assets.php:806 +#: includes/Assets.php:798 msgid "This field is required" msgstr "" -#: includes/Assets.php:807 +#: includes/Assets.php:799 msgid "Please fix this field." msgstr "" -#: includes/Assets.php:808 +#: includes/Assets.php:800 msgid "Please enter a valid email address." msgstr "" -#: includes/Assets.php:809 +#: includes/Assets.php:801 msgid "Please enter a valid URL." msgstr "" -#: includes/Assets.php:810 +#: includes/Assets.php:802 msgid "Please enter a valid date." msgstr "" -#: includes/Assets.php:811 +#: includes/Assets.php:803 msgid "Please enter a valid date (ISO)." msgstr "" -#: includes/Assets.php:812 +#: includes/Assets.php:804 msgid "Please enter a valid number." msgstr "" -#: includes/Assets.php:813 +#: includes/Assets.php:805 msgid "Please enter only digits." msgstr "" -#: includes/Assets.php:814 +#: includes/Assets.php:806 msgid "Please enter a valid credit card number." msgstr "" -#: includes/Assets.php:815 +#: includes/Assets.php:807 msgid "Please enter the same value again." msgstr "" -#: includes/Assets.php:816 +#: includes/Assets.php:808 msgid "Please enter no more than {0} characters." msgstr "" -#: includes/Assets.php:817 +#: includes/Assets.php:809 msgid "Please enter at least {0} characters." msgstr "" -#: includes/Assets.php:818 +#: includes/Assets.php:810 msgid "Please enter a value between {0} and {1} characters long." msgstr "" -#: includes/Assets.php:819 +#: includes/Assets.php:811 msgid "Please enter a value between {0} and {1}." msgstr "" -#: includes/Assets.php:820 +#: includes/Assets.php:812 msgid "Please enter a value less than or equal to {0}." msgstr "" -#: includes/Assets.php:821 +#: includes/Assets.php:813 msgid "Please enter a value greater than or equal to {0}." msgstr "" -#: includes/Assets.php:983 +#: includes/Assets.php:975 msgid "Upload featured image" msgstr "" -#: includes/Assets.php:984 +#: includes/Assets.php:976 msgid "Choose a file" msgstr "" -#: includes/Assets.php:985 +#: includes/Assets.php:977 msgid "Add Images to Product Gallery" msgstr "" -#: includes/Assets.php:986 +#: includes/Assets.php:978 msgid "Set featured image" msgstr "" -#: includes/Assets.php:987 +#: includes/Assets.php:979 #: includes/woo-views/html-product-download.php:8 msgid "Insert file URL" msgstr "" -#: includes/Assets.php:988 +#: includes/Assets.php:980 msgid "Add to gallery" msgstr "" -#: includes/Assets.php:989 +#: includes/Assets.php:981 msgid "Sorry, this attribute option already exists, Try a different one." msgstr "" -#: includes/Assets.php:990 +#: includes/Assets.php:982 msgid "Warning! This product will not have any variations if this option is not checked." msgstr "" -#: includes/Assets.php:991 +#: includes/Assets.php:983 msgid "Enter a name for the new attribute term:" msgstr "" -#: includes/Assets.php:992 +#: includes/Assets.php:984 msgid "Remove this attribute?" msgstr "" #. translators: %d: max linked variation. -#: includes/Assets.php:1001 +#: includes/Assets.php:993 msgid "Are you sure you want to link all variations? This will create a new variation for each and every possible combination of variation attributes (max %d per run)." msgstr "" -#: includes/Assets.php:1002 +#: includes/Assets.php:994 msgid "Enter a value" msgstr "" -#: includes/Assets.php:1003 +#: includes/Assets.php:995 msgid "Variation menu order (determines position in the list of variations)" msgstr "" -#: includes/Assets.php:1004 +#: includes/Assets.php:996 msgid "Enter a value (fixed or %)" msgstr "" -#: includes/Assets.php:1005 +#: includes/Assets.php:997 msgid "Are you sure you want to delete all variations? This cannot be undone." msgstr "" -#: includes/Assets.php:1006 +#: includes/Assets.php:998 msgid "Last warning, are you sure?" msgstr "" -#: includes/Assets.php:1007 +#: includes/Assets.php:999 msgid "Choose an image" msgstr "" -#: includes/Assets.php:1008 +#: includes/Assets.php:1000 msgid "Set variation image" msgstr "" -#: includes/Assets.php:1009 +#: includes/Assets.php:1001 msgid "variation added" msgstr "" -#: includes/Assets.php:1010 +#: includes/Assets.php:1002 msgid "variations added" msgstr "" -#: includes/Assets.php:1011 +#: includes/Assets.php:1003 msgid "No variations added" msgstr "" -#: includes/Assets.php:1012 +#: includes/Assets.php:1004 msgid "Are you sure you want to remove this variation?" msgstr "" -#: includes/Assets.php:1013 +#: includes/Assets.php:1005 msgid "Sale start date (YYYY-MM-DD format or leave blank)" msgstr "" -#: includes/Assets.php:1014 +#: includes/Assets.php:1006 msgid "Sale end date (YYYY-MM-DD format or leave blank)" msgstr "" -#: includes/Assets.php:1015 +#: includes/Assets.php:1007 msgid "Save changes before changing page?" msgstr "" -#: includes/Assets.php:1016 +#: includes/Assets.php:1008 msgid "%qty% variation" msgstr "" -#: includes/Assets.php:1017 +#: includes/Assets.php:1009 msgid "%qty% variations" msgstr "" -#: includes/Assets.php:1018 +#: includes/Assets.php:1010 msgid "No Result Found" msgstr "" -#: includes/Assets.php:1019 +#: includes/Assets.php:1011 msgid "Please insert value less than the regular price!" msgstr "" #. translators: %s: decimal -#: includes/Assets.php:1021 -#: includes/Assets.php:1201 +#: includes/Assets.php:1013 +#: includes/Assets.php:1193 msgid "Please enter with one decimal point (%s) without thousand separators." msgstr "" #. translators: %s: price decimal separator -#: includes/Assets.php:1023 -#: includes/Assets.php:1203 +#: includes/Assets.php:1015 +#: includes/Assets.php:1195 msgid "Please enter with one monetary decimal point (%s) without thousand separators and currency symbols." msgstr "" -#: includes/Assets.php:1024 -#: includes/Assets.php:1204 +#: includes/Assets.php:1016 +#: includes/Assets.php:1196 msgid "Please enter in country code with two capital letters." msgstr "" -#: includes/Assets.php:1025 -#: includes/Assets.php:1205 +#: includes/Assets.php:1017 +#: includes/Assets.php:1197 msgid "Please enter in a value less than the regular price." msgstr "" -#: includes/Assets.php:1026 -#: includes/Assets.php:1206 +#: includes/Assets.php:1018 +#: includes/Assets.php:1198 msgid "This product has produced sales and may be linked to existing orders. Are you sure you want to delete it?" msgstr "" -#: includes/Assets.php:1027 -#: includes/Assets.php:1207 +#: includes/Assets.php:1019 +#: includes/Assets.php:1199 msgid "This action cannot be reversed. Are you sure you wish to erase personal data from the selected orders?" msgstr "" -#: includes/Assets.php:1037 +#: includes/Assets.php:1029 msgid "Select and Crop" msgstr "" -#: includes/Assets.php:1038 +#: includes/Assets.php:1030 msgid "Choose Image" msgstr "" -#: includes/Assets.php:1039 +#: includes/Assets.php:1031 msgid "Product title is required" msgstr "" -#: includes/Assets.php:1040 +#: includes/Assets.php:1032 msgid "Product category is required" msgstr "" -#: includes/Assets.php:1041 +#: includes/Assets.php:1033 msgid "Product created successfully" msgstr "" -#: includes/Assets.php:1045 +#: includes/Assets.php:1037 msgid "One result is available, press enter to select it." msgstr "" -#: includes/Assets.php:1046 +#: includes/Assets.php:1038 msgid "%qty% results are available, use up and down arrow keys to navigate." msgstr "" -#: includes/Assets.php:1047 +#: includes/Assets.php:1039 msgid "No matches found" msgstr "" -#: includes/Assets.php:1048 +#: includes/Assets.php:1040 msgid "Loading failed" msgstr "" -#: includes/Assets.php:1049 +#: includes/Assets.php:1041 msgid "Please enter 1 or more characters" msgstr "" -#: includes/Assets.php:1050 +#: includes/Assets.php:1042 msgid "Please enter %qty% or more characters" msgstr "" -#: includes/Assets.php:1051 +#: includes/Assets.php:1043 msgid "Please delete 1 character" msgstr "" -#: includes/Assets.php:1052 +#: includes/Assets.php:1044 msgid "Please delete %qty% characters" msgstr "" -#: includes/Assets.php:1053 +#: includes/Assets.php:1045 msgid "You can only select 1 item" msgstr "" -#: includes/Assets.php:1054 +#: includes/Assets.php:1046 msgid "You can only select %qty% items" msgstr "" -#: includes/Assets.php:1055 +#: includes/Assets.php:1047 msgid "Loading more results…" msgstr "" -#: includes/Assets.php:1056 +#: includes/Assets.php:1048 msgid "Searching…" msgstr "" -#: includes/Assets.php:1057 +#: includes/Assets.php:1049 msgid "Calculating" msgstr "" -#: includes/Assets.php:1060 +#: includes/Assets.php:1052 msgid "Attribute Name" msgstr "" -#: includes/Assets.php:1062 +#: includes/Assets.php:1054 msgid "Are you sure? You have uploaded banner but didn't click the Update Settings button!" msgstr "" -#: includes/Assets.php:1063 +#: includes/Assets.php:1055 #: templates/settings/header.php:20 #: templates/settings/payment-manage.php:48 #: templates/settings/store-form.php:270 msgid "Update Settings" msgstr "" -#: includes/Assets.php:1065 +#: includes/Assets.php:1057 msgid "Please enter 3 or more characters" msgstr "" diff --git a/readme.txt b/readme.txt index d3fd9f452f..f8bb5ce1fb 100644 --- a/readme.txt +++ b/readme.txt @@ -347,7 +347,7 @@ A. Just install and activate the PRO version without deleting the free plugin. A == Changelog == -= v3.13.0 ( Oct 28, 2024 ) = += 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 diff --git a/templates/whats-new.php b/templates/whats-new.php index 03ff8ac398..06ef48db8d 100644 --- a/templates/whats-new.php +++ b/templates/whats-new.php @@ -5,7 +5,7 @@ $changelog = [ [ 'version' => 'Version 3.13.0', - 'released' => '2024-10-28', + 'released' => '2024-11-06', 'changes' => [ 'New' => [ [