Merge branch 'main' into feat/webhook-setup-configuration

Resolved conflicts in settings-page.php by keeping JavaScript in separate admin.js file
Integrated autofill functionality from main branch into admin.js

Author: KONFeature

admin/class-frak-admin.php

@@ -55,9 +55,27 @@ public function enqueue_scripts($hook) {
 
         wp_enqueue_code_editor(array('type' => 'text/javascript'));
         wp_enqueue_script('frak-admin', plugin_dir_url(dirname(__FILE__)) . 'admin/js/admin.js', array('jquery'), '1.0', true);
+        
+        // Get logo URL for autofill
+        $logo_url = '';
+        $site_icon_id = get_option('site_icon');
+        if ($site_icon_id) {
+            $logo_url = wp_get_attachment_image_url($site_icon_id, 'full');
+        }
+        if (!$logo_url) {
+            $custom_logo_id = get_theme_mod('custom_logo');
+            if ($custom_logo_id) {
+                $logo_url = wp_get_attachment_image_url($custom_logo_id, 'full');
+            }
+        }
+        
         wp_localize_script('frak-admin', 'frak_ajax', array(
             'ajax_url' => admin_url('admin-ajax.php'),
-            'nonce' => wp_create_nonce('frak_ajax_nonce')
+            'nonce' => wp_create_nonce('frak_ajax_nonce'),
+            'site_info' => array(
+                'name' => get_bloginfo('name'),
+                'logo_url' => $logo_url
+            )
         ));
 
         wp_add_inline_style('wp-admin', '
@@ -155,8 +173,12 @@ private function save_settings() {
     }
 
     private function render_settings_page() {
-        $app_name = get_option('frak_app_name', 'Your App Name');
-        $logo_url = get_option('frak_logo_url', '');
+        // Get default values from WordPress site info
+        $default_app_name = get_bloginfo('name');
+        $default_logo_url = $this->get_site_icon_url();
+        
+        $app_name = get_option('frak_app_name', $default_app_name);
+        $logo_url = get_option('frak_logo_url', $default_logo_url);
         $custom_config = get_option('frak_custom_config', '');
         $enable_tracking = get_option('frak_enable_purchase_tracking', 0);
         $enable_button = get_option('frak_enable_floating_button', 0);
@@ -170,6 +192,27 @@ private function render_settings_page() {
         include FRAK_PLUGIN_DIR . 'admin/views/settings-page.php';
     }
 
+    private function get_site_icon_url() {
+        $site_icon_id = get_option('site_icon');
+        if ($site_icon_id) {
+            $site_icon_url = wp_get_attachment_image_url($site_icon_id, 'full');
+            if ($site_icon_url) {
+                return $site_icon_url;
+            }
+        }
+        
+        // Fallback: try to get logo from theme customizer
+        $custom_logo_id = get_theme_mod('custom_logo');
+        if ($custom_logo_id) {
+            $custom_logo_url = wp_get_attachment_image_url($custom_logo_id, 'full');
+            if ($custom_logo_url) {
+                return $custom_logo_url;
+            }
+        }
+        
+        return '';
+    }
+
     private function get_default_config($app_name, $logo_url) {
         return <<<JS
 window.FrakSetup = {

admin/js/admin.js

@@ -44,6 +44,19 @@ jQuery(document).ready(function($) {
         $('#frak_show_reward, #frak_button_classname').prop('disabled', !enabled);
     }
 
+    // Autofill functionality
+    $('#autofill_app_name').on('click', function() {
+        if (frak_ajax.site_info.name) {
+            $('#frak_app_name').val(frak_ajax.site_info.name).trigger('input');
+        }
+    });
+
+    $('#autofill_logo_url').on('click', function() {
+        if (frak_ajax.site_info.logo_url) {
+            $('#frak_logo_url').val(frak_ajax.site_info.logo_url).trigger('input');
+        }
+    });
+    
     // Bind events
     $('#frak_app_name, #frak_logo_url').on('input', updateConfig);
     $('#frak_enable_floating_button').on('change', toggleFloatingButtonSettings);

admin/views/settings-page.php

@@ -15,6 +15,10 @@
                 <td>
                     <input type="text" id="frak_app_name" name="frak_app_name" 
                            value="<?php echo esc_attr($app_name); ?>" class="regular-text">
+                    <button type="button" id="autofill_app_name" class="button button-secondary" style="margin-left: 10px;">
+                        Use Site Name
+                    </button>
+                    <p class="description">Current site name: <strong><?php echo esc_html(get_bloginfo('name')); ?></strong></p>
                 </td>
             </tr>
             <tr>
@@ -24,6 +28,23 @@
                 <td>
                     <input type="url" id="frak_logo_url" name="frak_logo_url" 
                            value="<?php echo esc_url($logo_url); ?>" class="regular-text">
+                    <button type="button" id="autofill_logo_url" class="button button-secondary" style="margin-left: 10px;">
+                        Use Site Icon
+                    </button>
+                    <?php
+                    $site_icon_id = get_option('site_icon');
+                    $custom_logo_id = get_theme_mod('custom_logo');
+                    if ($site_icon_id || $custom_logo_id): ?>
+                        <p class="description">
+                            <?php if ($site_icon_id): ?>
+                                Site icon available
+                            <?php elseif ($custom_logo_id): ?>
+                                Custom logo available
+                            <?php endif; ?>
+                        </p>
+                    <?php else: ?>
+                        <p class="description">No site icon or custom logo found. <a href="<?php echo admin_url('customize.php'); ?>" target="_blank">Set one in Customizer</a></p>
+                    <?php endif; ?>
                 </td>
             </tr>
             <tr>
@@ -243,4 +264,3 @@ class="regular-text"
         <?php submit_button('Save Settings'); ?>
     </form>
 </div>
-