Merge remote-tracking branch 'upstream/develop' into fix/admin_notifi…

…cation_after_guest_email_verified
weDevsOfficial · Sep 27, 2024 · e69375e · e69375e
2 parents 79bf57d + 9466787
commit e69375e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 27 deletions.
diff --git a/assets/css/frontend-forms.css b/assets/css/frontend-forms.css
@@ -542,13 +542,6 @@ body ul.wpuf-form li .wpuf-address-field:after {
   display: table;
 }
 body ul.wpuf-form li .wpuf-address-field.city_name,
-body ul.wpuf-form li .wpuf-address-field.state,
-body ul.wpuf-form li .wpuf-address-field.zip,
-body ul.wpuf-form li .wpuf-address-field.country_select {
-  float: left;
-  width: 47%;
-}
-body ul.wpuf-form li .wpuf-address-field.city_name,
 body ul.wpuf-form li .wpuf-address-field.zip {
   margin-right: 4%;
 }
@@ -1835,7 +1828,7 @@ body .wpuf-attachment-upload-filelist + .moxie-shim {
 }
 img.wpuf-eye {
   position: absolute;
-  right: 0;
+  right: 1rem;
   top: 50%;
   transform: translateY(-50%) translateX(-6%);
 }
diff --git a/assets/js/components/subscriptions/SectionInputField.vue b/assets/js/components/subscriptions/SectionInputField.vue
@@ -122,7 +122,7 @@ const processInput = (event) => {
 };
 
 const processNumber = (event) => {
-    const allowedKeys = ['Backspace', 'Delete', 'Tab', 'ArrowLeft', 'ArrowRight'];
+    const allowedKeys = ['Backspace', 'Delete', 'Tab', 'ArrowLeft', 'ArrowRight', '.'];
     if (!allowedKeys.includes(event.key) && isNaN(Number(event.key))) {
         event.preventDefault();
     }

diff --git a/assets/js/subscriptions.min.js b/assets/js/subscriptions.min.js
diff --git a/assets/less/frontend-forms.less b/assets/less/frontend-forms.less
@@ -603,14 +603,6 @@ ul.wpuf-form {
             width: 100%;
             margin-bottom: 10px;
 
-            &.city_name,
-            &.state,
-            &.zip,
-            &.country_select {
-                float: left;
-                width: 47%;
-            }
-
             &.city_name,
             &.zip {
                 margin-right: 4%;
@@ -2124,7 +2116,7 @@ ul.wpuf-form{
 
 img.wpuf-eye {
     position: absolute;
-    right: 0;
+    right: 1rem;
     top: 50%;
     transform: translateY(-50%) translateX(-6%);
 }
diff --git a/includes/Admin/Forms/Form.php b/includes/Admin/Forms/Form.php
@@ -182,7 +182,9 @@ public function is_submission_open( $form, $form_settings ) {
             return [ $user_can_post, $info ];
         }
 
-        $has_post_count = $current_user->subscription()->has_post_count( $form_settings['post_type'] );
+        $post_type = ! empty( $form_settings['post_type'] ) ? $form_settings['post_type'] : 'post';
+
+        $has_post_count = $current_user->subscription()->has_post_count( $post_type );
 
         if ( $current_user->subscription()->current_pack_id() && ! $has_post_count ) {
             $user_can_post = 'no';

diff --git a/includes/Api/Subscription.php b/includes/Api/Subscription.php
@@ -391,7 +391,7 @@ public function create_or_update_item( $request ) {
         $post_content           = ! empty( $subscription['post_content'] ) ? sanitize_textarea_field(
             $subscription['post_content']
         ) : '';
-        $billing_amount         = ! empty( $subscription['meta_value']['_billing_amount'] ) ? (int) $subscription['meta_value']['_billing_amount'] : 0;
+        $billing_amount         = ! empty( $subscription['meta_value']['_billing_amount'] ) ? floatval( $subscription['meta_value']['_billing_amount'] ) : 0;
         $expiration_number      = ! empty( $subscription['meta_value']['_expiration_number'] ) ? (int) $subscription['meta_value']['_expiration_number'] : 0;
         $expiration_period      = ! empty( $subscription['meta_value']['_expiration_period'] ) ? sanitize_text_field(
             $subscription['meta_value']['_expiration_period']

diff --git a/languages/wp-user-frontend.pot b/languages/wp-user-frontend.pot
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WP User Frontend 4.0.11\n"
 "Report-Msgid-Bugs-To: https://wedevs.com/contact/\n"
-"POT-Creation-Date: 2024-09-17 06:55:34+00:00\n"
+"POT-Creation-Date: 2024-09-17 09:28:09+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1332,7 +1332,7 @@ msgstr ""
 #: admin/template.php:185 includes/Admin/Forms/Admin_Template.php:212
 #: includes/Fields/Field_Contract.php:687
 #: includes/Fields/Form_Field_Textarea.php:12
-#: includes/Fields/Form_Field_Textarea.php:125
+#: includes/Fields/Form_Field_Textarea.php:132
 msgid "Textarea"
 msgstr ""
 
@@ -2596,19 +2596,19 @@ msgstr ""
 msgid "Others"
 msgstr ""
 
-#: includes/Admin/Forms/Form.php:189 includes/Admin/Forms/Form.php:239
+#: includes/Admin/Forms/Form.php:191 includes/Admin/Forms/Form.php:241
 msgid "Post Limit Exceeded for your purchased subscription pack."
 msgstr ""
 
-#: includes/Admin/Forms/Form.php:212
+#: includes/Admin/Forms/Form.php:214
 #. translators: %s: Pack page link
 msgid ""
 "You need to  <a href=\"%s\">purchase a subscription package</a> to post in "
 "this form"
 msgstr ""
 
-#: includes/Admin/Forms/Form.php:219 includes/Admin/Forms/Form.php:252
-#: includes/Admin/Forms/Form.php:259
+#: includes/Admin/Forms/Form.php:221 includes/Admin/Forms/Form.php:254
+#: includes/Admin/Forms/Form.php:261
 msgid "Payment type not selected for this form. Please contact admin."
 msgstr ""