Merge branch 'release/3.6.1' into develop

weDevsOfficial · Jan 2, 2023 · 2cb6f8e · 2cb6f8e
2 parents f6e60db + 697f047
commit 2cb6f8e
Show file tree

Hide file tree

Showing 14 changed files with 652 additions and 532 deletions.
diff --git a/admin/html/whats-new.php b/admin/html/whats-new.php
@@ -1,5 +1,39 @@
 <?php
 $changelog = [
+    [
+        'version'  => 'Version 3.6.1',
+        'released' => '2023-01-02',
+        'changes'  => [
+            [
+                'title' => __( 'Add responsiveness to the upgrade-to-pro popup widget', 'wp-user-frontend' ),
+                'type'  => 'Enhancement',
+            ],
+            [
+                'title' => __( 'Update Appsero SDK to the latest version', 'wp-user-frontend' ),
+                'type'  => 'Enhancement',
+            ],
+            [
+                'title' => __( 'warning before updating a subscription package', 'wp-user-frontend' ),
+                'type'  => 'Enhancement',
+            ],
+            [
+                'title' => __( 'Subscription shouldn\'t be editable from user\'s profile', 'wp-user-frontend' ),
+                'type'  => 'Fix',
+            ],
+            [
+                'title' => __( 'Text field append \'0\' when character exceeds content restriction limit', 'wp-user-frontend' ),
+                'type'  => 'Fix',
+            ],
+            [
+                'title' => __( 'Fields within column doesn\'t behave as expected in forms', 'wp-user-frontend' ),
+                'type'  => 'Fix',
+            ],
+            [
+                'title' => __( 'Change sweetalert2 to v11.4.19 to remove anti-war message', 'wp-user-frontend' ),
+                'type'  => 'Update',
+            ],
+        ],
+    ],
     [
         'version'  => 'Version 3.6.0',
         'released' => '2022-11-23',

diff --git a/assets/css/admin.css b/assets/css/admin.css
@@ -1,3 +1,6 @@
+h2.swal2-title {
+  line-height: 1.2em;
+}
 .wpuf-admin fieldset {
   border: 1px solid #E3E3E3;
   margin: 20px 0 0px 0;
@@ -676,13 +679,15 @@ tr.pro-preview-html th {
 .pro-field-overlay:hover {
   display: block;
 }
+.wpuf-subscription-pack-settings nav .tab-current a.wpuf-button.button-upgrade-to-pro,
 a.wpuf-button.button-upgrade-to-pro {
   padding: 10px 15px;
   background: #ff9000;
   color: #fff;
   min-height: auto;
   border-radius: 5px;
   text-decoration: none;
+  border: none;
 }
 .pro-field-overlay a.wpuf-button.button-upgrade-to-pro {
   position: absolute;
@@ -691,6 +696,7 @@ a.wpuf-button.button-upgrade-to-pro {
   -webkit-transform: translate(-50%, -50%);
   transform: translate(-50%, -50%);
 }
+.wpuf-subscription-pack-settings nav .tab-current a.wpuf-button.button-upgrade-to-pro:hover,
 a.wpuf-button.button-upgrade-to-pro:hover {
   background: #d07805;
 }
@@ -729,6 +735,7 @@ img.user-listing.active {
   /* Safari 6.0 - 9.0 */
   filter: grayscale(0%) opacity(1) drop-shadow(8px 8px 5px #ccc);
 }
+.wpuf-subscription-pack-settings nav ul .wpuf-pro-field-tooltip,
 .wpuf-pro-field-tooltip {
   background: #000;
   width: max-content;
@@ -752,26 +759,32 @@ img.user-listing.active {
 h3.tooltip-header {
   color: #fff;
 }
+.wpuf-subscription-pack-settings nav ul .wpuf-pro-field-tooltip ul li span.tooltip-check svg path,
 .wpuf-pro-field-tooltip ul li span.tooltip-check svg path {
   fill: #139F84;
 }
+.wpuf-subscription-pack-settings nav ul .wpuf-pro-field-tooltip ul,
 .wpuf-pro-field-tooltip ul {
   margin-bottom: 30px;
 }
+.wpuf-subscription-pack-settings nav ul .wpuf-pro-field-tooltip ul li,
 .wpuf-pro-field-tooltip ul li {
   font-size: 1.2em;
   line-height: 1.5em;
   font-weight: 400;
+  margin-bottom: 6px;
 }
 span.tooltip-check {
   margin-right: 10px;
 }
+.wpuf-subscription-pack-settings nav ul .wpuf-pro-field-tooltip .pro-link,
 .wpuf-pro-field-tooltip .pro-link {
   display: flex;
   -webkit-justify-content: center;
   justify-content: center;
   margin-left: 25px;
 }
+.wpuf-subscription-pack-settings nav ul .wpuf-pro-field-tooltip i,
 .wpuf-pro-field-tooltip i {
   position: absolute;
   top: 100%;
@@ -781,6 +794,7 @@ span.tooltip-check {
   height: 12px;
   overflow: hidden;
 }
+.wpuf-subscription-pack-settings nav ul .wpuf-pro-field-tooltip i::after,
 .wpuf-pro-field-tooltip i::after {
   content: '';
   position: absolute;
@@ -791,6 +805,12 @@ span.tooltip-check {
   transform: translate(-50%, -50%) rotate(45deg);
   background-color: #000;
 }
+tr.pro-preview.wpuf-subscription-recurring {
+  position: relative;
+}
+tr.pro-preview.wpuf-subscription-recurring td {
+  position: initial;
+}
 tr.pro-preview span.pro-icon,
 tr span.pro-icon-title {
   position: relative;
@@ -799,7 +819,7 @@ tr span.pro-icon-title {
 a span.pro-icon-title {
   position: relative;
 }
-a span.pro-icon-title wpuf-pro-field-tooltip {
+a span.pro-icon-title .wpuf-pro-field-tooltip {
   left: 185px;
 }
 span.pro-icon-title:hover .wpuf-pro-field-tooltip {
@@ -841,6 +861,11 @@ span.pro-icon:hover .wpuf-pro-field-tooltip {
   position: absolute;
   right: 5px;
 }
+@media only screen and (max-width: 1399px) {
+  a.wpuf-button.button-upgrade-to-pro {
+    padding: 10px;
+  }
+}
 .wpuf-help-tabbed {
   display: flex;
   width: 100%;
@@ -1221,9 +1246,3 @@ span.pro-icon:hover .wpuf-pro-field-tooltip {
 .wpuf-subscription-pack-settings .subscription-nav-content section .form-table td {
   padding: 15px 0;
 }
-
-@media only screen and (max-width: 1399px) {
-    a.wpuf-button.button-upgrade-to-pro {
-        padding: 10px;
-    }
-}
diff --git a/assets/css/frontend-forms.css b/assets/css/frontend-forms.css
@@ -351,22 +351,27 @@ body ul.wpuf-form li .wpuf-fields .wpuf-name-field-wrap.format-first-middle-last
   float: right;
   width: 37%;
 }
-body ul.wpuf-form li .wpuf-fields .wpuf-help {
+body ul.wpuf-form li .wpuf-fields .wpuf-help,
+body ul.wpuf-form li .wpuf-fields .wpuf-wordlimit-message {
   color: #666;
   margin: 2px 0 5px 0;
   font-size: 12px;
   font-style: italic;
   font-family: sans-serif;
   display: block;
 }
-body ul.wpuf-form li .wpuf-fields .wpuf-help .text-danger {
+body ul.wpuf-form li .wpuf-fields .wpuf-help .text-danger,
+body ul.wpuf-form li .wpuf-fields .wpuf-wordlimit-message .text-danger {
   color: red;
 }
-body ul.wpuf-form li .wpuf-fields .wpuf-help .text-success {
+body ul.wpuf-form li .wpuf-fields .wpuf-help .text-success,
+body ul.wpuf-form li .wpuf-fields .wpuf-wordlimit-message .text-success {
   color: green;
 }
 body ul.wpuf-form li .wpuf-fields .wpuf-help #url-alart,
-body ul.wpuf-form li .wpuf-fields .wpuf-help #url-alart-mgs {
+body ul.wpuf-form li .wpuf-fields .wpuf-wordlimit-message #url-alart,
+body ul.wpuf-form li .wpuf-fields .wpuf-help #url-alart-mgs,
+body ul.wpuf-form li .wpuf-fields .wpuf-wordlimit-message #url-alart-mgs {
   font-style: normal;
   font-size: 16px;
 }
@@ -1664,6 +1669,9 @@ body .weforms-quiz-feedback .wrong-answer .wpuf-fields label.checked {
 body ul.wpuf-form .wpuf-el {
   position: relative;
 }
+body form.wpuf-form-add ul.wpuf-form .wpuf-el {
+  display: flex;
+}
 body ul.wpuf-form .weforms-frontend-field-points {
   position: absolute;
   top: 0;

diff --git a/assets/js/frontend-form.min.js b/assets/js/frontend-form.min.js
diff --git a/assets/js/upload.min.js b/assets/js/upload.min.js
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,14 @@
+= v3.6.1 (2 Jan, 2023) =
+
+* Enhancement - Add responsiveness to the upgrade-to-pro popup widget
+* Enhancement - Update Appsero SDK to the latest version
+* Enhancement - warning before updating a subscription package
+
+* Fix - Subscription shouldn't be editable from user's profile
+* Fix - Text field append '0' when character exceeds content restriction limit
+* Fix - Fields within column doesn't behave as expected in forms
+* Fix - Change sweetalert2 to v11.4.19 to remove anti-war message
+
 = v3.6.0 (23 Nov, 2022) =
 
 * Enhancement - Admin dashboard news and update meta-box added

diff --git a/class/encryption-helper.php b/class/encryption-helper.php
@@ -8,7 +8,7 @@ class WPUF_Encryption_Helper {
     /**
      * Get the Advanced Encryption Standard we are using
      *
-     * @since WPUF
+     * @since 3.5.29
      *
      * @return string
      */
@@ -21,7 +21,7 @@ public static function get_encryption_method() {
      * Returns 24 If PHP version is 7.2 or above.
      * For PHP version below 7.2 it will send the length as per the encryption method.
      *
-     * @since WPUF
+     * @since 3.5.29
      *
      * @return int|bool
      */
@@ -32,7 +32,7 @@ public static function get_encryption_nonce_length() {
     /**
      * Get the encryption key length. Defaults to 32
      *
-     * @since WPUF
+     * @since 3.5.29
      *
      * @return int
      */
@@ -43,7 +43,7 @@ public static function get_encryption_key_length() {
     /**
      * Get the base64 encoded auth keys
      *
-     * @since WPUF
+     * @since 3.5.29
      *
      * @return array
      * @throws Exception