diff --git a/Akaunting to PittPC CRM Conversion b/Akaunting to PittPC CRM Conversion new file mode 100644 index 00000000..9bc75d8e --- /dev/null +++ b/Akaunting to PittPC CRM Conversion @@ -0,0 +1,49 @@ +Akaunting to PittPC CRM Conversion + +Exports + +Accounts + +SELECT id AS account_id, name AS account_name, opening_balance FROM c4v_accounts WHERE company_id = 1; + +Categories + +SELECT id AS category_id, name AS category_name, type AS category_type FROM c4v_categories WHERE company_id = 1; + +Clients + +SELECT id AS client_id, name AS client_name, address AS client_address, phone AS client_phone, email AS client_email, website AS client_website FROM c4v_customers WHERE company_id = 1; + +UPDATE clients SET client_phone = replace(client_phone, '-', ''); + +Expenses + +SELECT id AS expense_id, description AS expense_description, amount AS expense_amount, paid_at AS expense_date, reference AS expense_reference, vendor_id, category_id, account_id FROM c4v_payments WHERE company_id = 1 AND deleted_at IS NULL; + +Invoices + +SELECT id AS invoice_id, invoice_number, invoice_status_code AS invoice_status, invoiced_at AS invoice_date, due_at AS invoice_due, amount AS invoice_amount, notes AS invoice_note, category_id, customer_id AS client_id FROM c4v_invoices WHERE company_id = 1 AND deleted_at IS NULL; + +Invoice History + +SELECT id AS invoice_history_id, created_at AS invoice_history_date, status_code AS invoice_history_status, description AS invoice_history_description, invoice_id FROM c4v_invoice_histories WHERE company_id = 1 AND deleted_at IS NULL; + +Invoice Items (Missing Subtotal Need calculated) + +SELECT id AS invoice_item_id, name AS invoice_item_name, quantity AS invoice_item_quantity, price AS invoice_item_price, tax AS invoice_item_tax, total AS invoice_item_total, invoice_id FROM c4v_invoice_items WHERE company_id = 1 AND deleted_at IS NULL; + +Payments + +SELECT id AS payment_id, paid_at AS payment_date, amount AS payment_amount, payment_method, reference AS payment_reference, account_id, invoice_id FROM c4v_invoice_payments WHERE company_id = 1 AND deleted_at IS NULL; + +Transfers + +SELECT c4v_transfers.id AS transfer_id, c4v_payments.amount AS transfer_amount, c4v_transfers.created_at AS transfer_date, c4v_payments.account_id AS transfer_account_from, c4v_revenues.account_id AS transfer_account_to, payment_id AS expense_id, revenue_id AS payment_id FROM c4v_transfers, c4v_payments, c4v_revenues WHERE c4v_transfers.revenue_id = c4v_revenues.id AND c4v_transfers.payment_id = c4v_payments.id AND c4v_transfers.company_id = 1 AND c4v_transfers.deleted_at IS NULL; + +Move Revenue to payments for Transfers only + +SELECT c4v_revenues.id AS payment_id, paid_at AS payment_date, amount AS payment_amount, account_id FROM c4v_transfers, c4v_revenues WHERE c4v_transfers.revenue_id = c4v_revenues.id AND c4v_revenues.deleted_at IS NULL; + +Vendors + +SELECT id AS vendor_id, name AS vendor_name, address AS vendor_address, email AS vendor_email, website AS vendor_website FROM c4v_vendors WHERE company_id = 1 AND deleted_at IS NULL; diff --git a/client.php b/client.php index 50493a36..b3e46efd 100644 --- a/client.php +++ b/client.php @@ -60,7 +60,7 @@ if(isset($_GET['client_id'])){ $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('client_application_id') AS num FROM client_applications WHERE client_id = $client_id")); $num_applications = $row['num']; - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE client_id = $client_id AND invoice_number > 0")); + $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE client_id = $client_id")); $num_invoices = $row['num']; $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('file_id') AS num FROM files WHERE client_id = $client_id")); diff --git a/client_invoices.php b/client_invoices.php index f600d8ed..baf2c047 100644 --- a/client_invoices.php +++ b/client_invoices.php @@ -1,6 +1,6 @@ 0 ORDER BY invoice_number DESC"); + $sql = mysqli_query($mysqli,"SELECT * FROM invoices WHERE client_id = $client_id ORDER BY invoice_number DESC"); ?> @@ -29,11 +29,7 @@ $invoice_amount = $row['invoice_amount']; //check to see if overdue - $unixtime_invoice_due = strtotime($invoice_due); - if($unixtime_invoice_due < time()){ - $invoice_status = "Overdue"; - $invoice_color = "text-danger"; - } + //Set Badge color based off of invoice status if($invoice_status == "Sent"){ diff --git a/invoice.php b/invoice.php index c441d970..66ec432c 100644 --- a/invoice.php +++ b/invoice.php @@ -33,7 +33,7 @@ if(isset($_GET['invoice_id'])){ } $client_website = $row['client_website']; - $sql_invoice_history = mysqli_query($mysqli,"SELECT * FROM invoice_history WHERE invoice_id = $invoice_id ORDER BY invoice_history_id ASC"); + $sql_invoice_history = mysqli_query($mysqli,"SELECT * FROM invoice_history WHERE invoice_id = $invoice_id ORDER BY invoice_history_id DESC"); $sql_payments = mysqli_query($mysqli,"SELECT * FROM payments, accounts WHERE payments.account_id = accounts.account_id AND payments.invoice_id = $invoice_id ORDER BY payments.payment_id DESC"); @@ -73,6 +73,9 @@ if(isset($_GET['invoice_id'])){
  • Invoices
    • +
  • + +
  • INV-
    • diff --git a/invoices.php b/invoices.php index 3ce7e4b0..ce277106 100644 --- a/invoices.php +++ b/invoices.php @@ -4,7 +4,6 @@ $sql = mysqli_query($mysqli,"SELECT * FROM invoices, clients WHERE invoices.client_id = clients.client_id - AND invoices.invoice_number > 0 ORDER BY invoices.invoice_number DESC"); ?> @@ -15,7 +14,7 @@
    - +
    diff --git a/post.php b/post.php index 4eb91bab..9a3673b6 100644 --- a/post.php +++ b/post.php @@ -35,15 +35,10 @@ if(isset($_POST['edit_company_settings'])){ $config_company_zip = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_zip'])); $config_company_phone = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_phone'])); $config_company_site = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_company_site'])); - if($_FILES['file']['tmp_name']!='') { - $path = "uploads/"; - $path = $path . basename( $_FILES['file']['name']); - $file_name = basename($path); - move_uploaded_file($_FILES['file']['tmp_name'], $path); - } + - mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$config_company_name', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = '$config_company_phone', config_company_site = '$config_company_site' config_invoice_logo = '$path'"); + mysqli_query($mysqli,"UPDATE settings SET config_company_name = '$config_company_name', config_company_address = '$config_company_address', config_company_city = '$config_company_city', config_company_state = '$config_company_state', config_company_zip = '$config_company_zip', config_company_phone = '$config_company_phone', config_company_site = '$config_company_site'"); header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -52,10 +47,11 @@ if(isset($_POST['edit_company_settings'])){ if(isset($_POST['edit_mail_settings'])){ $config_smtp_host = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_smtp_host'])); + $config_smtp_port = intval($_POST['config_smtp_port']); $config_smtp_username = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_smtp_username'])); $config_smtp_password = strip_tags(mysqli_real_escape_string($mysqli,$_POST['config_smtp_password'])); - mysqli_query($mysqli,"UPDATE settings SET config_smtp_host = '$config_smtp_host', config_smtp_username = '$config_smtp_username', config_smtp_password = '$config_smtp_password'"); + mysqli_query($mysqli,"UPDATE settings SET config_smtp_host = '$config_smtp_host', config_smtp_port = $config_smtp_port, config_smtp_username = '$config_smtp_username', config_smtp_password = '$config_smtp_password'"); header("Location: " . $_SERVER["HTTP_REFERER"]); @@ -257,7 +253,7 @@ if(isset($_POST['edit_client'])){ $_SESSION['alert_message'] = "Client updated"; - header("Location: clients.php"); + header("Location: " . $_SERVER["HTTP_REFERER"]); } @@ -1286,7 +1282,7 @@ if(isset($_GET['email_invoice'])){ $mpdf->watermarkTextAlpha = 0.1; $mpdf->SetDisplayMode('fullpage'); $mpdf->WriteHTML($html); - $mpdf->Output('uploads/invoice.pdf', 'F'); + $mpdf->Output("uploads/$invoice_date-$config_company_name-Invoice$invoice_number.pdf", 'F'); $mail = new PHPMailer(true); @@ -1310,7 +1306,7 @@ if(isset($_GET['email_invoice'])){ // Attachments //$mail->addAttachment('/var/tmp/file.tar.gz'); // Add attachments //$mail->addAttachment('/tmp/image.jpg', 'new.jpg'); // Optional name - $mail->addAttachment('uploads/invoice.pdf'); // Optional name + $mail->addAttachment("uploads/$invoice_date-$config_company_name-Invoice$invoice_number.pdf"); // Optional name // Content $mail->isHTML(true); // Set email format to HTML @@ -1338,6 +1334,7 @@ if(isset($_GET['email_invoice'])){ } catch (Exception $e) { echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo}"; } + unlink("uploads/$invoice_date-$config_company_name-Invoice$invoice_number.pdf"); } if(isset($_GET['pdf_invoice'])){ diff --git a/settings-company.php b/settings-company.php index 0eea017f..c4150bb5 100644 --- a/settings-company.php +++ b/settings-company.php @@ -7,14 +7,14 @@
    Company Settings
    -
    +
    - +
    @@ -24,18 +24,18 @@
    - +
    - +
    - $state_name) { ?> @@ -45,7 +45,7 @@
    - +
    @@ -54,7 +54,7 @@
    - +
    @@ -64,16 +64,13 @@
    - + -
    - - -
    + diff --git a/settings-mail.php b/settings-mail.php index 5ade92db..4a55f38c 100644 --- a/settings-mail.php +++ b/settings-mail.php @@ -17,6 +17,16 @@ + +
    + +
    +
    + +
    + +
    +
    diff --git a/uploads/earthbound-ness-avatar.jpg b/uploads/earthbound-ness-avatar.jpg new file mode 100644 index 00000000..20de8180 Binary files /dev/null and b/uploads/earthbound-ness-avatar.jpg differ
    Number