From 1e85b5d0fd6e08ebaa74c7b916877a61e28f0a1a Mon Sep 17 00:00:00 2001 From: alltheworld Date: Wed, 5 Mar 2014 10:58:52 +0200 Subject: [PATCH 01/11] report fixes update report image --- public/images/report_logo1.jpg | Bin 11112 -> 5234 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/images/report_logo1.jpg b/public/images/report_logo1.jpg index 64fe9c87a8a00a3758af758110e75bd5e0be56dd..c1bf4aae1108232778be346c561d71a342a60d8a 100644 GIT binary patch literal 5234 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 literal 11112 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 From 15d6eece8182604b2ed344326316e085212f7c11 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Wed, 5 Mar 2014 11:36:13 +0200 Subject: [PATCH 02/11] report fixes add email and phone --- public/js/script.js | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 15f444966d4d..a23290e1a6dc 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -564,6 +564,7 @@ function GetReportTemplate1 (invoice,checkMath) var account = invoice.account; + var currencyId = client.currency_id; var invoiceNumber = invoice.invoice_number; var invoiceDate = invoice.invoice_date ? invoice.invoice_date : ''; @@ -571,6 +572,9 @@ function GetReportTemplate1 (invoice,checkMath) var paid_to_date = invoice.amount - invoice.balance; + //var work_email = account.work_email ? account.work_email : ''; + //var work_phone =account.work_phone ? account.work_phone : ''; + var headerRight = 150; @@ -588,9 +592,9 @@ function GetReportTemplate1 (invoice,checkMath) var tableLeft = 50; - var tableTop = 240+100; + //var tableTop = 240+100; - var tableRowHeight = 18; + //var tableRowHeight = 18; var tablePadding = 14; @@ -717,31 +721,24 @@ function GetReportTemplate1 (invoice,checkMath) SetPdfColor('GrayText',doc); doc.setFontSize(7); -//TODO:NOT AVAILEABLE FROM DATAMODEL + //account.email='email N/A'; - if (account.email) { + if (account.work_email) { y += rowHeight; - doc.text(left, y, account.email); - } - else - { - //console.log('account.email NOT DEFINED !'); + doc.text(left, y, account.work_email); } -//TODO:NOT AVAILEABLE FROM DATAMODEL + //account.phone='phone N/A'; - if (account.phone) { + if (account.work_phone) { y += rowHeight; - doc.text(left, y, account.phone); - } - else - { - //console.log('account.phone NOT DEFINED !'); + doc.text(left, y, account.work_phone); } - var HeaderMarginThirdColumn=70;//should be dynamic and dependent on 1st image and 2nd column width + + var HeaderMarginThirdColumn=90;//should be dynamic and dependent on 1st image and 2nd column width var y = accountTop; var left = marginLeft+HeaderMarginThirdColumn; From 2a42f44acbfdf2b2ae6b88029e87d9e77cf04895 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Wed, 5 Mar 2014 11:41:06 +0200 Subject: [PATCH 03/11] report fixes update --- public/js/script.js | 43 ++----------------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index a23290e1a6dc..31e38b83bd60 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -552,19 +552,12 @@ function GetReportTemplate1 (invoice,checkMath) { var doc=false; -// var MaxWidth=550; -// var MaxHeight=800; -// return generatePdf2(invoice,checkMath); - 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 : ''; @@ -572,11 +565,6 @@ function GetReportTemplate1 (invoice,checkMath) var paid_to_date = invoice.amount - invoice.balance; - //var work_email = account.work_email ? account.work_email : ''; - //var work_phone =account.work_phone ? account.work_phone : ''; - - - var headerRight = 150; var accountTop = 30; var marginLeft = 180; @@ -591,10 +579,6 @@ function GetReportTemplate1 (invoice,checkMath) var lineTotalRight = 550; var tableLeft = 50; - - //var tableTop = 240+100; - - //var tableRowHeight = 18; var tablePadding = 14; @@ -722,14 +706,12 @@ function GetReportTemplate1 (invoice,checkMath) doc.setFontSize(7); - //account.email='email N/A'; if (account.work_email) { y += rowHeight; doc.text(left, y, account.work_email); } - //account.phone='phone N/A'; if (account.work_phone) { y += rowHeight; doc.text(left, y, account.work_phone); @@ -770,7 +752,7 @@ function GetReportTemplate1 (invoice,checkMath) SetPdfColor('LightBlue',doc); doc.setFontSize('11'); - doc.text(50, headerTop, 'Invoice'); + doc.text(50, headerTop, 'INVOICE'); SetPdfColor('GrayLogo',doc); //set black color y=130; @@ -808,7 +790,7 @@ function GetReportTemplate1 (invoice,checkMath) doc.text(marginLeft2, line3, balance); ClientCompanyName=client.name; - ClientCompanyEmail='';//client.email;//'22222222'; + ClientCompanyEmail=''; ClientCompanyPhone=client.work_phone; ClientCompanyAddress1=client.address1; @@ -956,31 +938,10 @@ function GetReportTemplate1 (invoice,checkMath) if (h+GlobalY > MaxGlobalY) { - - //tableTop = 40; - //GlobalY=tableTop; - - - - - //var MaxLinesPerPage=70; GlobalY=Report1AddNewPage(invoice,account,doc); - /* - doc.addPage(); - if (invoice.imageLogo1) - { - pageHeight=820; - var left = headerRight ; - y=pageHeight-invoice.imageLogoHeight1; - var left = headerRight - invoice.imageLogoWidth1; - doc.addImage(invoice.imageLogo1, 'JPEG', left, y, invoice.imageLogoWidth1, invoice.imageLogoHeight1); - - - }*/ - } if ((i%2)===0){ From ccea93d0cbdbee8c36ff5bc7b4db6531983398e1 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Wed, 5 Mar 2014 14:31:15 +0200 Subject: [PATCH 04/11] report fixes update --- public/js/script.js | 192 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 191 insertions(+), 1 deletion(-) diff --git a/public/js/script.js b/public/js/script.js index 31e38b83bd60..9b6019eafce0 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -558,6 +558,19 @@ function GetReportTemplate1 (invoice,checkMath) var client = invoice.client; var account = invoice.account; + + + + console.log(invoice); + + + var po_number= invoice.po_number ? invoice.po_number : ''; + var public_notes=invoice.public_notes ? invoice.public_notes : ''; + var terms=invoice.terms ? invoice.terms : ''; + + + + var currencyId = client.currency_id; var invoiceNumber = invoice.invoice_number; var invoiceDate = invoice.invoice_date ? invoice.invoice_date : ''; @@ -754,8 +767,11 @@ function GetReportTemplate1 (invoice,checkMath) doc.setFontSize('11'); doc.text(50, headerTop, 'INVOICE'); - SetPdfColor('GrayLogo',doc); //set black color + //SetPdfColor('GrayLogo',doc); //set black color y=130; + + + doc.setDrawColor(220,220,220); doc.line(30, y, 560, y); // horizontal line @@ -772,6 +788,21 @@ function GetReportTemplate1 (invoice,checkMath) var marginLeft2=120; var marginLeft3=180; + + + + + + + + + + + + +/* + + SetPdfColor('Black',doc); //set black color doc.setFontSize(7); @@ -826,6 +857,165 @@ function GetReportTemplate1 (invoice,checkMath) y=195; doc.line(30, y, 560, y); // horizontal line + + + +*/ + + + + GlobalY=line1; + + SetPdfColor('Black',doc); //set black color + doc.setFontSize(7); + + + + if(invoiceNumber){ + //inv number + doc.text(marginLeft1, GlobalY, 'Invoice Number'); + doc.setFontType("bold"); + doc.text(marginLeft2, GlobalY, invoiceNumber); + doc.setFontType("normal"); + + + GlobalY=GlobalY+16; + } + + doc.setFontType("normal"); + //PO# + if(po_number){ + //inv number + doc.text(marginLeft1, GlobalY, 'PO Number'); + // doc.setFontType("bold"); + doc.text(marginLeft2, GlobalY,po_number); + doc.setFontType("normal"); + GlobalY=GlobalY+16; + } + + //PO# + if(invoiceDate){ + //inv number + doc.text(marginLeft1, GlobalY, 'Invoice Date'); + // doc.setFontType("bold"); + doc.text(marginLeft2, GlobalY,invoiceDate); + doc.setFontType("normal"); + GlobalY=GlobalY+16; + } + + //PO# + if(dueDate){ + //inv number + doc.text(marginLeft1, GlobalY, 'Due Date'); + // doc.setFontType("bold"); + doc.text(marginLeft2, GlobalY,dueDate); + doc.setFontType("normal"); + GlobalY=GlobalY+16; + } + + //PO# + if(balance){ + //inv number + doc.text(marginLeft1, GlobalY, 'Balance '); + // doc.setFontType("bold"); + doc.text(marginLeft2, GlobalY,balance); + doc.setFontType("normal"); + GlobalY=GlobalY+16; + } + + + + + + + + y=GlobalY; + + y1=GlobalY; + + + GlobalY=line1; + + + + //SetPdfColor('LightBlue',doc); //set black color + //doc.text(marginLeft2, line3, balance); + + ClientCompanyName=client.name; + ClientCompanyEmail=''; + ClientCompanyPhone=client.work_phone; + + ClientCompanyAddress1=client.address1; + ClientCompanyAddress2=client.address2+' '+client.postal_code; + + + SetPdfColor('Black',doc); //set black color + + doc.setFontType("bold"); + doc.text(marginLeft3, GlobalY, ClientCompanyName); + doc.setFontType("normal"); + GlobalY=GlobalY+16; + + + if(client) + { + ClientCompanyName=getClientDisplayName(client); + ClientCompanyPhone=client.work_phone; + ClientCompanyEmail=client.contacts[0].email; + + } + + + doc.text(marginLeft3, GlobalY, ClientCompanyAddress1); + GlobalY=GlobalY+8; + + doc.text(marginLeft3, GlobalY, ClientCompanyAddress2); + GlobalY=GlobalY+16; + + doc.text(marginLeft3, GlobalY, ClientCompanyEmail); + GlobalY=GlobalY+8; + doc.text(marginLeft3, GlobalY, ClientCompanyPhone); + + GlobalY=GlobalY+16; + + //doc.text(marginLeft3, line21, ClientCompanyAddress1); + //doc.text(marginLeft3, line22, ClientCompanyAddress2); + + //doc.text(marginLeft3, line3, ClientCompanyEmail);// + //doc.text(marginLeft3, line31, ClientCompanyPhone); + + + +y2=GlobalY; + + + + if (y2>y1) {GlobalY=y2;y=y2;} + +// +// +// var po_number= invoice.po_number ? invoice.po_number : ''; +// var public_notes=invoice.public_notes ? invoice.public_notes : ''; +// var terms=invoice.terms ? invoice.terms : ''; +// + + + // SetPdfColor('GrayLogo',doc); //set black color + //y=195; + + doc.setDrawColor(220,220,220); + //doc.setFillColor(230,230,230); + + doc.line(30, y-8, 560, y-8); // horizontal line + + + + + + + + + //--------------------------------Publishing Table-------------------------------------------------- GlobalY=y+30; From 2aec776523b1d8651b1ac7c43c5145baf1133826 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Wed, 5 Mar 2014 15:20:21 +0200 Subject: [PATCH 05/11] report fixes update --- public/js/script.js | 92 +-------------------------------------------- 1 file changed, 2 insertions(+), 90 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 9b6019eafce0..4a52edccee43 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -767,7 +767,7 @@ function GetReportTemplate1 (invoice,checkMath) doc.setFontSize('11'); doc.text(50, headerTop, 'INVOICE'); - //SetPdfColor('GrayLogo',doc); //set black color + y=130; @@ -793,77 +793,6 @@ function GetReportTemplate1 (invoice,checkMath) - - - - - - - -/* - - - SetPdfColor('Black',doc); //set black color - - doc.setFontSize(7); - doc.text(marginLeft1, line1, 'Invoice Number'); - doc.text(marginLeft1, line2, 'Invoice Date'); - doc.text(marginLeft1, line3, 'Balance Due'); - - - doc.setFontType("bold"); - doc.text(marginLeft2, line1, invoiceNumber); - doc.setFontType("normal"); - doc.text(marginLeft2, line2, invoiceDate); - - - SetPdfColor('LightBlue',doc); //set black color - doc.text(marginLeft2, line3, balance); - - ClientCompanyName=client.name; - ClientCompanyEmail=''; - ClientCompanyPhone=client.work_phone; - - ClientCompanyAddress1=client.address1; - ClientCompanyAddress2=client.address2+' '+client.postal_code; - - - SetPdfColor('Black',doc); //set black color - - doc.setFontType("bold"); - - doc.text(marginLeft3, line1, ClientCompanyName); - doc.setFontType("normal"); - - - - if(client) - { - ClientCompanyName=getClientDisplayName(client); - ClientCompanyPhone=client.work_phone; - ClientCompanyEmail=client.contacts[0].email; - - } - - - doc.text(marginLeft3, line21, ClientCompanyAddress1); - doc.text(marginLeft3, line22, ClientCompanyAddress2); - - doc.text(marginLeft3, line3, ClientCompanyEmail); - doc.text(marginLeft3, line31, ClientCompanyPhone); - - - SetPdfColor('GrayLogo',doc); //set black color - y=195; - doc.line(30, y, 560, y); // horizontal line - - - - -*/ - - - GlobalY=line1; SetPdfColor('Black',doc); //set black color @@ -938,9 +867,6 @@ function GetReportTemplate1 (invoice,checkMath) - //SetPdfColor('LightBlue',doc); //set black color - //doc.text(marginLeft2, line3, balance); - ClientCompanyName=client.name; ClientCompanyEmail=''; ClientCompanyPhone=client.work_phone; @@ -978,11 +904,6 @@ function GetReportTemplate1 (invoice,checkMath) GlobalY=GlobalY+16; - //doc.text(marginLeft3, line21, ClientCompanyAddress1); - //doc.text(marginLeft3, line22, ClientCompanyAddress2); - - //doc.text(marginLeft3, line3, ClientCompanyEmail);// - //doc.text(marginLeft3, line31, ClientCompanyPhone); @@ -992,19 +913,10 @@ y2=GlobalY; if (y2>y1) {GlobalY=y2;y=y2;} -// -// -// var po_number= invoice.po_number ? invoice.po_number : ''; -// var public_notes=invoice.public_notes ? invoice.public_notes : ''; -// var terms=invoice.terms ? invoice.terms : ''; -// - // SetPdfColor('GrayLogo',doc); //set black color - //y=195; - doc.setDrawColor(220,220,220); - //doc.setFillColor(230,230,230); + doc.line(30, y-8, 560, y-8); // horizontal line From 2f006363c66dbfe2c257ead707c9877844af6b97 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Wed, 5 Mar 2014 15:21:53 +0200 Subject: [PATCH 06/11] report fixes update --- 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 4a52edccee43..205fdbd5b6ce 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -561,7 +561,7 @@ function GetReportTemplate1 (invoice,checkMath) - console.log(invoice); + var po_number= invoice.po_number ? invoice.po_number : ''; From da30d94bcee44838e5f323663d18a563dca42e6d Mon Sep 17 00:00:00 2001 From: alltheworld Date: Wed, 5 Mar 2014 15:31:46 +0200 Subject: [PATCH 07/11] report fixes discount field --- public/js/script.js | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index 205fdbd5b6ce..010a255298e1 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1133,6 +1133,12 @@ y2=GlobalY; var w2 = 510+tablePadding*2;//lineTotalRight-tablePadding*5; var h2 = doc.internal.getFontSize()*3+tablePadding*2; + + if (invoice.discount) + { + var h2 = doc.internal.getFontSize()*4+tablePadding*2; + } + doc.rect(x1, y1, w2, h2, 'FD'); @@ -1151,11 +1157,32 @@ y2=GlobalY; var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); doc.text(AmountX, x, AmountText); - - - x += doc.internal.getFontSize()*2; - //doc.text(footerLeft, x, ''); + + + + if (invoice.discount) + { + Msg='Discount'; + var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); + doc.text(TmpMsgX, x, Msg); + + + discount=invoice.discount/100; + //alert (discount); + d=total*discount; + + + doc.setFontType("normal"); + AmountText = formatMoney(d , currencyId); + headerLeft=headerRight+400; + var AmountX = headerLeft - (doc.getStringUnitWidth(AmountText) * doc.internal.getFontSize()); + doc.text(AmountX, x, AmountText); + x += doc.internal.getFontSize()*2; + } + + + Msg='Paid to Date'; var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); From d4b9ad8f725b430af6761e76d5328c773f01e02b Mon Sep 17 00:00:00 2001 From: alltheworld Date: Wed, 5 Mar 2014 15:35:59 +0200 Subject: [PATCH 08/11] report fixes background --- 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 010a255298e1..693bf5328190 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -959,13 +959,13 @@ y2=GlobalY; tableTop=GlobalY;//redefine this to dynamic value doc.setFontSize(10); - + 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'); - + doc.setFontType("normal"); if (hasTaxes) { doc.text(taxX, tableTop, 'Tax'); @@ -1048,8 +1048,8 @@ y2=GlobalY; if ((i%2)===0){ doc.setLineWidth(0.5); - doc.setDrawColor(230,230,230); - doc.setFillColor(230,230,230); + doc.setDrawColor(251,251,251); + doc.setFillColor(251,251,251); var x1 = tableLeft-tablePadding ; From 9af257a2789ebd41e5cfc06d4b0f6a9e7f0db6f4 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Wed, 5 Mar 2014 15:46:38 +0200 Subject: [PATCH 09/11] report fixes --- public/js/script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/js/script.js b/public/js/script.js index 693bf5328190..aefb51871bc1 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1160,8 +1160,9 @@ y2=GlobalY; x += doc.internal.getFontSize()*2; +//alert(invoice.discount!=''); - if (invoice.discount) + if (invoice.discount>0 ) { Msg='Discount'; var TmpMsgX = MsgRightAlign-(doc.getStringUnitWidth(Msg) * doc.internal.getFontSize()); From 50e8f45dffb2bd6c1b2ed8b013986c5345b73466 Mon Sep 17 00:00:00 2001 From: alltheworld Date: Wed, 5 Mar 2014 16:43:41 +0200 Subject: [PATCH 10/11] report fixes lines --- public/js/script.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/public/js/script.js b/public/js/script.js index aefb51871bc1..e8058f9ebd2d 100644 --- a/public/js/script.js +++ b/public/js/script.js @@ -1061,6 +1061,15 @@ y2=GlobalY; doc.rect(x1, y1, w2, h2, 'FD'); + + doc.setDrawColor(220,220,220); + doc.line(x1, y1, x1+w2, y1); // horizontal line + + doc.line(x1, y1+h2, x1+w2, y1+h2); // horizontal line + + + + } x=GlobalY; @@ -1160,7 +1169,6 @@ y2=GlobalY; x += doc.internal.getFontSize()*2; -//alert(invoice.discount!=''); if (invoice.discount>0 ) { @@ -1170,7 +1178,7 @@ y2=GlobalY; discount=invoice.discount/100; - //alert (discount); + d=total*discount; From 70b9256ddbc919f31d395f8a59f314c8ed75a5a0 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 5 Mar 2014 17:03:31 +0200 Subject: [PATCH 11/11] bug fixes --- app/models/Invoice.php | 2 +- app/views/about_us.blade.php | 2 ++ app/views/contact_us.blade.php | 2 ++ app/views/splash.blade.php | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/Invoice.php b/app/models/Invoice.php index 7b446d65dfa3..f2b4bea4a822 100755 --- a/app/models/Invoice.php +++ b/app/models/Invoice.php @@ -57,7 +57,7 @@ class Invoice extends EntityModel $this->setVisible(['invoice_number', 'discount', 'po_number', 'invoice_date', 'due_date', 'terms', 'public_notes', 'amount', 'balance', 'invoice_items', 'client', 'tax_name', 'tax_rate', 'account']); $this->client->setVisible(['name', 'address1', 'address2', 'city', 'state', 'postal_code', 'work_phone', 'payment_terms', 'contacts', 'country', 'currency_id' ]); - $this->account->setVisible(['name', 'address1', 'address2', 'city', 'state', 'postal_code', 'country', 'currency_id']); + $this->account->setVisible(['name', 'address1', 'address2', 'city', 'state', 'postal_code', 'work_phone', 'work_email', 'country', 'currency_id']); foreach ($this->invoice_items as $invoiceItem) { diff --git a/app/views/about_us.blade.php b/app/views/about_us.blade.php index e703f44f7c24..929b9556686c 100644 --- a/app/views/about_us.blade.php +++ b/app/views/about_us.blade.php @@ -28,6 +28,8 @@
    +
  • {{ link_to('about_us', 'About Us' ) }}
    • +
  • {{ link_to('contact_us', 'Contact Us' ) }}
  • {{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}
diff --git a/app/views/contact_us.blade.php b/app/views/contact_us.blade.php index 3ac6f2232dab..e5db84b7b8dd 100644 --- a/app/views/contact_us.blade.php +++ b/app/views/contact_us.blade.php @@ -91,6 +91,8 @@ var contactForm = {
    +
  • {{ link_to('about_us', 'About Us' ) }}
    • +
  • {{ link_to('contact_us', 'Contact Us' ) }}
  • {{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}
diff --git a/app/views/splash.blade.php b/app/views/splash.blade.php index 920ebcf586c7..9243ca49fa72 100755 --- a/app/views/splash.blade.php +++ b/app/views/splash.blade.php @@ -51,6 +51,8 @@
    + +
  • {{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}