Changeset 3385037

Timestamp:

10/27/2025 08:28:24 AM (4 months ago)

Author:

versionnext

Message:

Prepare 1.1.3: fixes/changes

Location:

formpays-pro

Files:

• assets/screenshot-13.jpg (added)
• trunk/CHANGELOG.md (modified) (1 diff)
• trunk/README.txt (modified) (5 diffs)
• trunk/admin/class-formpays-pro-admin.php (modified) (5 diffs)
• trunk/admin/views/email-notifications.php (added)
• trunk/assets/css/email-notifications.css (added)
• trunk/assets/js/email-notifications.js (added)
• trunk/assets/js/frontend.js (modified) (1 diff)
• trunk/formpays-pro.php (modified) (10 diffs)
• trunk/includes/class-formpays-pro-email-handler.php (added)
• trunk/includes/class-formpays-pro-forms.php (modified) (8 diffs)
• trunk/includes/gateways/class-formpays-pro-razorpay.php (modified) (4 diffs)

formpays-pro/trunk/CHANGELOG.md

@@ -1 +1 @@
 # FormPays Pro - Changelog
+---
+
+## [1.1.3] - 2024-12-19
+
+### Email Notifications & Payment Gateway Enhancements
+**Comprehensive Email System & Razorpay Integration Improvements**
+
+#### New Features
+- **Email Notifications System**: 
+  - Added "Email Notifications & Confirmations" admin menu
+  - 4 customizable email templates (Payment Success/Failed for Customer/Admin)
+  - Automatic email sending on payment events
+  - Test email functionality to verify settings
+  - Dynamic placeholders: `{transaction_id}`, `{amount}`, `{customer_name}`, `{customer_email}`, `{payment_date}`, `{payment_method}`, `{form_title}`, `{site_name}`
+- **Smart Phone Number Formatting**: 
+  - Automatically adds country code for Razorpay compatibility
+  - Formats numbers in `+{country code}{phone number}` format
+  - Handles various input formats (with/without country code)
+
+#### Bug Fixes
+- **Fixed Deprecated Property Warning**: Declared `$email_handler` property to fix PHP 8.2+ deprecation warning
+- **Payment Method Selection**: Payment method selected on form now properly passed to Razorpay gateway
+- **Phone Number Prefilling**: Customer phone number now correctly prefilled in Razorpay checkout page
+- **Transaction Time Display**: Success page now shows correct transaction completion time
+- **Success Page Enhancement**: Improved success page with more transaction details and better styling
+
+#### Code Quality
+- **WordPress Coding Standards**: Fixed placeholder ordering in translatable strings
+- **Nonce Verification**: Added proper phpcs:ignore comments for email settings save
+- **External Assets**: Moved email notifications JavaScript and CSS to external files (`assets/js/email-notifications.js`, `assets/css/email-notifications.css`)
+
 ---
 

formpays-pro/trunk/README.txt

@@ -6 +6 @@
 Requires PHP: 5.6
 Requires PHP: 7.4
-Stable tag: 1.1.2
+Stable tag: 1.1.3
 Plugin URI: https://version-next.com/formpays-pro/
 Author URI: https://version-next.com/
@@ -27 +27 @@
 * **Transaction Management**: Complete payment tracking and management
 * **Email Notifications**: Automatic notifications for payments and failures
+* **Email Templates**: Customize notification emails for customers and admins
 
 = Payment Gateways =
@@ -141 +142 @@
 11. Analytics Dashboard
 12. Drag and Drop Form Field
+13. Notification Email Template
 
 == External Services ==
@@ -380 +382 @@
 = Available Notifications =
 
-* **Transaction Created**: Sent to customer and admin
-* **Payment Success**: Sent to customer and admin
-* **Payment Failure**: Sent to customer with retry information
+* **Payment Success - Customer**: Confirmation email to customer with transaction details
+* **Payment Success - Admin**: Notification to admin about successful payment
+* **Payment Failed - Customer**: Failure notification with retry information
+* **Payment Failed - Admin**: Alert to admin about failed payment
+
+= Email Template Customization =
+
+1. Go to **FormPays Pro → Email Notifications**
+2. Customize email templates with dynamic placeholders:
+   - `{transaction_id}` - Transaction ID
+   - `{amount}` - Payment amount
+   - `{customer_name}` - Customer name
+   - `{customer_email}` - Customer email
+   - `{payment_date}` - Payment date and time
+   - `{payment_method}` - Selected payment method
+   - `{form_title}` - Form title
+   - `{site_name}` - Your site name
+3. Enable/disable individual email notifications
+4. Test email functionality to verify settings
 
 = Customization =
