change settings prefix

Kalpa-Services · Aug 20, 2024 · d794070 · d794070
1 parent 6e892e5
commit d794070
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 31 deletions.
diff --git a/admin/js/admin-script.js b/admin/js/admin-script.js
@@ -6,6 +6,9 @@ jQuery(document).ready(function($) {
         originalValues[this.id] = $(this).val();
     });
 
+    // Ensure mmgcp_mode is set correctly
+    originalValues['mmgcp_mode'] = $('#mmgcp_mode').val();
+
     $('.toggle-secret-key').click(function() {
         var targetId = $(this).data('target');
         var secretKeyInput = $('#' + targetId);
@@ -19,14 +22,14 @@ jQuery(document).ready(function($) {
     });
 
     function toggleLiveModeIndicator() {
-        if ($('#mmg_mode').val() === 'live') {
+        if ($('#mmgcp_mode').val() === 'live') {
             $('#live-mode-indicator').show();
         } else {
             $('#live-mode-indicator').hide();
         }
     }
 
-    $('#mmg_mode').on('change', toggleLiveModeIndicator);
+    $('#mmgcp_mode').on('change', toggleLiveModeIndicator);
     toggleLiveModeIndicator(); // Initial state
 
     $('form#mmg-checkout-settings-form').submit(function(e) {
@@ -40,8 +43,8 @@ jQuery(document).ready(function($) {
         if (changedFields.length > 0) {
             var confirmMessage = '';
             if (changedFields.includes('Mode')) {
-                var oldMode = originalValues['mmg_mode'];
-                var newMode = $('#mmg_mode').val();
+                var oldMode = originalValues['mmgcp_mode'];
+                var newMode = $('#mmgcp_mode').val();
                 confirmMessage = 'You have switched from ' + oldMode + ' to ' + newMode + '.\n\nAre you sure you want to save this change?';
             } else {
                 confirmMessage += 'You have changed the following fields:\n' + changedFields.join('\n') + '\nAre you sure you want to save these changes?';
@@ -62,8 +65,8 @@ function copyToClipboard(text) {
     document.body.removeChild(tempInput);
 
     var successMessage = document.getElementById('copy-success');
-		successMessage.style.display = 'inline';
-		setTimeout(function() {
-			successMessage.style.display = 'none';
-		}, 2000);
-	}   
+    successMessage.style.display = 'inline';
+    setTimeout(function() {
+        successMessage.style.display = 'none';
+    }, 2000);
+}
diff --git a/includes/class-mmgcp-checkout-payment.php b/includes/class-mmgcp-checkout-payment.php
@@ -75,7 +75,7 @@ class MMGCP_Checkout_Payment {
 	 */
 	public function __construct() {
 		// Initialize plugin.
-		$this->mode = get_option( 'mmg_mode', 'demo' ); // Default mode set to 'demo'.
+		$this->mode = get_option( 'mmgcp_mode', 'demo' ); // Default mode set to 'demo'.
 
 		// Generate or retrieve unique callback URL.
 		$this->callback_url = $this->mmgcp_generate_unique_callback_url();
@@ -172,13 +172,13 @@ public function mmgcp_generate_checkout_url() {
 
 			$timestamp  = round( microtime( true ) * 1000 ); // Use milliseconds.
 			$token_data = array(
-				'secretKey'             => get_option( "mmg_{$this->mode}_secret_key" ),
+				'secretKey'             => get_option( "mmgcp_{$this->mode}_secret_key" ),
 				'amount'                => $amount,
-				'merchantId'            => get_option( "mmg_{$this->mode}_merchant_id" ),
+				'merchantId'            => get_option( "mmgcp_{$this->mode}_merchant_id" ),
 				'merchantTransactionId' => $order->get_id() . '-' . $attempt_number,
 				'productDescription'    => $description,
 				'requestInitiationTime' => (string) $timestamp,
-				'merchantName'          => get_option( 'mmg_merchant_name', get_bloginfo( 'name' ) ),
+				'merchantName'          => get_option( 'mmgcp_merchant_name', get_bloginfo( 'name' ) ),
 			);
 
 			$encrypted    = $this->mmgcp_encrypt( $token_data );

diff --git a/includes/class-mmgcp-checkout-settings.php b/includes/class-mmgcp-checkout-settings.php
@@ -36,26 +36,26 @@ public function mmgcp_add_admin_menu() {
 	 * Register settings.
 	 */
 	public function mmgcp_register_settings() {
-		register_setting( 'mmgcp_checkout_settings', 'mmg_mode', array( 'sanitize_callback' => array( $this, 'mmgcp_sanitize_mode' ) ) );
+		register_setting( 'mmgcp_checkout_settings', 'mmgcp_mode', array( 'sanitize_callback' => array( $this, 'mmgcp_sanitize_mode' ) ) );
 
 		// Live credentials.
-		register_setting( 'mmgcp_checkout_settings', 'mmg_live_client_id', array( 'sanitize_callback' => 'sanitize_text_field' ) );
-		register_setting( 'mmgcp_checkout_settings', 'mmg_live_merchant_id', array( 'sanitize_callback' => 'sanitize_text_field' ) );
-		register_setting( 'mmgcp_checkout_settings', 'mmg_live_secret_key', array( 'sanitize_callback' => 'sanitize_text_field' ) );
-		register_setting( 'mmgcp_checkout_settings', 'mmg_live_rsa_public_key', array( 'sanitize_callback' => array( $this, 'mmgcp_sanitize_multiline_field' ) ) );
-		register_setting( 'mmgcp_checkout_settings', 'mmg_live_rsa_private_key', array( 'sanitize_callback' => array( $this, 'mmgcp_sanitize_multiline_field' ) ) );
-		register_setting( 'mmgcp_checkout_settings', 'mmg_live_checkout_url', array( 'sanitize_callback' => 'esc_url' ) );
+		register_setting( 'mmgcp_checkout_settings', 'mmgcp_live_client_id', array( 'sanitize_callback' => 'sanitize_text_field' ) );
+		register_setting( 'mmgcp_checkout_settings', 'mmgcp_live_merchant_id', array( 'sanitize_callback' => 'sanitize_text_field' ) );
+		register_setting( 'mmgcp_checkout_settings', 'mmgcp_live_secret_key', array( 'sanitize_callback' => 'sanitize_text_field' ) );
+		register_setting( 'mmgcp_checkout_settings', 'mmgcp_live_rsa_public_key', array( 'sanitize_callback' => array( $this, 'mmgcp_sanitize_multiline_field' ) ) );
+		register_setting( 'mmgcp_checkout_settings', 'mmgcp_live_rsa_private_key', array( 'sanitize_callback' => array( $this, 'mmgcp_sanitize_multiline_field' ) ) );
+		register_setting( 'mmgcp_checkout_settings', 'mmgcp_live_checkout_url', array( 'sanitize_callback' => 'esc_url' ) );
 
 		// Demo credentials.
-		register_setting( 'mmgcp_checkout_settings', 'mmg_demo_client_id', array( 'sanitize_callback' => 'sanitize_text_field' ) );
-		register_setting( 'mmgcp_checkout_settings', 'mmg_demo_merchant_id', array( 'sanitize_callback' => 'sanitize_text_field' ) );
-		register_setting( 'mmgcp_checkout_settings', 'mmg_demo_secret_key', array( 'sanitize_callback' => 'sanitize_text_field' ) );
+		register_setting( 'mmgcp_checkout_settings', 'mmgcp_demo_client_id', array( 'sanitize_callback' => 'sanitize_text_field' ) );
+		register_setting( 'mmgcp_checkout_settings', 'mmgcp_demo_merchant_id', array( 'sanitize_callback' => 'sanitize_text_field' ) );
+		register_setting( 'mmgcp_checkout_settings', 'mmgcp_demo_secret_key', array( 'sanitize_callback' => 'sanitize_text_field' ) );
 		register_setting( 'mmgcp_checkout_settings', 'mmg_demo_rsa_public_key', array( 'sanitize_callback' => array( $this, 'mmgcp_sanitize_multiline_field' ) ) );
-		register_setting( 'mmgcp_checkout_settings', 'mmg_demo_rsa_private_key', array( 'sanitize_callback' => array( $this, 'mmgcp_sanitize_multiline_field' ) ) );
-		register_setting( 'mmgcp_checkout_settings', 'mmg_demo_checkout_url', array( 'sanitize_callback' => 'esc_url' ) );
+		register_setting( 'mmgcp_checkout_settings', 'mmgcp_demo_rsa_private_key', array( 'sanitize_callback' => array( $this, 'mmgcp_sanitize_multiline_field' ) ) );
+		register_setting( 'mmgcp_checkout_settings', 'mmgcp_demo_checkout_url', array( 'sanitize_callback' => 'esc_url' ) );
 
 		// Common settings.
-		register_setting( 'mmgcp_checkout_settings', 'mmg_merchant_name', array( 'sanitize_callback' => 'sanitize_text_field' ) );
+		register_setting( 'mmgcp_checkout_settings', 'mmgcp_merchant_name', array( 'sanitize_callback' => 'sanitize_text_field' ) );
 	}
 
 	/**
@@ -80,9 +80,9 @@ public function mmgcp_settings_page() {
 					<tr valign="top">
 						<th scope="row">Mode</th>
 						<td>
-							<select name="mmg_mode" id="mmg_mode">
-								<option value="live" <?php selected( get_option( 'mmg_mode' ), 'live' ); ?>>Live</option>
-								<option value="demo" <?php selected( get_option( 'mmg_mode' ), 'demo' ); ?>>Sandbox</option>
+							<select name="mmgcp_mode" id="mmgcp_mode">
+								<option value="live" <?php selected( get_option( 'mmgcp_mode' ), 'live' ); ?>>Live</option>
+								<option value="demo" <?php selected( get_option( 'mmgcp_mode' ), 'demo' ); ?>>Sandbox</option>
 							</select>
 							<span id="live-mode-indicator" style="display: none; margin-left: 10px;">
 								<span class="blinking-dot"></span> Live Mode
@@ -189,8 +189,8 @@ public function mmgcp_enqueue_admin_scripts() {
 	 * @return string
 	 */
 	private function mmgcp_get_checkout_url() {
-		$mode = get_option( 'mmg_mode', 'demo' );
-		return get_option( "mmg_{$mode}_checkout_url", 'live' === $mode ? 'https://gtt-checkout.qpass.com:8743/checkout-endpoint/home' : 'https://gtt-uat-checkout.qpass.com:8743/checkout-endpoint/home' );
+		$mode = get_option( 'mmgcp_mode', 'demo' );
+		return get_option( "mmgcp_{$mode}_checkout_url", 'live' === $mode ? 'https://gtt-checkout.qpass.com:8743/checkout-endpoint/home' : 'https://gtt-uat-checkout.qpass.com:8743/checkout-endpoint/home' );
 	}
 
 	/**