Changeset 3033873

Timestamp:

02/10/2024 02:10:48 AM (13 months ago)

Author:

sunnysonic

Message:

• tested wordpress 6.4.3
• accounting regions can now be edited by the admin through the menu
• a tag system has been implemented
• tags can be created through the stand-alone menu called "Tags" and applied to every client profile
• client list can be filtered by tags now
• open tasks dashboard widget now shows in two columns and can be filtered by due, started and all open tasks

Location:

wp-easy-crm

Files:

• tags/1.0.19 (added)
• tags/1.0.19/assets (added)
• tags/1.0.19/assets/banner-1544x500.jpg (added)
• tags/1.0.19/assets/banner-772x250.jpg (added)
• tags/1.0.19/assets/icon-128x128.png (added)
• tags/1.0.19/assets/icon-256x256.png (added)
• tags/1.0.19/assets/screenshot-1.jpg (added)
• tags/1.0.19/assets/screenshot-2.jpg (added)
• tags/1.0.19/assets/screenshot-3.jpg (added)
• tags/1.0.19/assets/screenshot-4.jpg (added)
• tags/1.0.19/assets/screenshot-5.jpg (added)
• tags/1.0.19/assets/screenshot-6.jpg (added)
• tags/1.0.19/easy-crm.php (added)
• tags/1.0.19/languages (added)
• tags/1.0.19/languages/wp-easy-crm-es_CR.mo (added)
• tags/1.0.19/languages/wp-easy-crm-es_CR.po (added)
• tags/1.0.19/languages/wp-easy-crm-es_ES.mo (added)
• tags/1.0.19/languages/wp-easy-crm-es_ES.po (added)
• tags/1.0.19/languages/wp-easy-crm.pot (added)
• tags/1.0.19/readme.txt (added)
• tags/1.0.19/scripts (added)
• tags/1.0.19/scripts/dataTables.responsive.min.js (added)
• tags/1.0.19/scripts/datatables.min.css (added)
• tags/1.0.19/scripts/datatables.min.js (added)
• tags/1.0.19/scripts/html2pdf.bundle.min.js (added)
• tags/1.0.19/views (added)
• tags/1.0.19/views/accountingregions.php (added)
• tags/1.0.19/views/addClient.php (added)
• tags/1.0.19/views/addClientLog.php (added)
• tags/1.0.19/views/addQuote.php (added)
• tags/1.0.19/views/addTask.php (added)
• tags/1.0.19/views/clientProfile.php (added)
• tags/1.0.19/views/forms.php (added)
• tags/1.0.19/views/listClients.php (added)
• tags/1.0.19/views/quotationsInvoices.php (added)
• tags/1.0.19/views/quoteView.php (added)
• tags/1.0.19/views/settings.php (added)
• tags/1.0.19/views/tagsView.php (added)
• tags/1.0.19/views/tasks.php (added)
• trunk/easy-crm.php (modified) (11 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/views/accountingregions.php (added)
• trunk/views/addClient.php (modified) (6 diffs)
• trunk/views/addTask.php (modified) (4 diffs)
• trunk/views/clientProfile.php (modified) (2 diffs)
• trunk/views/listClients.php (modified) (8 diffs)
• trunk/views/tagsView.php (added)

wp-easy-crm/trunk/easy-crm.php

@@ -4 +4 @@
  * Plugin Name:       Easy CRM
  * Description:       Collect new leads, manage clients, quotations, invoices, tasks and more for your entire team
- * Version:           1.0.18
+ * Version:           1.0.19
  * Author:            IT-iCO SRL
  * Author URI:        https://it-ico.com
@@ -47 +47 @@
             nombrecontacto varchar(500) NOT NULL,
             nota varchar(2000),
+            tagsrelations varchar(2000),
             clientsource varchar(150),
             telefono varchar(500),
@@ -189 +190 @@
 
 
+    $tagTable = $wpdb->prefix . 'easytags';
+
+    // Create tags Table if not exist
+
+    $sqltags = "CREATE TABLE $tagTable (
+        id int(11) NOT NULL AUTO_INCREMENT,
+        tagtitle varchar(200) NOT NULL,
+        tagcolor varchar(200),
+        created_at datetime NOT NULL,
+        PRIMARY KEY tag_id (id)
+    ) $charset_collate;";
+
+    add_option( "clients_db_version", "1.0" );
+
+    // Include Upgrade Script
+    require_once( ABSPATH . '/wp-admin/includes/upgrade.php' );
+
+    // Create Table
+    dbDelta( $sqltags );
+
+
+
 
     $logclientTable = $wpdb->prefix . 'logclient';
@@ -215 +238 @@
         dbDelta( $sqllog );
 
