diff --git a/add_contact_modal.php b/add_contact_modal.php index 5a4d01cf..5e717d00 100644 --- a/add_contact_modal.php +++ b/add_contact_modal.php @@ -2,7 +2,7 @@
-
New Contact
+
New Contact
diff --git a/add_payment_modal.php b/add_payment_modal.php index d642206f..b635854a 100644 --- a/add_payment_modal.php +++ b/add_payment_modal.php @@ -28,7 +28,7 @@
- +
diff --git a/add_product_modal.php b/add_product_modal.php index fc526ec5..2d22c9c6 100644 --- a/add_product_modal.php +++ b/add_product_modal.php @@ -19,7 +19,7 @@
- +
diff --git a/add_trip_copy_modal.php b/add_trip_copy_modal.php index 89902c0e..9a78223a 100644 --- a/add_trip_copy_modal.php +++ b/add_trip_copy_modal.php @@ -43,7 +43,7 @@
- +
@@ -72,6 +72,11 @@ + +
+ + +
diff --git a/add_trip_modal.php b/add_trip_modal.php index 3144dc4c..25c93dc3 100644 --- a/add_trip_modal.php +++ b/add_trip_modal.php @@ -41,7 +41,7 @@
- + @@ -68,7 +68,7 @@
- +
diff --git a/api.php b/api.php index 96803390..f1f44739 100644 --- a/api.php +++ b/api.php @@ -20,7 +20,7 @@ if(isset($_GET['api_key'])){ $row = mysqli_fetch_array($sql); $name = $row['name']; - echo $name; + echo "$name - $cid"; } diff --git a/check_login.php b/check_login.php index 418920b0..815f7504 100644 --- a/check_login.php +++ b/check_login.php @@ -26,6 +26,9 @@ include("get_settings.php"); + $_SESSION['alert_message'] = ''; + $_SESSION['alert_type'] = "warning"; + //Detects if using an apple device and uses apple maps instead of google $iPod = stripos($_SERVER['HTTP_USER_AGENT'],"iPod"); $iPhone = stripos($_SERVER['HTTP_USER_AGENT'],"iPhone"); diff --git a/clients.php b/clients.php index 5f8f1a95..ef6ab6ec 100644 --- a/clients.php +++ b/clients.php @@ -66,9 +66,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); - - - + + + diff --git a/edit_calendar_event_modal.php b/edit_calendar_event_modal.php index ee9ec517..1036463e 100644 --- a/edit_calendar_event_modal.php +++ b/edit_calendar_event_modal.php @@ -65,6 +65,7 @@
+ Delete
diff --git a/edit_product_modal.php b/edit_product_modal.php index e4c063fe..a4d86407 100644 --- a/edit_product_modal.php +++ b/edit_product_modal.php @@ -20,7 +20,7 @@
- +
diff --git a/edit_trip_modal.php b/edit_trip_modal.php index 9efe5bb3..6a4f8182 100644 --- a/edit_trip_modal.php +++ b/edit_trip_modal.php @@ -44,7 +44,7 @@
- +
@@ -76,7 +76,7 @@
class="custom-control-input" id="customControlAutosizing" name="roundtrip" value="1" > - +
diff --git a/footer.php b/footer.php index 43cff6a8..1f94e724 100644 --- a/footer.php +++ b/footer.php @@ -47,3 +47,14 @@ + + \ No newline at end of file diff --git a/get_settings.php b/get_settings.php index 9293c7ec..13667f09 100644 --- a/get_settings.php +++ b/get_settings.php @@ -40,6 +40,9 @@ $config_invoice_overdue_reminders = $row['config_invoice_overdue_reminders']; $config_invoice_next_number = $row['config_invoice_next_number']; $config_invoice_prefix = $row['config_invoice_prefix']; +$config_ticket_next_number = $row['config_ticket_next_number']; +$config_ticket_prefix = $row['config_ticket_prefix']; + //Defaults $config_default_expense_account = $row['config_default_expense_account']; $config_default_payment_account = $row['config_default_payment_account']; @@ -56,9 +59,6 @@ $config_enable_cron = $row['config_enable_cron']; $config_base_url = $row['config_base_url']; -$_SESSION['alert_message'] = ''; -$_SESSION['alert_type'] = "warning"; - $client_types_array = array( 'Residential', 'Law', diff --git a/header.php b/header.php index 4ab2f175..2f6efff2 100644 --- a/header.php +++ b/header.php @@ -1,5 +1,13 @@ + + - <?php echo $config_company_name; ?> + <?php echo $config_app_name; ?> diff --git a/invoice.php b/invoice.php index 00826864..96acd031 100644 --- a/invoice.php +++ b/invoice.php @@ -157,7 +157,7 @@ if(isset($_GET['invoice_id'])){
@@ -225,8 +225,8 @@ if(isset($_GET['invoice_id'])){
- - + + - - + + - +
Name ">Type EmailName ">Type Email Phone Balance Action + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id"); + $row = mysqli_fetch_array($sql_revenues); + $revenue_total_amount_for_month = $row['revenue_total_amount_for_month']; + + $payment_total_amount_for_month = $payment_total_amount_for_month + $revenue_total_amount_for_month; + + $payment_total_amount_for_quarter_one = $payment_total_amount_for_quarter_one + $payment_total_amount_for_month; + } + + ?> + + + + 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id"); + $row = mysqli_fetch_array($sql_revenues); + $revenue_total_amount_for_month = $row['revenue_total_amount_for_month']; + + $payment_total_amount_for_month = $payment_total_amount_for_month + $revenue_total_amount_for_month; + + $payment_total_amount_for_quarter_two = $payment_total_amount_for_quarter_two + $payment_total_amount_for_month; + } + + ?> + + + + 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id"); + $row = mysqli_fetch_array($sql_revenues); + $revenue_total_amount_for_month = $row['revenue_total_amount_for_month']; + + $payment_total_amount_for_month = $payment_total_amount_for_month + $revenue_total_amount_for_month; + + $payment_total_amount_for_quarter_three = $payment_total_amount_for_quarter_three + $payment_total_amount_for_month; + } + + ?> + + + + 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id"); + $row = mysqli_fetch_array($sql_revenues); + $revenue_total_amount_for_month = $row['revenue_total_amount_for_month']; + + $payment_total_amount_for_month = $payment_total_amount_for_month + $revenue_total_amount_for_month; + + $payment_total_amount_for_quarter_four = $payment_total_amount_for_quarter_four + $payment_total_amount_for_month; + } + + $total_payments_for_all_four_quarters = $payment_total_amount_for_quarter_one + $payment_total_amount_for_quarter_two + $payment_total_amount_for_quarter_three + $payment_total_amount_for_quarter_four; + + ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND vendor_id > 0 AND company_id = $session_company_id"); + $row = mysqli_fetch_array($sql_expenses); + $expense_total_amount_for_quarter_one = $expense_total_amount_for_quarter_one + $row['expense_total_amount_for_month']; + } + + ?> + + + + 0 AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND vendor_id > 0 AND company_id = $session_company_id"); + $row = mysqli_fetch_array($sql_expenses); + $expense_total_amount_for_quarter_two = $expense_total_amount_for_quarter_two + $row['expense_total_amount_for_month']; + } + + ?> + + + + 0 AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND vendor_id > 0 AND company_id = $session_company_id"); + $row = mysqli_fetch_array($sql_expenses); + $expense_total_amount_for_quarter_three = $expense_total_amount_for_quarter_three + $row['expense_total_amount_for_month']; + } + + ?> + + + + 0 AND YEAR(expense_date) = $year AND MONTH(expense_date) = $month AND vendor_id > 0 AND company_id = $session_company_id"); + $row = mysqli_fetch_array($sql_expenses); + $expense_total_amount_for_quarter_four = $expense_total_amount_for_quarter_four + $row['expense_total_amount_for_month']; + } + + $total_expenses_for_all_four_quarters = $expense_total_amount_for_quarter_one + $expense_total_amount_for_quarter_two + $expense_total_amount_for_quarter_three + $expense_total_amount_for_quarter_four; + + ?> + + + + + + + + + + + + + + + + +
Jan-MarApr-JunJul-SepOct-DecTotal


