diff --git a/add_asset_modal.php b/add_asset_modal.php index 3066ef77..8b42eca8 100644 --- a/add_asset_modal.php +++ b/add_asset_modal.php @@ -187,7 +187,7 @@
- + @@ -197,7 +197,7 @@
- + @@ -291,4 +291,4 @@ - \ No newline at end of file + diff --git a/add_client_modal.php b/add_client_modal.php index 09c3c831..5b0264e1 100644 --- a/add_client_modal.php +++ b/add_client_modal.php @@ -251,4 +251,4 @@ - \ No newline at end of file + diff --git a/add_company_modal.php b/add_company_modal.php index f4f66da3..e6334d60 100644 --- a/add_company_modal.php +++ b/add_company_modal.php @@ -86,7 +86,7 @@
- + @@ -138,4 +138,4 @@ - \ No newline at end of file + diff --git a/add_contact_modal.php b/add_contact_modal.php index 01215df9..9bfc26bd 100644 --- a/add_contact_modal.php +++ b/add_contact_modal.php @@ -72,7 +72,7 @@
- + @@ -115,4 +115,4 @@ - \ No newline at end of file + diff --git a/add_location_modal.php b/add_location_modal.php index 6b321f46..fc83df4b 100644 --- a/add_location_modal.php +++ b/add_location_modal.php @@ -48,7 +48,7 @@
- + @@ -178,4 +178,4 @@ - \ No newline at end of file + diff --git a/add_network_modal.php b/add_network_modal.php index d5d15241..265b3351 100644 --- a/add_network_modal.php +++ b/add_network_modal.php @@ -47,7 +47,7 @@
- + @@ -93,4 +93,4 @@ - \ No newline at end of file + diff --git a/add_vendor_modal.php b/add_vendor_modal.php index 0de0fd35..5bf7ebdf 100644 --- a/add_vendor_modal.php +++ b/add_vendor_modal.php @@ -150,7 +150,7 @@
- + @@ -199,4 +199,4 @@ - \ No newline at end of file + diff --git a/client_print.php b/client_print.php index f6c8db32..d7e736ae 100644 --- a/client_print.php +++ b/client_print.php @@ -147,19 +147,19 @@ if(isset($_GET['client_id'])){
@@ -168,56 +168,58 @@ if(isset($_GET['client_id'])){ 0){ ?> -

Contacts ()

- - - - - - - - - - - - 2){ - $contact_phone = substr($row['contact_phone'],0,3)."-".substr($row['contact_phone'],3,3)."-".substr($row['contact_phone'],6,4); - } - $contact_extension = $row['contact_extension']; - if(!empty($contact_extension)){ - $contact_extension = "x$contact_extension"; - } - $contact_mobile = $row['contact_mobile']; - if(strlen($contact_mobile)>2){ - $contact_mobile = substr($row['contact_mobile'],0,3)."-".substr($row['contact_mobile'],3,3)."-".substr($row['contact_mobile'],6,4); - } - $contact_email = $row['contact_email']; +
+

Contacts ()

+
NameTitleEmailPhoneMobile
+ + + + + + + + + + + - - - - - - - + while($row = mysqli_fetch_array($sql_contacts)){ + $contact_id = $row['contact_id']; + $contact_name = $row['contact_name']; + $contact_title = $row['contact_title']; + $contact_phone = $row['contact_phone']; + if(strlen($contact_phone)>2){ + $contact_phone = substr($row['contact_phone'],0,3)."-".substr($row['contact_phone'],3,3)."-".substr($row['contact_phone'],6,4); + } + $contact_extension = $row['contact_extension']; + if(!empty($contact_extension)){ + $contact_extension = "x$contact_extension"; + } + $contact_mobile = $row['contact_mobile']; + if(strlen($contact_mobile)>2){ + $contact_mobile = substr($row['contact_mobile'],0,3)."-".substr($row['contact_mobile'],3,3)."-".substr($row['contact_mobile'],6,4); + } + $contact_email = $row['contact_email']; - + ?> + + + + + + + - -
NameTitleEmailPhoneMobile
+ + + + + - 0){ ?>

Locations ()

diff --git a/edit_asset_modal.php b/edit_asset_modal.php index 4877cad4..09dd9c40 100644 --- a/edit_asset_modal.php +++ b/edit_asset_modal.php @@ -186,7 +186,7 @@
- + @@ -196,7 +196,7 @@
- + @@ -291,4 +291,4 @@ - \ No newline at end of file + diff --git a/edit_client_modal.php b/edit_client_modal.php index a57c5278..17d3f654 100644 --- a/edit_client_modal.php +++ b/edit_client_modal.php @@ -209,7 +209,7 @@
- + @@ -252,4 +252,4 @@ - \ No newline at end of file + diff --git a/edit_company_modal.php b/edit_company_modal.php index 4e4bb324..7cadcd11 100644 --- a/edit_company_modal.php +++ b/edit_company_modal.php @@ -88,7 +88,7 @@
- + @@ -146,4 +146,4 @@ - \ No newline at end of file + diff --git a/edit_contact_modal.php b/edit_contact_modal.php index 07d5ba49..294977fe 100644 --- a/edit_contact_modal.php +++ b/edit_contact_modal.php @@ -59,7 +59,7 @@
- + @@ -74,7 +74,7 @@
- + @@ -128,4 +128,4 @@ - \ No newline at end of file + diff --git a/edit_location_modal.php b/edit_location_modal.php index b98a7421..80b72a52 100644 --- a/edit_location_modal.php +++ b/edit_location_modal.php @@ -50,7 +50,7 @@
- + @@ -187,4 +187,4 @@ - \ No newline at end of file + diff --git a/edit_network_modal.php b/edit_network_modal.php index 918f7261..0120c69e 100644 --- a/edit_network_modal.php +++ b/edit_network_modal.php @@ -47,7 +47,7 @@
- + @@ -93,4 +93,4 @@ - \ No newline at end of file + diff --git a/edit_vendor_modal.php b/edit_vendor_modal.php index c598057b..987d1ad5 100644 --- a/edit_vendor_modal.php +++ b/edit_vendor_modal.php @@ -148,7 +148,7 @@
- + @@ -197,4 +197,4 @@ - \ No newline at end of file + diff --git a/footer.php b/footer.php index 386ee242..91345930 100644 --- a/footer.php +++ b/footer.php @@ -20,8 +20,7 @@ - - + diff --git a/invoice.php b/invoice.php index c5cc2404..f47105b9 100644 --- a/invoice.php +++ b/invoice.php @@ -515,7 +515,7 @@ include("footer.php"); ] }, - watermark: {text: '', color: 'grey', opacity: 0.3, bold: true, italics: false}, + //watermark: {text: '', color: 'lightgrey', opacity: 0.3, bold: true, italics: false}, content: [ // Header @@ -530,58 +530,15 @@ include("footer.php"); [ { - text: 'INVOICE', + text: 'Invoice', style: 'invoiceTitle', width: '*' }, { - stack: [ - { - columns: [ - { - text:'Invoice #', - style:'invoiceSubTitle', - width: '*' - - }, - { - text:'', - style:'invoiceSubValue', - width: 100 - - } - ] - }, - { - columns: [ - { - text:'Date Issued', - style:'invoiceSubTitle', - width: '*' - }, - { - text:'', - style:'invoiceSubValue', - width: 100 - } - ] - }, - { - columns: [ - { - text:'Due Date', - style:'invoiceSubTitle', - width: '*' - }, - { - text:'', - style:'invoiceSubValue', - width: 100 - } - ] - }, - ] - } + text: '', + style: 'invoiceNumber', + width: '*' + }, ], ], }, @@ -595,24 +552,54 @@ include("footer.php"); }, { text: '', - style:'invoiceBillingTitle', + style:'invoiceBillingTitleClient', }, ] }, - + // Billing Address { columns: [ { - text: ' \n \n \n \n ', + text: ' \n \n \n ', style: 'invoiceBillingAddress' }, { - text: ' \n \n \n \n ', - style: 'invoiceBillingAddress' + text: ' \n \n \n ', + style: 'invoiceBillingAddressClient' }, ] }, + // Invoice Dates + { + columns: [ + { + text:'Invoice Date', + style:'invoiceDateTitle', + width: '*' + }, + { + text:'', + style:'invoiceDateValue', + width: 50 + } + ] + }, + { + columns: [ + { + text:'Due Date', + style:'invoiceDateTitle', + width: '*' + }, + { + text:'', + style:'invoiceDateValue', + width: 50 + } + ] + }, + // Line breaks '\n\n', // Items @@ -678,13 +665,13 @@ include("footer.php"); }, { text: '$item_description', - style:'itemSubTitle' + style:'itemDescription' } ], { text:'$item_quantity', - style:'itemNumber' + style:'itemQty' }, { text:'$$item_price', @@ -709,7 +696,7 @@ include("footer.php"); // END Items ] }, // table - // layout: 'lightHorizontalLines' + layout: 'lightHorizontalLines' }, // TOTAL { @@ -743,7 +730,7 @@ include("footer.php"); ], [ { - text:'TOTAL', + text:'Total', style:'itemsFooterTotalTitle' }, { @@ -776,7 +763,7 @@ include("footer.php"); layout: 'lightHorizontalLines' }, { - text: 'NOTES', + text: 'Notes', style:'notesTitle' }, { @@ -785,157 +772,132 @@ include("footer.php"); } ], styles: { - - // Document Footer - documentFooterCenter: { - fontSize: 10, - margin: [5,5,5,5], - alignment:'center' - }, - // Invoice Title - invoiceTitle: { - fontSize: 22, - bold: true, - alignment:'right', - margin:[0,0,0,15] - }, - // Invoice Details - invoiceSubTitle: { - fontSize: 12, - alignment:'right' - }, - invoiceSubValue: { - fontSize: 12, - alignment:'right' - }, - // Billing Headers - invoiceBillingTitle: { - fontSize: 14, - bold: true, - alignment:'left', - margin:[0,20,0,5], - }, - // Billing Details - invoiceBillingDetails: { - alignment:'left' - - }, - invoiceBillingAddressTitle: { - margin: [0,7,0,3], - bold: true - }, - invoiceBillingAddress: { - - }, - // Items Header - itemsHeader: { - margin: [0,5,0,5], - bold: true - }, - // Item Title - itemTitle: { - bold: true, - }, - itemSubTitle: { + // Document Footer + documentFooterCenter: { + fontSize: 8, + margin: [5,5,5,5], + alignment:'center' + }, + // Invoice Title + invoiceTitle: { + fontSize: 16, + bold: true, + alignment:'right', + margin:[0,0,0,3] + }, + // Invoice Number + invoiceNumber: { + fontSize: 12, + alignment:'right' + }, + + // Billing Headers + invoiceBillingTitle: { + fontSize: 12, + bold: true, + alignment:'left', + margin:[0,20,0,5] + }, + invoiceBillingTitleClient: { + fontSize: 12, + bold: true, + alignment:'right', + margin:[0,20,0,5] + }, + // Billing Details + invoiceBillingAddress: { + fontSize: 8, + lineHeight: 1.2 + }, + invoiceBillingAddressClient: { + fontSize: 8, + lineHeight: 1.2, + alignment:'right', + margin:[0,0,0,30] + }, + // Invoice Dates + invoiceDateTitle: { + fontSize: 8, + alignment:'right', + margin:[0,0,0,3] + }, + invoiceDateValue: { + fontSize: 8, + alignment:'right', + }, + // Items Header + itemsHeader: { + fontSize: 8, + margin: [0,5,0,5], + bold: true + }, + // Item Title + itemTitle: { + fontSize: 8, + bold: true, + margin: [0,5,0,3] + }, + itemDescription: { italics: true, - fontSize: 11 - }, - itemNumber: { - margin: [0,5,0,5], - alignment: 'center', - }, - itemTotal: { - margin: [0,5,0,5], - bold: true, - alignment: 'center', - }, - - // Items Footer (Subtotal, Total, Tax, etc) - itemsFooterSubTitle: { - margin: [0,5,0,5], - bold: true, - alignment:'right', - }, - itemsFooterSubValue: { - margin: [0,5,0,5], - bold: true, - alignment:'center', - }, - itemsFooterTotalTitle: { - margin: [0,5,0,5], - bold: true, - alignment:'right', - }, - itemsFooterTotalValue: { - margin: [0,5,0,5], - bold: true, - alignment:'center', - }, - notesTitle: { - fontSize: 10, - bold: true, - margin: [0,50,0,3], - }, - notesText: { - fontSize: 10 - }, - center: { - alignment:'center', - }, - }, - defaultStyle: { - columnGap: 20, - } - }; - - - diff --git a/js/app.js b/js/app.js index a6d66f02..6e2d172b 100644 --- a/js/app.js +++ b/js/app.js @@ -21,3 +21,6 @@ $('.summernote').summernote({ //DateTime $('.datetimepicker').datetimepicker({ }); + +//Data Input Mask +$('[data-mask]').inputmask(); diff --git a/test_starter_new.php b/test_starter_new.php index 61af966d..cbfb3fd8 100644 --- a/test_starter_new.php +++ b/test_starter_new.php @@ -1,3 +1,4 @@

Content

+