-
-
-
-
 }
 function eacr_uninstall() {
@@ -232 +251 @@
     $logclientTable = $wpdb->prefix . 'logclient';
     $accountingregionTable = $wpdb->prefix . 'eacraccountingregion';
+    $tagTable = $wpdb->prefix . 'easytags';
+
 
     $wpdb->query( "DROP TABLE IF EXISTS $quoteLineclientTable" );
@@ -249 +270 @@
 
     $wpdb->query( "DROP TABLE IF EXISTS $accountingregionTable" );
+    delete_option("clients_db_version");
+
+    $wpdb->query( "DROP TABLE IF EXISTS $tagTable" );
     delete_option("clients_db_version");
 
@@ -478 +502 @@
     $taskTable = $wpdb->prefix . 'task';
     $clientTable = $wpdb->prefix . 'clients';
+    
+    // Add buttons to filter tasks
+    echo '
+    <div style="margin-bottom: 10px;">
+        <button onclick="filterTasks(\'started\')">Show Started Tasks</button>
+        <button onclick="filterTasks(\'due\')">Show Due Tasks</button>
+        <button onclick="filterTasks(\'all\')">Show All Open Tasks</button>
+    </div>
+    ';
+
+    // JavaScript function to filter tasks
+    echo '
+    <script>
+    function filterTasks(type) {
+        // Get all task cards
+        var tasks = document.getElementsByClassName("task-card");
+
+        // Loop through all task cards
+        for (var i = 0; i < tasks.length; i++) {
+            var task = tasks[i];
+            var start = task.dataset.start;
+            var end = task.dataset.end;
+
+            // Show or hide task cards based on filter type
+            if (type === "started" && new Date(start) > new Date()) {
+                task.style.display = "none";
+            } else if (type === "due" && new Date(end) > new Date()) {
+                task.style.display = "none";
+            } else if (type === "all") {
+                task.style.display = "block";
+            } else {
+                task.style.display = "block";
+            }
+        }
+    }
+    </script>
+    ';
+
+    // Fetch tasks based on filter (not implemented yet)
     $allmyopentasks = $wpdb->get_results(
         $wpdb->prepare(
-            "SELECT * from $taskTable WHERE useridfk = %d AND completed = 0 ORDER BY created_at DESC",$myuserid
-        ),ARRAY_A
+            "SELECT * FROM $taskTable WHERE useridfk = %d AND completed = 0 ORDER BY created_at DESC", $myuserid
+        ), ARRAY_A
     );
-       
+    
+    // Add CSS for two-column layout and task card width adjustment
+    echo "
+    <style>
+        /* CSS for two-column layout */
+        .task-container {
+            display: grid;
+            grid-template-columns: repeat(2, 1fr); /* Two columns with equal width */
+            gap: 10px; /* Smaller gap between tasks */
+        }
+
+        .task-card {
+            box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2);
+            transition: 0.3s;
+            border-radius: 5px;
+            background-color: #e0e4cc;
+            /* Limit task card width to fit within the widget space */
+            /*max-width: calc(50% - 10px);  Adjust according to your widget space and gap */
+            padding: 20px; /* Moved padding from .task-card to .task-container */
+            margin-bottom: 10px; /* Added margin to create space between tasks */
+        }
+
+        .task-title {
+            font-size: 16px;
+            margin-bottom: 10px; /* Added margin to create space between title and button */
+        }
+
+        .task-buttons {
+            display: flex;
+            align-items: center;
+        }
+
+        .task-buttons a {
+            margin-left: 10px; /* Added margin between buttons */
+        }
+    </style>
+    ";
+
     if(count($allmyopentasks) > 0){
+        // Wrap tasks in a container with two columns
+        echo '<div class="task-container">';
+        
         // Reverse the order of tasks
         $reversedTasks = array_reverse($allmyopentasks);
         foreach($reversedTasks as $singletask){
             // Start of card container with shadow, padding, and margin for card-like appearance
-            echo '<div style="box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); transition: 0.3s; border-radius: 5px; margin: 5px; margin-bottom:15px; padding: 20px; background-color: #e0e4cc;">';
+            echo '<div class="task-card" data-start="' . $singletask['start_at'] . '" data-end="' . $singletask['end_at'] . '">';
     
                 // Title and button container
-                echo '<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px;">';
-                    // Task title
-                    echo '<div style="flex-grow: 1; font-size: 16px;"><b> # '.esc_html($singletask['tasktitle']).'</b></div>';
-    
+                echo '<div class="task-title"><b> # '.esc_html($singletask['tasktitle']).'</b></div>';
+                echo '<div class="task-buttons">';
                     // Buttons and client name
                     $clientid = sanitize_text_field($singletask['clientidfk']);
@@ -502 +603 @@
                         $clientdetails = $wpdb->get_row($wpdb->prepare("SELECT * FROM $clientTable WHERE id = %d", $clientid));
                         $clientname = $clientdetails->clientname;
-                        echo '<div><a class="button button-secondary" href="admin.php?page=wp-easy-crm-perfil&id='.$clientid.'">'.$clientname.'</a><span> </span></div>';
+                        echo '<a class="button button-secondary" href="admin.php?page=wp-easy-crm-perfil&id='.$clientid.'">'.$clientname.'</a>';
                     } else {
-                        echo '<div><a class="button button-secondary" href="admin.php?page=wp-easy-crm-tasks">'.__('Tasks', 'wp-easy-crm').'</a><span> </span></div>';
+                        echo '<a class="button button-secondary" href="admin.php?page=wp-easy-crm-tasks">'.__('Tasks', 'wp-easy-crm').'</a>';
                     }
-                echo '</div>'; // End of title and button container
+                echo '</div>'; // End of button container
 
                 // Date information included within the main card container
@@ -516 +617 @@
                 echo '<div style="padding: 10px; background-color: #F2F2F2; border-radius: 5px; margin-top: 10px;">'; // Added margin-top for spacing
                 if ($startDateTime <= $currentDateTime) {
-                    echo '<span style="color: rgba(255, 0, 0, 0.5);font-weight: bold; font-size: 13px;">Start: ' . htmlspecialchars($startDateTime->format('Y-m-d')) . '</span>';
+                    echo '<span style="color: rgba(255, 0, 0, 0.5);font-weight: bold; font-size: 11px;">Start: ' . htmlspecialchars($startDateTime->format('Y-m-d')) . '</span>';
                 } else {
-                    echo '<span style="color: grey;font-size: 13px;">Start: ' . htmlspecialchars($startDateTime->format('Y-m-d')) . '</span>';
+                    echo '<span style="color: grey;font-size: 11px;">Start: ' . htmlspecialchars($startDateTime->format('Y-m-d')) . '</span>';
                 }
     
                 if ($endDateTime <= $currentDateTime) {
-                    echo '<span style="color: rgba(255, 0, 0, 0.5);font-weight: bold;margin-left: 1em;font-size: 13px;">Due: ' . htmlspecialchars($endDateTime->format('Y-m-d')) . '</span>';
+                    echo '<span style="color: rgba(255, 0, 0, 0.5);font-weight: bold;margin-left: 1em;font-size: 11px;">Due: ' . htmlspecialchars($endDateTime->format('Y-m-d')) . '</span>';
                 } else {
-                    echo '<span style="color: grey;margin-left: 1em;font-size: 13px;">Due: ' . htmlspecialchars($endDateTime->format('Y-m-d')) . '</span>';
+                    echo '<span style="color: grey;margin-left: 1em;font-size: 11px;">Due: ' . htmlspecialchars($endDateTime->format('Y-m-d')) . '</span>';
                 }
                 echo '</div>'; // End of date information container
-    
+
                 // Task description
                 echo '<div>'.wp_kses_post($singletask['taskdescription']).'</div>';
     
-                
-    
             echo '</div>'; // End of the main card container
             //echo '<hr/>'; // Separator (consider styling or removing for spacing)
         }
