Merge branch 'release/3.14.3' into develop

shashwatahalder01 · Dec 11, 2024 · a0d9e64 · a0d9e64
2 parents 31194fa + 99dd9af
commit a0d9e64
Show file tree

Hide file tree

Showing 17 changed files with 337 additions and 101 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,22 @@
+### v3.13.1 ( Nov 11, 2024 ) ###
+
+- **update:** Compatibility with the Printful Integration Module added.
+- **fix:** Improved logic to ensure the `add new category` button only appears when appropriate conditions are met, enhancing user experience.
+
+
 ### 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.
 
 ### v3.12.5 ( Oct 16, 2024 ) ###
 
 - **fix:** Implement order trash and untrash handling for Dokan
-- **fix:** Added wordpress native i18n support
+- **fix:** Added WordPress native i18n support
 
 ### v3.12.4 ( Oct 03, 2024 ) ###
 

diff --git a/README.md b/README.md
@@ -5,9 +5,9 @@
 **Requires at least:** 6.5  
 **Tested up to:** 6.7.1  
 **WC requires at least:** 8.0.0  
-**WC tested up to:** 9.4.2  
+**WC tested up to:** 9.4.3  
 **Requires PHP:** 7.4  
-**Stable tag:** 3.14.2  
+**Stable tag:** 3.14.3  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -346,6 +346,8 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 
 ## Changelog ##
+### v3.14.3 ( Dec 11, 2024 ) ###
+- **update:** Updated Dokan admin header to display current pro plan and version with upgrading option.
 
 ### v3.14.2 ( Dec 06, 2024 ) ###
 
@@ -372,12 +374,6 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 - **fix:** Moved the vendor edit page from Dokan Pro to Dokan Lite and eliminated the commission setting from the WordPress default user profile page.
 - **fix:** Removed the commission from every category, introducing category-based commission in global settings, vendor settings, Dokan subscription products, and the admin setup wizard.
 
-### v3.13.1 ( Nov 11, 2024 ) ###
-
-- **update:** Compatibility with the Printful Integration Module added.
-- **fix:** Improved logic to ensure the `add new category` button only appears when appropriate conditions are met, enhancing user experience.
-
-
 [CHECK THE FULL CHANGELOG](https://github.com/getdokan/dokan/blob/develop/CHANGELOG.md).
 
 ## Upgrade Notice ##

diff --git a/assets/css/admin.css b/assets/css/admin.css
@@ -106,31 +106,85 @@
 }
 .dokan-admin-header {
   background: #fff;
-  padding: 15px 15px 15px 22px;
-  margin: 0 0 0 -20px;
-  box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.1);
+  padding: 16px 24px;
+  margin: 20px 20px 0 2px;
+  border-radius: 8px;
+  box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.06);
+}
+.dokan-admin-header .dokan-admin-header-content {
   display: flex;
   align-items: center;
   justify-content: space-between;
+  width: 100%;
 }
