From e6cbb8ba3fd74090d4153e9a7223f804c3b0409f Mon Sep 17 00:00:00 2001 From: alltheworld Date: Sun, 2 Mar 2014 02:35:01 +0200 Subject: [PATCH 01/18] 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 f18e1df1be..78382f9717 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 02/18] 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 78382f9717..3a7ee54b2a 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 03/18] 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 3a7ee54b2a..eaa2708980 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 04/18] 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 eaa2708980..14bb4b07da 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 05/18] 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 14bb4b07da..ea44e92501 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 06/18] 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 ea44e92501..4e4239c663 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 07/18] 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 4e4239c663..d1c9140bfd 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 08/18] 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 d1c9140bfd..3752ed3332 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 09/18] 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 3752ed3332..3baa19ff93 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 10/18] 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 3baa19ff93..461c3b195f 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 11/18] 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 461c3b195f..a03e145e97 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 12/18] 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 a03e145e97..b205782da8 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 13/18] 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 b205782da8..7e4026fc0a 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 14/18] 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 7e4026fc0a..331e6be10c 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 15/18] 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 331e6be10c..13e4a66663 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 16/18] 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 13e4a66663..362a371881 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 17/18] 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 362a371881..bf45c85d77 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 18/18] 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 bf45c85d77..c0ec47b29c 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;