diff --git a/add_campaign_modal.php b/add_campaign_modal.php index c46845e2..f0c5eb14 100644 --- a/add_campaign_modal.php +++ b/add_campaign_modal.php @@ -14,6 +14,9 @@
  • Campaign
    • +
  • + Content +
  • Recipients
    • @@ -27,24 +30,73 @@
    - +
    +
    + +
    + +
    - +
    +
    + +
    + +
    - +
    +
    + +
    + +
    - +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + + +
    +
    @@ -52,14 +104,9 @@
    - Recipients + -
    - - -
    - -
    @@ -110,7 +146,7 @@
    - +
    diff --git a/campaigns.php b/campaigns.php index 8c4a8720..f9242d8b 100644 --- a/campaigns.php +++ b/campaigns.php @@ -112,6 +112,11 @@
    +
    + Draft + Queued + Sent +
    " id="advancedFilter"> @@ -153,7 +158,11 @@ "> Name + Sent + Opened + Clicked Created + Scheduled Status Action @@ -170,11 +179,32 @@ $campaign_scheduled_at = $row['campaign_scheduled_at']; $campaign_created_at = $row['campaign_created_at']; + //Set Badge color based off of campaign status + if($campaign_status == "Sent"){ + $campaign_badge_color = "warning text-white"; + }elseif($campaign_status == "Queued"){ + $campaign_badge_color = "info"; + }elseif($campaign_status == "Sending"){ + $campaign_badge_color = "primary"; + }elseif($campaign_status == "Sent"){ + $campaign_badge_color = "success"; + }else{ + $campaign_badge_color = "secondary"; + } + ?> - + + - + - + - - + + + + + +
    +
    +
    + +
    + + + +
    + +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    + +
    + +
    +
    + +
    + + + +
      + + +
    • +
      + + +
      +
      • + + + +
    + +
    + +
    + +
    + +
    + + +
    +
    +
    + + \ No newline at end of file diff --git a/post.php b/post.php index 73be1f63..77e5c744 100644 --- a/post.php +++ b/post.php @@ -1642,7 +1642,6 @@ if(isset($_GET['export_client_vendors_csv'])){ } // Campaigns - if(isset($_POST['add_campaign'])){ $name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['name']))); @@ -1650,8 +1649,10 @@ if(isset($_POST['add_campaign'])){ $from_name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['from_name']))); $from_email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['from_email']))); $content = trim(mysqli_real_escape_string($mysqli,$_POST['content'])); + $status = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['status']))); + $scheduled_time = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['scheduled_time']))); - mysqli_query($mysqli,"INSERT INTO campaigns SET campaign_name = '$name', campaign_subject = '$subject', campaign_from_name = '$from_name', campaign_from_email = '$from_email', campaign_content = '$content', campaign_status = 'Draft', campaign_created_at = NOW(), company_id = $session_company_id"); + mysqli_query($mysqli,"INSERT INTO campaigns SET campaign_name = '$name', campaign_subject = '$subject', campaign_from_name = '$from_name', campaign_from_email = '$from_email', campaign_content = '$content', campaign_status = '$status', campaign_scheduled_at = '$scheduled_time', campaign_created_at = NOW(), company_id = $session_company_id"); $campaign_id = mysqli_insert_id($mysqli); @@ -1739,7 +1740,10 @@ if(isset($_GET['delete_campaign'])){ $row = mysqli_fetch_array($sql); $campaign_name = $row['campaign_name']; + //Delete Campaign mysqli_query($mysqli,"DELETE FROM campaigns WHERE campaign_id = $campaign_id AND company_id = $session_company_id"); + //Delete Messages Related to the Campaign + mysqli_query($mysqli,"DELETE FROM campaign_messages WHERE message_campaign_id = $campaign_id AND company_id = $session_company_id"); //logging mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Campaign', log_action = 'Delete', log_description = '$session_name deleted mail campaign $campaign_name', log_created_at = NOW(), company_id = $session_company_id, log_user_id = $session_user_id");