-    }
-    
-    
-    
-       
-
-    // echo '<div class="eacr-dashboard-widget">Hello, world!</div>';
-}
+        
+        echo '</div>'; // End of task container
+    }
+}
+
+
   
   function eacr_register_dashboard_widget() {
@@ -611 +708 @@
     add_submenu_page("wp-easy-crm","Tasks",__('Tasks', 'wp-easy-crm'),"edit_others_posts","wp-easy-crm-tasks","eacr_tasks_call");
     add_submenu_page("wp-easy-crm","Quotes / Invoices",__('Quotes / Invoices', 'wp-easy-crm'),"edit_others_posts","wp-easy-crm-quotes","eacr_quotes_call");
+    add_submenu_page("wp-easy-crm","Tags",__('Tags', 'wp-easy-crm'),"edit_others_posts","wp-easy-crm-tags","eacr_tags_call");
     add_submenu_page("wp-easy-crm","Forms",__('Forms', 'wp-easy-crm'),"edit_others_posts","wp-easy-crm-forms","eacr_forms_call");
     add_submenu_page("wp-easy-crm","Settings",__('Settings', 'wp-easy-crm'),"manage_options","wp-easy-crm-settings","eacr_settings_call");
+    add_submenu_page("wp-easy-crm","Accounting Regions",__('Accounting Regions', 'wp-easy-crm'),"manage_options","wp-easy-crm-accregions","eacr_accregions_call");
+
 
 
@@ -626 +726 @@
 }
 
