diff --git a/alerts.php b/alerts.php index 810ad892..c8da22ed 100644 --- a/alerts.php +++ b/alerts.php @@ -2,9 +2,9 @@ 0"; + $where_clause = "IS NOT NULL"; }else{ - $where_clause = "= 0"; + $where_clause = "IS NULL"; } ?> diff --git a/check_login.php b/check_login.php index e4a1b5ae..225f7ec5 100644 --- a/check_login.php +++ b/check_login.php @@ -1,5 +1,5 @@ 0 AND basename($_SERVER['PHP_SELF']) !== 'client.php' AND basename($_SERVER['PHP_SELF']) !== 'post.php'){ - header("Location: logout.php"); - die; - } $session_user_id = $_SESSION['user_id']; @@ -25,7 +19,6 @@ $session_avatar = $row['avatar']; $session_company_id = $row['company_id']; $session_company_name = $row['company_name']; - $session_client_id = $row['client_id']; $session_token = $row['token']; include("get_settings.php"); @@ -42,7 +35,7 @@ } //Get unAcked Alert Count for the badge on the top nav - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('alert_id') AS num FROM alerts WHERE alert_ack_date = 0")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('alert_id') AS num FROM alerts WHERE alert_ack_date IS NULL AND company_id = $session_company_id")); $num_alerts = $row['num']; ?> \ No newline at end of file diff --git a/client_side_nav.php b/client_side_nav.php index 07a60259..631abdcd 100644 --- a/client_side_nav.php +++ b/client_side_nav.php @@ -6,7 +6,7 @@

