Merge branch 'weDevsOfficial:develop' into enhance/default-avatar-banner

README.md

@@ -5,9 +5,9 @@
 **Requires at least:** 5.4  
 **Tested up to:** 6.2.2  
 **WC requires at least:** 5.0.0  
-**WC tested up to:** 7.8.0  
+**WC tested up to:** 7.9.0  
 **Requires PHP:** 7.2  
-**Stable tag:** 3.7.21  
+**Stable tag:** 3.7.24  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -338,6 +338,47 @@ A. Just install and activate the PRO version without deleting the free plugin. A
 
 ## Changelog ##
 
+### v3.7.24 ( Jul 25, 2023 ) ###
+
+- **update:** Restrictions added for vendors to review and purchase their own products.
+Previously, vendors could purchase and post reviews for their own product. Which is not logical and could manipulate the search results of a product in a marketplace. With this update, vendors will not be able to purchase or post reviews for their own product.
+- **update:** [ReverseWithdrawal] Now Admin can request payment from vendors using the Reverse Withdrawal feature.
+Currently, there is no way for Site admins to request payments from vendors. For some use cases, it is essential for admins to request money from vendors. For example: In Stripe 3DS mode, if customers ask for a refund, refund will be given from the admin Stripe account, after that vendor transfer will be reversed. But if the vendor doesn't have enough money in their stripe account transfer reversal will fail, in that case, vendor balance will be negative. Another case would be for non-connected vendors, in that case, admin will be responsible for refund and admin needs to request money from vendors.
+- **update:** [AdminSettings] Added a toggle switch for Google ReCaptcha in the appearance settings for better control.
+- **update:** [AdminSettings] Sensitive information like API keys, client secrets, etc., are now displayed as password fields with an unhide button to improve security.
+- **update:** [AdminCommission] Now, "percentage" is selected by default if the admin setup wizard is skipped in the commission setting.
+- **fix:** Added some missing translations.
+Previously, the template folder at dokan-lite was missing when the .pot file was generated. With this fix template folder will be respected while generating the pot file.
+
+
+### v3.7.23 ( Jul 14, 2023 ) ###
+
+- **fix:** Fixed an issue where the withdraw request could not be approved from the Admin Dashboard via REST API.
+
+### v3.7.22 ( Jul 12, 2023 ) ###
+
+- **fix:** Fixed an issue where multiple withdrawal requests can be placed via API.
+If a withdrawal request was placed by a vendor until that request was approved or rejected by Admin, making another withdrawal request wasn’t possible via frontend. However, the admin was able to make a withdrawal request via REST API. With this fix, this problem now has been resolved.
+- **fix:** Fixed a PHP notice for importing dummy data without providing any data via REST API
+endpoint: {{SERVER_URL}}/wp-json/dokan/v1/dummy-data/import
+- **fix:** While updating the withdrawal request via REST API, the minimum withdrawal amount limit wasn’t considered. For example, if the minimum withdrawal limit was set to 50, for an existing withdrawal request, the admin can set the withdrawal value to less than 50. This issue has been fixed now.
+endpoint: {{SERVER_URL}}/wp-json/dokan/v1/withdraw/{withdraw_id}
+- **fix:** Fixed an issue where store products API was returning all products instead of published products.
+endpoint: {{SERVER_URL}}/wp-json/dokan/v1/stores/{store_id}/products
+- **fix:** Fixed some CSS issues on the vendor store settings page for the store banner image.
+- **fix:** [Withdraw] Fixed an issue where PayPal withdraw method status was displaying default but the corresponding vendor didn’t set up the payment method yet. With this fix, we marked the payment method as needing setup instead of the default payment method.
+- **fix:** [Withdraw] After connecting to a payment method, the button text changes from `Setup` to `Make default` or `default` if selected. But after disconnecting that method button text doesn't change back to `Setup`. Now this issue has been fixed.
+- **update:** Updated vendor store API to support profile picture and banner delete feature. To delete one of these fields, one needs to set a 0 (zero) value while making the API request.
+endpoint: {{SERVER_URL}}/wp-json/dokan/{{version}}/stores/{store_Id}
+- **update:** Added various html tag support for rich text editors on various places of vendor dashboard.
+Previously, the product editor on the vendor's side was a lot more limited than the one available on the admin side. With this update, we’ve included various tags, like heading elements, paragraphs, etc support for rich text editors.
+- **update:** Added random ordering for store REST API endpoint,
+Previously, random ordering for stores wasn’t available for store API. With this update, we’ve added this feature.
+endpoint: {{SERVER_URL}}/wp-json/dokan/v1/stores/
+- **update:** Added phone number validation for vendor dashboard store settings page and vendor registration form.
+Previously, for phone numbers only numeric values were accepted, now a valid phone number including spaces, -, _, (, ), etc also supports phone number fields.
+- **update:** [Withdraw] Fixed an issue where withdraw payment method wasn't enabled but can be used for both manual withdrawal and auto withdraw disbursement schedules from the vendor dashboard payment settings page.
+
 ### v3.7.21 ( Jun 23, 2023 ) ###
 
 - **fix:** Fixed an issue where gateway fees from WooCommerce PayPal Payments were not being deducted from vendors’ earnings.