@@ -449 +467 @@
 
 == Changelog ==
+
+= 1.1.3 =
+* **Features**: Added Email Notifications & Confirmations menu with customizable email templates
+* **Features**: Automatic email notifications for payment success and failure to customers and admins
+* **Features**: Test email functionality to verify email settings
+* **Features**: Smart phone number formatting with country code for Razorpay integration
+* **Bug Fix**: Fixed deprecated dynamic property warning for email_handler
+* **Bug Fix**: Resolved payment method selection not being passed to Razorpay gateway
+* **Bug Fix**: Fixed customer phone number not being prefilled in Razorpay checkout
+* **Bug Fix**: Corrected transaction time display on success page
+* **Enhancement**: Enhanced success page with more detailed transaction information
+* **Code Quality**: Fixed placeholder ordering in translatable strings
+* **Code Quality**: Added WordPress Coding Standards compliance for email notifications
 
 = 1.1.2 =

formpays-pro/trunk/admin/class-formpays-pro-admin.php

@@ -30 +30 @@
         add_action( 'wp_ajax_formpays_pro_bulk_delete_transactions', array( $this, 'ajax_bulk_delete_transactions' ) );
         add_action( 'wp_ajax_formpays_pro_bulk_approve_transactions', array( $this, 'ajax_bulk_approve_transactions' ) );