- +
    • -
  • "> 'Internet Explorer', + '/Trident/i' => 'Internet Explorer', + '/firefox/i' => 'Firefox', + '/safari/i' => 'Safari', + '/chrome/i' => 'Chrome', + '/edge/i' => 'Edge', + '/opera/i' => 'Opera', + '/netscape/i' => 'Netscape', + '/maxthon/i' => 'Maxthon', + '/konqueror/i' => 'Konqueror', + '/ubrowser/i' => 'UC Browser', + '/mobile/i' => 'Handheld Browser' + ); + foreach ($browser_array as $regex => $value) { + if (preg_match($regex, $user_agent)) { + $browser = $value; + } + } + return $browser; +} + +function get_os() { + $user_agent = get_user_agent(); + $os_platform = "Unknown OS Platform"; + $os_array = array( + '/windows nt 10/i' => 'Windows 10', + '/windows nt 6.3/i' => 'Windows 8.1', + '/windows nt 6.2/i' => 'Windows 8', + '/windows nt 6.1/i' => 'Windows 7', + '/windows nt 6.0/i' => 'Windows Vista', + '/windows nt 5.2/i' => 'Windows Server 2003/XP x64', + '/windows nt 5.1/i' => 'Windows XP', + '/windows xp/i' => 'Windows XP', + '/macintosh|mac os x/i' => 'Mac OS X', + '/linux/i' => 'Linux', + '/ubuntu/i' => 'Ubuntu', + '/iphone/i' => 'iPhone', + '/ipod/i' => 'iPod', + '/ipad/i' => 'iPad', + '/android/i' => 'Android', + '/blackberry/i' => 'BlackBerry', + '/webos/i' => 'Mobile' + ); + foreach ($os_array as $regex => $value) { + if (preg_match($regex, $user_agent)) { + $os_platform = $value; + } + } + return $os_platform; +} + + + +function get_device(){ + $tablet_browser = 0; + $mobile_browser = 0; + if (preg_match('/(tablet|ipad|playbook)|(android(?!.*(mobi|opera mini)))/i', strtolower($_SERVER['HTTP_USER_AGENT']))) { + $tablet_browser++; + } + if (preg_match('/(up.browser|up.link|mmp|symbian|smartphone|midp|wap|phone|android|iemobile)/i', strtolower($_SERVER['HTTP_USER_AGENT']))) { + $mobile_browser++; + } + if ((strpos(strtolower($_SERVER['HTTP_ACCEPT']),'application/vnd.wap.xhtml+xml') > 0) or ((isset($_SERVER['HTTP_X_WAP_PROFILE']) or isset($_SERVER['HTTP_PROFILE'])))) { + $mobile_browser++; + } + $mobile_ua = strtolower(substr(get_user_agent(), 0, 4)); + $mobile_agents = array( + 'w3c ','acs-','alav','alca','amoi','audi','avan','benq','bird','blac', + 'blaz','brew','cell','cldc','cmd-','dang','doco','eric','hipt','inno', + 'ipaq','java','jigs','kddi','keji','leno','lg-c','lg-d','lg-g','lge-', + 'maui','maxo','midp','mits','mmef','mobi','mot-','moto','mwbp','nec-', + 'newt','noki','palm','pana','pant','phil','play','port','prox', + 'qwap','sage','sams','sany','sch-','sec-','send','seri','sgh-','shar', + 'sie-','siem','smal','smar','sony','sph-','symb','t-mo','teli','tim-', + 'tosh','tsm-','upg1','upsi','vk-v','voda','wap-','wapa','wapi','wapp', + 'wapr','webc','winw','winw','xda ','xda-'); + if (in_array($mobile_ua,$mobile_agents)) { + $mobile_browser++; + } + if (strpos(strtolower(get_user_agent()),'opera mini') > 0) { + $mobile_browser++; + //Check for tablets on opera mini alternative headers + $stock_ua = strtolower(isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA'])?$_SERVER['HTTP_X_OPERAMINI_PHONE_UA']:(isset($_SERVER['HTTP_DEVICE_STOCK_UA'])?$_SERVER['HTTP_DEVICE_STOCK_UA']:'')); + if (preg_match('/(tablet|ipad|playbook)|(android(?!.*mobile))/i', $stock_ua)) { + $tablet_browser++; + } + } + if ($tablet_browser > 0) { + // do something for tablet devices + return 'Tablet'; + } + else if ($mobile_browser > 0) { + // do something for mobile devices + return 'Mobile'; + } + else { + // do something for everything else + return 'Computer'; + } +} + ?> \ No newline at end of file diff --git a/guest_view_invoice.php b/guest_view_invoice.php index 724a14e2..7c4e03eb 100644 --- a/guest_view_invoice.php +++ b/guest_view_invoice.php @@ -55,9 +55,16 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ $config_company_phone = substr($row['config_company_phone'],0,3)."-".substr($row['config_company_phone'],3,3)."-".substr($row['config_company_phone'],6,4); } $config_company_email = $row['config_company_email']; + $config_invoice_logo = $row['config_invoice_logo']; + $ip = get_ip(); + $os = get_os(); + $browser = get_web_browser(); + $device = get_device(); //Mark viewed in history - mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = '$invoice_status', history_description = 'Invoice viewed', history_created_at = NOW(), invoice_id = $invoice_id, company_id = $company_id"); + mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = '$invoice_status', history_description = 'Invoice viewed - $ip - $os - $browser - $device', history_created_at = NOW(), invoice_id = $invoice_id, company_id = $company_id"); + + mysqli_query($mysqli,"INSERT INTO alerts SET alert_type = 'Invoice Viewed', alert_message = 'Invoice $invoice_number has been viewed by $client_name - $ip - $os - $browser - $device', alert_date = NOW(), company_id = $company_id"); //Update status to Viewed only if invoice_status = "Sent" if($invoice_status == 'Sent'){ @@ -74,11 +81,11 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ $balance = $invoice_amount - $amount_paid; //check to see if overdue - - $unixtime_invoice_due = strtotime($invoice_due); - if($unixtime_invoice_due < time()){ - $invoice_status = "Overdue"; - $invoice_color = "text-danger"; + if($invoice_status !== "Paid" AND $invoice_status !== "Draft" AND $invoice_status !== "Cancelled"){ + $unixtime_invoice_due = strtotime($invoice_due) + 86400; + if($unixtime_invoice_due < time()){ + $invoice_color = "text-danger"; + } } //Set Badge color based off of invoice status @@ -94,17 +101,16 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ $invoice_badge_color = "secondary"; } - - ?> +
    -

    Invoice

    +

    Invoice

    Print - Download + Download PDF @@ -116,52 +122,50 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
    +
    +
    + +
    +
    -
    -
    - From -
    -
    -
      -
      • -
      • -
      • -
      • -
      • -
    -
    -
    + + +
      +

      • +
      • +
      • +
    • P:
      • +
      • +
    +
    -
    -
    - Bill To -
    -
    -
      -
      • -
      • -
      • -
      • -
      • -
    -
    -
    + +
      +

      • +
      • +
      • +
    • P:
      • +
    • E:
      • +
    +
    -
    -
    -
    - Details -
    -
    -
      -
    • Invoice Number:
      • -
    • Invoice Date:
      • -
    • Payment Due:
      • -
    -
    -
    +
    +
    +
    +
    +
    + + + + + + + + + +
    Invoice Date
    Due Date
    @@ -170,11 +174,7 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
    -
    - Items -
    - - +
    @@ -226,9 +226,6 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
    -
    - Notes -
    diff --git a/guest_view_quote.php b/guest_view_quote.php index dafba0df..15110605 100644 --- a/guest_view_quote.php +++ b/guest_view_quote.php @@ -55,6 +55,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){ $config_company_phone = substr($row['config_company_phone'],0,3)."-".substr($row['config_company_phone'],3,3)."-".substr($row['config_company_phone'],6,4); } $config_company_email = $row['config_company_email']; + $config_invoice_logo = $row['config_invoice_logo']; //Mark viewed in history mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = '$quote_status', history_description = 'Quote viewed', history_created_at = NOW(), quote_id = $quote_id, company_id = $company_id"); @@ -99,6 +100,12 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){
    +
    +
    + +
    +
    +
    @@ -179,7 +186,7 @@ if(isset($_GET['quote_id'], $_GET['url_key'])){ $item_subtotal = $row['item_price']; $item_tax = $row['item_tax']; $item_total = $row['item_total']; - $total_tax = $item_tax + $invoice_tax; + $total_tax = $item_tax + $total_tax; $sub_total = $item_price * $item_quantity + $sub_total; ?> diff --git a/index.php b/index.php index e92a7b40..f8472bdc 100644 --- a/index.php +++ b/index.php @@ -1,5 +1,5 @@ - +
    1. @@ -11,6 +11,10 @@

      Blank Page

      -

      This is a great starting point for new custom pages.

      +

      +

      +

      +

      +

      \ No newline at end of file diff --git a/invoice.php b/invoice.php index 971145bd..4be1badc 100644 --- a/invoice.php +++ b/invoice.php @@ -19,6 +19,7 @@ if(isset($_GET['invoice_id'])){ $invoice_due = $row['invoice_due']; $invoice_amount = $row['invoice_amount']; $invoice_note = $row['invoice_note']; + $invoice_url_key = $row['invoice_url_key']; $category_id = $row['category_id']; $client_id = $row['client_id']; $client_name = $row['client_name']; @@ -50,7 +51,7 @@ if(isset($_GET['invoice_id'])){ //check to see if overdue if($invoice_status !== "Paid" AND $invoice_status !== "Draft" AND $invoice_status !== "Cancelled"){ - $unixtime_invoice_due = strtotime($invoice_due); + $unixtime_invoice_due = strtotime($invoice_due) + 86400; if($unixtime_invoice_due < time()){ $invoice_overdue = "Overdue"; } @@ -105,11 +106,12 @@ if(isset($_GET['invoice_id'])){
      Edit Copy - Recurring + Create Recurring Send Mark Sent Add Payment Print + ">Guest URL PDF Cancel diff --git a/invoices.php b/invoices.php index 45bd87f8..d452d5ff 100644 --- a/invoices.php +++ b/invoices.php @@ -192,7 +192,7 @@ $now = time(); - if(($invoice_status == "Sent" or $invoice_status == "Partial") and strtotime($invoice_due) < $now ){ + if(($invoice_status == "Sent" or $invoice_status == "Partial" or $invoice_status == "Viewed") and strtotime($invoice_due) + 86400 < $now ){ $overdue_color = "text-danger font-weight-bold"; }else{ $overdue_color = ""; diff --git a/login.php b/login.php index 6bf8441c..1be36e72 100644 --- a/login.php +++ b/login.php @@ -25,19 +25,11 @@ if(isset($_POST['login'])){ $token = $row['token']; $_SESSION['user_id'] = $row['user_id']; $_SESSION['name'] = $row['name']; - $_SESSION['client_id'] = $row['client_id']; - $client_id = $row['client_id']; if(empty($token)){ $_SESSION['logged'] = TRUE; - if($client_id > 0){ - header("Location: client.php?client_id=$client_id"); - }else{ - //header("Location: $config_start_page"); - header("Location: dashboard.php"); - } - + header("Location: dashboard.php"); }else{ require_once("rfc6238.php"); diff --git a/quote.php b/quote.php index 5a61f11a..fc1322d2 100644 --- a/quote.php +++ b/quote.php @@ -18,6 +18,7 @@ if(isset($_GET['quote_id'])){ $quote_date = $row['quote_date']; $quote_amount = $row['quote_amount']; $quote_note = $row['quote_note']; + $quote_url_key = $row['quote_url_key']; $category_id = $row['category_id']; $client_id = $row['client_id']; $client_name = $row['client_name']; @@ -57,6 +58,9 @@ if(isset($_GET['quote_id'])){
    2. Quotes
      3. +
    3. + +
    @@ -81,6 +85,7 @@ if(isset($_GET['quote_id'])){ Send Email Mark Sent Print + ">Guest URL PDF Delete
    Product