Merge branch 'release/3.9.6' into develop

.editorconfig

@@ -13,7 +13,7 @@ trim_trailing_whitespace = false
 
 [{.jshintrc,*.json,*.yml,*.js,*.less}]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 [{*.txt,wp-config-sample.php}]
 end_of_line = lf

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.2.2  
-**Requires PHP:** 7.3  
-**Stable tag:** 3.9.5  
+**WC tested up to:** 8.4.2  
+**Requires PHP:** 7.4  
+**Stable tag:** 3.9.6  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -338,6 +338,11 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 ## Changelog ##
 
+### v3.9.6 ( Jan 10, 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.
+
 ### v3.9.5 ( Dec 28, 2023 ) ###
 
 - **fix:** API request on get all orders returns empty results for the endpoint http://dev.test/wp-json/dokan/v1/orders due to default customer id was set to 0.

assets/css/vue-admin.css

@@ -2110,6 +2110,63 @@ ul[data-v-525b077c] {
 }
 }
 
+.combine_fields[data-v-14248927] {
+  display: flex;
+  justify-content: right;
+  align-items: center;
+}
+.combine_fields .percent_fee[data-v-14248927] {
+  padding-right: 10px;
+}
+.combine_fields .fixed_fee input[data-v-14248927],
+.combine_fields .percent_fee input[data-v-14248927] {
+  width: 100px;
+}
+
+.wm-box-container[data-v-31bb288b] {
+  display: flex;
+  flex-direction: column;
+}
+.wm-box-container .wm-methods-box-container[data-v-31bb288b] {
+  margin-top: 15px;
+}
+.wm-box-container .wm-methods-box-container .wm-methods-box[data-v-31bb288b] {
+  border-bottom: 1px solid #f3f4f6;
+  padding: 0 30px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.wm-box-container .wm-methods-box-container .wm-methods-box[data-v-31bb288b]:last-child {
+  border-bottom: 0;
+}
+.wm-box-container .wm-methods-box-container .wm-methods-box .wm-method[data-v-31bb288b] {
+  display: flex;
+  align-items: center;
+}
+.wm-box-container .wm-methods-box-container .wm-methods-box .wm-charges[data-v-31bb288b] {
+  display: flex;
+  align-items: center;
+}
+.wm-box-container .wm-methods-box-container .wm-methods-box .wm-charges .wm-automated[data-v-31bb288b] {
+  border: 1px solid #dbdbdb;
+  color: #838181;
+  padding: 5px 8px;
+  border-radius: 12px;
+  background: #f5f5f6;
+}
+@media only screen and (max-width: 782px) {
+.wm-box-container .wm-methods-box-container .wm-methods-box[data-v-31bb288b] {
+    flex-direction: column;
+    justify-content: start;
+    align-items: start;
+}
+.wm-box-container .wm-methods-box-container .wm-methods-box .wm-charges[data-v-31bb288b] {
+    margin-left: -20px;
+    margin-bottom: 20px;
+}
+}
+
 span.repeatable-item-description {
   color: #999;
   font-size: 11px;

assets/src/js/withdraw.js

@@ -29,7 +29,15 @@
         withdrawTemplate: '',
         withdrawModal: '',
 
+        loadModalTemplate: function() {
+            if ( ! Dokan_Withdraw.withdrawTemplate && $('#tmpl-withdraw-request-popup').length ) {
+              const template = window.wp.template( 'withdraw-request-popup' );
+              Dokan_Withdraw.withdrawTemplate = template();
+            }
+        },
+
         initModal: function() {
+            Dokan_Withdraw.loadModalTemplate();
              const modal = $( '#dokan-withdraw-request-popup' ).iziModal(
                  {
                      width       : 690,
@@ -298,8 +306,6 @@
     };
 
     $(document).ready(function() {
-        const template = window.wp.template( 'withdraw-request-popup' );
-        Dokan_Withdraw.withdrawTemplate = template().trim();
         Dokan_Withdraw.init();
     });
 })(jQuery);

composer.json

@@ -11,22 +11,22 @@
   ],
   "minimum-stability": "dev",
   "require": {
-    "php": ">=7.3",
-    "appsero/client": "dev-develop",
+    "php": ">=7.4",
+    "appsero/client": "^v1.4.0",
     "jakeasmith/http_build_url": "^1"
   },
   "require-dev": {
     "wp-coding-standards/wpcs": "dev-develop",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
     "tareq1988/wp-php-cs-fixer": "dev-master",
     "phpcompatibility/phpcompatibility-wp": "dev-master",
-    "phpunit/phpunit": "^8.5.31",
+    "phpunit/phpunit": "^9.6",
     "wp-phpunit/wp-phpunit": "dev-master",
     "yoast/phpunit-polyfills": "^1.0@dev"
   },
   "config": {
     "platform": {
-      "php": "7.3"
+      "php": "7.4"
     },
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true