+function eacr_accregions_call(){
+
+    include_once EASYCRM_PLUGIN_DIR_PATH.'/views/accountingregions.php';
+}
+
+function eacr_tags_call(){
+
+    include_once EASYCRM_PLUGIN_DIR_PATH.'/views/tagsView.php';
+}
 
 function eacr_client_quoteview_call(){

wp-easy-crm/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 5.9
 Tested up to: 6.4.3
-Stable tag: 1.0.18
+Stable tag: 1.0.19
 Contributors: sunnysonic
 License: GPLv2 or later
@@ -60 +60 @@
 
 == Changelog ==
+
+= 1.0.19 =
+* tested wordpress 6.4.3
+* accounting regions can now be edited by the admin through the menu
+* a tag system has been implemented 
+* tags can be created through the stand-alone menu called "Tags" and applied to every client profile
+* client list can be filtered by tags now
+* open tasks dashboard widget now shows in two columns and can be filtered by due, started and all open tasks
 
 = 1.0.18 =

wp-easy-crm/trunk/views/addClient.php

@@ -10 +10 @@
 $id = sanitize_text_field(isset($_GET['id']) ? intval($_GET['id']) : "");
 
-
-
-
 if(isset($_POST['btnsubmit'])){
     
@@ -19 +16 @@
 
     if(!empty($action)){
-        //update client
-        $wpdb->update($clientTable,array(
-            "clientname" => sanitize_text_field(wp_unslash($_POST['clientname'])),
-            "clientstatus" => sanitize_text_field(wp_unslash($_POST['clientstatus'])),
-            "email" => sanitize_text_field(wp_unslash($_POST['email'])),
-            "nombrecontacto" => sanitize_text_field(wp_unslash($_POST['nombrecontacto'])),
-            "nota" => sanitize_text_field(wp_unslash($_POST['nota'])),
-            "telefono" => sanitize_text_field(wp_unslash($_POST['telefono'])),
-            "clientsource" => sanitize_text_field(wp_unslash($_POST['clientsource'])),
-            "provincia" => sanitize_text_field(wp_unslash($_POST['provincia'])),
-            "direccion" => sanitize_text_field(wp_unslash($_POST['direccion'])),
-            "lastupdate_at" => sanitize_text_field(wp_unslash($_POST['lastupdate_at'])),
-            "idaccountingregionfk" => sanitize_text_field(wp_unslash($_POST['idaccountingregionfk'])),
-            "created_at" => sanitize_text_field(wp_unslash($_POST['created_at']))
-        ), array(
-           "id" => $id
-        ));
-        $msg = "<div class='updated update'>" . __( 'Client successfully updated. You will be redirected to the client profile in 2 seconds automatically.', 'wp-easy-crm' ) . "</div>";
-
-        // Construct the redirect URL dynamically to client profile
-        $redirect_url = admin_url('admin.php?page=wp-easy-crm-perfil&id=' . $id);
-
-        // JavaScript for delay and redirection
-        echo "<script>
-            setTimeout(function() {
-                window.location.href = '" . $redirect_url . "';
-            }, 2000);
-        </script>";
-
+        // Update client
+
+        // Fetch existing emails associated with the client being updated
+        $existing_emails_for_client = $wpdb->get_var(
+            $wpdb->prepare(
+                "SELECT email FROM $clientTable WHERE id = %d", $id
+            )
+        );
+
+        // Split existing emails into an array
+        $existing_emails_for_client = explode(',', $existing_emails_for_client);
+
+        // Initialize an array to store new emails for the client
+        $new_emails = array();
+
+        // Retrieve entered emails and split them by comma
+        $entered_emails = isset($_POST['email']) ? sanitize_text_field($_POST['email']) : '';
+        $emails_array = explode(',', $entered_emails);
+        $existing_emails = array();
+
+        // Check each email against the database, excluding the current client being updated
+        foreach ($emails_array as $email) {
+            // Trim the email
+            $trimmed_email = trim($email);
+            
+            // Check if the trimmed email is not empty
+            if (!empty($trimmed_email)) {
+                // If the email is not associated with the client being updated
+                if (!in_array($trimmed_email, $existing_emails_for_client)) {
+                    // Add it to the new emails array for further processing
+                    $new_emails[] = $trimmed_email;
+                }
+            }
+        }
+
+        // Initialize an array to store existing emails for other clients
+        $existing_emails = array();
+
+        // Check each new email against the database for duplication
+        foreach ($new_emails as $new_email) {
+            // Split the new email into an array in case it contains multiple emails
+            $new_email_array = explode(',', $new_email);
+
+            // Check each individual email
+            foreach ($new_email_array as $individual_email) {
+                // If the email already exists for another client
+                $existing_client = $wpdb->get_row(
+                    $wpdb->prepare(
+                        "SELECT * FROM $clientTable WHERE email LIKE %s AND id != %d", '%' . trim($individual_email) . '%', $id
+                    ), ARRAY_A
+                );
+                
+                // If an existing client is found, add the email to the existing emails array
+                if ($existing_client) {
+                    $existing_emails[] = trim($individual_email);
+                }
+            }
+        }
+        
+        // If there are existing emails, display an alert
+        if (!empty($existing_emails)) {
+            $msg = "<div style='color:red'>".esc_html(__( 'Error - the following email(s) already exist in the database for other clients: ', 'wp-easy-crm' ));
+            foreach ($existing_emails as $existing_email) {
+                $msg .= $existing_email . ', ';
+            }
+            $msg = rtrim($msg, ', '); // Remove trailing comma
+            $msg .= ". Please search for those emails in the client-list and add your data to the existing client files.</div>";
+        } else {
+            // Continue updating the client
+            $wpdb->update($clientTable,array(
+                "clientname" => sanitize_text_field(wp_unslash($_POST['clientname'])),
+                "clientstatus" => sanitize_text_field(wp_unslash($_POST['clientstatus'])),
+                "email" => sanitize_text_field(wp_unslash($_POST['email'])),
+                "nombrecontacto" => sanitize_text_field(wp_unslash($_POST['nombrecontacto'])),
+                "nota" => sanitize_text_field(wp_unslash($_POST['nota'])),
+                "telefono" => sanitize_text_field(wp_unslash($_POST['telefono'])),
+                "clientsource" => sanitize_text_field(wp_unslash($_POST['clientsource'])),
+                "provincia" => sanitize_text_field(wp_unslash($_POST['provincia'])),
+                "direccion" => sanitize_text_field(wp_unslash($_POST['direccion'])),
+                "lastupdate_at" => sanitize_text_field(wp_unslash($_POST['lastupdate_at'])),
+                "idaccountingregionfk" => sanitize_text_field(wp_unslash($_POST['idaccountingregionfk'])),
+                "created_at" => sanitize_text_field(wp_unslash($_POST['created_at']))
+            ), array(
+               "id" => $id
+            ));
+            $msg = "<div class='updated update'>" . __( 'Client successfully updated. You will be redirected to the client profile in 2 seconds automatically.', 'wp-easy-crm' ) . "</div>";
+    
+            // Construct the redirect URL dynamically to client profile
+            $redirect_url = admin_url('admin.php?page=wp-easy-crm-perfil&id=' . $id);
+    
+            // JavaScript for delay and redirection
+            echo "<script>
+                setTimeout(function() {
+                    window.location.href = '" . $redirect_url . "';
+                }, 2000);
+            </script>";
+        }
+
+    } else {
+        // Add new client
+
+        // Retrieve entered emails and split them by comma
+        $entered_emails = isset($_POST['email']) ? sanitize_text_field($_POST['email']) : '';
+        $emails_array = explode(',', $entered_emails);
+        $existing_emails = array();
+
+        // Check each email against the database
+        foreach ($emails_array as $email) {
+            $existing_client = $wpdb->get_row(
+                $wpdb->prepare(
+                    "SELECT * FROM $clientTable WHERE email = %s", trim($email)
+                ), ARRAY_A
+            );
+            if ($existing_client) {
+                $existing_emails[] = $email;
+            }
+        }
+
+        // If there are existing emails, display an alert
+        if (!empty($existing_emails)) {
+            $msg = "<div style='color:red'>".esc_html(__( 'Error - the following email(s) already exist in the database: ', 'wp-easy-crm' ));
+            foreach ($existing_emails as $existing_email) {
+                $msg .= $existing_email . ', ';
+            }
+            $msg = rtrim($msg, ', '); // Remove trailing comma
+            $msg .= ". Please search for that email in the client-list and add your data to the existing client file.</div>";
+        } else {
+            // Continue adding the new client
+            $wpdb->insert($clientTable,array(
+                "clientname"=>sanitize_text_field($_POST['clientname']),
+                "clientstatus"=>sanitize_text_field($_POST['clientstatus']),
+                "email"=>sanitize_text_field($_POST['email']),
+                "nombrecontacto"=>sanitize_text_field($_POST['nombrecontacto']),
+                "nota"=>sanitize_text_field($_POST['nota']),
+                "telefono"=>sanitize_text_field($_POST['telefono']),
+                "clientsource"=>sanitize_text_field($_POST['clientsource']),
+                "provincia"=>sanitize_text_field($_POST['provincia']),
+                "direccion"=>sanitize_text_field($_POST['direccion']),
+                "lastupdate_at"=>sanitize_text_field($_POST['lastupdate_at']),
+                "idaccountingregionfk" => sanitize_text_field(wp_unslash($_POST['idaccountingregionfk'])),
+                "created_at"=>sanitize_text_field($_POST['created_at'])
+            ));
+            if($wpdb->insert_id > 0){
+                $msg = "<div class='updated update'>".esc_html(__( 'client successfully saved. You will be redirected to the client profile in 2 seconds automatically.', 'wp-easy-crm' ))."</div>";
+        
+                // Construct the redirect URL dynamically to client profile
+                $redirect_url = admin_url('admin.php?page=wp-easy-crm-perfil&id=' . $wpdb->insert_id);
+        
+                // JavaScript for delay and redirection
+                echo "<script>
+                    setTimeout(function() {
+                        window.location.href = '" . $redirect_url . "';
+                    }, 2000);
+                </script>";
+        
+            }else{
+                $msg = "<div style='color:red'>".esc_html(__( 'error - client information couldn\'t be stored', 'wp-easy-crm' ))."</div>";
+            }
+        }
     }
-    else{
-        //add new client
-    $wpdb->insert($clientTable,array(
-        "clientname"=>sanitize_text_field($_POST['clientname']),
-        "clientstatus"=>sanitize_text_field($_POST['clientstatus']),
-        "email"=>sanitize_text_field($_POST['email']),
-        "nombrecontacto"=>sanitize_text_field($_POST['nombrecontacto']),
-        "nota"=>sanitize_text_field($_POST['nota']),
-        "telefono"=>sanitize_text_field($_POST['telefono']),
-        "clientsource"=>sanitize_text_field($_POST['clientsource']),
-        "provincia"=>sanitize_text_field($_POST['provincia']),
-        "direccion"=>sanitize_text_field($_POST['direccion']),
-        "lastupdate_at"=>sanitize_text_field($_POST['lastupdate_at']),
-        "idaccountingregionfk" => sanitize_text_field(wp_unslash($_POST['idaccountingregionfk'])),
-        "created_at"=>sanitize_text_field($_POST['created_at'])
-    ));
-    if($wpdb->insert_id > 0){
-        $msg = "<div class='updated update'>".esc_html(__( 'client successfully saved', 'wp-easy-crm' ))."</div>";
-
-    }else{
-        $msg = "<div style='color:red'>".esc_html(__( 'error - client information couldn\'t be stored', 'wp-easy-crm' ))."</div>";
-    }
-
-
-    }
-
-    
-
 }
 
@@ -84 +183 @@
     ),ARRAY_A
 );
