From d46852cd9a2bb1bf2d071dc645e1580ebabe37f7 Mon Sep 17 00:00:00 2001 From: dtookey Date: Fri, 8 Apr 2022 15:49:52 -0400 Subject: [PATCH] added client name to billing report --- src/sql/0-run-first/billing.sql | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/sql/0-run-first/billing.sql b/src/sql/0-run-first/billing.sql index 87485d5..94e834e 100644 --- a/src/sql/0-run-first/billing.sql +++ b/src/sql/0-run-first/billing.sql @@ -1,24 +1,27 @@ DROP TABLE IF EXISTS billing_report; CREATE TABLE billing_report AS -SELECT pkey, +SELECT billing.pkey, refNumber, (SELECT all_projects.proj_type from all_projects where all_projects.refnum = refNumber) AS division, line_created, accepted_date, (qty * default_price) AS fee, invoice_accepted, - (SELECT clients.name FROM clients where clients.pkey = (SELECT contacts.cl_fkey from contacts where pkey = (SELECT all_projects.contact_fkey where all_projects.refnum = refNumber))) as 'Client' + clients.name as Client FROM billing + INNER JOIN all_projects on billing.refNumber = all_projects.refnum + INNER JOIN contacts on all_projects.contact_fkey = contacts.pkey + INNER JOIN clients on contacts.cl_fkey = clients.pkey where invoice_accepted = 1; CREATE INDEX ref_num ON billing_report (refNumber); CREATE INDEX div_idx ON billing_report (division); - UPDATE billing_report - SET division = IF( - division = 'Warranty', - CONCAT(SUBSTRING(refNumber, 1, 3), ' - ', 'Structural'), - CONCAT(SUBSTRING(refNumber, 1, 3), ' - ', division) - ); +UPDATE billing_report +SET division = IF( + division = 'Warranty', + CONCAT(SUBSTRING(refNumber, 1, 3), ' - ', 'Structural'), + CONCAT(SUBSTRING(refNumber, 1, 3), ' - ', division) + );