-.dokan-admin-header .dokan-admin-header-logo {
+.dokan-admin-header .dokan-admin-logo-wrap {
+  display: flex;
+  flex: 1;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-admin-header-logo {
   display: flex;
   align-items: center;
 }
-.dokan-admin-header .dokan-admin-header-logo img {
-  height: 25px;
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-admin-header-logo img {
+  height: 32px;
   width: auto;
   margin-right: 12px;
 }
-.dokan-admin-header .dokan-admin-header-logo span {
-  color: #F1634C;
-  background: #FFF4F2;
-  padding: 4px 12px;
-  font-size: 12px;
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-right: 24px;
+  flex: 1;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag {
+  border-radius: 20px;
+  font-size: 1rem;
+  line-height: 20px;
+  font-weight: 400;
+  padding: 0.5rem 1rem;
+  max-height: 2rem;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.lite {
+  background: #FF9B5366;
+  color: #7B4E2E;
+  display: flex;
+  align-items: center;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.pro {
+  background: #D8D8FE;
+  color: #7047EB;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  text-transform: capitalize;
+  font-weight: 450;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.pro .version-tag-pro-badge {
+  background: #7047EB;
+  color: white;
+  border-radius: 28px;
+  display: inline-flex;
+  align-items: center;
+  padding: 3px 9px;
+  font-size: 16px;
+  margin: -10px 0 -10px -10px;
+}
+.dokan-admin-header .upgrade-button {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  background: #7047EB;
+  color: white;
+  padding: 10px 20px;
+  border-radius: 6px;
+  text-decoration: none;
   font-weight: 500;
-  font-family: "SF Pro Text", sans-serif;
-  border: 1px solid rgba(241, 99, 76, 0.2);
-  border-radius: 93px;
+  transition: background-color 0.2s;
+  margin-left: auto;
+}
+.dokan-admin-header .upgrade-button:hover {
+  background: #A244FF;
 }
 .dokan-admin-header .dokan-admin-header-menu {
   padding-right: 6px;
@@ -289,6 +343,26 @@
 .dokan-admin-header .dokan-admin-header-menu .menu-item .menu-icon .dropdown .list-item a:focus {
   box-shadow: none;
 }
+@media screen and (max-width: 782px) {
+  .dokan-admin-logo-wrap {
+    flex-direction: column;
+  }
+  .dokan-admin-header {
+    margin: 10px 10px 0 2px;
+    padding: 12px 16px;
+  }
+  .dokan-admin-header .dokan-admin-header-content {
+    gap: 16px;
+    align-items: start;
+  }
+  .dokan-admin-header .dokan-version-tags {
+    margin: 12px 0;
+    flex-wrap: wrap;
+  }
+  .dokan-admin-header .upgrade-button {
+    margin: 0;
+  }
+}
 .dokan-dashboard .post-box-container {
   width: 49%;
   float: left;

diff --git a/assets/css/vue-admin.css b/assets/css/vue-admin.css
@@ -4659,7 +4659,7 @@ to {
   opacity: 1;
 }
 #dokan-vendor-capabilities .capability-card .capability-image .zoom {
-  background-color: #FFB24B;
+  background-color: #7047EB;
   border-radius: 9px;
   color: white;
   font-size: 24px;

diff --git a/assets/js/admin-rtl.css b/assets/js/admin-rtl.css
@@ -106,31 +106,85 @@
 }
 .dokan-admin-header {
   background: #fff;
-  padding: 15px 22px 15px 15px;
-  margin: 0 -20px 0 0;
-  box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.1);
+  padding: 16px 24px;
+  margin: 20px 2px 0 20px;
+  border-radius: 8px;
+  box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.06);
+}
+.dokan-admin-header .dokan-admin-header-content {
   display: flex;
   align-items: center;
   justify-content: space-between;
+  width: 100%;
 }
-.dokan-admin-header .dokan-admin-header-logo {
+.dokan-admin-header .dokan-admin-logo-wrap {
+  display: flex;
+  flex: 1;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-admin-header-logo {
   display: flex;
   align-items: center;
 }
-.dokan-admin-header .dokan-admin-header-logo img {
-  height: 25px;
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-admin-header-logo img {
+  height: 32px;
   width: auto;
   margin-left: 12px;
 }
-.dokan-admin-header .dokan-admin-header-logo span {
-  color: #F1634C;
-  background: #FFF4F2;
-  padding: 4px 12px;
-  font-size: 12px;
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-left: 24px;
+  flex: 1;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag {
+  border-radius: 20px;
+  font-size: 1rem;
+  line-height: 20px;
+  font-weight: 400;
+  padding: 0.5rem 1rem;
+  max-height: 2rem;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.lite {
+  background: #FF9B5366;
+  color: #7B4E2E;
+  display: flex;
+  align-items: center;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.pro {
+  background: #D8D8FE;
+  color: #7047EB;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  text-transform: capitalize;
+  font-weight: 450;
+}
+.dokan-admin-header .dokan-admin-logo-wrap .dokan-version-tags .version-tag.pro .version-tag-pro-badge {
+  background: #7047EB;
+  color: white;
+  border-radius: 28px;
+  display: inline-flex;
+  align-items: center;
+  padding: 3px 9px;
+  font-size: 16px;
+  margin: -10px -10px -10px 0;
+}
+.dokan-admin-header .upgrade-button {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  background: #7047EB;
+  color: white;
+  padding: 10px 20px;
+  border-radius: 6px;
+  text-decoration: none;
   font-weight: 500;
-  font-family: "SF Pro Text", sans-serif;
-  border: 1px solid rgba(241, 99, 76, 0.2);
-  border-radius: 93px;
+  transition: background-color 0.2s;
+  margin-right: auto;
+}
+.dokan-admin-header .upgrade-button:hover {
+  background: #A244FF;
 }
 .dokan-admin-header .dokan-admin-header-menu {
   padding-left: 6px;
@@ -289,6 +343,26 @@
 .dokan-admin-header .dokan-admin-header-menu .menu-item .menu-icon .dropdown .list-item a:focus {
   box-shadow: none;
 }
+@media screen and (max-width: 782px) {
+  .dokan-admin-logo-wrap {
+    flex-direction: column;
+  }
+  .dokan-admin-header {
+    margin: 10px 2px 0 10px;
+    padding: 12px 16px;
+  }
+  .dokan-admin-header .dokan-admin-header-content {
+    gap: 16px;
+    align-items: start;
+  }
+  .dokan-admin-header .dokan-version-tags {
+    margin: 12px 0;
+    flex-wrap: wrap;
+  }
+  .dokan-admin-header .upgrade-button {
+    margin: 0;
+  }
+}
 .dokan-dashboard .post-box-container {
   width: 49%;
   float: right;

diff --git a/assets/js/admin.asset.php b/assets/js/admin.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'c3d32b38d516ff742fe3');
+<?php return array('dependencies' => array(), 'version' => 'ddf6144763ba70ef3897');
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array(), 'version' => 'c3d32b38d516ff742fe3');
		<?php return array('dependencies' => array(), 'version' => 'ddf6144763ba70ef3897');