+        add_action( 'wp_ajax_formpays_pro_send_test_email', array( $this, 'ajax_send_test_email' ) );
     }
     /**
@@ -93 +94 @@
             'formpays-pro-analytics',
             array( $this, 'analytics_page' )
+        );
+        add_submenu_page(
+            'formpays-pro',
+            __( 'Email Notifications', 'formpays-pro' ),
+            __( 'Email Notifications', 'formpays-pro' ),
+            'manage_options',
+            'formpays-pro-email-notifications',
+            array( $this, 'email_notifications_page' )
         );
         add_submenu_page(
@@ -216 +225 @@
                     'export_nonce' => wp_create_nonce( 'formpays_pro_export_transactions' ),
                     'debug'        => defined( 'WP_DEBUG' ) && WP_DEBUG,
+                )
+            );
+        }
+
+        // Enqueue email notifications-specific styles and scripts
+        if ( strpos( $hook, 'formpays-pro-email-notifications' ) !== false ) {
+            wp_enqueue_style(
+                'formpays-pro-email-notifications',
+                FORMPAYS_PRO_PLUGIN_URL . 'assets/css/email-notifications.css',
+                array( 'formpays-pro-admin' ),
+                FORMPAYS_PRO_VERSION
+            );
+
+            wp_enqueue_script(
+                'formpays-pro-email-notifications',
+                FORMPAYS_PRO_PLUGIN_URL . 'assets/js/email-notifications.js',
+                array( 'jquery', 'formpays-pro-admin' ),
+                FORMPAYS_PRO_VERSION,
+                true
+            );
+
+            // Localize email notifications script
+            wp_localize_script(
+                'formpays-pro-email-notifications',
+                'formpays_pro_email_notifications',
+                array(
+                    'ajax_url'           => admin_url( 'admin-ajax.php' ),
+                    'nonce'              => wp_create_nonce( 'formpays_pro_test_email' ),
+                    'please_enter_email' => esc_html__( 'Please enter a test email address.', 'formpays-pro' ),
+                    'sending'            => esc_html__( 'Sending...', 'formpays-pro' ),
+                    'test_email_sent'    => esc_html__( 'Test email sent successfully!', 'formpays-pro' ),
+                    'failed_to_send'     => esc_html__( 'Failed to send test email: ', 'formpays-pro' ),
+                    'unknown_error'      => esc_html__( 'Unknown error', 'formpays-pro' ),
+                    'failed_to_send_error' => esc_html__( 'Failed to send test email. Please try again.', 'formpays-pro' ),
                 )
             );
@@ -1132 +1175 @@
         include FORMPAYS_PRO_PLUGIN_DIR . 'admin/views/analytics.php';
     }
+
+    /**
+     * Email notifications page
+     */
+    public function email_notifications_page() {
+        // Handle form submission for email settings
+        if ( isset( $_POST['formpays_pro_email_nonce'] ) && wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['formpays_pro_email_nonce'] ) ), 'formpays_pro_email_settings' ) ) {
+            $this->handle_email_settings_save();
+        }
+
+        // Get current email settings
+        $email_settings = get_option( 'formpays_pro_email_settings', array() );
+        
+        // Default email templates
+        $default_templates = array(
+            'payment_success_customer' => array(
+                'subject' => __( 'Payment Confirmation - Transaction #{transaction_id}', 'formpays-pro' ),
+                'message' => __( 'Dear {customer_name},
+
+Thank you for your payment! Your transaction has been completed successfully.
+
+Transaction Details:
+- Transaction ID: {transaction_id}
+- Amount: {amount}
+- Payment Date: {payment_date}
+- Payment Method: {payment_method}
+
+If you have any questions, please contact us.
+
+Best regards,
+{site_name}', 'formpays-pro' ),
+                'enabled' => true,
+            ),
+            'payment_success_admin' => array(
+                'subject' => __( 'New Payment Received - Transaction #{transaction_id}', 'formpays-pro' ),
+                'message' => __( 'A new payment has been received:
+
+Transaction Details:
+- Transaction ID: {transaction_id}
+- Amount: {amount}
+- Customer Name: {customer_name}
+- Customer Email: {customer_email}
+- Payment Date: {payment_date}
+- Payment Method: {payment_method}
+- Form: {form_title}
+
+Please check your admin panel for more details.', 'formpays-pro' ),
+                'enabled' => true,
+            ),
+            'payment_failed_customer' => array(
+                'subject' => __( 'Payment Failed - Transaction #{transaction_id}', 'formpays-pro' ),
+                'message' => __( 'Dear {customer_name},
+
+We were unable to process your payment for transaction #{transaction_id}.
+
+Amount: {amount}
+Payment Date: {payment_date}
+
+Please try again or contact us for assistance.
+
+Best regards,
+{site_name}', 'formpays-pro' ),
+                'enabled' => true,
+            ),
+            'payment_failed_admin' => array(
+                'subject' => __( 'Payment Failed - Transaction #{transaction_id}', 'formpays-pro' ),
+                'message' => __( 'A payment has failed:
+
+Transaction Details:
+- Transaction ID: {transaction_id}
+- Amount: {amount}
+- Customer Name: {customer_name}
+- Customer Email: {customer_email}
+- Payment Date: {payment_date}
+- Form: {form_title}
+
+Please check the transaction details in your admin panel.', 'formpays-pro' ),
+                'enabled' => true,
+            ),
+        );
+
+        // Merge with defaults
+        $email_templates = array();
+        foreach ( $default_templates as $key => $default ) {
+            $email_templates[ $key ] = isset( $email_settings[ $key ] ) ? wp_parse_args( $email_settings[ $key ], $default ) : $default;
+        }
+
+        // Get admin email settings
+        $admin_email = isset( $email_settings['admin_email'] ) ? $email_settings['admin_email'] : get_option( 'admin_email' );
+        $from_name = isset( $email_settings['from_name'] ) ? $email_settings['from_name'] : get_bloginfo( 'name' );
+        $from_email = isset( $email_settings['from_email'] ) ? $email_settings['from_email'] : get_option( 'admin_email' );
+
+        // Include the email notifications view
+        include FORMPAYS_PRO_PLUGIN_DIR . 'admin/views/email-notifications.php';
+    }
+
+    /**
+     * Handle email settings save
+     */
+    private function handle_email_settings_save() {
+        if ( ! current_user_can( 'manage_options' ) ) {
+            wp_die( esc_html__( 'You do not have permission to perform this action.', 'formpays-pro' ) );
+        }
+
+        $email_settings = array();
+
+        // Save admin email settings
+        // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce verification handled in email_notifications_page()
+        $email_settings['admin_email'] = sanitize_email( wp_unslash( $_POST['admin_email'] ?? '' ) );
+        // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce verification handled in email_notifications_page()
+        $email_settings['from_name'] = sanitize_text_field( wp_unslash( $_POST['from_name'] ?? '' ) );
+        // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce verification handled in email_notifications_page()
+        $email_settings['from_email'] = sanitize_email( wp_unslash( $_POST['from_email'] ?? '' ) );
+
+        // Save email templates
+        $template_keys = array( 'payment_success_customer', 'payment_success_admin', 'payment_failed_customer', 'payment_failed_admin' );
+        
+        foreach ( $template_keys as $key ) {
+            // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce verification handled in email_notifications_page()
+            $email_settings[ $key ] = array(
+                // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce verification handled in email_notifications_page()
+                'subject' => sanitize_text_field( wp_unslash( $_POST[ $key . '_subject' ] ?? '' ) ),
+                // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce verification handled in email_notifications_page()
+                'message' => wp_kses_post( wp_unslash( $_POST[ $key . '_message' ] ?? '' ) ),
+                // phpcs:ignore WordPress.Security.NonceVerification.Missing -- Nonce verification handled in email_notifications_page()
+                'enabled' => isset( $_POST[ $key . '_enabled' ] ),
+            );
+        }
+
+        // Save settings
+        update_option( 'formpays_pro_email_settings', $email_settings );
+
+        // Add success notice
+        add_action( 'admin_notices', function() {
+            echo '<div class="notice notice-success is-dismissible"><p>' . esc_html__( 'Email settings saved successfully!', 'formpays-pro' ) . '</p></div>';
+        });
+    }
     /**
      * AJAX: Save form
@@ -2353 +2533 @@
         }
     }
+
+    /**
+     * AJAX: Send test email
+     */
+    public function ajax_send_test_email() {
+        // Verify nonce
+        if ( ! wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['nonce'] ?? '' ) ), 'formpays_pro_test_email' ) ) {
+            wp_send_json_error( esc_html__( 'Security check failed.', 'formpays-pro' ) );
+        }
+
+        // Check permissions
+        if ( ! current_user_can( 'manage_options' ) ) {
+            wp_send_json_error( esc_html__( 'You do not have permission to perform this action.', 'formpays-pro' ) );
+        }
+
+        $test_email = isset( $_POST['test_email'] ) ? sanitize_email( wp_unslash( $_POST['test_email'] ) ) : '';
+        if ( empty( $test_email ) ) {
+            wp_send_json_error( esc_html__( 'Please provide a valid email address.', 'formpays-pro' ) );
+        }
+
+        // Get email settings
+        $email_settings = get_option( 'formpays_pro_email_settings', array() );
+        $from_name = isset( $email_settings['from_name'] ) ? $email_settings['from_name'] : get_bloginfo( 'name' );
+        $from_email = isset( $email_settings['from_email'] ) ? $email_settings['from_email'] : get_option( 'admin_email' );
+
+        // Sample data for testing
+        $sample_data = array(
+            'transaction_id' => 'TEST-' . wp_rand( 1000, 9999 ),
+            'amount' => '$50.00',
+            'customer_name' => 'John Doe',
+            'customer_email' => $test_email,
+            'payment_date' => gmdate( 'Y-m-d H:i:s' ),
+            'payment_method' => 'Credit Card',
+            'form_title' => 'Sample Form',
+            'site_name' => get_bloginfo( 'name' ),
+        );
+
+        // Test email subject and message
+        $subject = __( 'FormPays Pro - Test Email', 'formpays-pro' );
+        $message = sprintf(
+            // translators: %1$s is the site name, %2$s is the transaction ID, %3$s is the amount, %4$s is the customer name, %5$s is the payment date, %6$s is the payment method, %7$s is the site name again
+            __( 'This is a test email from %1$s to verify that email notifications are working correctly.
+
+Sample Transaction Data:
+- Transaction ID: %2$s
+- Amount: %3$s
+- Customer Name: %4$s
+- Payment Date: %5$s
+- Payment Method: %6$s
+
+If you received this email, your email settings are configured properly.
+
+Best regards,
+%7$s', 'formpays-pro' ),
+            get_bloginfo( 'name' ),
+            $sample_data['transaction_id'],
+            $sample_data['amount'],
+            $sample_data['customer_name'],
+            $sample_data['payment_date'],
+            $sample_data['payment_method'],
+            get_bloginfo( 'name' )
+        );
+
+        // Set headers
+        $headers = array(
+            'Content-Type: text/html; charset=UTF-8',
+            'From: ' . $from_name . ' <' . $from_email . '>',
+        );
+
+        // Send test email
+        $sent = wp_mail( $test_email, $subject, $message, $headers );
+
+        if ( $sent ) {
+            wp_send_json_success( esc_html__( 'Test email sent successfully!', 'formpays-pro' ) );
+        } else {
+            wp_send_json_error( esc_html__( 'Failed to send test email. Please check your email settings.', 'formpays-pro' ) );
+        }
+    }
 }

