From 7fc457883c19bfbcce283d3717ed8a943ade3825 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Thu, 27 Feb 2014 08:57:59 +0200 Subject: [PATCH 01/30] report 3-3 --- app/views/invoices/edit.blade.php | 4 + public/images/report_logo3.jpg | Bin 0 -> 31804 bytes public/js/script.js | 673 +++++++++++++++++++++++++++++- 3 files changed, 671 insertions(+), 6 deletions(-) create mode 100644 public/images/report_logo3.jpg diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index b28396570d5c..471d01543e7a 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -571,6 +571,10 @@ invoice.imageLogoWidth2 =325/2; invoice.imageLogoHeight2 = 81/2; + invoice.imageLogo3 = "{{ HTML::image_data('images/report_logo3.jpg') }}"; + invoice.imageLogoWidth3 =325/2; + invoice.imageLogoHeight3 = 81/2; + return invoice; } diff --git a/public/images/report_logo3.jpg b/public/images/report_logo3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..8696d0535fa2c89da2c8877239466683a47f9edc GIT binary patch literal 31804 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 0) { + + var discount = total * (invoice.discount/100); + total -= discount; + } + + var tax = 0; + if (invoice.tax && parseFloat(invoice.tax.rate)) { + tax = parseFloat(invoice.tax.rate); + } else if (invoice.tax_rate && parseFloat(invoice.tax_rate)) { + tax = parseFloat(invoice.tax_rate); + } + + if (tax) { + var tax = total * (tax/100); + total = parseFloat(total) + parseFloat(tax); + } + + total = formatMoney(total - (invoice.amount - invoice.balance), currencyId); + + var balance = formatMoney(total, currencyId); + + /* + @param orientation One of "portrait" or "landscape" (or shortcuts "p" (Default), "l") + @param unit Measurement unit to be used when coordinates are specified. One of "pt" (points), "mm" (Default), "cm", "in" + @param format One of 'a3', 'a4' (Default),'a5' ,'letter' ,'legal' + @returns {jsPDF} + */ + var doc = new jsPDF('portrait', 'pt','a4'); + + + + //Set PDF properities + doc.setProperties({ + title: '', + subject: 'Report', + author: 'Ninja', + keywords: 'pdf, javascript,geenerated', + creator: 'Ninja' + }); + + + //set default style for report + doc.setFont('Helvetica',''); + doc.setFontSize(7); + + doc.setLineWidth(0.5); + + //doc.setFillColor( 46,43,43); + //doc.setFillColor( 46,43,43); + + doc.setDrawColor(242,101,34); + doc.setFillColor(242,101,34); + + + var x1 =0; + + var y1 = 0; + + var w2 = 595; + var h2 = 100;// doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; + doc.rect(x1, y1, w2, h2, 'FD'); + + + + + + +//---------------------------------------------------------------------------------------------------- + if (invoice.image) + { + var left = headerRight - invoice.imageWidth; + doc.addImage(invoice.image, 'JPEG', left, 30, invoice.imageWidth, invoice.imageHeight); + } + + Report3AddFooter (invoice,doc); + + var invoiceNumberX = headerRight - (doc.getStringUnitWidth(invoiceNumber, false) * doc.internal.getFontSize()); + var invoiceDateX = headerRight - (doc.getStringUnitWidth(invoiceDate) * doc.internal.getFontSize()); + var dueDateX = headerRight - (doc.getStringUnitWidth(dueDate) * doc.internal.getFontSize()); + var poNumberX = headerRight - (doc.getStringUnitWidth(invoice.po_number) * doc.internal.getFontSize()); + + + + var y = accountTop; + var left = marginLeft; + + + doc.setFontSize(7); + SetPdfColor('White',doc); + + + +//TODO:NOT AVAILEABLE FROM DATAMODEL + //account.email='email N/A'; + if (account.email) { + y += rowHeight; + doc.text(left, y, account.email); + } + else + { + //console.log('account.email NOT DEFINED !'); + } + +//TODO:NOT AVAILEABLE FROM DATAMODEL + if (account.phone) { + y += rowHeight; + doc.text(left, y, account.phone); + } + else + { + //console.log('account.phone NOT DEFINED !'); + } + + + var HeaderMarginThirdColumn=70; + + //second column + doc.setFontType("bold"); + var MaxWidth=594; + + var LineOne= account.name; + + var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineOne) * doc.internal.getFontSize()); + + if (account.name) { + + y += rowHeight; + doc.text(AlignLine, y, LineOne); + } + + y += rowHeight; + + doc.setFontType("normal"); + + + var LineTwo= account.address1+' '+account.address2+account.city+' '+(account.country ? account.country.name : ''); + + var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineTwo) * doc.internal.getFontSize()); + y += rowHeight; + doc.text(AlignLine, y, LineTwo); + + +//-----------------------------Publish Client Details block-------------------------------------------- + + var y = accountTop; + var left = marginLeft; + + var headerY = headerTop; + + + + SetPdfColor('GrayLogo',doc); //set black color + + + var line1=headerTop+16; + var line2=headerTop+16*2; + var line21=headerTop+16*1.6; + var line22=headerTop+16*2.2; + + var line3=headerTop+16*3; + var line31=headerTop+16*3.6; + + var marginLeft1=50; + + + SetPdfColor('Black',doc); //set black color + + doc.setFontSize(7); + + + ClientCompanyName=client.name; + ClientCompanyEmail='';//client.email;//'22222222'; + ClientCompanyPhone=client.work_phone; + + ClientCompanyAddress1=client.address1; + ClientCompanyAddress2=client.address2+' '+client.postal_code; + + if(client) + { + ClientCompanyName=getClientDisplayName(client); + ClientCompanyPhone=client.work_phone; + ClientCompanyEmail=client.contacts[0].email; + + } + + //show left column + SetPdfColor('Black',doc); //set black color + doc.setFontType("normal"); + + +//publish filled box + doc.setDrawColor(200,200,200); + doc.setFillColor(54,164,152); + + GlobalY=190; + doc.setLineWidth(0.5); + + var BlockLenght=220; + var x1 =595-BlockLenght; + var y1 = GlobalY-12; + var w2 = BlockLenght; + var h2 = 90; + doc.rect(x1, y1, w2, h2, 'FD'); + + + + SetPdfColor('SomeGreen',doc); + doc.setFontSize('14'); + doc.setFontType("bold"); + doc.text(50, GlobalY, 'YOUR INVOICE'); + + + var z=GlobalY; + z=z+30; + + + SetPdfColor('Black',doc); + + if (ClientCompanyName) + { + doc.setFontSize('8'); + doc.setFontType("bold"); + doc.text(marginLeft1, z, ClientCompanyName); + z=z+15;//doc.internal.getFontSize(); + } + + if (ClientCompanyAddress1) + { + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft1, z, ClientCompanyAddress1); + z=z+15;////z=z+doc.internal.getFontSize(); + } + if (ClientCompanyAddress2) + { + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft1, z, ClientCompanyAddress2); + z=z+15;////z=z+doc.internal.getFontSize(); + } + + if (ClientCompanyEmail) + { + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft1, z, ClientCompanyEmail); + z=z+15;///z=z+doc.internal.getFontSize(); + } + if (ClientCompanyPhone) + { + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft1, z, ClientCompanyPhone); + z=z+15;////z=z+doc.internal.getFontSize(); + } + + + marginLeft2=395; + + //publish left side information + + SetPdfColor('White',doc); + z=GlobalY+15; + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft2, z,'Invoice Number'); + z=z+15;//doc.internal.getFontSize(); + + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft2, z,'Invoice date'); + z=z+15;//doc.internal.getFontSize(); + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft2, z,'Due Date'); + z=z+15;//doc.internal.getFontSize(); + + + marginLeft3=marginLeft2+65; + + z=GlobalY+15; + + + var invoiceNumber = invoice.invoice_number; + var invoiceDate = invoice.invoice_date ? invoice.invoice_date : ''; + var dueDate = invoice.due_date ? invoice.due_date : ''; + + + doc.setFontSize('7'); + doc.setFontType("bold"); + doc.text(marginLeft3, z,invoiceNumber); + z=z+15;//doc.internal.getFontSize(); + + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft3, z,invoiceDate); + z=z+15;//doc.internal.getFontSize(); + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft3, z,dueDate); + z=z+15;//doc.internal.getFontSize(); + + y=z+60; +//--------------------------------Publishing Table-------------------------------------------------- + GlobalY=y+30; + GlobalY=GlobalY+70;//y+30; + SetPdfColor('Black',doc); + doc.setFontSize(7); + var hasTaxes = false; + for (var i=0; i 0) || (item.tax_rate && parseFloat(item.tax_rate) > 0)) { + hasTaxes = true; + break; + } + } + if (hasTaxes) + { + descriptionLeft -= 20; + unitCostRight -= 40; + qtyRight -= 40; + } + + var costX = unitCostRight - (doc.getStringUnitWidth('Unit Cost') * doc.internal.getFontSize()); + var qtyX = qtyRight - (doc.getStringUnitWidth('Quantity') * doc.internal.getFontSize()); + var taxX = taxRight - (doc.getStringUnitWidth('Tax') * doc.internal.getFontSize()); + var totalX = lineTotalRight - (doc.getStringUnitWidth('Line Total') * doc.internal.getFontSize()); + + tableTop=GlobalY;//redefine this to dynamic value + + doc.setFontSize(12); + doc.setFontType("bold"); + + doc.text(tableLeft, tableTop, 'Item'); + doc.text(descriptionLeft, tableTop, 'Description'); + doc.text(costX, tableTop, 'Unit Cost'); + doc.text(qtyX, tableTop, 'Quantity'); + doc.text(totalX, tableTop, 'Line Total'); + + if (hasTaxes) + { + doc.text(taxX, tableTop, 'Tax'); + } + + + doc.setFontSize(7); + + /* line items */ + + var line = 1; + var total = 0; + var shownItem = false; + + + GlobalY=GlobalY+24; //padding from top + + var FontSize=7; + doc.setFontSize(FontSize); + doc.setFontType("normal"); + + var MaxLinesPerPage=40; + + + + for (var i=0; i MaxGlobalY) { + + tableTop = 40; + GlobalY=tableTop; + + doc.addPage(); + Report3AddFooter(invoice,doc); + } + + if ((i%2)===0){ + doc.setLineWidth(0.5); + doc.setDrawColor(240,240,240); + doc.setFillColor(240,240,240); + + + + var x1 = tableLeft-tablePadding ; + var y1 = GlobalY-FontSize; + var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; + var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; + doc.rect(x1, y1, w2, h2, 'FD'); + } + else + { + doc.setLineWidth(0.5); + doc.setDrawColor(251,251,251); + doc.setFillColor(251,251,251); + + + var x1 = tableLeft-tablePadding ; + var y1 = GlobalY-FontSize; + var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; + var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; + doc.rect(x1, y1, w2, h2, 'FD'); + } + + x=GlobalY; + + GlobalY=GlobalY+h+tablePadding*2; + + + SetPdfColor('SomeGreen',doc); + doc.text(tableLeft, x, productKey); + + SetPdfColor('Black',doc); + doc.text(descriptionLeft, x, notes); + + doc.text(costX, x, cost); + doc.text(qtyX, x, qty); + doc.text(totalX, x, lineTotal); + + if (tax) { + doc.text(taxX, x, tax+'%'); + } + + + line=line+length; + } +//-------------------------------Publishing Document balance------------------------------------------ + + + x += 16+50; + + doc.setFontType("bold"); + MsgRightAlign=400; + + + + GlobalY=x; + + doc.setLineWidth(0.3); + + doc.setDrawColor(251,251,251); + doc.setFillColor(251,251,251); + var x1 = tableLeft-tablePadding*2 ; + var y1 = GlobalY-FontSize-tablePadding; + var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; + var h2 = doc.internal.getFontSize()*3+tablePadding*2; + doc.rect(x1, y1, w2, h2, 'FD'); + + + Msg='Total'; + var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); + doc.text(TmpMsgX, x, Msg); + + doc.setFontType("normal"); + AmountText = formatMoney(total , currencyId); + headerLeft=headerRight+400; + var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); + doc.text(AmountX, x, AmountText); + + + + + x += doc.internal.getFontSize()*2; + + Msg='Amount Payed'; + var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); + doc.text(TmpMsgX, x, Msg); + + + + AmountText = formatMoney(paid_to_date , currencyId); + headerLeft=headerRight+400; + var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); + doc.text(AmountX, x, AmountText); + + + + + doc.setFontType("bold"); + + doc.setFontSize(12); + x += doc.internal.getFontSize()*4; + Msg='Amount Due'; + var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); + + + + doc.text(TmpMsgX, x, Msg); + + + SetPdfColor('LightBlue',doc); + AmountText = formatMoney(balance , currencyId); + headerLeft=headerRight+400; + var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); + doc.text(AmountX, x, AmountText); + + + + + + + return doc; +} + + + + function SetPdfColor(color,doc) { @@ -1829,7 +2448,7 @@ function Report2AddFooter (invoice,doc) pageHeight=820; var left = 250;//headerRight ; y=pageHeight-invoice.imageLogoHeight2; - var headerRight=350; + var headerRight=370; var left = headerRight - invoice.imageLogoWidth2; doc.addImage(invoice.imageLogo2, 'JPEG', left, y, invoice.imageLogoWidth2, invoice.imageLogoHeight2); @@ -1841,3 +2460,45 @@ function Report2AddFooter (invoice,doc) } +function Report3AddFooter (invoice,doc) +{ + + doc.setLineWidth(0.5); +// doc.setDrawColor(41,37,37); +// doc.setFillColor(41,37,37); + doc.setDrawColor(242,101,34); + doc.setFillColor(242,101,34); + + // return doc.setTextColor(240,240,240);//select color Custom Report GRAY Colour + + + + + var x1 = 0;//tableLeft-tablePadding ; + + var y1 = 750; + + var w2 = 596; + var h2 = 94;//doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; + + + + doc.rect(x1, y1, w2, h2, 'FD'); + + + if (invoice.imageLogo3) + { + pageHeight=820; + var left = 250;//headerRight ; + y=pageHeight-invoice.imageLogoHeight3; + var headerRight=370; + + var left = headerRight - invoice.imageLogoWidth3; + doc.addImage(invoice.imageLogo3, 'JPEG', left, y, invoice.imageLogoWidth3, invoice.imageLogoHeight3); + + + } + + + +} From 63af55922150726357b7c44d7287272c541e6a07 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Thu, 27 Feb 2014 09:06:19 +0200 Subject: [PATCH 02/30] report 3-3 --- public/js/script.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 2c8daba67bca..0624024e4c70 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -2215,7 +2215,7 @@ function GetReportTemplate3 (invoice,checkMath) length=doc.splitTextToSize(item.notes, 200).length; var h=length*FontSize; - MaxGlobalY=750; + MaxGlobalY=730; if (h+GlobalY > MaxGlobalY) { tableTop = 40; @@ -2412,12 +2412,6 @@ function SetPdfColor(color,doc) - - -function Report1AddFooter (doc) -{ -} - function Report2AddFooter (invoice,doc) { @@ -2464,8 +2458,6 @@ function Report3AddFooter (invoice,doc) { doc.setLineWidth(0.5); -// doc.setDrawColor(41,37,37); -// doc.setFillColor(41,37,37); doc.setDrawColor(242,101,34); doc.setFillColor(242,101,34); From fe9249beb7f495f7662e929cfeebdf16fdfc5f33 Mon Sep 17 00:00:00 2001 From: Razi KAntorp Date: Thu, 27 Feb 2014 12:42:23 +0100 Subject: [PATCH 03/30] Dasboard table headers, golobal button change. --- app/views/accounts/details.blade.php | 2 +- app/views/accounts/notifications.blade.php | 2 +- app/views/accounts/payments.blade.php | 2 +- app/views/clients/edit.blade.php | 4 +--- app/views/credits/edit.blade.php | 7 +++---- app/views/dashboard.blade.php | 4 ++-- app/views/payments/edit.blade.php | 6 +++--- public/css/style.css | 2 ++ 8 files changed, 14 insertions(+), 15 deletions(-) diff --git a/app/views/accounts/details.blade.php b/app/views/accounts/details.blade.php index a82dedcdf656..bf3ac60d4b02 100755 --- a/app/views/accounts/details.blade.php +++ b/app/views/accounts/details.blade.php @@ -75,7 +75,7 @@
- {{ Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') }} + {{ Button::lg_success_submit('Save')->append_with_icon('floppy-disk') }}
{{ Former::close() }} diff --git a/app/views/accounts/notifications.blade.php b/app/views/accounts/notifications.blade.php index 1759187d446c..4a0e8a41be79 100755 --- a/app/views/accounts/notifications.blade.php +++ b/app/views/accounts/notifications.blade.php @@ -18,7 +18,7 @@ {{ Former::textarea('invoice_terms')->label('Set default invoice terms') }} {{ Former::textarea('email_footer')->label('Set default email signature') }} - {{ Former::actions( Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') ) }} + {{ Former::actions( Button::lg_success_submit('Save')->append_with_icon('floppy-disk') ) }} {{ Former::close() }} @stop \ No newline at end of file diff --git a/app/views/accounts/payments.blade.php b/app/views/accounts/payments.blade.php index 9075f9034579..ce8a149d8507 100755 --- a/app/views/accounts/payments.blade.php +++ b/app/views/accounts/payments.blade.php @@ -45,7 +45,7 @@ @endforeach - {{ Former::actions( Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') ) }} + {{ Former::actions( Button::lg_success_submit('Save')->append_with_icon('floppy-disk') ) }} {{ Former::close() }} diff --git a/app/views/clients/edit.blade.php b/app/views/clients/edit.blade.php index e59b79d8b44a..84fab15a0758 100755 --- a/app/views/clients/edit.blade.php +++ b/app/views/clients/edit.blade.php @@ -148,10 +148,8 @@ - -
- {{ Button::lg_primary_submit('Save')->append_with_icon('floppy-disk') }} + {{ Button::lg_primary_submit_success('Save')->append_with_icon('floppy-disk') }} {{ Button::lg_default_link('clients/' . ($client ? $client->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
diff --git a/app/views/credits/edit.blade.php b/app/views/credits/edit.blade.php index b55a2038b191..047f792dfd68 100755 --- a/app/views/credits/edit.blade.php +++ b/app/views/credits/edit.blade.php @@ -28,10 +28,9 @@ - -
- {{ Button::lg_primary_submit('Save') }}  |  - {{ link_to('credits/' . ($credit ? $credit->public_id : ''), 'Cancel') }} +
+ {{ Button::lg_primary_submit_success('Save')->append_with_icon('floppy-disk') }} + {{ Button::lg_default_link('credits/' . ($credit ? $credit->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
{{ Former::close() }} diff --git a/app/views/dashboard.blade.php b/app/views/dashboard.blade.php index b23c040375fc..eaa27672e9a1 100644 --- a/app/views/dashboard.blade.php +++ b/app/views/dashboard.blade.php @@ -98,8 +98,8 @@
-
-
+
+

Upcoming invoices

diff --git a/app/views/payments/edit.blade.php b/app/views/payments/edit.blade.php index e8f446fed65e..580e48ff3000 100755 --- a/app/views/payments/edit.blade.php +++ b/app/views/payments/edit.blade.php @@ -32,9 +32,9 @@
-
- {{ Button::lg_primary_submit_success('Save') }}  |  - {{ link_to('payments/' . ($payment ? $payment->public_id : ''), 'Cancel') }} +
+ {{ Button::lg_primary_submit_success('Save')->append_with_icon('floppy-disk') }} + {{ Button::lg_default_link('payments/' . ($payment ? $payment->public_id : ''), 'Cancel')->append_with_icon('remove-circle'); }}
{{ Former::close() }} diff --git a/public/css/style.css b/public/css/style.css index fc5937eb2a90..7a20ed55d472 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -448,6 +448,8 @@ background-clip: padding-box; } .panel-body {padding: 25px;} +.dashboard .panel-heading { margin: -1px; } + .dashboard .panel-body {padding: 0;} .dashboard .table-striped>tbody>tr>td, .table-striped>tbody>tr>th { background-color: #fbfbfb;} From 0209454e91922593d05d92c22249738445b49bd6 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 27 Feb 2014 16:10:16 +0200 Subject: [PATCH 04/30] changed report names --- public/js/script.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 0624024e4c70..f18e1df1be7b 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -535,9 +535,9 @@ $.fn.datepicker.defaults.todayHighlight = true; function GetPdf(invoice,checkMath,report_id){ - if (report_id==2) return GetReportTemplate1(invoice,checkMath); - if (report_id==3) return GetReportTemplate2(invoice,checkMath); - if (report_id==1) return GetReportTemplate3(invoice,checkMath); + if (report_id==1) return GetReportTemplate1(invoice,checkMath); + if (report_id==2) return GetReportTemplate2(invoice,checkMath); + if (report_id==3) return GetReportTemplate3(invoice,checkMath); alert('report template not implemented yet'); From e6cbb8ba3fd74090d4153e9a7223f804c3b0409f Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 02:35:01 +0200 Subject: [PATCH 05/30] report 3-3 --- public/js/script.js | 357 +++++++++++++++++++++++++------------------- 1 file changed, 200 insertions(+), 157 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index f18e1df1be7b..78382f97177b 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1,4 +1,4 @@ -// http://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser +GetReportTemplate3// http://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser var isOpera = !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0; var isFirefox = typeof InstallTrigger !== 'undefined'; // Firefox 1.0+ var isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0; @@ -535,9 +535,9 @@ $.fn.datepicker.defaults.todayHighlight = true; function GetPdf(invoice,checkMath,report_id){ - if (report_id==1) return GetReportTemplate1(invoice,checkMath); + if (report_id==1) return GetReportTemplate3(invoice,checkMath); if (report_id==2) return GetReportTemplate2(invoice,checkMath); - if (report_id==3) return GetReportTemplate3(invoice,checkMath); + if (report_id==3) return GetReportTemplate1(invoice,checkMath); alert('report template not implemented yet'); @@ -1737,6 +1737,154 @@ function GetReportTemplate2 (invoice,checkMath) + + + +function SetPdfColor(color,doc) +{ + + if (color=='LightBlue') { + return doc.setTextColor(41,156, 194); + } + + if (color=='Black') { + return doc.setTextColor(46,43,43);//select color black + } + if (color=='GrayLogo') { + //return doc.setTextColor(207,209, 210);//select color Custom Report GRAY + return doc.setTextColor(207,241, 241);//select color Custom Report GRAY + } + + if (color=='GrayBackground') { + //return doc.setTextColor(207,209, 210);//select color Custom Report GRAY + return doc.setTextColor(251,251, 251);//select color Custom Report GRAY + } + + + + if (color=='GrayText') { + return doc.setTextColor(161,160,160);//select color Custom Report GRAY Colour + } + + if (color=='White') { + return doc.setTextColor(255,255,255);//select color Custom Report GRAY Colour + } + + + + if (color=='SomeGreen') { + return doc.setTextColor(54,164,152);//select color Custom Report GRAY Colour + } + + + + + if (color=='LightGrayReport2-gray') { + return doc.setTextColor(240,240,240);//select color Custom Report GRAY Colour + } + + if (color=='LightGrayReport2-white') { + return doc.setTextColor(251,251,251);//select color Custom Report GRAY Colour + } + + + + + alert('color is not defined'); + return false; + +} + + + +function Report2AddFooter (invoice,doc) +{ + + doc.setLineWidth(0.5); + doc.setDrawColor(41,37,37); + doc.setFillColor(41,37,37); + + + // return doc.setTextColor(240,240,240);//select color Custom Report GRAY Colour + + + + + var x1 = 0;//tableLeft-tablePadding ; + + var y1 = 750; + + var w2 = 596; + var h2 = 94;//doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; + + + + doc.rect(x1, y1, w2, h2, 'FD'); + + + if (invoice.imageLogo2) + { + pageHeight=820; + var left = 250;//headerRight ; + y=pageHeight-invoice.imageLogoHeight2; + var headerRight=370; + + var left = headerRight - invoice.imageLogoWidth2; + doc.addImage(invoice.imageLogo2, 'JPEG', left, y, invoice.imageLogoWidth2, invoice.imageLogoHeight2); + + + } + + + +} + +function Report3AddFooter (invoice,doc) +{ + + doc.setLineWidth(0.5); + doc.setDrawColor(242,101,34); + doc.setFillColor(242,101,34); + + // return doc.setTextColor(240,240,240);//select color Custom Report GRAY Colour + + + + + var x1 = 0;//tableLeft-tablePadding ; + + var y1 = 750; + + var w2 = 596; + var h2 = 94;//doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; + + + + doc.rect(x1, y1, w2, h2, 'FD'); + + + if (invoice.imageLogo3) + { + pageHeight=820; + var left = 250;//headerRight ; + y=pageHeight-invoice.imageLogoHeight3; + var headerRight=370; + + var left = headerRight - invoice.imageLogoWidth3; + doc.addImage(invoice.imageLogo3, 'JPEG', left, y, invoice.imageLogoWidth3, invoice.imageLogoHeight3); + + + } + + + +} + + + + + + function GetReportTemplate3 (invoice,checkMath) { var doc=false; @@ -1858,7 +2006,7 @@ function GetReportTemplate3 (invoice,checkMath) var y1 = 0; var w2 = 595; - var h2 = 100;// doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; + var h2 = 140;// doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; doc.rect(x1, y1, w2, h2, 'FD'); @@ -1868,10 +2016,12 @@ function GetReportTemplate3 (invoice,checkMath) //---------------------------------------------------------------------------------------------------- if (invoice.image) - { - var left = headerRight - invoice.imageWidth; - doc.addImage(invoice.image, 'JPEG', left, 30, invoice.imageWidth, invoice.imageHeight); - } + { + + y=170; + var left = headerRight - invoice.imageWidth; + doc.addImage(invoice.image, 'JPEG', left, y, invoice.imageWidth, invoice.imageHeight); + } Report3AddFooter (invoice,doc); @@ -1925,10 +2075,19 @@ function GetReportTemplate3 (invoice,checkMath) if (account.name) { - y += rowHeight; - doc.text(AlignLine, y, LineOne); + //SetPdfColor('SomeGreen',doc); + doc.setFontSize('36'); + doc.setFontType("bold"); + doc.text(40,50, LineOne); + + doc.setFontType("normal"); + doc.setFontSize('7'); } + + + /* + y += rowHeight; doc.setFontType("normal"); @@ -1939,7 +2098,7 @@ function GetReportTemplate3 (invoice,checkMath) var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineTwo) * doc.internal.getFontSize()); y += rowHeight; doc.text(AlignLine, y, LineTwo); - +*/ //-----------------------------Publish Client Details block-------------------------------------------- @@ -2059,12 +2218,22 @@ function GetReportTemplate3 (invoice,checkMath) } + + + + + + + + + + marginLeft2=395; //publish left side information SetPdfColor('White',doc); - z=GlobalY+15; + z=30;//GlobalY+15; doc.setFontSize('8'); doc.setFontType("normal"); @@ -2079,13 +2248,19 @@ function GetReportTemplate3 (invoice,checkMath) doc.setFontSize('8'); doc.setFontType("normal"); - doc.text(marginLeft2, z,'Due Date'); + doc.text(marginLeft2, z,'Payment Date'); + z=z+15;//doc.internal.getFontSize(); + + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft2, z,'Amount Due'); z=z+15;//doc.internal.getFontSize(); marginLeft3=marginLeft2+65; - z=GlobalY+15; + z=30;//GlobalY+15; var invoiceNumber = invoice.invoice_number; @@ -2109,6 +2284,17 @@ function GetReportTemplate3 (invoice,checkMath) doc.text(marginLeft3, z,dueDate); z=z+15;//doc.internal.getFontSize(); + + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft3, z,total); + z=z+15;//doc.internal.getFontSize(); + + + + + y=z+60; //--------------------------------Publishing Table-------------------------------------------------- GlobalY=y+30; @@ -2351,146 +2537,3 @@ function GetReportTemplate3 (invoice,checkMath) return doc; } - - - - -function SetPdfColor(color,doc) -{ - - if (color=='LightBlue') { - return doc.setTextColor(41,156, 194); - } - - if (color=='Black') { - return doc.setTextColor(46,43,43);//select color black - } - if (color=='GrayLogo') { - //return doc.setTextColor(207,209, 210);//select color Custom Report GRAY - return doc.setTextColor(207,241, 241);//select color Custom Report GRAY - } - - if (color=='GrayBackground') { - //return doc.setTextColor(207,209, 210);//select color Custom Report GRAY - return doc.setTextColor(251,251, 251);//select color Custom Report GRAY - } - - - - if (color=='GrayText') { - return doc.setTextColor(161,160,160);//select color Custom Report GRAY Colour - } - - if (color=='White') { - return doc.setTextColor(255,255,255);//select color Custom Report GRAY Colour - } - - - - if (color=='SomeGreen') { - return doc.setTextColor(54,164,152);//select color Custom Report GRAY Colour - } - - - - - if (color=='LightGrayReport2-gray') { - return doc.setTextColor(240,240,240);//select color Custom Report GRAY Colour - } - - if (color=='LightGrayReport2-white') { - return doc.setTextColor(251,251,251);//select color Custom Report GRAY Colour - } - - - - - alert('color is not defined'); - return false; - -} - - - -function Report2AddFooter (invoice,doc) -{ - - doc.setLineWidth(0.5); - doc.setDrawColor(41,37,37); - doc.setFillColor(41,37,37); - - - // return doc.setTextColor(240,240,240);//select color Custom Report GRAY Colour - - - - - var x1 = 0;//tableLeft-tablePadding ; - - var y1 = 750; - - var w2 = 596; - var h2 = 94;//doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; - - - - doc.rect(x1, y1, w2, h2, 'FD'); - - - if (invoice.imageLogo2) - { - pageHeight=820; - var left = 250;//headerRight ; - y=pageHeight-invoice.imageLogoHeight2; - var headerRight=370; - - var left = headerRight - invoice.imageLogoWidth2; - doc.addImage(invoice.imageLogo2, 'JPEG', left, y, invoice.imageLogoWidth2, invoice.imageLogoHeight2); - - - } - - - -} - -function Report3AddFooter (invoice,doc) -{ - - doc.setLineWidth(0.5); - doc.setDrawColor(242,101,34); - doc.setFillColor(242,101,34); - - // return doc.setTextColor(240,240,240);//select color Custom Report GRAY Colour - - - - - var x1 = 0;//tableLeft-tablePadding ; - - var y1 = 750; - - var w2 = 596; - var h2 = 94;//doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; - - - - doc.rect(x1, y1, w2, h2, 'FD'); - - - if (invoice.imageLogo3) - { - pageHeight=820; - var left = 250;//headerRight ; - y=pageHeight-invoice.imageLogoHeight3; - var headerRight=370; - - var left = headerRight - invoice.imageLogoWidth3; - doc.addImage(invoice.imageLogo3, 'JPEG', left, y, invoice.imageLogoWidth3, invoice.imageLogoHeight3); - - - } - - - -} From 3aef6a249067325079385542f1828d9a29273f5e Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 03:33:48 +0200 Subject: [PATCH 06/30] report 3-3 --- public/js/script.js | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 78382f97177b..3a7ee54b2aa5 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -2120,7 +2120,7 @@ function GetReportTemplate3 (invoice,checkMath) var line3=headerTop+16*3; var line31=headerTop+16*3.6; - var marginLeft1=50; + var marginLeft1=394; SetPdfColor('Black',doc); //set black color @@ -2149,29 +2149,28 @@ function GetReportTemplate3 (invoice,checkMath) //publish filled box - doc.setDrawColor(200,200,200); - doc.setFillColor(54,164,152); +// doc.setDrawColor(200,200,200); +// doc.setFillColor(54,164,152); GlobalY=190; - doc.setLineWidth(0.5); - - var BlockLenght=220; - var x1 =595-BlockLenght; - var y1 = GlobalY-12; - var w2 = BlockLenght; - var h2 = 90; - doc.rect(x1, y1, w2, h2, 'FD'); + //doc.setLineWidth(0.5); +// var BlockLenght=220; +// var x1 =595-BlockLenght; +// var y1 = GlobalY-12; +// var w2 = BlockLenght; +// var h2 = 90; +// // doc.rect(x1, y1, w2, h2, 'FD'); - SetPdfColor('SomeGreen',doc); - doc.setFontSize('14'); - doc.setFontType("bold"); - doc.text(50, GlobalY, 'YOUR INVOICE'); - - +// SetPdfColor('SomeGreen',doc); +// doc.setFontSize('14'); +// doc.setFontType("bold"); +// doc.text(50, GlobalY, 'YOUR INVOICE'); +// +// var z=GlobalY; - z=z+30; +// z=z+30; SetPdfColor('Black',doc); @@ -2297,7 +2296,7 @@ function GetReportTemplate3 (invoice,checkMath) y=z+60; //--------------------------------Publishing Table-------------------------------------------------- - GlobalY=y+30; + GlobalY=y+130; GlobalY=GlobalY+70;//y+30; SetPdfColor('Black',doc); doc.setFontSize(7); From f545a92b8acfbff40474c03f4bbd0778d5bd2fa3 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 03:38:44 +0200 Subject: [PATCH 07/30] report 3-3 --- public/js/script.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 3a7ee54b2aa5..eaa2708980cd 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1720,7 +1720,7 @@ function GetReportTemplate2 (invoice,checkMath) doc.text(TmpMsgX, x, Msg); - SetPdfColor('LightBlue',doc); + //SetPdfColor('LightBlue',doc); AmountText = formatMoney(balance , currencyId); headerLeft=headerRight+400; var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); @@ -1866,12 +1866,12 @@ function Report3AddFooter (invoice,doc) if (invoice.imageLogo3) { pageHeight=820; - var left = 250;//headerRight ; + // var left = 25;//250;//headerRight ; y=pageHeight-invoice.imageLogoHeight3; - var headerRight=370; + //var headerRight=370; - var left = headerRight - invoice.imageLogoWidth3; - doc.addImage(invoice.imageLogo3, 'JPEG', left, y, invoice.imageLogoWidth3, invoice.imageLogoHeight3); + //var left = headerRight - invoice.imageLogoWidth3; + doc.addImage(invoice.imageLogo3, 'JPEG', 40, y, invoice.imageLogoWidth3, invoice.imageLogoHeight3); } From 1fbb6afaf7f44fefece83bb28a01b100941aa1c1 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 04:02:19 +0200 Subject: [PATCH 08/30] report 3-3 --- public/js/script.js | 75 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 4 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index eaa2708980cd..14bb4b07da8a 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1839,7 +1839,7 @@ function Report2AddFooter (invoice,doc) } -function Report3AddFooter (invoice,doc) +function Report3AddFooter (invoice,account,doc) { doc.setLineWidth(0.5); @@ -1878,6 +1878,73 @@ function Report3AddFooter (invoice,doc) + + + + + var LineOne= account.name; + + MaxWidth=440; + var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineOne) * doc.internal.getFontSize()); + + if (account.name) { + + y =780; + + doc.setFontSize(12); + //doc.setFontType("normal"); + doc.setFontType("bold"); + SetPdfColor('White',doc); + + + doc.text(AlignLine, y, LineOne); + + doc.setFontSize(7); + } + + +var y =780; + + var AlignLine2=AlignLine+110; + if (account.address1) { + + doc.setFontSize(12); + doc.setFontType("normal"); + SetPdfColor('White',doc); + doc.text(AlignLine2, y,account.address1); + doc.setFontSize(7); + + y=y+18; + } + + + + if (account.address2) { + + doc.setFontSize(12); + doc.setFontType("normal"); + SetPdfColor('White',doc); + doc.text(AlignLine2, y,account.address2); + doc.setFontSize(7); + + y=y+18; + } + + + + doc.setFontSize(12); + doc.setFontType("normal"); + SetPdfColor('White',doc); + + + var LineTwo= account.city+' '+(account.country ? account.country.name : ''); + + doc.text(AlignLine2, y,LineTwo); + doc.setFontSize(7); + + + + } @@ -2023,7 +2090,7 @@ function GetReportTemplate3 (invoice,checkMath) doc.addImage(invoice.image, 'JPEG', left, y, invoice.imageWidth, invoice.imageHeight); } - Report3AddFooter (invoice,doc); + Report3AddFooter (invoice,account,doc); var invoiceNumberX = headerRight - (doc.getStringUnitWidth(invoiceNumber, false) * doc.internal.getFontSize()); var invoiceDateX = headerRight - (doc.getStringUnitWidth(invoiceDate) * doc.internal.getFontSize()); @@ -2407,7 +2474,7 @@ function GetReportTemplate3 (invoice,checkMath) GlobalY=tableTop; doc.addPage(); - Report3AddFooter(invoice,doc); + Report3AddFooter(invoice,account,doc); } if ((i%2)===0){ @@ -2523,7 +2590,7 @@ function GetReportTemplate3 (invoice,checkMath) doc.text(TmpMsgX, x, Msg); - SetPdfColor('LightBlue',doc); + // SetPdfColor('LightBlue',doc); AmountText = formatMoney(balance , currencyId); headerLeft=headerRight+400; var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); From 83e842d215141a6bdeca9c298f93dbd810a1f337 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 04:04:42 +0200 Subject: [PATCH 09/30] report 3-3 --- public/js/script.js | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 14bb4b07da8a..ea44e925011d 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -2214,30 +2214,10 @@ function GetReportTemplate3 (invoice,checkMath) SetPdfColor('Black',doc); //set black color doc.setFontType("normal"); - -//publish filled box -// doc.setDrawColor(200,200,200); -// doc.setFillColor(54,164,152); - GlobalY=190; - //doc.setLineWidth(0.5); -// var BlockLenght=220; -// var x1 =595-BlockLenght; -// var y1 = GlobalY-12; -// var w2 = BlockLenght; -// var h2 = 90; -// // doc.rect(x1, y1, w2, h2, 'FD'); - - -// SetPdfColor('SomeGreen',doc); -// doc.setFontSize('14'); -// doc.setFontType("bold"); -// doc.text(50, GlobalY, 'YOUR INVOICE'); -// -// var z=GlobalY; -// z=z+30; + SetPdfColor('Black',doc); @@ -2290,10 +2270,6 @@ function GetReportTemplate3 (invoice,checkMath) - - - - marginLeft2=395; //publish left side information @@ -2509,7 +2485,7 @@ function GetReportTemplate3 (invoice,checkMath) GlobalY=GlobalY+h+tablePadding*2; - SetPdfColor('SomeGreen',doc); +// SetPdfColor('SomeGreen',doc); doc.text(tableLeft, x, productKey); SetPdfColor('Black',doc); @@ -2590,7 +2566,7 @@ function GetReportTemplate3 (invoice,checkMath) doc.text(TmpMsgX, x, Msg); - // SetPdfColor('LightBlue',doc); + AmountText = formatMoney(balance , currencyId); headerLeft=headerRight+400; var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); From eb749878c0b62f9b88207565a759f1657d6c7407 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 04:21:53 +0200 Subject: [PATCH 10/30] report 3-3 --- public/js/script.js | 85 ++++++++++++++++++++++++++++----------------- 1 file changed, 53 insertions(+), 32 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index ea44e925011d..4e4239c66303 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -2453,32 +2453,19 @@ function GetReportTemplate3 (invoice,checkMath) Report3AddFooter(invoice,account,doc); } - if ((i%2)===0){ - doc.setLineWidth(0.5); - doc.setDrawColor(240,240,240); - doc.setFillColor(240,240,240); - var x1 = tableLeft-tablePadding ; - var y1 = GlobalY-FontSize; - var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; - doc.rect(x1, y1, w2, h2, 'FD'); - } - else - { - doc.setLineWidth(0.5); - doc.setDrawColor(251,251,251); - doc.setFillColor(251,251,251); + doc.setDrawColor(0,0,0); // draw red lines + doc.setLineWidth(0.1); + + var x1 = tableLeft-tablePadding ; + var y1 = GlobalY-FontSize; + var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; + doc.line(x1, y1,x1+w2, y1); // horizontal line + - var x1 = tableLeft-tablePadding ; - var y1 = GlobalY-FontSize; - var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; - doc.rect(x1, y1, w2, h2, 'FD'); - } x=GlobalY; @@ -2502,6 +2489,15 @@ function GetReportTemplate3 (invoice,checkMath) line=line+length; } + +//------------------------------ + + var x1 = tableLeft-tablePadding ; + var y1 = GlobalY-FontSize; + var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; + doc.line(x1, y1,x1+w2, y1); // horizontal line + + //-------------------------------Publishing Document balance------------------------------------------ @@ -2514,15 +2510,15 @@ function GetReportTemplate3 (invoice,checkMath) GlobalY=x; - doc.setLineWidth(0.3); - - doc.setDrawColor(251,251,251); - doc.setFillColor(251,251,251); - var x1 = tableLeft-tablePadding*2 ; - var y1 = GlobalY-FontSize-tablePadding; - var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - var h2 = doc.internal.getFontSize()*3+tablePadding*2; - doc.rect(x1, y1, w2, h2, 'FD'); +// doc.setLineWidth(0.3); +// +// doc.setDrawColor(251,251,251); +// doc.setFillColor(251,251,251); +// var x1 = tableLeft-tablePadding*2 ; +// var y1 = GlobalY-FontSize-tablePadding; +// var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; +// var h2 = doc.internal.getFontSize()*3+tablePadding*2; +// doc.rect(x1, y1, w2, h2, 'FD'); Msg='Total'; @@ -2554,8 +2550,33 @@ function GetReportTemplate3 (invoice,checkMath) - doc.setFontType("bold"); + + + + + + doc.setLineWidth(0.3); + + doc.setDrawColor(63,60,60); + doc.setFillColor(63,60,60); + var x1 = tableLeft-tablePadding*2 ; + var y1 = x+ doc.internal.getFontSize()*4; + var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; + var h2 = doc.internal.getFontSize()*3+tablePadding*2; + doc.rect(x1, y1, w2, h2, 'FD'); + + + + + + + + + + + doc.setFontType("bold"); + SetPdfColor('White',doc); doc.setFontSize(12); x += doc.internal.getFontSize()*4; Msg='Amount Due'; @@ -2566,7 +2587,7 @@ function GetReportTemplate3 (invoice,checkMath) doc.text(TmpMsgX, x, Msg); - + doc.setFontType("normal"); AmountText = formatMoney(balance , currencyId); headerLeft=headerRight+400; var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); From f13e42f34f41005be2415f93cdbab5b586e7d8ae Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 04:28:51 +0200 Subject: [PATCH 11/30] report 3-3 --- public/js/script.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/js/script.js b/public/js/script.js index 4e4239c66303..d1c9140bfdbc 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -2473,11 +2473,16 @@ function GetReportTemplate3 (invoice,checkMath) // SetPdfColor('SomeGreen',doc); + + doc.setFontType("bold"); doc.text(tableLeft, x, productKey); + doc.setFontType("normal"); SetPdfColor('Black',doc); doc.text(descriptionLeft, x, notes); + + doc.text(costX, x, cost); doc.text(qtyX, x, qty); doc.text(totalX, x, lineTotal); From 28a2eece85a23e2416c460e388374e8e0e0d9c02 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 05:13:12 +0200 Subject: [PATCH 12/30] report 3-3 --- public/js/script.js | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index d1c9140bfdbc..3752ed333229 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -2214,7 +2214,7 @@ function GetReportTemplate3 (invoice,checkMath) SetPdfColor('Black',doc); //set black color doc.setFontType("normal"); - GlobalY=190; + GlobalY=170; var z=GlobalY; @@ -2359,16 +2359,56 @@ function GetReportTemplate3 (invoice,checkMath) qtyRight -= 40; } + + + + + + + + + + + + + + + var costX = unitCostRight - (doc.getStringUnitWidth('Unit Cost') * doc.internal.getFontSize()); var qtyX = qtyRight - (doc.getStringUnitWidth('Quantity') * doc.internal.getFontSize()); var taxX = taxRight - (doc.getStringUnitWidth('Tax') * doc.internal.getFontSize()); - var totalX = lineTotalRight - (doc.getStringUnitWidth('Line Total') * doc.internal.getFontSize()); + var totalX = lineTotalRight - (doc.getStringUnitWidth('Line Total') * doc.internal.getFontSize()) -15; tableTop=GlobalY;//redefine this to dynamic value + doc.setFontSize(12); doc.setFontType("bold"); + + + + + + + + + + doc.setLineWidth(0.3); + + doc.setDrawColor(63,60,60); + doc.setFillColor(63,60,60); + var x1 = tableLeft-tablePadding*2+5 ; + var y1 = GlobalY-doc.internal.getFontSize()-15; + var w2 = 515+tablePadding*2-3;//lineTotalRight-tablePadding*5; + var h2 = doc.internal.getFontSize()+15*2; + doc.rect(x1, y1, w2, h2, 'FD'); + + + SetPdfColor('White',doc); + + + doc.text(tableLeft, tableTop, 'Item'); doc.text(descriptionLeft, tableTop, 'Description'); doc.text(costX, tableTop, 'Unit Cost'); From 12aac27b95c0fdbfb3bdb0c80ef20682db79d37e Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 05:16:15 +0200 Subject: [PATCH 13/30] report 3-3 --- public/js/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/script.js b/public/js/script.js index 3752ed333229..3baa19ff9394 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -2420,7 +2420,7 @@ function GetReportTemplate3 (invoice,checkMath) doc.text(taxX, tableTop, 'Tax'); } - + SetPdfColor('Black',doc); doc.setFontSize(7); /* line items */ From fbfd9c324cdaa4137df0c2024808dbc56b80e5be Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 05:19:14 +0200 Subject: [PATCH 14/30] report 3-3 --- public/js/script.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 3baa19ff9394..461c3b195f0a 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -2340,7 +2340,7 @@ function GetReportTemplate3 (invoice,checkMath) y=z+60; //--------------------------------Publishing Table-------------------------------------------------- GlobalY=y+130; - GlobalY=GlobalY+70;//y+30; + GlobalY=GlobalY+30;//y+30; SetPdfColor('Black',doc); doc.setFontSize(7); var hasTaxes = false; @@ -2494,8 +2494,8 @@ function GetReportTemplate3 (invoice,checkMath) } - - +if (i!=0) +{ doc.setDrawColor(0,0,0); // draw red lines doc.setLineWidth(0.1); @@ -2503,7 +2503,7 @@ function GetReportTemplate3 (invoice,checkMath) var y1 = GlobalY-FontSize; var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; doc.line(x1, y1,x1+w2, y1); // horizontal line - +} From 9432fd16e68ae3978969cb47ef10a9ddc14cceac Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 05:46:41 +0200 Subject: [PATCH 15/30] report 3-3 --- public/js/script.js | 130 ++++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 461c3b195f0a..a03e145e979e 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -2059,25 +2059,10 @@ function GetReportTemplate3 (invoice,checkMath) doc.setFont('Helvetica',''); doc.setFontSize(7); - doc.setLineWidth(0.5); - - //doc.setFillColor( 46,43,43); - //doc.setFillColor( 46,43,43); - - doc.setDrawColor(242,101,34); - doc.setFillColor(242,101,34); - - - var x1 =0; - - var y1 = 0; - - var w2 = 595; - var h2 = 140;// doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; - doc.rect(x1, y1, w2, h2, 'FD'); + Report3AddHeader (invoice,account,doc); @@ -2132,41 +2117,9 @@ function GetReportTemplate3 (invoice,checkMath) var HeaderMarginThirdColumn=70; - //second column - doc.setFontType("bold"); - var MaxWidth=594; - - var LineOne= account.name; - - var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineOne) * doc.internal.getFontSize()); - - if (account.name) { - - //SetPdfColor('SomeGreen',doc); - doc.setFontSize('36'); - doc.setFontType("bold"); - doc.text(40,50, LineOne); - - doc.setFontType("normal"); - doc.setFontSize('7'); - } - /* - - y += rowHeight; - - doc.setFontType("normal"); - - - var LineTwo= account.address1+' '+account.address2+account.city+' '+(account.country ? account.country.name : ''); - - var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineTwo) * doc.internal.getFontSize()); - y += rowHeight; - doc.text(AlignLine, y, LineTwo); -*/ - //-----------------------------Publish Client Details block-------------------------------------------- var y = accountTop; @@ -2484,17 +2437,23 @@ function GetReportTemplate3 (invoice,checkMath) length=doc.splitTextToSize(item.notes, 200).length; var h=length*FontSize; MaxGlobalY=730; + + + if (h+GlobalY > MaxGlobalY) { - tableTop = 40; + tableTop = 180; GlobalY=tableTop; doc.addPage(); + Report3AddHeader(invoice,account,doc); Report3AddFooter(invoice,account,doc); + NewPageFlag=1; } + else NewPageFlag=0; -if (i!=0) +if (i!=0&NewPageFlag==0) { doc.setDrawColor(0,0,0); // draw red lines doc.setLineWidth(0.1); @@ -2535,12 +2494,17 @@ if (i!=0) line=line+length; } -//------------------------------ - var x1 = tableLeft-tablePadding ; - var y1 = GlobalY-FontSize; - var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - doc.line(x1, y1,x1+w2, y1); // horizontal line + if (GlobalY>600) + { + GlobalY=150; + x=150; + doc.addPage(); + Report3AddHeader(invoice,account,doc); + Report3AddFooter(invoice,account,doc); + } + + //-------------------------------Publishing Document balance------------------------------------------ @@ -2555,17 +2519,8 @@ if (i!=0) GlobalY=x; -// doc.setLineWidth(0.3); -// -// doc.setDrawColor(251,251,251); -// doc.setFillColor(251,251,251); -// var x1 = tableLeft-tablePadding*2 ; -// var y1 = GlobalY-FontSize-tablePadding; -// var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; -// var h2 = doc.internal.getFontSize()*3+tablePadding*2; -// doc.rect(x1, y1, w2, h2, 'FD'); - + SetPdfColor('Black',doc); Msg='Total'; var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); doc.text(TmpMsgX, x, Msg); @@ -2645,3 +2600,48 @@ if (i!=0) return doc; } + + + + +function Report3AddHeader (invoice,account,doc) +{ + doc.setLineWidth(0.5); + + //doc.setFillColor( 46,43,43); + //doc.setFillColor( 46,43,43); + + doc.setDrawColor(242,101,34); + doc.setFillColor(242,101,34); + + + var x1 =0; + + var y1 = 0; + + var w2 = 595; + var h2 = 140; + doc.rect(x1, y1, w2, h2, 'FD'); + + SetPdfColor('White',doc); + //second column + doc.setFontType("bold"); + var MaxWidth=594; + + var LineOne= account.name; + + var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineOne) * doc.internal.getFontSize()); + + if (account.name) { + + //SetPdfColor('SomeGreen',doc); + doc.setFontSize('36'); + doc.setFontType("bold"); + doc.text(40,50, LineOne); + + doc.setFontType("normal"); + doc.setFontSize('7'); + } + + +} \ No newline at end of file From a11d6958af2452e5376ffec2a2062c8ddab41eb3 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 05:49:59 +0200 Subject: [PATCH 16/30] report 3-3 --- public/js/script.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/public/js/script.js b/public/js/script.js index a03e145e979e..b205782da870 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -2505,6 +2505,22 @@ if (i!=0&NewPageFlag==0) } + else + + { + + //put line separator + + doc.setDrawColor(0,0,0); // draw red lines + doc.setLineWidth(0.1); + + var x1 = tableLeft-tablePadding ; + var y1 = GlobalY-FontSize; + var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; + doc.line(x1, y1,x1+w2, y1); // horizontal line + + } + //-------------------------------Publishing Document balance------------------------------------------ From acaba0635b940d809479085de9e5bad382fe7fbf Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 06:19:00 +0200 Subject: [PATCH 17/30] report 3-3 --- public/js/script.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index b205782da870..7e4026fc0ae5 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1989,7 +1989,7 @@ function GetReportTemplate3 (invoice,checkMath) //var tableTop = 240+100; //var tableRowHeight = 18; - var tablePadding = 6; + var tablePadding = 14; @@ -2461,7 +2461,7 @@ if (i!=0&NewPageFlag==0) var x1 = tableLeft-tablePadding ; var y1 = GlobalY-FontSize; var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - doc.line(x1, y1,x1+w2, y1); // horizontal line + doc.line(x1, y1-10,x1+w2, y1-10); // horizontal line } @@ -2491,6 +2491,7 @@ if (i!=0&NewPageFlag==0) } + line=line+length; } From f647d78065c3efda53d0d6a4a2680f3472d7285c Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 06:20:23 +0200 Subject: [PATCH 18/30] report 3-3 --- public/js/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/script.js b/public/js/script.js index 7e4026fc0ae5..331e6be10cf0 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -2383,7 +2383,7 @@ function GetReportTemplate3 (invoice,checkMath) var shownItem = false; - GlobalY=GlobalY+24; //padding from top + GlobalY=GlobalY+24+10; //padding from top var FontSize=7; doc.setFontSize(FontSize); From 0db59a9c9dfc3f7377843a4cc7fda14685cb491f Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 06:33:29 +0200 Subject: [PATCH 19/30] report 3-3 --- public/js/script.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 331e6be10cf0..13e4a666631e 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -535,9 +535,9 @@ $.fn.datepicker.defaults.todayHighlight = true; function GetPdf(invoice,checkMath,report_id){ - if (report_id==1) return GetReportTemplate3(invoice,checkMath); + if (report_id==1) return GetReportTemplate1(invoice,checkMath); if (report_id==2) return GetReportTemplate2(invoice,checkMath); - if (report_id==3) return GetReportTemplate1(invoice,checkMath); + if (report_id==3) return GetReportTemplate3(invoice,checkMath); alert('report template not implemented yet'); @@ -592,7 +592,7 @@ function GetReportTemplate1 (invoice,checkMath) var tableTop = 240+100; var tableRowHeight = 18; - var tablePadding = 6; + var tablePadding = 14; @@ -992,10 +992,10 @@ function GetReportTemplate1 (invoice,checkMath) var x1 = tableLeft-tablePadding ; - var y1 = GlobalY-FontSize; + var y1 = GlobalY-FontSize-5; var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; + var h2 = doc.internal.getFontSize()*length+length*1.1+10;//+h;//+tablePadding; From 2fcdb0c28b2de8adb88f1ff3a4cc254098e98497 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 06:39:07 +0200 Subject: [PATCH 20/30] report 3-3 --- public/js/script.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 13e4a666631e..362a37188122 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1160,7 +1160,7 @@ function GetReportTemplate2 (invoice,checkMath) //var tableTop = 240+100; //var tableRowHeight = 18; - var tablePadding = 6; + var tablePadding = 14; @@ -1597,7 +1597,7 @@ function GetReportTemplate2 (invoice,checkMath) length=doc.splitTextToSize(item.notes, 200).length; var h=length*FontSize; - MaxGlobalY=750; + MaxGlobalY=740; if (h+GlobalY > MaxGlobalY) { tableTop = 40; @@ -1615,9 +1615,9 @@ function GetReportTemplate2 (invoice,checkMath) var x1 = tableLeft-tablePadding ; - var y1 = GlobalY-FontSize; + var y1 = GlobalY-FontSize-5; var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; + var h2 = doc.internal.getFontSize()*length+length*1.1+10;//+h;//+tablePadding; doc.rect(x1, y1, w2, h2, 'FD'); } else @@ -1628,9 +1628,9 @@ function GetReportTemplate2 (invoice,checkMath) var x1 = tableLeft-tablePadding ; - var y1 = GlobalY-FontSize; + var y1 = GlobalY-FontSize-5; var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; + var h2 = doc.internal.getFontSize()*length+length*1.1+10;//+h;//+tablePadding; doc.rect(x1, y1, w2, h2, 'FD'); } From cbc4f4655828e69e6f51b55c67ca083fc4c6bfe5 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 06:57:00 +0200 Subject: [PATCH 21/30] report 3-3 --- public/js/script.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 362a37188122..bf45c85d7797 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1,4 +1,4 @@ -GetReportTemplate3// http://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser +// http://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser var isOpera = !!window.opera || navigator.userAgent.indexOf(' OPR/') >= 0; var isFirefox = typeof InstallTrigger !== 'undefined'; // Firefox 1.0+ var isSafari = Object.prototype.toString.call(window.HTMLElement).indexOf('Constructor') > 0; @@ -1053,7 +1053,7 @@ function GetReportTemplate1 (invoice,checkMath) doc.setLineWidth(0.3); doc.setDrawColor(200,200,200); doc.setFillColor(251,251,251); - var x1 = tableLeft-tablePadding*2 ; + var x1 = tableLeft-tablePadding*2+14 ; var y1 = GlobalY-FontSize-tablePadding; var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; var h2 = doc.internal.getFontSize()*3+tablePadding*2; @@ -1553,7 +1553,6 @@ function GetReportTemplate2 (invoice,checkMath) var MaxLinesPerPage=40; - for (var i=0; i Date: Sun, 2 Mar 2014 06:57:48 +0200 Subject: [PATCH 22/30] report 3-3 --- public/js/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/js/script.js b/public/js/script.js index bf45c85d7797..c0ec47b29cbd 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -2576,7 +2576,7 @@ if (i!=0&NewPageFlag==0) doc.setDrawColor(63,60,60); doc.setFillColor(63,60,60); - var x1 = tableLeft-tablePadding*2 ; + var x1 = tableLeft-tablePadding*2 +14; var y1 = x+ doc.internal.getFontSize()*4; var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; var h2 = doc.internal.getFontSize()*3+tablePadding*2; From 39774ccaaf7f263310fd072be78ec5508a4188bf Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 2 Mar 2014 08:30:30 +0200 Subject: [PATCH 23/30] merging changes --- public/js/script.js | 2011 +++++++++++++++++++++++-------------------- 1 file changed, 1089 insertions(+), 922 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index f18e1df1be7b..5e806765ffea 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -20,10 +20,10 @@ function generatePDF(invoice, checkMath) { /* Handle converting variables in the invoices (ie, MONTH+1) */ function processVariables(str) { - if (!str) return ''; - var variables = ['MONTH','QUARTER','YEAR']; - for (var i=0; i<'span6'p>>", - //"sDom": "<'row'<'span6'l><'span6'f>r>t<'row'<'span6'i><'span6'p>>", - "sPaginationType": "bootstrap", - //"bProcessing": true, - //"iDisplayLength": 50, - "bInfo": true, - "oLanguage": { - //"sLengthMenu": "_MENU_ records per page" - "sLengthMenu": "_MENU_", - "sSearch": "" - } - //"sScrollY": "500px", + "sDom": "t<'row-fluid'<'span6'i><'span6'p>>", + //"sDom": "<'row'<'span6'l><'span6'f>r>t<'row'<'span6'i><'span6'p>>", + "sPaginationType": "bootstrap", + //"bProcessing": true, + //"iDisplayLength": 50, + "bInfo": true, + "oLanguage": { + //"sLengthMenu": "_MENU_ records per page" + "sLengthMenu": "_MENU_", + "sSearch": "" + } + //"sScrollY": "500px", } ); /* Default class modification */ $.extend( $.fn.dataTableExt.oStdClasses, { - "sWrapper": "dataTables_wrapper form-inline" + "sWrapper": "dataTables_wrapper form-inline" } ); /* API method to get paging information */ $.fn.dataTableExt.oApi.fnPagingInfo = function ( oSettings ) { - return { - "iStart": oSettings._iDisplayStart, - "iEnd": oSettings.fnDisplayEnd(), - "iLength": oSettings._iDisplayLength, - "iTotal": oSettings.fnRecordsTotal(), - "iFilteredTotal": oSettings.fnRecordsDisplay(), - "iPage": oSettings._iDisplayLength === -1 ? - 0 : Math.ceil( oSettings._iDisplayStart / oSettings._iDisplayLength ), - "iTotalPages": oSettings._iDisplayLength === -1 ? - 0 : Math.ceil( oSettings.fnRecordsDisplay() / oSettings._iDisplayLength ) - }; + return { + "iStart": oSettings._iDisplayStart, + "iEnd": oSettings.fnDisplayEnd(), + "iLength": oSettings._iDisplayLength, + "iTotal": oSettings.fnRecordsTotal(), + "iFilteredTotal": oSettings.fnRecordsDisplay(), + "iPage": oSettings._iDisplayLength === -1 ? + 0 : Math.ceil( oSettings._iDisplayStart / oSettings._iDisplayLength ), + "iTotalPages": oSettings._iDisplayLength === -1 ? + 0 : Math.ceil( oSettings.fnRecordsDisplay() / oSettings._iDisplayLength ) + }; }; /* Bootstrap style pagination control */ $.extend( $.fn.dataTableExt.oPagination, { - "bootstrap": { - "fnInit": function( oSettings, nPaging, fnDraw ) { - var oLang = oSettings.oLanguage.oPaginate; - var fnClickHandler = function ( e ) { - e.preventDefault(); - if ( oSettings.oApi._fnPageChange(oSettings, e.data.action) ) { - fnDraw( oSettings ); - } - }; + "bootstrap": { + "fnInit": function( oSettings, nPaging, fnDraw ) { + var oLang = oSettings.oLanguage.oPaginate; + var fnClickHandler = function ( e ) { + e.preventDefault(); + if ( oSettings.oApi._fnPageChange(oSettings, e.data.action) ) { + fnDraw( oSettings ); + } + }; - $(nPaging).addClass('pagination').append( - '
    '+ - ''+ - ''+ - '
' - ); - var els = $('a', nPaging); - $(els[0]).bind( 'click.DT', { action: "previous" }, fnClickHandler ); - $(els[1]).bind( 'click.DT', { action: "next" }, fnClickHandler ); - }, + $(nPaging).addClass('pagination').append( + '
    '+ + ''+ + ''+ + '
' + ); + var els = $('a', nPaging); + $(els[0]).bind( 'click.DT', { action: "previous" }, fnClickHandler ); + $(els[1]).bind( 'click.DT', { action: "next" }, fnClickHandler ); + }, - "fnUpdate": function ( oSettings, fnDraw ) { - var iListLength = 5; - var oPaging = oSettings.oInstance.fnPagingInfo(); - var an = oSettings.aanFeatures.p; - var i, ien, j, sClass, iStart, iEnd, iHalf=Math.floor(iListLength/2); + "fnUpdate": function ( oSettings, fnDraw ) { + var iListLength = 5; + var oPaging = oSettings.oInstance.fnPagingInfo(); + var an = oSettings.aanFeatures.p; + var i, ien, j, sClass, iStart, iEnd, iHalf=Math.floor(iListLength/2); - if ( oPaging.iTotalPages < iListLength) { - iStart = 1; - iEnd = oPaging.iTotalPages; - } - else if ( oPaging.iPage <= iHalf ) { - iStart = 1; - iEnd = iListLength; - } else if ( oPaging.iPage >= (oPaging.iTotalPages-iHalf) ) { - iStart = oPaging.iTotalPages - iListLength + 1; - iEnd = oPaging.iTotalPages; - } else { - iStart = oPaging.iPage - iHalf + 1; - iEnd = iStart + iListLength - 1; - } + if ( oPaging.iTotalPages < iListLength) { + iStart = 1; + iEnd = oPaging.iTotalPages; + } + else if ( oPaging.iPage <= iHalf ) { + iStart = 1; + iEnd = iListLength; + } else if ( oPaging.iPage >= (oPaging.iTotalPages-iHalf) ) { + iStart = oPaging.iTotalPages - iListLength + 1; + iEnd = oPaging.iTotalPages; + } else { + iStart = oPaging.iPage - iHalf + 1; + iEnd = iStart + iListLength - 1; + } - for ( i=0, ien=an.length ; i'+j+'') - .insertBefore( $('li:last', an[i])[0] ) - .bind('click', function (e) { - e.preventDefault(); - oSettings._iDisplayStart = (parseInt($('a', this).text(),10)-1) * oPaging.iLength; - fnDraw( oSettings ); - } ); - } + // Add the new list items and their event handlers + for ( j=iStart ; j<=iEnd ; j++ ) { + sClass = (j==oPaging.iPage+1) ? 'class="active"' : ''; + $('
  • '+j+'
    • ') + .insertBefore( $('li:last', an[i])[0] ) + .bind('click', function (e) { + e.preventDefault(); + oSettings._iDisplayStart = (parseInt($('a', this).text(),10)-1) * oPaging.iLength; + fnDraw( oSettings ); + } ); + } - // Add / remove disabled classes from the static elements - if ( oPaging.iPage === 0 ) { - $('li:first', an[i]).addClass('disabled'); - } else { - $('li:first', an[i]).removeClass('disabled'); - } + // Add / remove disabled classes from the static elements + if ( oPaging.iPage === 0 ) { + $('li:first', an[i]).addClass('disabled'); + } else { + $('li:first', an[i]).removeClass('disabled'); + } - if ( oPaging.iPage === oPaging.iTotalPages-1 || oPaging.iTotalPages === 0 ) { - $('li:last', an[i]).addClass('disabled'); - } else { - $('li:last', an[i]).removeClass('disabled'); - } - } - } - } + if ( oPaging.iPage === oPaging.iTotalPages-1 || oPaging.iTotalPages === 0 ) { + $('li:last', an[i]).addClass('disabled'); + } else { + $('li:last', an[i]).removeClass('disabled'); + } + } + } + } } ); @@ -211,47 +211,47 @@ $.extend( $.fn.dataTableExt.oPagination, { * Required TableTools 2.1+ */ if ( $.fn.DataTable.TableTools ) { - // Set the classes that TableTools uses to something suitable for Bootstrap - $.extend( true, $.fn.DataTable.TableTools.classes, { - "container": "DTTT btn-group", - "buttons": { - "normal": "btn", - "disabled": "disabled" - }, - "collection": { - "container": "DTTT_dropdown dropdown-menu", - "buttons": { - "normal": "", - "disabled": "disabled" - } - }, - "print": { - "info": "DTTT_print_info modal" - }, - "select": { - "row": "active" - } - } ); + // Set the classes that TableTools uses to something suitable for Bootstrap + $.extend( true, $.fn.DataTable.TableTools.classes, { + "container": "DTTT btn-group", + "buttons": { + "normal": "btn", + "disabled": "disabled" + }, + "collection": { + "container": "DTTT_dropdown dropdown-menu", + "buttons": { + "normal": "", + "disabled": "disabled" + } + }, + "print": { + "info": "DTTT_print_info modal" + }, + "select": { + "row": "active" + } + } ); - // Have the collection use a bootstrap compatible dropdown - $.extend( true, $.fn.DataTable.TableTools.DEFAULTS.oTags, { - "collection": { - "container": "ul", - "button": "li", - "liner": "a" - } - } ); + // Have the collection use a bootstrap compatible dropdown + $.extend( true, $.fn.DataTable.TableTools.DEFAULTS.oTags, { + "collection": { + "container": "ul", + "button": "li", + "liner": "a" + } + } ); } /* $(document).ready(function() { - $('#example').dataTable( { - "sDom": "<'row'<'span6'l><'span6'f>r>t<'row'<'span6'i><'span6'p>>", - "sPaginationType": "bootstrap", - "oLanguage": { - "sLengthMenu": "_MENU_ records per page" - } - } ); + $('#example').dataTable( { + "sDom": "<'row'<'span6'l><'span6'f>r>t<'row'<'span6'i><'span6'p>>", + "sPaginationType": "bootstrap", + "oLanguage": { + "sLengthMenu": "_MENU_ records per page" + } + } ); } ); */ @@ -278,45 +278,45 @@ $(function() { function enableHoverClick($combobox, $entityId, url) { - /* - $combobox.mouseleave(function() { - $combobox.css('text-decoration','none'); - }).on('mouseenter', function(e) { - setAsLink($combobox, $combobox.closest('.combobox-container').hasClass('combobox-selected')); - }).on('focusout mouseleave', function(e) { - setAsLink($combobox, false); - }).on('click', function() { - var clientId = $entityId.val(); - if ($(combobox).closest('.combobox-container').hasClass('combobox-selected')) { - if (parseInt(clientId) > 0) { - window.open(url + '/' + clientId, '_blank'); - } else { - $('#myModal').modal('show'); - } - }; - }); + /* + $combobox.mouseleave(function() { + $combobox.css('text-decoration','none'); + }).on('mouseenter', function(e) { + setAsLink($combobox, $combobox.closest('.combobox-container').hasClass('combobox-selected')); + }).on('focusout mouseleave', function(e) { + setAsLink($combobox, false); + }).on('click', function() { + var clientId = $entityId.val(); + if ($(combobox).closest('.combobox-container').hasClass('combobox-selected')) { + if (parseInt(clientId) > 0) { + window.open(url + '/' + clientId, '_blank'); + } else { + $('#myModal').modal('show'); + } + }; + }); */ } function setAsLink($input, enable) { - if (enable) { - $input.css('text-decoration','underline'); - $input.css('cursor','pointer'); - } else { - $input.css('text-decoration','none'); - $input.css('cursor','text'); - } + if (enable) { + $input.css('text-decoration','underline'); + $input.css('cursor','pointer'); + } else { + $input.css('text-decoration','none'); + $input.css('cursor','text'); + } } function setComboboxValue($combobox, id, name) { - $combobox.find('input').val(id); - $combobox.find('input.form-control').val(name); - if (id && name) { - $combobox.find('select').combobox('setSelected'); - $combobox.find('.combobox-container').addClass('combobox-selected'); - } else { - $combobox.find('.combobox-container').removeClass('combobox-selected'); - } + $combobox.find('input').val(id); + $combobox.find('input.form-control').val(name); + if (id && name) { + $combobox.find('select').combobox('setSelected'); + $combobox.find('.combobox-container').addClass('combobox-selected'); + } else { + $combobox.find('.combobox-container').removeClass('combobox-selected'); + } } @@ -346,24 +346,24 @@ ko.bindingHandlers.dropdown = { /* ko.utils.registerEventHandler(element, "change", function () { - console.log("change: %s", $(element).val()); - var - valueAccessor($(element).val()); + console.log("change: %s", $(element).val()); + var + valueAccessor($(element).val()); //$(element).combobox('refresh'); }); - */ + */ }, - update: function (element, valueAccessor) { - var value = ko.utils.unwrapObservable(valueAccessor()); - var id = (value && value.public_id) ? value.public_id() : (value && value.id) ? value.id() : value ? value : false; - //console.log("combo-update: %s", id); - if (id) { - $(element).val(id); - $(element).combobox('refresh'); - } else { - $(element).combobox('clearTarget'); - $(element).combobox('clearElement'); - } + update: function (element, valueAccessor) { + var value = ko.utils.unwrapObservable(valueAccessor()); + var id = (value && value.public_id) ? value.public_id() : (value && value.id) ? value.id() : value ? value : false; + //console.log("combo-update: %s", id); + if (id) { + $(element).val(id); + $(element).combobox('refresh'); + } else { + $(element).combobox('clearTarget'); + $(element).combobox('clearElement'); + } } }; @@ -373,11 +373,11 @@ ko.bindingHandlers.datePicker = { var value = ko.utils.unwrapObservable(valueAccessor()); if (value) $(element).datepicker('update', value); $(element).change(function() { - var value = valueAccessor(); + var value = valueAccessor(); value($(element).val()); }) }, - update: function (element, valueAccessor) { + update: function (element, valueAccessor) { var value = ko.utils.unwrapObservable(valueAccessor()); if (value) $(element).datepicker('update', value); } @@ -386,14 +386,14 @@ ko.bindingHandlers.datePicker = { function wordWrapText(value, width) { - if (!width) width = 200; - var doc = new jsPDF('p', 'pt'); - doc.setFont('Helvetica',''); - doc.setFontSize(10); + if (!width) width = 200; + var doc = new jsPDF('p', 'pt'); + doc.setFont('Helvetica',''); + doc.setFontSize(10); - var lines = value.split("\n"); + var lines = value.split("\n"); for (var i = 0; i < lines.length; i++) { - var numLines = doc.splitTextToSize(lines[i], width).length; + var numLines = doc.splitTextToSize(lines[i], width).length; if (numLines <= 1) continue; var j = 0; space = lines[i].length; while (j++ < lines[i].length) { @@ -406,9 +406,9 @@ function wordWrapText(value, width) var newValue = (lines.join("\n")).trim(); if (value == newValue) { - return newValue; + return newValue; } else { - return wordWrapText(newValue, width); + return wordWrapText(newValue, width); } } @@ -416,105 +416,105 @@ function wordWrapText(value, width) function getClientDisplayName(client) { - var contact = client.contacts[0]; - if (client.name) { - return client.name; - } else if (contact.first_name || contact.last_name) { - return contact.first_name + ' ' + contact.last_name; - } else { - return contact.email; - } + var contact = client.contacts[0]; + if (client.name) { + return client.name; + } else if (contact.first_name || contact.last_name) { + return contact.first_name + ' ' + contact.last_name; + } else { + return contact.email; + } } function populateInvoiceComboboxes(clientId, invoiceId) { - var clientMap = {}; - var invoiceMap = {}; - var invoicesForClientMap = {}; - var $clientSelect = $('select#client'); - - for (var i=0; i MaxGlobalY) { tableTop = 40; @@ -1615,9 +1614,9 @@ function GetReportTemplate2 (invoice,checkMath) var x1 = tableLeft-tablePadding ; - var y1 = GlobalY-FontSize; + var y1 = GlobalY-FontSize-5; var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; + var h2 = doc.internal.getFontSize()*length+length*1.1+10;//+h;//+tablePadding; doc.rect(x1, y1, w2, h2, 'FD'); } else @@ -1628,9 +1627,9 @@ function GetReportTemplate2 (invoice,checkMath) var x1 = tableLeft-tablePadding ; - var y1 = GlobalY-FontSize; + var y1 = GlobalY-FontSize-5; var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; + var h2 = doc.internal.getFontSize()*length+length*1.1+10;//+h;//+tablePadding; doc.rect(x1, y1, w2, h2, 'FD'); } @@ -1672,7 +1671,7 @@ function GetReportTemplate2 (invoice,checkMath) doc.setDrawColor(251,251,251); doc.setFillColor(251,251,251); - var x1 = tableLeft-tablePadding*2 ; + var x1 = tableLeft-tablePadding*2 +14; var y1 = GlobalY-FontSize-tablePadding; var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; var h2 = doc.internal.getFontSize()*3+tablePadding*2; @@ -1720,7 +1719,7 @@ function GetReportTemplate2 (invoice,checkMath) doc.text(TmpMsgX, x, Msg); - SetPdfColor('LightBlue',doc); + //SetPdfColor('LightBlue',doc); AmountText = formatMoney(balance , currencyId); headerLeft=headerRight+400; var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); @@ -1737,621 +1736,6 @@ function GetReportTemplate2 (invoice,checkMath) -function GetReportTemplate3 (invoice,checkMath) -{ - var doc=false; - - var GlobalY=0;//Y position of line at current page - - - - var client = invoice.client; - var account = invoice.account; - - - var currencyId = client.currency_id; - var invoiceNumber = invoice.invoice_number; - var invoiceDate = invoice.invoice_date ? invoice.invoice_date : ''; - var dueDate = invoice.due_date ? invoice.due_date : ''; - - var paid_to_date=client.paid_to_date; - - var headerRight = 150; - var accountTop = 30; - var marginLeft = 180; - var rowHeight = 10; - var headerTop = 125; //height of HEADER //should be dynamic ! - - - var descriptionLeft = 162; - var unitCostRight = 410; - var qtyRight = 480; - var taxRight = 480; - var lineTotalRight = 550; - var tableLeft = 50; - - - //var tableTop = 240+100; - - //var tableRowHeight = 18; - var tablePadding = 6; - - - -//------------------------------ move to functions ! - var total = 0; - for (var i=0; i 0) { - - var discount = total * (invoice.discount/100); - total -= discount; - } - - var tax = 0; - if (invoice.tax && parseFloat(invoice.tax.rate)) { - tax = parseFloat(invoice.tax.rate); - } else if (invoice.tax_rate && parseFloat(invoice.tax_rate)) { - tax = parseFloat(invoice.tax_rate); - } - - if (tax) { - var tax = total * (tax/100); - total = parseFloat(total) + parseFloat(tax); - } - - total = formatMoney(total - (invoice.amount - invoice.balance), currencyId); - - var balance = formatMoney(total, currencyId); - - /* - @param orientation One of "portrait" or "landscape" (or shortcuts "p" (Default), "l") - @param unit Measurement unit to be used when coordinates are specified. One of "pt" (points), "mm" (Default), "cm", "in" - @param format One of 'a3', 'a4' (Default),'a5' ,'letter' ,'legal' - @returns {jsPDF} - */ - var doc = new jsPDF('portrait', 'pt','a4'); - - - - //Set PDF properities - doc.setProperties({ - title: '', - subject: 'Report', - author: 'Ninja', - keywords: 'pdf, javascript,geenerated', - creator: 'Ninja' - }); - - - //set default style for report - doc.setFont('Helvetica',''); - doc.setFontSize(7); - - doc.setLineWidth(0.5); - - //doc.setFillColor( 46,43,43); - //doc.setFillColor( 46,43,43); - - doc.setDrawColor(242,101,34); - doc.setFillColor(242,101,34); - - - var x1 =0; - - var y1 = 0; - - var w2 = 595; - var h2 = 100;// doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; - doc.rect(x1, y1, w2, h2, 'FD'); - - - - - - -//---------------------------------------------------------------------------------------------------- - if (invoice.image) - { - var left = headerRight - invoice.imageWidth; - doc.addImage(invoice.image, 'JPEG', left, 30, invoice.imageWidth, invoice.imageHeight); - } - - Report3AddFooter (invoice,doc); - - var invoiceNumberX = headerRight - (doc.getStringUnitWidth(invoiceNumber, false) * doc.internal.getFontSize()); - var invoiceDateX = headerRight - (doc.getStringUnitWidth(invoiceDate) * doc.internal.getFontSize()); - var dueDateX = headerRight - (doc.getStringUnitWidth(dueDate) * doc.internal.getFontSize()); - var poNumberX = headerRight - (doc.getStringUnitWidth(invoice.po_number) * doc.internal.getFontSize()); - - - - var y = accountTop; - var left = marginLeft; - - - doc.setFontSize(7); - SetPdfColor('White',doc); - - - -//TODO:NOT AVAILEABLE FROM DATAMODEL - //account.email='email N/A'; - if (account.email) { - y += rowHeight; - doc.text(left, y, account.email); - } - else - { - //console.log('account.email NOT DEFINED !'); - } - -//TODO:NOT AVAILEABLE FROM DATAMODEL - if (account.phone) { - y += rowHeight; - doc.text(left, y, account.phone); - } - else - { - //console.log('account.phone NOT DEFINED !'); - } - - - var HeaderMarginThirdColumn=70; - - //second column - doc.setFontType("bold"); - var MaxWidth=594; - - var LineOne= account.name; - - var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineOne) * doc.internal.getFontSize()); - - if (account.name) { - - y += rowHeight; - doc.text(AlignLine, y, LineOne); - } - - y += rowHeight; - - doc.setFontType("normal"); - - - var LineTwo= account.address1+' '+account.address2+account.city+' '+(account.country ? account.country.name : ''); - - var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineTwo) * doc.internal.getFontSize()); - y += rowHeight; - doc.text(AlignLine, y, LineTwo); - - -//-----------------------------Publish Client Details block-------------------------------------------- - - var y = accountTop; - var left = marginLeft; - - var headerY = headerTop; - - - - SetPdfColor('GrayLogo',doc); //set black color - - - var line1=headerTop+16; - var line2=headerTop+16*2; - var line21=headerTop+16*1.6; - var line22=headerTop+16*2.2; - - var line3=headerTop+16*3; - var line31=headerTop+16*3.6; - - var marginLeft1=50; - - - SetPdfColor('Black',doc); //set black color - - doc.setFontSize(7); - - - ClientCompanyName=client.name; - ClientCompanyEmail='';//client.email;//'22222222'; - ClientCompanyPhone=client.work_phone; - - ClientCompanyAddress1=client.address1; - ClientCompanyAddress2=client.address2+' '+client.postal_code; - - if(client) - { - ClientCompanyName=getClientDisplayName(client); - ClientCompanyPhone=client.work_phone; - ClientCompanyEmail=client.contacts[0].email; - - } - - //show left column - SetPdfColor('Black',doc); //set black color - doc.setFontType("normal"); - - -//publish filled box - doc.setDrawColor(200,200,200); - doc.setFillColor(54,164,152); - - GlobalY=190; - doc.setLineWidth(0.5); - - var BlockLenght=220; - var x1 =595-BlockLenght; - var y1 = GlobalY-12; - var w2 = BlockLenght; - var h2 = 90; - doc.rect(x1, y1, w2, h2, 'FD'); - - - - SetPdfColor('SomeGreen',doc); - doc.setFontSize('14'); - doc.setFontType("bold"); - doc.text(50, GlobalY, 'YOUR INVOICE'); - - - var z=GlobalY; - z=z+30; - - - SetPdfColor('Black',doc); - - if (ClientCompanyName) - { - doc.setFontSize('8'); - doc.setFontType("bold"); - doc.text(marginLeft1, z, ClientCompanyName); - z=z+15;//doc.internal.getFontSize(); - } - - if (ClientCompanyAddress1) - { - - doc.setFontSize('8'); - doc.setFontType("normal"); - doc.text(marginLeft1, z, ClientCompanyAddress1); - z=z+15;////z=z+doc.internal.getFontSize(); - } - if (ClientCompanyAddress2) - { - - doc.setFontSize('8'); - doc.setFontType("normal"); - doc.text(marginLeft1, z, ClientCompanyAddress2); - z=z+15;////z=z+doc.internal.getFontSize(); - } - - if (ClientCompanyEmail) - { - doc.setFontSize('8'); - doc.setFontType("normal"); - doc.text(marginLeft1, z, ClientCompanyEmail); - z=z+15;///z=z+doc.internal.getFontSize(); - } - if (ClientCompanyPhone) - { - - doc.setFontSize('8'); - doc.setFontType("normal"); - doc.text(marginLeft1, z, ClientCompanyPhone); - z=z+15;////z=z+doc.internal.getFontSize(); - } - - - marginLeft2=395; - - //publish left side information - - SetPdfColor('White',doc); - z=GlobalY+15; - - doc.setFontSize('8'); - doc.setFontType("normal"); - doc.text(marginLeft2, z,'Invoice Number'); - z=z+15;//doc.internal.getFontSize(); - - - doc.setFontSize('8'); - doc.setFontType("normal"); - doc.text(marginLeft2, z,'Invoice date'); - z=z+15;//doc.internal.getFontSize(); - - doc.setFontSize('8'); - doc.setFontType("normal"); - doc.text(marginLeft2, z,'Due Date'); - z=z+15;//doc.internal.getFontSize(); - - - marginLeft3=marginLeft2+65; - - z=GlobalY+15; - - - var invoiceNumber = invoice.invoice_number; - var invoiceDate = invoice.invoice_date ? invoice.invoice_date : ''; - var dueDate = invoice.due_date ? invoice.due_date : ''; - - - doc.setFontSize('7'); - doc.setFontType("bold"); - doc.text(marginLeft3, z,invoiceNumber); - z=z+15;//doc.internal.getFontSize(); - - - doc.setFontSize('8'); - doc.setFontType("normal"); - doc.text(marginLeft3, z,invoiceDate); - z=z+15;//doc.internal.getFontSize(); - - doc.setFontSize('8'); - doc.setFontType("normal"); - doc.text(marginLeft3, z,dueDate); - z=z+15;//doc.internal.getFontSize(); - - y=z+60; -//--------------------------------Publishing Table-------------------------------------------------- - GlobalY=y+30; - GlobalY=GlobalY+70;//y+30; - SetPdfColor('Black',doc); - doc.setFontSize(7); - var hasTaxes = false; - for (var i=0; i 0) || (item.tax_rate && parseFloat(item.tax_rate) > 0)) { - hasTaxes = true; - break; - } - } - if (hasTaxes) - { - descriptionLeft -= 20; - unitCostRight -= 40; - qtyRight -= 40; - } - - var costX = unitCostRight - (doc.getStringUnitWidth('Unit Cost') * doc.internal.getFontSize()); - var qtyX = qtyRight - (doc.getStringUnitWidth('Quantity') * doc.internal.getFontSize()); - var taxX = taxRight - (doc.getStringUnitWidth('Tax') * doc.internal.getFontSize()); - var totalX = lineTotalRight - (doc.getStringUnitWidth('Line Total') * doc.internal.getFontSize()); - - tableTop=GlobalY;//redefine this to dynamic value - - doc.setFontSize(12); - doc.setFontType("bold"); - - doc.text(tableLeft, tableTop, 'Item'); - doc.text(descriptionLeft, tableTop, 'Description'); - doc.text(costX, tableTop, 'Unit Cost'); - doc.text(qtyX, tableTop, 'Quantity'); - doc.text(totalX, tableTop, 'Line Total'); - - if (hasTaxes) - { - doc.text(taxX, tableTop, 'Tax'); - } - - - doc.setFontSize(7); - - /* line items */ - - var line = 1; - var total = 0; - var shownItem = false; - - - GlobalY=GlobalY+24; //padding from top - - var FontSize=7; - doc.setFontSize(FontSize); - doc.setFontType("normal"); - - var MaxLinesPerPage=40; - - - - for (var i=0; i MaxGlobalY) { - - tableTop = 40; - GlobalY=tableTop; - - doc.addPage(); - Report3AddFooter(invoice,doc); - } - - if ((i%2)===0){ - doc.setLineWidth(0.5); - doc.setDrawColor(240,240,240); - doc.setFillColor(240,240,240); - - - - var x1 = tableLeft-tablePadding ; - var y1 = GlobalY-FontSize; - var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; - doc.rect(x1, y1, w2, h2, 'FD'); - } - else - { - doc.setLineWidth(0.5); - doc.setDrawColor(251,251,251); - doc.setFillColor(251,251,251); - - - var x1 = tableLeft-tablePadding ; - var y1 = GlobalY-FontSize; - var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - var h2 = doc.internal.getFontSize()*length+length*1.1;//+h;//+tablePadding; - doc.rect(x1, y1, w2, h2, 'FD'); - } - - x=GlobalY; - - GlobalY=GlobalY+h+tablePadding*2; - - - SetPdfColor('SomeGreen',doc); - doc.text(tableLeft, x, productKey); - - SetPdfColor('Black',doc); - doc.text(descriptionLeft, x, notes); - - doc.text(costX, x, cost); - doc.text(qtyX, x, qty); - doc.text(totalX, x, lineTotal); - - if (tax) { - doc.text(taxX, x, tax+'%'); - } - - - line=line+length; - } -//-------------------------------Publishing Document balance------------------------------------------ - - - x += 16+50; - - doc.setFontType("bold"); - MsgRightAlign=400; - - - - GlobalY=x; - - doc.setLineWidth(0.3); - - doc.setDrawColor(251,251,251); - doc.setFillColor(251,251,251); - var x1 = tableLeft-tablePadding*2 ; - var y1 = GlobalY-FontSize-tablePadding; - var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - var h2 = doc.internal.getFontSize()*3+tablePadding*2; - doc.rect(x1, y1, w2, h2, 'FD'); - - - Msg='Total'; - var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); - doc.text(TmpMsgX, x, Msg); - - doc.setFontType("normal"); - AmountText = formatMoney(total , currencyId); - headerLeft=headerRight+400; - var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); - doc.text(AmountX, x, AmountText); - - - - - x += doc.internal.getFontSize()*2; - - Msg='Amount Payed'; - var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); - doc.text(TmpMsgX, x, Msg); - - - - AmountText = formatMoney(paid_to_date , currencyId); - headerLeft=headerRight+400; - var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); - doc.text(AmountX, x, AmountText); - - - - - doc.setFontType("bold"); - - doc.setFontSize(12); - x += doc.internal.getFontSize()*4; - Msg='Amount Due'; - var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); - - - - doc.text(TmpMsgX, x, Msg); - - - SetPdfColor('LightBlue',doc); - AmountText = formatMoney(balance , currencyId); - headerLeft=headerRight+400; - var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); - doc.text(AmountX, x, AmountText); - - - - - - - return doc; -} - @@ -2454,7 +1838,7 @@ function Report2AddFooter (invoice,doc) } -function Report3AddFooter (invoice,doc) +function Report3AddFooter (invoice,account,doc) { doc.setLineWidth(0.5); @@ -2481,16 +1865,799 @@ function Report3AddFooter (invoice,doc) if (invoice.imageLogo3) { pageHeight=820; - var left = 250;//headerRight ; + // var left = 25;//250;//headerRight ; y=pageHeight-invoice.imageLogoHeight3; - var headerRight=370; + //var headerRight=370; - var left = headerRight - invoice.imageLogoWidth3; - doc.addImage(invoice.imageLogo3, 'JPEG', left, y, invoice.imageLogoWidth3, invoice.imageLogoHeight3); + //var left = headerRight - invoice.imageLogoWidth3; + doc.addImage(invoice.imageLogo3, 'JPEG', 40, y, invoice.imageLogoWidth3, invoice.imageLogoHeight3); } + + + + + var LineOne= account.name; + + MaxWidth=440; + var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineOne) * doc.internal.getFontSize()); + + if (account.name) { + + y =780; + + doc.setFontSize(12); + //doc.setFontType("normal"); + doc.setFontType("bold"); + SetPdfColor('White',doc); + + + doc.text(AlignLine, y, LineOne); + + doc.setFontSize(7); + } + + +var y =780; + + var AlignLine2=AlignLine+110; + if (account.address1) { + + doc.setFontSize(12); + doc.setFontType("normal"); + SetPdfColor('White',doc); + doc.text(AlignLine2, y,account.address1); + doc.setFontSize(7); + + y=y+18; + } + + + + if (account.address2) { + + doc.setFontSize(12); + doc.setFontType("normal"); + SetPdfColor('White',doc); + doc.text(AlignLine2, y,account.address2); + doc.setFontSize(7); + + y=y+18; + } + + + + doc.setFontSize(12); + doc.setFontType("normal"); + SetPdfColor('White',doc); + + + var LineTwo= account.city+' '+(account.country ? account.country.name : ''); + + doc.text(AlignLine2, y,LineTwo); + doc.setFontSize(7); + + + + } + + + + + + +function GetReportTemplate3 (invoice,checkMath) +{ + var doc=false; + + var GlobalY=0;//Y position of line at current page + + + + var client = invoice.client; + var account = invoice.account; + + + var currencyId = client.currency_id; + var invoiceNumber = invoice.invoice_number; + var invoiceDate = invoice.invoice_date ? invoice.invoice_date : ''; + var dueDate = invoice.due_date ? invoice.due_date : ''; + + var paid_to_date=client.paid_to_date; + + var headerRight = 150; + var accountTop = 30; + var marginLeft = 180; + var rowHeight = 10; + var headerTop = 125; //height of HEADER //should be dynamic ! + + + var descriptionLeft = 162; + var unitCostRight = 410; + var qtyRight = 480; + var taxRight = 480; + var lineTotalRight = 550; + var tableLeft = 50; + + + //var tableTop = 240+100; + + //var tableRowHeight = 18; + var tablePadding = 14; + + + +//------------------------------ move to functions ! + var total = 0; + for (var i=0; i 0) { + + var discount = total * (invoice.discount/100); + total -= discount; + } + + var tax = 0; + if (invoice.tax && parseFloat(invoice.tax.rate)) { + tax = parseFloat(invoice.tax.rate); + } else if (invoice.tax_rate && parseFloat(invoice.tax_rate)) { + tax = parseFloat(invoice.tax_rate); + } + + if (tax) { + var tax = total * (tax/100); + total = parseFloat(total) + parseFloat(tax); + } + + total = formatMoney(total - (invoice.amount - invoice.balance), currencyId); + + var balance = formatMoney(total, currencyId); + + /* + @param orientation One of "portrait" or "landscape" (or shortcuts "p" (Default), "l") + @param unit Measurement unit to be used when coordinates are specified. One of "pt" (points), "mm" (Default), "cm", "in" + @param format One of 'a3', 'a4' (Default),'a5' ,'letter' ,'legal' + @returns {jsPDF} + */ + var doc = new jsPDF('portrait', 'pt','a4'); + + + + //Set PDF properities + doc.setProperties({ + title: '', + subject: 'Report', + author: 'Ninja', + keywords: 'pdf, javascript,geenerated', + creator: 'Ninja' + }); + + + //set default style for report + doc.setFont('Helvetica',''); + doc.setFontSize(7); + + + + + Report3AddHeader (invoice,account,doc); + + + +//---------------------------------------------------------------------------------------------------- + if (invoice.image) + { + + y=170; + var left = headerRight - invoice.imageWidth; + doc.addImage(invoice.image, 'JPEG', left, y, invoice.imageWidth, invoice.imageHeight); + } + + Report3AddFooter (invoice,account,doc); + + var invoiceNumberX = headerRight - (doc.getStringUnitWidth(invoiceNumber, false) * doc.internal.getFontSize()); + var invoiceDateX = headerRight - (doc.getStringUnitWidth(invoiceDate) * doc.internal.getFontSize()); + var dueDateX = headerRight - (doc.getStringUnitWidth(dueDate) * doc.internal.getFontSize()); + var poNumberX = headerRight - (doc.getStringUnitWidth(invoice.po_number) * doc.internal.getFontSize()); + + + + var y = accountTop; + var left = marginLeft; + + + doc.setFontSize(7); + SetPdfColor('White',doc); + + + +//TODO:NOT AVAILEABLE FROM DATAMODEL + //account.email='email N/A'; + if (account.email) { + y += rowHeight; + doc.text(left, y, account.email); + } + else + { + //console.log('account.email NOT DEFINED !'); + } + +//TODO:NOT AVAILEABLE FROM DATAMODEL + if (account.phone) { + y += rowHeight; + doc.text(left, y, account.phone); + } + else + { + //console.log('account.phone NOT DEFINED !'); + } + + + var HeaderMarginThirdColumn=70; + + + + +//-----------------------------Publish Client Details block-------------------------------------------- + + var y = accountTop; + var left = marginLeft; + + var headerY = headerTop; + + + + SetPdfColor('GrayLogo',doc); //set black color + + + var line1=headerTop+16; + var line2=headerTop+16*2; + var line21=headerTop+16*1.6; + var line22=headerTop+16*2.2; + + var line3=headerTop+16*3; + var line31=headerTop+16*3.6; + + var marginLeft1=394; + + + SetPdfColor('Black',doc); //set black color + + doc.setFontSize(7); + + + ClientCompanyName=client.name; + ClientCompanyEmail='';//client.email;//'22222222'; + ClientCompanyPhone=client.work_phone; + + ClientCompanyAddress1=client.address1; + ClientCompanyAddress2=client.address2+' '+client.postal_code; + + if(client) + { + ClientCompanyName=getClientDisplayName(client); + ClientCompanyPhone=client.work_phone; + ClientCompanyEmail=client.contacts[0].email; + + } + + //show left column + SetPdfColor('Black',doc); //set black color + doc.setFontType("normal"); + + GlobalY=170; + + var z=GlobalY; + + + + SetPdfColor('Black',doc); + + if (ClientCompanyName) + { + doc.setFontSize('8'); + doc.setFontType("bold"); + doc.text(marginLeft1, z, ClientCompanyName); + z=z+15;//doc.internal.getFontSize(); + } + + if (ClientCompanyAddress1) + { + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft1, z, ClientCompanyAddress1); + z=z+15;////z=z+doc.internal.getFontSize(); + } + if (ClientCompanyAddress2) + { + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft1, z, ClientCompanyAddress2); + z=z+15;////z=z+doc.internal.getFontSize(); + } + + if (ClientCompanyEmail) + { + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft1, z, ClientCompanyEmail); + z=z+15;///z=z+doc.internal.getFontSize(); + } + if (ClientCompanyPhone) + { + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft1, z, ClientCompanyPhone); + z=z+15;////z=z+doc.internal.getFontSize(); + } + + + + + + + + + marginLeft2=395; + + //publish left side information + + SetPdfColor('White',doc); + z=30;//GlobalY+15; + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft2, z,'Invoice Number'); + z=z+15;//doc.internal.getFontSize(); + + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft2, z,'Invoice date'); + z=z+15;//doc.internal.getFontSize(); + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft2, z,'Payment Date'); + z=z+15;//doc.internal.getFontSize(); + + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft2, z,'Amount Due'); + z=z+15;//doc.internal.getFontSize(); + + + marginLeft3=marginLeft2+65; + + z=30;//GlobalY+15; + + + var invoiceNumber = invoice.invoice_number; + var invoiceDate = invoice.invoice_date ? invoice.invoice_date : ''; + var dueDate = invoice.due_date ? invoice.due_date : ''; + + + doc.setFontSize('7'); + doc.setFontType("bold"); + doc.text(marginLeft3, z,invoiceNumber); + z=z+15;//doc.internal.getFontSize(); + + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft3, z,invoiceDate); + z=z+15;//doc.internal.getFontSize(); + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft3, z,dueDate); + z=z+15;//doc.internal.getFontSize(); + + + + doc.setFontSize('8'); + doc.setFontType("normal"); + doc.text(marginLeft3, z,total); + z=z+15;//doc.internal.getFontSize(); + + + + + + y=z+60; +//--------------------------------Publishing Table-------------------------------------------------- + GlobalY=y+130; + GlobalY=GlobalY+30;//y+30; + SetPdfColor('Black',doc); + doc.setFontSize(7); + var hasTaxes = false; + for (var i=0; i 0) || (item.tax_rate && parseFloat(item.tax_rate) > 0)) { + hasTaxes = true; + break; + } + } + if (hasTaxes) + { + descriptionLeft -= 20; + unitCostRight -= 40; + qtyRight -= 40; + } + + + + + + + + + + + + + + + + + var costX = unitCostRight - (doc.getStringUnitWidth('Unit Cost') * doc.internal.getFontSize()); + var qtyX = qtyRight - (doc.getStringUnitWidth('Quantity') * doc.internal.getFontSize()); + var taxX = taxRight - (doc.getStringUnitWidth('Tax') * doc.internal.getFontSize()); + var totalX = lineTotalRight - (doc.getStringUnitWidth('Line Total') * doc.internal.getFontSize()) -15; + + tableTop=GlobalY;//redefine this to dynamic value + + + doc.setFontSize(12); + doc.setFontType("bold"); + + + + + + + + + + + doc.setLineWidth(0.3); + + doc.setDrawColor(63,60,60); + doc.setFillColor(63,60,60); + var x1 = tableLeft-tablePadding*2+5 ; + var y1 = GlobalY-doc.internal.getFontSize()-15; + var w2 = 515+tablePadding*2-3;//lineTotalRight-tablePadding*5; + var h2 = doc.internal.getFontSize()+15*2; + doc.rect(x1, y1, w2, h2, 'FD'); + + + SetPdfColor('White',doc); + + + + doc.text(tableLeft, tableTop, 'Item'); + doc.text(descriptionLeft, tableTop, 'Description'); + doc.text(costX, tableTop, 'Unit Cost'); + doc.text(qtyX, tableTop, 'Quantity'); + doc.text(totalX, tableTop, 'Line Total'); + + if (hasTaxes) + { + doc.text(taxX, tableTop, 'Tax'); + } + + SetPdfColor('Black',doc); + doc.setFontSize(7); + + /* line items */ + + var line = 1; + var total = 0; + var shownItem = false; + + + GlobalY=GlobalY+24+10; //padding from top + + var FontSize=7; + doc.setFontSize(FontSize); + doc.setFontType("normal"); + + var MaxLinesPerPage=40; + + + + for (var i=0; i MaxGlobalY) { + + tableTop = 180; + GlobalY=tableTop; + + doc.addPage(); + Report3AddHeader(invoice,account,doc); + Report3AddFooter(invoice,account,doc); + NewPageFlag=1; + } + else NewPageFlag=0; + + +if (i!=0&NewPageFlag==0) +{ + doc.setDrawColor(0,0,0); // draw red lines + doc.setLineWidth(0.1); + + var x1 = tableLeft-tablePadding ; + var y1 = GlobalY-FontSize; + var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; + doc.line(x1, y1-10,x1+w2, y1-10); // horizontal line +} + + + + x=GlobalY; + + GlobalY=GlobalY+h+tablePadding*2; + + +// SetPdfColor('SomeGreen',doc); + + doc.setFontType("bold"); + doc.text(tableLeft, x, productKey); + + doc.setFontType("normal"); + SetPdfColor('Black',doc); + doc.text(descriptionLeft, x, notes); + + + + doc.text(costX, x, cost); + doc.text(qtyX, x, qty); + doc.text(totalX, x, lineTotal); + + if (tax) { + doc.text(taxX, x, tax+'%'); + } + + + + line=line+length; + } + + + if (GlobalY>600) + { + GlobalY=150; + x=150; + doc.addPage(); + Report3AddHeader(invoice,account,doc); + Report3AddFooter(invoice,account,doc); + } + + + else + + { + + //put line separator + + doc.setDrawColor(0,0,0); // draw red lines + doc.setLineWidth(0.1); + + var x1 = tableLeft-tablePadding ; + var y1 = GlobalY-FontSize; + var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; + doc.line(x1, y1,x1+w2, y1); // horizontal line + + } + + + +//-------------------------------Publishing Document balance------------------------------------------ + + + x += 16+50; + + doc.setFontType("bold"); + MsgRightAlign=400; + + + + GlobalY=x; + + + SetPdfColor('Black',doc); + Msg='Total'; + var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); + doc.text(TmpMsgX, x, Msg); + + doc.setFontType("normal"); + AmountText = formatMoney(total , currencyId); + headerLeft=headerRight+400; + var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); + doc.text(AmountX, x, AmountText); + + + + + x += doc.internal.getFontSize()*2; + + Msg='Amount Payed'; + var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); + doc.text(TmpMsgX, x, Msg); + + + + AmountText = formatMoney(paid_to_date , currencyId); + headerLeft=headerRight+400; + var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); + doc.text(AmountX, x, AmountText); + + + + + + + + + + + doc.setLineWidth(0.3); + + doc.setDrawColor(63,60,60); + doc.setFillColor(63,60,60); + var x1 = tableLeft-tablePadding*2 +14; + var y1 = x+ doc.internal.getFontSize()*4; + var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; + var h2 = doc.internal.getFontSize()*3+tablePadding*2; + doc.rect(x1, y1, w2, h2, 'FD'); + + + + + + + + + + + doc.setFontType("bold"); + SetPdfColor('White',doc); + doc.setFontSize(12); + x += doc.internal.getFontSize()*4; + Msg='Amount Due'; + var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); + + + + doc.text(TmpMsgX, x, Msg); + + + doc.setFontType("normal"); + AmountText = formatMoney(balance , currencyId); + headerLeft=headerRight+400; + var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); + doc.text(AmountX, x, AmountText); + + + + + + + return doc; +} + + + + +function Report3AddHeader (invoice,account,doc) +{ + doc.setLineWidth(0.5); + + //doc.setFillColor( 46,43,43); + //doc.setFillColor( 46,43,43); + + doc.setDrawColor(242,101,34); + doc.setFillColor(242,101,34); + + + var x1 =0; + + var y1 = 0; + + var w2 = 595; + var h2 = 140; + doc.rect(x1, y1, w2, h2, 'FD'); + + SetPdfColor('White',doc); + //second column + doc.setFontType("bold"); + var MaxWidth=594; + + var LineOne= account.name; + + var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineOne) * doc.internal.getFontSize()); + + if (account.name) { + + //SetPdfColor('SomeGreen',doc); + doc.setFontSize('36'); + doc.setFontType("bold"); + doc.text(40,50, LineOne); + + doc.setFontType("normal"); + doc.setFontSize('7'); + } + + +} \ No newline at end of file From cfa06662f8454bfcfcd12dea86924ad45e48939c Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 2 Mar 2014 08:44:33 +0200 Subject: [PATCH 24/30] merging conflicts --- public/js/script.js | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 24a64d50e8dd..5e806765ffea 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -2570,20 +2570,6 @@ if (i!=0&NewPageFlag==0) -<<<<<<< HEAD - - - doc.setLineWidth(0.3); - - doc.setDrawColor(63,60,60); - doc.setFillColor(63,60,60); - var x1 = tableLeft-tablePadding*2 +14; - var y1 = x+ doc.internal.getFontSize()*4; - var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; - var h2 = doc.internal.getFontSize()*3+tablePadding*2; - doc.rect(x1, y1, w2, h2, 'FD'); -======= ->>>>>>> 39774ccaaf7f263310fd072be78ec5508a4188bf doc.setLineWidth(0.3); @@ -2602,12 +2588,9 @@ if (i!=0&NewPageFlag==0) -<<<<<<< HEAD -======= ->>>>>>> 39774ccaaf7f263310fd072be78ec5508a4188bf doc.setFontType("bold"); SetPdfColor('White',doc); doc.setFontSize(12); From 6f87769077a3d21b8f5338db2aaa6aae2aadacec Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 3 Mar 2014 20:26:45 +0200 Subject: [PATCH 25/30] bug fixes --- app/controllers/AccountController.php | 4 ++- ...2014_03_03_155556_add_phone_to_account.php | 36 +++++++++++++++++++ app/views/accounts/details.blade.php | 2 ++ app/views/invoices/edit.blade.php | 4 +-- public/css/style.css | 4 +-- public/js/script.js | 7 ++-- 6 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 app/database/migrations/2014_03_03_155556_add_phone_to_account.php diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index 93db77a26903..9199cb3a95ac 100755 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -498,12 +498,14 @@ class AccountController extends \BaseController { { $account = Account::findOrFail(Auth::user()->account_id); $account->name = trim(Input::get('name')); + $account->work_email = trim(Input::get('work_email')); + $account->work_phone = trim(Input::get('work_phone')); $account->address1 = trim(Input::get('address1')); $account->address2 = trim(Input::get('address2')); $account->city = trim(Input::get('city')); $account->state = trim(Input::get('state')); $account->postal_code = trim(Input::get('postal_code')); - $account->country_id = Input::get('country_id') ? Input::get('country_id') : null; + $account->country_id = Input::get('country_id') ? Input::get('country_id') : null; $account->size_id = Input::get('size_id') ? Input::get('size_id') : null; $account->industry_id = Input::get('industry_id') ? Input::get('industry_id') : null; $account->timezone_id = Input::get('timezone_id') ? Input::get('timezone_id') : null; diff --git a/app/database/migrations/2014_03_03_155556_add_phone_to_account.php b/app/database/migrations/2014_03_03_155556_add_phone_to_account.php new file mode 100644 index 000000000000..1de12fb34e3b --- /dev/null +++ b/app/database/migrations/2014_03_03_155556_add_phone_to_account.php @@ -0,0 +1,36 @@ +string('work_phone'); + $table->string('work_email'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('accounts', function($table) + { + $table->dropColumn('work_phone'); + $table->dropColumn('work_email'); + }); + } + +} \ No newline at end of file diff --git a/app/views/accounts/details.blade.php b/app/views/accounts/details.blade.php index bf3ac60d4b02..839e718ae54f 100755 --- a/app/views/accounts/details.blade.php +++ b/app/views/accounts/details.blade.php @@ -27,6 +27,8 @@ {{ Former::legend('Details') }} {{ Former::text('name') }} + {{ Former::text('work_email')->label('Email') }} + {{ Former::text('work_phone')->label('Phone') }} {{ Former::file('logo')->max(2, 'MB')->accept('image')->inlineHelp('Supported: JPEG, GIF and PNG. Recommnded size: 120px width, 80px height') }} @if (file_exists($account->getLogoPath())) diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index 471d01543e7a..f4ea5e0b6868 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -1397,7 +1397,7 @@ } $('.word-wrap').each(function(index, input) { - $(input).height($(input).val().split('\n').length * 22); + $(input).height($(input).val().split('\n').length * 20); }); } @@ -1468,7 +1468,7 @@ if (!model.invoice().discount()) model.invoice().discount(''); ko.applyBindings(model); - + onItemChange(); diff --git a/public/css/style.css b/public/css/style.css index 7a20ed55d472..c0e226bae36c 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -53,7 +53,7 @@ margin-bottom: 0; padding-top: 10px; } textarea.form-control { -height: auto !important; +/*height: auto !important;*/ } /*tables*/ table.dataTable { border-radius: 3px; border-collapse: collapse; @@ -73,7 +73,7 @@ th:last-child { tr {border: none;} th {border-left: 1px solid #d26b26; } .table>thead>tr>th, .table>tbody>tr>th, .table>tfoot>tr>th, .table>thead>tr>td, .table>tbody>tr>td, .table>tfoot>tr>td { -vertical-align: middle; +vertical-align: top; border-top: none; border-bottom: 1px solid #dfe0e1; } diff --git a/public/js/script.js b/public/js/script.js index 5e806765ffea..64775f08adae 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -569,8 +569,7 @@ function GetReportTemplate1 (invoice,checkMath) var invoiceDate = invoice.invoice_date ? invoice.invoice_date : ''; var dueDate = invoice.due_date ? invoice.due_date : ''; - var paid_to_date=client.paid_to_date; - + var paid_to_date = invoice.amount - invoice.balance; @@ -1140,7 +1139,7 @@ function GetReportTemplate2 (invoice,checkMath) var invoiceDate = invoice.invoice_date ? invoice.invoice_date : ''; var dueDate = invoice.due_date ? invoice.due_date : ''; - var paid_to_date=client.paid_to_date; + var paid_to_date = invoice.amount - invoice.balance; var headerRight = 150; var accountTop = 30; @@ -1968,7 +1967,7 @@ function GetReportTemplate3 (invoice,checkMath) var invoiceDate = invoice.invoice_date ? invoice.invoice_date : ''; var dueDate = invoice.due_date ? invoice.due_date : ''; - var paid_to_date=client.paid_to_date; + var paid_to_date = invoice.amount - invoice.balance; var headerRight = 150; var accountTop = 30; From c87a58c3c54fc29dcde9811856fc20c34b878b03 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 3 Mar 2014 20:30:56 +0200 Subject: [PATCH 26/30] bug fixes --- public/css/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/css/style.css b/public/css/style.css index c0e226bae36c..4720cf0c2e40 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -54,6 +54,7 @@ padding-top: 10px; } textarea.form-control { /*height: auto !important;*/ +min-height: 38px; } /*tables*/ table.dataTable { border-radius: 3px; border-collapse: collapse; From a6fac4f90012d7d3b6aec82a8fab63345c170ad1 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 3 Mar 2014 20:31:29 +0200 Subject: [PATCH 27/30] bug fixes --- public/css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/css/style.css b/public/css/style.css index 4720cf0c2e40..3a8481632091 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -54,7 +54,7 @@ padding-top: 10px; } textarea.form-control { /*height: auto !important;*/ -min-height: 38px; +min-height: 40px; } /*tables*/ table.dataTable { border-radius: 3px; border-collapse: collapse; From 2f207f8a7ff8878b305b6d8f204fa820c5fc9f02 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Mon, 3 Mar 2014 16:04:33 +0200 Subject: [PATCH 28/30] report fixes --- public/js/script.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 64775f08adae..7bca0f3125b4 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -797,8 +797,8 @@ function GetReportTemplate1 (invoice,checkMath) doc.setFontSize(7); doc.text(marginLeft1, line1, 'Invoice Number'); - doc.text(marginLeft1, line2, 'Invoice date'); - doc.text(marginLeft1, line3, 'Amount Due'); + doc.text(marginLeft1, line2, 'Invoice Date'); + doc.text(marginLeft1, line3, 'Balance Due'); doc.setFontType("bold"); @@ -986,7 +986,7 @@ function GetReportTemplate1 (invoice,checkMath) if ((i%2)===0){ doc.setLineWidth(0.5); - doc.setDrawColor(200,200,200); + doc.setDrawColor(230,230,230); doc.setFillColor(230,230,230); var x1 = tableLeft-tablePadding ; @@ -1050,7 +1050,7 @@ function GetReportTemplate1 (invoice,checkMath) GlobalY=x; doc.setLineWidth(0.3); - doc.setDrawColor(200,200,200); + doc.setDrawColor(251,251,251); doc.setFillColor(251,251,251); var x1 = tableLeft-tablePadding*2+14 ; var y1 = GlobalY-FontSize-tablePadding; @@ -1062,7 +1062,7 @@ function GetReportTemplate1 (invoice,checkMath) - Msg='Total'; + Msg='Subtotal'; var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); doc.text(TmpMsgX, x, Msg); @@ -1080,7 +1080,7 @@ function GetReportTemplate1 (invoice,checkMath) x += doc.internal.getFontSize()*2; //doc.text(footerLeft, x, ''); - Msg='Amount Payed'; + Msg='Paid to Date'; var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); doc.text(TmpMsgX, x, Msg); @@ -1099,7 +1099,7 @@ function GetReportTemplate1 (invoice,checkMath) doc.setFontSize(10); x += doc.internal.getFontSize()*4; //doc.text(footerLeft, x, ''); - Msg='Amount Due'; + Msg='Balance Due'; var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); From 31377eb2267fb8e7c1581a9cd7193592539139db Mon Sep 17 00:00:00 2001 From: alltheworld Date: Mon, 3 Mar 2014 17:49:10 +0200 Subject: [PATCH 29/30] report fixes --- public/js/script.js | 50 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 7bca0f3125b4..f4485157b84d 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -900,7 +900,7 @@ function GetReportTemplate1 (invoice,checkMath) var shownItem = false; - GlobalY=GlobalY+14; //padding from top + GlobalY=GlobalY+14+10; //padding from top var FontSize=7; doc.setFontSize(FontSize); @@ -1034,8 +1034,20 @@ function GetReportTemplate1 (invoice,checkMath) + + + //-------------------------------Publishing Document balance------------------------------------------ +//check do we need to go to next page + MinHeight=700; + + if (GlobalY > MinHeight) { + + + GlobalY=Report1AddNewPage(invoice,account,doc); + } + @@ -1047,19 +1059,22 @@ function GetReportTemplate1 (invoice,checkMath) - GlobalY=x; + // GlobalY=x; + + GlobalY=GlobalY+25; doc.setLineWidth(0.3); doc.setDrawColor(251,251,251); doc.setFillColor(251,251,251); var x1 = tableLeft-tablePadding*2+14 ; var y1 = GlobalY-FontSize-tablePadding; + var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; var h2 = doc.internal.getFontSize()*3+tablePadding*2; doc.rect(x1, y1, w2, h2, 'FD'); - + x=y1+FontSize+tablePadding; Msg='Subtotal'; @@ -1122,6 +1137,19 @@ function GetReportTemplate1 (invoice,checkMath) } + + + + + + + + + + + + + function GetReportTemplate2 (invoice,checkMath) { var doc=false; @@ -1794,7 +1822,6 @@ function SetPdfColor(color,doc) } - function Report2AddFooter (invoice,doc) { @@ -2659,4 +2686,19 @@ function Report3AddHeader (invoice,account,doc) } +} + + +function Report1AddNewPage(invoice,account,doc) +{ + //alert(1); + doc.addPage(); + + GlobalY = 40; + return GlobalY; +} + +function Report1AddFooter(invoice,account,doc) +{ + alert(2); } \ No newline at end of file From da2ad78db43670d7a2ad912f63f337bc137a0d06 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Mon, 3 Mar 2014 21:18:31 +0200 Subject: [PATCH 30/30] report fixes --- public/js/script.js | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index f4485157b84d..15f444966d4d 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -960,14 +960,16 @@ function GetReportTemplate1 (invoice,checkMath) if (h+GlobalY > MaxGlobalY) { - tableTop = 40; - GlobalY=tableTop; + //tableTop = 40; + //GlobalY=tableTop; //var MaxLinesPerPage=70; + GlobalY=Report1AddNewPage(invoice,account,doc); + /* doc.addPage(); if (invoice.imageLogo1) { @@ -980,7 +982,7 @@ function GetReportTemplate1 (invoice,checkMath) doc.addImage(invoice.imageLogo1, 'JPEG', left, y, invoice.imageLogoWidth1, invoice.imageLogoHeight1); - } + }*/ } @@ -2649,18 +2651,12 @@ if (i!=0&NewPageFlag==0) function Report3AddHeader (invoice,account,doc) { doc.setLineWidth(0.5); - //doc.setFillColor( 46,43,43); //doc.setFillColor( 46,43,43); - doc.setDrawColor(242,101,34); doc.setFillColor(242,101,34); - - var x1 =0; - var y1 = 0; - var w2 = 595; var h2 = 140; doc.rect(x1, y1, w2, h2, 'FD'); @@ -2669,11 +2665,8 @@ function Report3AddHeader (invoice,account,doc) //second column doc.setFontType("bold"); var MaxWidth=594; - var LineOne= account.name; - var AlignLine = MaxWidth-30- (doc.getStringUnitWidth(LineOne) * doc.internal.getFontSize()); - if (account.name) { //SetPdfColor('SomeGreen',doc); @@ -2691,14 +2684,16 @@ function Report3AddHeader (invoice,account,doc) function Report1AddNewPage(invoice,account,doc) { - //alert(1); doc.addPage(); + if (invoice.imageLogo1) + { + pageHeight=820; + y=pageHeight-invoice.imageLogoHeight1; + var left = 20;//headerRight - invoice.imageLogoWidth1; + doc.addImage(invoice.imageLogo1, 'JPEG', left, y, invoice.imageLogoWidth1, invoice.imageLogoHeight1); + + } GlobalY = 40; return GlobalY; } - -function Report1AddFooter(invoice,account,doc) -{ - alert(2); -} \ No newline at end of file