assets/css/style.css

@@ -4337,12 +4337,12 @@ div.media-sidebar a.edit-attachment {
 }
 .dokan-settings-content .dokan-settings-area .dokan-banner {
   border: 4px dashed #d8d8d8;
-  height: 300px;
-  margin: 0 0 30px 35px;
+  margin: 0 auto 35px;
   max-width: 850px;
   text-align: center;
   overflow: hidden;
   position: relative;
+  min-height: 300px;
 }
 .dokan-settings-content .dokan-settings-area .dokan-banner img {
   max-width: 100%;
@@ -6375,10 +6375,10 @@ p.vendor-customer-registration .radio:hover {
   }
   .dokan-dashboard .dokan-dash-sidebar .dokan-settings-area .dokan-banner,
   .dokan-dashboard .dokan-dashboard-content .dokan-settings-area .dokan-banner {
-    width: auto !important;
-    height: auto !important;
-    margin: 0 !important;
-    margin-bottom: 15px !important;
+    width: auto;
+    height: auto;
+    margin-bottom: 15px;
+    min-height: unset;
   }
   .dokan-dashboard .dashboard-content-area .dokan-announcement-widget .dokan-right {
     float: right !important;

assets/css/vue-admin.css

@@ -2063,6 +2063,46 @@ ul[data-v-525b077c] {
   border-radius: 50%;
 }
 
+.secret-box-wraper[data-v-38c7e6d8] {
+  display: flex;
+  flex-direction: row-reverse;
+}
+.secret-box-wraper .secret-input-box[data-v-38c7e6d8] {
+  position: relative;
+  display: flex;
+  width: 25em;
+}
+.secret-box-wraper .secret-input-box div button[data-v-38c7e6d8] {
+  cursor: pointer;
+  height: 20px;
+  min-height: 32px;
+  min-width: 32px;
+  border: 0.957434px solid #686666;
+  box-shadow: 0px 3.82974px 3.82974px rgba(0, 0, 0, 0.1);
+  border-radius: 5px;
+  background: white;
+  color: #686666;
+}
+.secret-box-wraper .secret-input-box .secret-input[data-v-38c7e6d8] {
+  width: 100%;
+}
+.secret-box-wraper .secret-input-box .secret-input.blurry-input[data-v-38c7e6d8] {
+  color: transparent;
+  text-shadow: 0 0 7px #333;
+}
+.secret-box-wraper .secret-input-box .secret-input-placeholder[data-v-38c7e6d8] {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  color: #686666;
+}
+@media only screen and (max-width: 768px) {
+.secret-box-wraper .secret-input-box[data-v-38c7e6d8] {
+    max-width: 125px !important;
+}
+}
+
 span.repeatable-item-description {
   color: #999;
   font-size: 11px;
@@ -2212,6 +2252,10 @@ ul.dokan-settings-repeatable-list li span.remove-item {
 .field_contents fieldset .field_data .field_desc a:focus {
   box-shadow: 0 0 0 1px transparent;
 }
+.field_contents fieldset .social-switch-wraper {
+  display: flex;
+  align-items: center;
+}
 .field_contents .combine_fields {
   display: flex;
   justify-content: right;
@@ -2379,6 +2423,9 @@ ul.dokan-settings-repeatable-list li span.remove-item {
   padding-top: 0;
   border-radius: 50%;
 }
+.field_contents .scl_fields_disable {
+  filter: grayscale(1);
+}
 .field_contents .scl_fields {
   margin: 15px 0 4px 0px;
   border: 0.82px solid #E5E5E5;
@@ -2441,6 +2488,9 @@ ul.dokan-settings-repeatable-list li span.remove-item {
   position: absolute;
   transform: translate(-50%, -50%);
 }
+.field_contents .scl_fields .scl_header .expand_btn .active-social-expend-btn {
+  background: #4CAF4F;
+}
 .field_contents .scl_fields .scl_info {
   background: #fff;
 }
@@ -3984,6 +4034,180 @@ to {
 }
 }
 
+.dokan-radio-fields[data-v-41450cfc] {
+  display: flex;
+  flex: 2;
+  align-self: center;
+}
+.dokan-radio-fields label[data-v-41450cfc] {
+  border: 1px solid #b0a7a7;
+  padding: 10px 15px;
+  display: inline-block;
+  overflow: hidden;
+  font-size: 12px;
+  font-family: Roboto, sans-serif;
+  font-weight: 400;
+  line-height: 14px;
+  border-right: 0;
+}
+.dokan-radio-fields label .dashicons-yes[data-v-41450cfc] {
+  color: #fff;
+  width: 15px;
+  height: 15px;
+  margin: -1px 3px 0 0;
+  cursor: pointer;
+  display: none;
+  font-size: 15px;
+  background: #1aa0f7;
+  padding-top: 0;
+  border-radius: 50%;
+}
+.dokan-radio-fields label input[type=radio][data-v-41450cfc] {
+  display: none;
+}
+.dokan-radio-fields label[data-v-41450cfc]:hover {
+  color: rgba(3, 58, 163, 0.85);
+  background: rgba(182, 206, 254, 0.38);
+  box-sizing: border-box;
+  box-shadow: 0 4px 4px rgba(0, 0, 0, 0.1);
+}
+.dokan-radio-fields label.checked[data-v-41450cfc] {
+  color: rgba(3, 58, 163, 0.85);
+  border: 1px solid rgba(3, 58, 163, 0.81) !important;
+  background: rgba(182, 206, 254, 0.38);
+  box-sizing: border-box;
+}
+.dokan-radio-fields label.checked .dashicons-yes[data-v-41450cfc] {
+  display: inline-block;
+}
+.dokan-radio-fields label[data-v-41450cfc]:first-child {
+  border-top-left-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
+.dokan-radio-fields label[data-v-41450cfc]:last-child {
+  border-right: 1px solid #b0a7a7;
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
+
+.dokan-rw-footer {
+  display: flex;
+  flex-direction: row-reverse;
+}
+.dokan-rw-footer .dokan-rw-footer-btn {
+  display: flex;
+  align-items: center;
+}
+.dokan-rw-footer .dokan-rw-footer-btn img.not-loading {
+  height: 0px;
+  transition: height 200ms;
+}
+.dokan-rw-footer .dokan-rw-footer-btn img.is-loading {
+  height: 20px;
+  margin-right: 10px;
+  transition: height 200ms;
+}
+.dokan-rw-multiselect-container .multiselect .multiselect__tags {
+  border: 1px solid #b0a7a7;
+}
+.dokan-rw-multiselect-container .multiselect .multiselect__tags .multiselect__placeholder {
+  color: #b0a7a7;
+}
+.dokan-rw-section .dokan-rw-section-heading {
+  display: flex;
+  align-items: center;
+  column-gap: 5px;
+}
+.dokan-rw-section .dokan-rw-section-body .dokan-rw-note-area textarea {
+  width: 100%;
+  padding: 0.2rem;
+  border: 1px solid #b0a7a7;
+  min-height: 100px;
+  padding-left: 0.2rem;
+  padding-right: 0.2rem;
+}
+.dokan-rw-section .dokan-rw-section-body .dokan-rw-note-area textarea:focus {
+  border-color: #b0a7a7;
+  box-shadow: 0 0 0 0px #b0a7a7;
+  outline: none;
+}
+.dokan-rw-section .dokan-rw-section-body .dokan-rw-note-area textarea::placeholder {
+  color: #b0a7a7;
+}
+.dokan-rw-multiselect {
+  margin-top: 1rem;
+}
+.dokan-rw-multiselect input {
+  padding: 0;
+  line-height: 0;
+  min-height: 0;
+  box-shadow: none;
+  border-radius: 0;
+  border: none;
+}
+.dokan-rw-multiselect input:focus {
+  border-color: transparent;
+  box-shadow: none;
+  outline: none;
+}
+.dokan-rw-input input {
+  width: 100%;
+  padding: 0.2rem;
+  border: 1px solid #b0a7a7;
+}
+.dokan-rw-input input:focus {
+  border-color: #b0a7a7;
+  box-shadow: 0 0 0 0px #b0a7a7;
+  outline: none;
+}
+.dokan-rw-input input::placeholder {
+  color: #b0a7a7;
+}
+@media only screen and (max-width: 800px) {
+.dokan-add-new-rw .dokan-modal-content {
+    width: 80% !important;
+}
+}
+@media only screen and (max-width: 500px) {
+.dokan-add-new-rw .dokan-modal-content {
+    width: 400px !important;
+    top: 50% !important;
+}
+}
+@media only screen and (max-width: 376px) {
+.dokan-add-new-rw .dokan-modal-content {
+    width: 90% !important;
+}
+}
+.dokan-add-new-rw .dokan-modal-content {
+  height: 70% !important;
+  overflow: scroll;
+}
+.dokan-add-new-rw .modal-footer {
+  bottom: -55px;
+  position: relative;
+}
+.dokan-add-new-rw .modal-body {
+  overflow-y: hidden !important;
+}
+
+.animate-enter-active {
+  animation: animate 150ms;
+}
+.animate-leave-active {
+  animation: animate 150ms reverse;
+}
+@keyframes animate {
+0% {
+    opacity: 0;
+}
+50% {
+    opacity: 0.5;
+}
+100% {
+    opacity: 1;
+}
+}
 .swal2-actions button {
   margin-right: 10px !important;
 }
@@ -3992,6 +4216,14 @@ to {
   display: flex;
   flex-wrap: wrap;
 }
+#dokan_reverse_withdrawal_list_table .dokan-reverse-withdrawal-filters {
+  display: flex;
+}
+@media only screen and (max-width: 500px) {
+#dokan_reverse_withdrawal_list_table .dokan-reverse-withdrawal-filters {
+    flex-direction: column;
+}
+}
 #dokan_reverse_withdrawal_list_table input.multiselect__input {
   border: none;
 }