-
-
 
 ?>
@@ -112 +209 @@
     <select name="clientstatus" required>
         <option value="<?php echo esc_html(isset($row_details['clientstatus']) ? $row_details['clientstatus'] : ""); ?>"><?php echo esc_html(isset($row_details['clientstatus']) ? $row_details['clientstatus'] : _e( 'Choose client status', 'wp-easy-crm' ))?></option>
-        <option value="lead">"<?php _e( "Lead", 'wp-easy-crm' );?>"</option>
-        <option value="customer">"<?php _e( 'Customer', 'wp-easy-crm' );?>"</option>
-        <option value="refused">"<?php _e( 'Refused', 'wp-easy-crm' );?>"</option>
-        <option value="blacklisted">"<?php _e( 'Blacklisted', 'wp-easy-crm' );?>"</option>
+        <option value="lead"><?php _e( "Lead", 'wp-easy-crm' );?></option>
+        <option value="customer"><?php _e( 'Customer', 'wp-easy-crm' );?></option>
+        <option value="refused"><?php _e( 'Refused', 'wp-easy-crm' );?></option>
+        <option value="blacklisted"><?php _e( 'Blacklisted', 'wp-easy-crm' );?></option>
 
     </select>
@@ -128 +225 @@
     <select name="clientsource" required>
         <option value="<?php echo esc_html(isset($row_details['clientsource']) ? $row_details['clientsource'] : ""); ?>"><?php echo esc_html(isset($row_details['clientsource']) ? $row_details['clientsource'] : _e( 'Choose client source', 'wp-easy-crm' ))?></option>