formpays-pro/trunk/assets/js/frontend.js

@@ -2477 +2477 @@
                 label: $selectedInput.closest('.payment-method-option-wrapper').find('.payment-method-label').text()
             });
+            
+            // Recalculate amount display (amount should stay the same, just ensure display is correct)
+            FormPaysProFrontend.calculateTotalAmount($form);
         },
         

formpays-pro/trunk/formpays-pro.php

@@ -4 +4 @@
  * Plugin URI: https://version-next.com/formpays-pro/
  * Description: Advanced payment form with multiple payment gateways support and conditional logic
- * Version: 1.1.2
+ * Version: 1.1.3
  * Author: versionnext, codexdemon
  * Author URI: https://version-next.com/
@@ -79 +79 @@
 
     /**
+     * Email handler instance
+     */
+    public $email_handler;
+
+    /**
      * Admin instance
      */
@@ -122 +127 @@
         require_once FORMPAYS_PRO_PLUGIN_DIR . 'includes/class-formpays-pro-transactions.php';
         require_once FORMPAYS_PRO_PLUGIN_DIR . 'includes/class-formpays-pro-analytics.php';
+        require_once FORMPAYS_PRO_PLUGIN_DIR . 'includes/class-formpays-pro-email-handler.php';
 
         if ( is_admin() ) {
@@ -165 +171 @@
         $this->transactions = new FormPays_Pro_Transactions();
         $this->analytics    = new FormPays_Pro_Analytics();
+        $this->email_handler = new FormPays_Pro_Email_Handler();
 
         if ( is_admin() ) {
@@ -359 +366 @@
     private function get_success_page_content() {
         return '
+<style>
+.formpays-pro-success-page {
+    min-height: 60vh;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 40px 20px;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+}
+.formpays-pro-success-page .success-container {
+    max-width: 600px;
+    width: 100%;
+    text-align: center;
+    background: #fff;
+    padding: 40px;
+    border-radius: 8px;
+    box-shadow: 0 4px 6px rgba(0,0,0,0.1);
+}
+.formpays-pro-success-page .success-icon {
+    margin-bottom: 20px;
+}
+.formpays-pro-success-page h1 {
+    color: #2c3e50;
+    margin-bottom: 15px;
+    font-size: 32px;
+}
+.formpays-pro-success-page > .success-container > p:first-of-type {
+    color: #7f8c8d;
+    margin-bottom: 30px;
+    font-size: 16px;
+}
+.formpays-pro-success-page .success-details {
+    background: #f8f9fa;
+    padding: 25px;
+    border-radius: 6px;
+    margin: 30px 0;
+    text-align: left;
+}
+.formpays-pro-success-page .success-details p {
+    margin: 12px 0;
+    color: #34495e;
+    font-size: 15px;
+}
+.formpays-pro-success-page .success-actions {
+    margin-top: 30px;
+    display: flex;
+    gap: 15px;
+    justify-content: center;
+    flex-wrap: wrap;
+}
+.formpays-pro-success-page .btn {
+    padding: 12px 30px;
+    border: none;
+    border-radius: 6px;
+    text-decoration: none;
+    display: inline-block;
+    font-weight: 600;
+    transition: all 0.3s ease;
+    cursor: pointer;
+}
+.formpays-pro-success-page .btn-primary {
+    background: #528FF0;
+    color: white;
+}
+.formpays-pro-success-page .btn-primary:hover {
+    background: #4278d1;
+    color: white;
+}
+.formpays-pro-success-page .btn-secondary {
+    background: #95a5a6;
+    color: white;
+}
+.formpays-pro-success-page .btn-secondary:hover {
+    background: #7f8c8d;
+    color: white;
+}
+</style>
+
 <div class="formpays-pro-success-page">
     <div class="success-container">
@@ -371 +456 @@
         <div class="success-details">
             <p><strong>Transaction ID:</strong> [TRANSACTION_ID]</p>
-            <p><strong>Amount:</strong> [AMOUNT]</p>
-            <p><strong>Date:</strong> [DATE]</p>
+            <p><strong>Amount Paid:</strong> [AMOUNT]</p>
+            <p><strong>Payment Date & Time:</strong> [DATE]</p>
+            <p><strong>Customer Name:</strong> [CUSTOMER_NAME]</p>
+            <p><strong>Customer Email:</strong> [CUSTOMER_EMAIL]</p>
+            <p><strong>Payment Status:</strong> [PAYMENT_STATUS]</p>
         </div>
         <div class="success-actions">
-            <a href="' . home_url() . '" class="btn btn-primary">Return to Home</a>
-            <a href="mailto:' . get_option( 'admin_email' ) . '" class="btn btn-secondary">Contact Support</a>
+            <a href="' . esc_url( home_url() ) . '" class="btn btn-primary">Return to Home</a>
+            <a href="mailto:' . esc_attr( get_option( 'admin_email' ) ) . '" class="btn btn-secondary">Contact Support</a>
         </div>
     </div>
@@ -754 +842 @@
 
             $this->transactions->update_transaction( $transaction_id, $update_data );
+
+            // Send success emails
+            $this->send_payment_emails( $transaction_id, 'success' );
         } else {
             // Payment failed
@@ -764 +855 @@
                 )
             );
+
+            // Send failed emails
+            $this->send_payment_emails( $transaction_id, 'failed' );
         }
 
