Merge branch 'release/3.9.7'

.github/workflows/e2e_api_tests.yml

@@ -13,6 +13,15 @@ on:
 
     # workflow can be manually triggered
     workflow_dispatch:
+      inputs:
+        testsuite:
+          description: Choose which test suite to run
+          default: All
+          type: choice
+          options:
+            - E2E
+            - API
+            - All
 
 # Cancels all previous workflow runs for pull requests that have not completed.
 concurrency:
@@ -69,8 +78,7 @@ jobs:
             - name: Composer install and build (Dokan-lite)
               if: success()
               run: |
-                  composer install --no-dev
-                  composer dump-autoload -o
+                composer install --no-dev -o
 
             - name: Npm install and build (Dokan-lite)
               if: success()
@@ -150,17 +158,17 @@ jobs:
                   cd tests/pw
                   npm run pw:browser-with-deps
 
-            # Install only the OS dependencies if cache hit  not needed
-            - name: Install Playwright OS dependencies
-              if: steps.playwright-cache.outputs.cache-hit == 'true'
-              run: |
-                cd tests/pw
-                npm run pw:deps-only
+            # # Install only the OS dependencies if cache hit  not needed
+            # - name: Install Playwright OS dependencies
+            #   if: steps.playwright-cache.outputs.cache-hit == 'true'
+            #   run: |
+            #     cd tests/pw
+            #     npm run pw:deps-only
 
             # Run e2e tests
             - name: 🧪 Running the e2e tests
               id: e2e-test
-              if: success()
+              if: success() || ( success() && (github.event_name == 'workflow_dispatch' && (github.event.inputs.testsuite == 'E2E' || github.event.inputs.testsuite == 'All')))
               timeout-minutes: 40
               run: |
                   cd tests/pw 
@@ -169,7 +177,7 @@ jobs:
             # Run API tests
             - name: 🧪 Running the api tests
               id: api-test
-              if: always() && steps.db-port.outcome == 'success'
+              if: always() && steps.db-port.outcome == 'success' || ( always() && steps.db-port.outcome == 'success' && (github.event_name == 'workflow_dispatch' && (github.event.inputs.testsuite == 'API' || github.event.inputs.testsuite == 'All')))
               timeout-minutes: 5
               run: |
                   cd tests/pw 

README.md

@@ -5,9 +5,9 @@
 **Requires at least:** 5.6  
 **Tested up to:** 6.4.2  
 **WC requires at least:** 5.0.0  
-**WC tested up to:** 8.4.2  
+**WC tested up to:** 8.5.2  
 **Requires PHP:** 7.4  
-**Stable tag:** 3.9.6  
+**Stable tag:** 3.9.7  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -338,7 +338,18 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 ## Changelog ##
 
-### v3.9.6 ( Jan 10, 2024 ) ###
+### v3.9.7 ( Jan 29, 2024 ) ###
+
+- **update:** Added WooCommerce Cart and Checkout Block supports for Dokan Lite
+- **fix:** Fixed an issue where the vendor’s store map address was not saved during vendor setup wizard configuration
+- **fix:** Some links under the vendor dashboard weren't working properly due to a nonce mismatch. With this release, those issues have been fixed.
+- **fix:** Fixed an issue where the valid store name required check was missing from the customer-to-vendor migration form.
+- **fix:** Fixed an issue where the customer buys digital and physical products from different vendors, shipping charges are applied separately to each vendor.
+- **fix:** Fixed some translation-related issues with the date range picker
+- **fix:** Fixed some translation-related issues with Dokan Sweetalert
+
+
+### v3.9.6 ( Jan 11, 2024 ) ###
 
 - **new** Features: Withdraw Charge
 Dokan has introduced a new feature that allows the admin to set a withdrawal charge for vendors. This charge can be either a flat rate or a percentage of the withdrawal amount based on the payment gateway used. The charge will be reflected in the details report, and vendors can see how many charges will apply when they request a withdrawal. The vendor dashboard list will also show the charge and receivable amount. This feature provides greater flexibility and transparency in managing vendor withdrawals.

assets/src/js/dokan-daterangepicker.js

@@ -4,7 +4,7 @@
             // Set date range data.
             let localeData = {
                 format      : dokan_get_daterange_picker_format(),
-                ...dokan_helper.locale
+                ...dokan_helper.daterange_picker_local
             };
 
             // Date range picker handler.

assets/src/js/helper.js

@@ -262,6 +262,7 @@
       showCancelButton  : true,
       confirmButtonColor:'#28a745',
       cancelButtonColor :'#dc3545',
+      ...dokan_helper.sweetalert_local
     };
 
     const args   = { ...defaults, ...options };

composer.json

@@ -12,7 +12,7 @@
   "minimum-stability": "dev",
   "require": {
     "php": ">=7.4",
-    "appsero/client": "^v1.4.0",
+    "appsero/client": "^v2.0.1",
     "jakeasmith/http_build_url": "^1"
   },
   "require-dev": {