-        <option value="website">"<?php _e( "Website", 'wp-easy-crm' );?>"</option>
-        <option value="email">"<?php _e( 'Email', 'wp-easy-crm' );?>"</option>
-        <option value="call">"<?php _e( 'Call', 'wp-easy-crm' );?>"</option>
-        <option value="social media">"<?php _e( 'Social Media', 'wp-easy-crm' );?>"</option>
-        <option value="recommendation">"<?php _e( 'Recommendation', 'wp-easy-crm' );?>"</option>
-        <option value="other">"<?php _e( 'Other', 'wp-easy-crm' );?>"</option>
+        <option value="website"><?php _e( "Website", 'wp-easy-crm' );?></option>
+        <option value="email"><?php _e( 'Email', 'wp-easy-crm' );?></option>
+        <option value="call"><?php _e( 'Call', 'wp-easy-crm' );?></option>
+        <option value="social media"><?php _e( 'Social Media', 'wp-easy-crm' );?></option>
+        <option value="recommendation"><?php _e( 'Recommendation', 'wp-easy-crm' );?></option>
+        <option value="other"><?php _e( 'Other', 'wp-easy-crm' );?></option>
     </select>
 
@@ -203 +300 @@
 
 </form>
-
-

wp-easy-crm/trunk/views/addTask.php

@@ -125 +125 @@
     $taskdescription = wpautop($_POST['taskdescription']);
 
+    $row_details_client = $wpdb->get_row(
+        $wpdb->prepare(
+            "SELECT * from $clientTable WHERE id = %d",$id
+        ),ARRAY_A
+    );
+    
  
     if(!empty($action)){
@@ -172 +178 @@
             $user_data = get_userdata(sanitize_text_field($_POST['useridfk']));
             $to = $user_data->user_email;
-            $subject = __('A task was edited for you', 'wp-easy-crm' );
+            if (isset($row_details_client['clientname']) && is_string($row_details_client['clientname'])) {
+                // $row_details_client is not empty, process the data
+                $subject = __('A task was edited for you for client: ', 'wp-easy-crm' ).$row_details_client['clientname'];
+            } else {
+                // $row_details_client is empty, handle the case where no data was found
+                $subject = __('A task was edited for you', 'wp-easy-crm' );
+            }
             $message = __('The Task Title is: ', 'wp-easy-crm') .sanitize_text_field($_POST['tasktitle']);
             $headers = array('From: Easy CRM '.esc_html($domain_name).' <wordpress@'.esc_html($domain_name).'>', 'Content-Type: text/html; charset=UTF-8');
@@ -185 +197 @@
     else{
         // Allowed HTML tags and attributes
-        
-        
-
+     
 
         $taskdescription = wpautop($_POST['taskdescription']);
@@ -223 +233 @@
             $user_data = get_userdata($_POST['useridfk']);
             $to = $user_data->user_email;
-            $subject = __('A new task was added for you', 'wp-easy-crm' );
+            if (isset($row_details_client['clientname']) && is_string($row_details_client['clientname'])) {
+                // $row_details_client is not empty, process the data
+                $subject = __('A new task was added for you for client: ', 'wp-easy-crm' ).$row_details_client['clientname'];
+            } else {
+                // $row_details_client is empty, handle the case where no data was found
+                $subject = __('A new task was added for you', 'wp-easy-crm' );
+            }
+            
             $message = __('The Task Title is: ', 'wp-easy-crm') .sanitize_text_field($_POST['tasktitle']);
             $headers = array('From: Easy CRM '.esc_html($domain_name).' <wordpress@'.esc_html($domain_name).'>', 'Content-Type: text/html; charset=UTF-8');

wp-easy-crm/trunk/views/clientProfile.php

@@ -153 +153 @@
 ?> <b><?php _e( 'Contact(s):', 'wp-easy-crm' );?></b> <?php echo esc_html($row_details['nombrecontacto']) ?> <b>Email(s):</b> <?php echo esc_html($row_details['email']) ?> <b><?php _e( 'Telephone(s):', 'wp-easy-crm' );?></b> <?php echo $row_details['telefono'] ?> <b><?php _e( 'State:', 'wp-easy-crm' );?></b> <?php echo $row_details['provincia'] ?></code>
 </br></br><code><b><?php _e( 'Address:', 'wp-easy-crm' );?></b> <?php echo esc_html($row_details['direccion']) ?> <b>Accounting Region:</b> <?php echo esc_html($accountingRegionName) ?> </code>
-</br></br><code><b><?php _e( 'Note:', 'wp-easy-crm' );?></b> <?php echo esc_html($row_details['nota']) ?></code>
+</br></br><code><b><?php _e( 'Note:', 'wp-easy-crm' );?></b> <?php echo esc_html($row_details['nota']) ?></code><br/><br/>
+<b> <?php _e( 'Tags: ', 'wp-easy-crm' );?></b><?php echoTagsStuff($row_details); //add tags menu and pass client data ?>
 
 <style>
@@ -469 +470 @@
 </script>
 
+<?php 
+
+//this section echos all the hashtag section in the client profile menu
+function echoTagsStuff($clientdata) {
+    global $wpdb;
+    $tagTable = $wpdb->prefix . 'easytags';
+    $clientTable = $wpdb->prefix . 'clients';
+    $clientId = isset($clientdata['id']) ? $clientdata['id'] : 0;
+    $currentTagsIds = !empty($clientdata['tagsrelations']) ? explode(',', $clientdata['tagsrelations']) : [];
+
+    // Handle tag deletion
+    if (isset($_POST['delete_tag'], $_POST['tag_id'], $_POST['_wpnonce_delete_tag']) && wp_verify_nonce($_POST['_wpnonce_delete_tag'], 'delete_tag_action')) {
+        $tagIdToDelete = intval($_POST['tag_id']);
+        if (($key = array_search($tagIdToDelete, $currentTagsIds)) !== false) {
+            unset($currentTagsIds[$key]);
+            $newTagsIds = implode(',', $currentTagsIds);
+            $wpdb->update($clientTable, ['tagsrelations' => $newTagsIds], ['id' => $clientId]);
+            echo "<script>window.location.reload();</script>";
+        }
+    }
+
+    // Handle adding a new tag
+    if (isset($_POST['add_tag'], $_POST['new_tag_id'], $_POST['_wpnonce_add_new_tag']) && wp_verify_nonce($_POST['_wpnonce_add_new_tag'], 'add_new_tag_action')) {
+        $newTagId = intval($_POST['new_tag_id']);
+        if (!in_array($newTagId, $currentTagsIds)) {
+            $currentTagsIds[] = $newTagId;
+            $newTagsIds = implode(',', $currentTagsIds);
+            $wpdb->update($clientTable, ['tagsrelations' => $newTagsIds], ['id' => $clientId]);
+            echo "<script>window.location.reload();</script>";
+        }
+    }
+
+    // Fetch and display current tags
+    if (!empty($currentTagsIds)) {
+        $placeholders = implode(',', array_fill(0, count($currentTagsIds), '%d'));
+        $tags = $wpdb->get_results($wpdb->prepare("SELECT id, tagtitle, tagcolor FROM $tagTable WHERE id IN ($placeholders)", $currentTagsIds));
+        foreach ($tags as $tag) {
+            echo '<div class="tag-bubble" style="background-color:' . esc_attr($tag->tagcolor) . '; color: #ffffff;">';
+            echo '#' . esc_html($tag->tagtitle);
+            echo '<form method="post" action="" style="display:inline;"><input type="hidden" name="tag_id" value="' . esc_attr($tag->id) . '"><input type="hidden" name="delete_tag" value="1"><input type="hidden" name="_wpnonce_delete_tag" value="' . wp_create_nonce('delete_tag_action') . '"><button type="submit" class="tag-delete">X</button></form>';
+            echo '</div>';
+        }
+    }
+
+    // Collapsible Add Tag Form
+    echo '<div id="addTagButton" style="cursor: pointer; display: inline-block; margin-left: 20px; font-size: 24px;">+</div>';
+    echo '<div id="addTagForm" style="display: none; margin-top: 10px;">';
+    echo '<form method="post" action="">';
+    echo '<select name="new_tag_id"><option value="">Select a tag to add</option>';
+    $allTags = $wpdb->get_results("SELECT id, tagtitle FROM $tagTable");
+    foreach ($allTags as $tag) {
+        if (!in_array($tag->id, $currentTagsIds)) {
+            echo '<option value="' . esc_attr($tag->id) . '">' . esc_html($tag->tagtitle) . '</option>';
+        }
+    }
+    echo '</select>';
+    echo '<input type="hidden" name="add_tag" value="1">';
+    echo wp_nonce_field('add_new_tag_action', '_wpnonce_add_new_tag', true, false);
+    echo '<input type="submit" value="Add Tag">';
+    echo '</form></div>';
+
+    // JavaScript for collapsible form
+    echo '<script>
+    jQuery(document).ready(function($) {
+        $("#addTagButton").click(function() {
+            $("#addTagForm").slideToggle();
+        });
+    });
+    </script>';
+
+    // Styling
+echo '<style>
+.tag-bubble {
+    display: inline-block;
+    border-radius: 15px;
+    padding: 5px 10px;
+    margin: 5px;
+    cursor: pointer;
+    font-weight: bold;
+    background-color: #ffffff;
+    color: #ffffff;
+    box-shadow: 0 2px 4px rgba(0,0,0,0.2);
+    letter-spacing: 2px; /* Increased letter spacing */
+}
+.tag-delete {
+    margin-left: 8px;
+    color: #000000;
+    cursor: pointer;
+}
+#addTagButton {
+    background-color: #f0f0f0;
+    padding: 8px; /* Reduced padding for a smaller circle */
+    border-radius: 50%;
+    width: 24px; /* Reduced width for a smaller circle */
+    height: 24px; /* Reduced height for a smaller circle */
+    text-align: center;
+    line-height: 8px; /* Adjust line height for vertical alignment */
+    box-shadow: 0 2px 4px rgba(0,0,0,0.2);
+    cursor: pointer;
+}
+#addTagForm select, #addTagForm input[type="submit"] {
+    margin-top: 5px;
+}
+</style>';
+}
+
+
+
+
+
+
+
+
+?>
+
 <!-- Hook for Projects and other modules to be added -->
 <?php