@@ -793 +887 @@
         }
 
-        // Replace placeholders with actual transaction data
+        // Replace placeholders with actual transaction data.
+        // Use updated_at for payment time (which is when status was updated), fallback to created_at if not available.
+        $payment_timestamp = ! empty( $transaction->updated_at ) ? $transaction->updated_at : $transaction->created_at;
+        
         $replacements = array(
             '[TRANSACTION_ID]' => $transaction->transaction_id,
             '[AMOUNT]'         => $transaction->currency . ' ' . number_format( $transaction->amount, 2 ),
-            '[DATE]'           => date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), strtotime( $transaction->created_at ) ),
+            '[DATE]'           => date_i18n( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), strtotime( $payment_timestamp ) ),
             '[CUSTOMER_NAME]'  => $transaction->customer_name,
             '[CUSTOMER_EMAIL]' => $transaction->customer_email,
@@ -926 +1023 @@
         return ob_get_clean();
     }
+
+    /**
+     * Send payment emails based on status
+     *
+     * @param int    $transaction_id Transaction ID.
+     * @param string $status Payment status ('success' or 'failed').
+     * @return void
+     */
+    private function send_payment_emails( $transaction_id, $status ) {
+        if ( ! isset( $this->email_handler ) ) {
+            return;
+        }
+
+        // Get transaction data
+        $transaction = $this->transactions->get_transaction( $transaction_id );
+        if ( ! $transaction ) {
+            return;
+        }
+
+        // Get form data
+        $form = $this->forms->get_form( $transaction->form_id );
+        if ( ! $form ) {
+            return;
+        }
+
+        // Parse form data
+        $form_data = is_string( $transaction->form_data ) ? json_decode( $transaction->form_data, true ) : $transaction->form_data;
+        if ( ! is_array( $form_data ) ) {
+            $form_data = array();
+        }
+
+        // Send emails based on status
+        if ( 'success' === $status ) {
+            $this->email_handler->send_payment_success_customer( $transaction, $form, $form_data );
+            $this->email_handler->send_payment_success_admin( $transaction, $form, $form_data );
+        } elseif ( 'failed' === $status ) {
+            $this->email_handler->send_payment_failed_customer( $transaction, $form, $form_data );
+            $this->email_handler->send_payment_failed_admin( $transaction, $form, $form_data );
+        }
+    }
 }
 