Income
$$$$$
Gross Profit$$$$$


Expenses
$$$$$
Total Expenses


$$$$$
Net Profit$$$$$
+ +		 + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 AND YEAR(revenue_date) = $year AND MONTH(revenue_date) = $month AND revenues.company_id = $session_company_id"); + $row = mysqli_fetch_array($sql_revenues); + $revenues_total_amount_for_month = $row['revenue_amount_for_month']; + + $payment_total_amount_for_month = $payment_total_amount_for_month + $revenues_total_amount_for_month; + + + $total_payment_for_all_months = $payment_total_amount_for_month + $total_payment_for_all_months; + + ?> + + + + + + + +
CategoryJanuaryFebruaryMarchAprilMayJuneJulyAugustSeptemberOctoberNovemberDecemberTotal
$$
Total$$
+
+ + + + + +
  • + " + href="settings-ticket.php"> +
    + Ticket +     +
  • " diff --git a/settings-ticket.php b/settings-ticket.php new file mode 100644 index 00000000..40294922 --- /dev/null +++ b/settings-ticket.php @@ -0,0 +1,39 @@ + + + + +
    +
    +
    Ticket Settings
    +
    +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + +
    +
    + +
    + + +
    +
    +
    + + - - + - + + +
    Setup Database
    diff --git a/ticket.php b/ticket.php new file mode 100644 index 00000000..f4648932 --- /dev/null +++ b/ticket.php @@ -0,0 +1,166 @@ + + +2){ + $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4); + } + $client_website = $row['client_website']; + $client_net_terms = $row['client_net_terms']; + if($client_net_terms == 0){ + $client_net_terms = $config_default_net_terms; + } + $ticket_prefix = $row['ticket_prefix']; + $ticket_number = $row['ticket_number']; + $ticket_category = $row['ticket_category']; + $ticket_subject = $row['ticket_subject']; + $ticket_details = $row['ticket_details']; + $ticket_status = $row['ticket_status']; + $ticket_created_at = $row['ticket_created_at']; + $ticket_updated_at = $row['ticket_updated_at']; + $ticket_closed_at = $row['ticket_closed_at']; + $ticket_created_by = $row['ticket_created_by']; + + if($ticket_status == "Open"){ + $ticket_badge_color = "primary"; + }elseif($ticket_status == "Working"){ + $ticket_badge_color = "success"; + }else{ + $ticket_badge_color = "secondary"; + } + +?> + + + + +
      +
    1. + Tickets +
      2. +
    2. Ticket Details
      3. +
    +
    +
    +
    +
    +

    + Ticket +

    + + + + +
    +
    + +
    +

    Client

    + +
    + + +
    + + + +
    + +
    + +

    Details

    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    + Print +
    + Edit + Delete +
    +
    +
    +
    +

    +
    +
    + +
    + +
    + +
    + + +
    + + + +
    +
    +

    +
    +
    +
    + + + +
    + +
    + + + + + +