wp-easy-crm/trunk/views/listClients.php

@@ -11 +11 @@
 $accregionTable = $wpdb->prefix . 'eacraccountingregion';
 $projectsTable = $wpdb->prefix . 'easyprojects';
+$tagTable = $wpdb->prefix . 'easytags';
 
 
@@ -184 +185 @@
     // echo "Table with clients does not exist.";
 }
+}
+
+
+// Assuming $tagTable is defined and contains the name of your tag table
+$allTags = $wpdb->get_results("SELECT * FROM $tagTable ORDER BY tagtitle ASC");
+$tagMap = [];
+foreach ($allTags as $tag) {
+    // Assuming $tag->id, $tag->tagtitle, and $tag->tagcolor are the properties
+    $tagMap[$tag->id] = $tag;
 }
 
@@ -300 +310 @@
         // Initialize your DataTable
         var table = $('#clientstable').DataTable({
-            order: [[7, 'desc']],
+            order: [[8, 'desc']],
             "pageLength": 12, // Default number of rows to display
             "lengthMenu": [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]], // Page length options (including 'All')
@@ -310 +320 @@
                 },
                 {
-                    "targets": 8, // Index of the 9th column (Region ID)
+                    "targets": 9, // Index of the 9th column (Region ID)
                     "visible": false // Hide the column
                 }