formpays-pro/trunk/includes/class-formpays-pro-forms.php

@@ -370 +370 @@
             );
             wp_add_inline_script( 'formpays-pro-frontend', $form_init_script );
+            
+            // Initialize payment method and amount display for forms with payment methods
+            if ( ! empty( $form->payment_methods ) && is_array( $form->payment_methods ) && ( ! isset( $form->payment_collection ) || $form->payment_collection !== 'disabled' ) ) {
+                $payment_init_script = sprintf(
+                    'jQuery(document).ready(function($) {
+                        var $form = $("#formpays_pro_form_%s");
+                        // Wait a bit for the form to be fully initialized
+                        setTimeout(function() {
+                            // Set default payment method data if not already set
+                            if (!$form.data("selected-payment-method")) {
+                                var $firstMethod = $form.find("input[name=\'payment_method\']:checked");
+                                if ($firstMethod.length) {
+                                    $form.data("selected-payment-method", $firstMethod.val());
+                                }
+                            }
+                            // Ensure amount is calculated and displayed
+                            if (typeof FormPaysProFrontend.calculateTotalAmount === "function") {
+                                FormPaysProFrontend.calculateTotalAmount($form);
+                            }
+                        }, 100);
+                    });',
+                    esc_js( $form_id )
+                );
+                wp_add_inline_script( 'formpays-pro-frontend', $payment_init_script );
+            }
             ?>
         <?php endif; ?>
@@ -693 +718 @@
     }
 
+    // Capture selected payment method if present.
+    $selected_payment_method = '';
+    if ( isset( $_POST['payment_method'] ) && ! empty( $_POST['payment_method'] ) ) {
+        $selected_payment_method = sanitize_text_field( wp_unslash( $_POST['payment_method'] ) );
+    }
+
     // Validate form data with extracted field data only
     $validation_result = $this->validate_form_data( $form, $form_field_data );
@@ -716 +747 @@
         );
     } else {
-        // Process payment
-        $payment_result = $this->process_payment( $form, $validation_result );
+        // Process payment (pass selected payment method).
+        $payment_result = $this->process_payment( $form, $validation_result, $selected_payment_method );
 
         if ( is_wp_error( $payment_result ) ) {
@@ -1017 +1048 @@
      * Process payment
      */
-private function process_payment( $form, $data ) {
+private function process_payment( $form, $data, $selected_payment_method = '' ) {
     global $formpays_pro;
 
@@ -1055 +1086 @@
     } elseif ( ! empty( $data['customer_phone'] ) ) {
         $customer_mobile = $data['customer_phone'];
+    } elseif ( ! empty( $data['contact'] ) ) {
+        $customer_mobile = $data['contact'];
     } else {
         // No mobile field found - provide a default value
@@ -1061 +1094 @@
     }
 
+    // Format phone number to include country code for Razorpay
+    $customer_mobile = $this->format_phone_number_for_razorpay( $customer_mobile );
+
     // Gateway-specific field validation
     $validation_result = $this->validate_gateway_requirements( $form->gateway, $data );
@@ -1087 +1123 @@
     // Create transaction record
     $transaction_data = array(
-        'form_id'         => $form->id,
-        'transaction_id'  => $transaction_id,
-        'gateway_name'    => $form->gateway,
-        'customer_name'   => $customer_name,
-        'customer_email'  => $customer_email,
-        'customer_mobile' => $customer_mobile,
-        'amount'          => $payment_amount,
-        'currency'        => $form->currency,
-        'payment_status'  => 'pending',
-        'form_data'       => wp_json_encode( $data ),
-        'ip_address'      => $this->get_user_ip_address(),
-        'user_agent'      => isset( $_SERVER['HTTP_USER_AGENT'] ) ? sanitize_textarea_field( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) ) : '',
+        'form_id'              => $form->id,
+        'transaction_id'       => $transaction_id,
+        'gateway_name'         => $form->gateway,
+        'customer_name'        => $customer_name,
+        'customer_email'       => $customer_email,
+        'customer_mobile'      => $customer_mobile,
+        'amount'               => $payment_amount,
+        'currency'             => $form->currency,
+        'payment_status'       => 'pending',
+        'form_data'            => wp_json_encode( $data ),
+        'ip_address'           => $this->get_user_ip_address(),
+        'user_agent'           => isset( $_SERVER['HTTP_USER_AGENT'] ) ? sanitize_textarea_field( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) ) : '',
+        'selected_payment_method' => $selected_payment_method, // Pass selected payment method to gateway.
     );
 
@@ -1652 +1689 @@
      * Get human-readable field label
      */
-private function get_field_label( $field_id ) {
-    $field_labels = array(
-        'customer_name'   => __( 'Customer Name', 'formpays-pro' ),
-        'customer_email'  => __( 'Customer Email', 'formpays-pro' ),
-        'customer_mobile' => __( 'Customer Phone', 'formpays-pro' ),
-        'form_id'         => __( 'Form ID', 'formpays-pro' ),
-    );
-
-    return isset( $field_labels[ $field_id ] ) ? $field_labels[ $field_id ] : ucfirst( str_replace( '_', ' ', $field_id ) );
-}
-}
+    private function get_field_label( $field_id ) {
+        $field_labels = array(
+            'customer_name'   => __( 'Customer Name', 'formpays-pro' ),
+            'customer_email'  => __( 'Customer Email', 'formpays-pro' ),
+            'customer_mobile' => __( 'Customer Phone', 'formpays-pro' ),
+            'form_id'         => __( 'Form ID', 'formpays-pro' ),
+        );
+
+        return isset( $field_labels[ $field_id ] ) ? $field_labels[ $field_id ] : ucfirst( str_replace( '_', ' ', $field_id ) );
+    }
+
+    /**
+     * Format phone number for Razorpay (add country code if missing)
+     *
+     * @param string $phone Phone number.
+     * @return string
+     */
+    private function format_phone_number_for_razorpay( $phone ) {
+        // Remove any whitespace or special characters
+        $phone = preg_replace( '/[^0-9+]/', '', $phone );
+
+        // If phone already has country code (starts with +), return as is
+        if ( strpos( $phone, '+' ) === 0 ) {
+            return $phone;
+        }
+
+        // If phone starts with 00, replace with +
+        if ( strpos( $phone, '00' ) === 0 ) {
+            return '+' . substr( $phone, 2 );
+        }
+
+        // Default: assume Indian number and add +91
+        if ( strlen( $phone ) === 10 ) {
+            return '+91' . $phone;
+        }
+
+        // If 11 digits and starts with 0, assume Indian and add +91
+        if ( strlen( $phone ) === 11 && substr( $phone, 0, 1 ) === '0' ) {
+            return '+91' . substr( $phone, 1 );
+        }
+
+        // For numbers longer than 10 digits without +, assume they might have country code
+        // Add + if not present and the number is already long enough
+        if ( strlen( $phone ) > 10 && strpos( $phone, '+' ) === false ) {
+            return '+' . $phone;
+        }
+
+        // Return with default +91 for Indian numbers
+        return '+91' . $phone;
+    }
+}