@@ -360 +370 @@
             } else {
                 // Filter DataTables rows based on the region ID
-                // Assumes the region ID is in a specific column (e.g., column index 8)
-                table.column(8).search(regionId).draw(); 
+                // Assumes the region ID is in a specific column (e.g., column index 9)
+                table.column(9).search(regionId).draw(); 
             }
         });
 
+        jQuery('#filterbytags').click(function(e) {
+        e.preventDefault();
+        jQuery(this).toggleClass('show-menu');
+        jQuery('#tagFilterContainer').slideToggle();
+        
+
     });
+
+// Filter button click event handler
+jQuery('#applyTagFilter').click(function() {
+    // Get an array of selected tag IDs
+    var selectedTags = jQuery('input[name="tags[]"]:checked').map(function() {
+        return jQuery(this).val();
+    }).get();
+
+    // Clear any previous custom search function
+    jQuery.fn.dataTable.ext.search = [];
+
+    if (selectedTags.length > 0) {
+        // Use custom filtering function to check if any of the selected tags match the tags associated with each row
+        jQuery.fn.dataTable.ext.search.push(
+            function(settings, data, dataIndex) {
+                var rowTags = jQuery(table.row(dataIndex).node()).find('.column-columnname span[data-tagid]').map(function() {
+                    return jQuery(this).data('tagid').toString();
+                }).get();
+
+                return selectedTags.every(function(tag) {
+                    return rowTags.includes(tag);
+                });
+            }
+        );
+    }
+
+    table.draw(); // Redraw table to apply search/filter
+
+    //jQuery('#tagFilterContainer').slideUp(); // Hide the tag filter container
+});
+
+
+
+
+    });
+
+
+    
 
     </script>
@@ -380 +434 @@
     <a class="button button-secondary" id="buttonclientsonly" href=""><?php _e( 'Show Clients only', 'wp-easy-crm' );?></a>
     <a class="button button-secondary" id="buttonblackrefonly" href=""><?php _e( 'Show Refused and Blacklisted only', 'wp-easy-crm' );?></a>
+    <style>#tagFilterContainer {
+    padding: 10px;
+    border: 1px solid #ccc;
+    margin-top: 10px;
+    }
+    #filterbytags::after {
+    content: '\25BC'; /* Unicode character for down-pointing triangle */
+    }
+
+    #filterbytags.show-menu::after {
+        content: '\25B2'; /* Unicode character for up-pointing triangle */
+    }
+
+    </style>
+    <a class="button button-secondary" id="filterbytags" href=""><?php _e( 'Filter by Tags', 'wp-easy-crm' );?></a>
+    <div id="tagFilterContainer" style="display:none;">
+    <span>Those filters will persist until the page is reloaded. Uncheck all and click 'Filter' again to show all entries.</span>
+    <form id="tagFilterForm" style="display: flex; flex-wrap: wrap; align-items: center; padding: 10px;">
+        <?php foreach ($allTags as $tag): ?>
+            <label style="margin: 5px; padding: 5px; background-color: <?php echo esc_attr($tag->tagcolor); ?>; color: #ffffff; border-radius: 5px; display: flex; align-items: center;">
+                <input type="checkbox" name="tags[]" value="<?php echo esc_attr($tag->id); ?>" style="margin-right: 5px;" />
+                <?php echo esc_html($tag->tagtitle); ?>
+            </label>
+        <?php endforeach; ?>
+        <button type="button" class="button-primary" id="applyTagFilter" style="margin-left: auto; padding: 5px 10px; cursor: pointer;"><?php _e('Filter', 'wp-easy-crm'); ?></button>
+    </form>
+    </div>
+
     <?php 
     // if general access list buttons to filter by country / accounting region
@@ -457 +539 @@
         <th class="manage-column column-cb check-column" scope="col"><b><?php _e( 'Contacts', 'wp-easy-crm' );?></b></th>
         <th class="manage-column column-cb check-column" scope="col"><b><?php _e( 'Telephone', 'wp-easy-crm' );?></b></th>
+        <th class="manage-column column-cb check-column" scope="col"><b><?php _e( 'Tags', 'wp-easy-crm' );?></b></th>
         <th class="manage-column column-cb check-column" scope="col"><b><?php _e( 'Date added', 'wp-easy-crm' );?></b></th>
         <th class="manage-column column-cb check-column" scope="col"><b><?php _e( 'Region ID', 'wp-easy-crm' );?></b></th>
@@ -551 +634 @@
     <td class="column-columnname"><?php echo esc_html($client['nombrecontacto']) ?></td>
     <td class="column-columnname"><?php echo esc_html($client['telefono']) ?></td>
+    <td class="column-columnname">
+    <?php 
+    // Split the client's tag relations into an array of tag IDs
+    $clientTagIds = explode(',', $client['tagsrelations']);
+    
+    foreach ($clientTagIds as $tagId) {
+        // Check if the tag ID exists in the tag map
+        if (isset($tagMap[$tagId])) {
+            // Display the tag title in its defined color
+            $tag = $tagMap[$tagId];
+            echo '<span data-tagid="' . esc_attr($tag->id) . '" style="background-color: ' . esc_attr($tag->tagcolor) . '; color: #ffffff; padding: 2px 5px; border-radius: 3px; margin-right: 5px;">' . esc_html($tag->tagtitle) . '</span>';
+        }
+    }
+    ?>
+    </td>
+
+
     <td class="column-columnname"><?php echo esc_html($client['created_at']) ?></td>
     <td class="column-columnname"><?php echo esc_html($client['idaccountingregionfk']) ?></td>