formpays-pro/trunk/includes/gateways/class-formpays-pro-razorpay.php

@@ -427 +427 @@
             'description'  => sprintf( 'Payment for %s', $payment_data['customer_name'] ),
             'callback_url' => $callback_url,
+            'customer'     => array(
+                'name'  => $payment_data['customer_name'],
+                'email' => $payment_data['customer_email'],
+                'contact' => ! empty( $payment_data['customer_mobile'] ) ? $payment_data['customer_mobile'] : ( ! empty( $payment_data['customer_phone'] ) ? $payment_data['customer_phone'] : '' ),
+            ),
         );
 
@@ -482 +487 @@
                 $cancel_url
             );
+        }
+
+        // Map internal payment methods to Razorpay methods.
+        $method_mapping = array(
+            'card'        => 'card',
+            'upi'         => 'upi',
+            'netbanking'  => 'netbanking',
+            'wallet'      => 'wallet',
+            'emi'         => 'emi',
+        );
+
+        // Handle selected payment method.
+        $method_options = array();
+        if ( ! empty( $payment_data['selected_payment_method'] ) ) {
+            $selected_method = $payment_data['selected_payment_method'];
+            if ( isset( $method_mapping[ $selected_method ] ) ) {
+                $method_options = array(
+                    'method' => $method_mapping[ $selected_method ],
+                );
+            }
         }
 
@@ -495 +520 @@
                 'name'    => $payment_data['customer_name'],
                 'email'   => $payment_data['customer_email'],
-                'contact' => $payment_data['customer_mobile'] ?? '',
+                'contact' => ! empty( $payment_data['customer_mobile'] ) ? $payment_data['customer_mobile'] : ( ! empty( $payment_data['customer_phone'] ) ? $payment_data['customer_phone'] : '' ),
             ),
             'notes'        => array(
@@ -507 +532 @@
             'cancel_url'   => $cancel_url,
         );
+
+        // Add method filter if payment method is selected.
+        if ( ! empty( $method_options ) ) {
+            $checkout_data['method'] = $method_options['method'];
+        }
 
         // Debug: Log checkout data (only in debug mode and not during activation)