Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 19:14:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-03-10 08:10:08 +02:00
parent 1f5ba56f0f
commit 388ca323c8
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/AccountController.php
View File

@ -450,7 +450,7 @@ class AccountController extends \BaseController {
if ($validator->fails()) if ($validator->fails())
{ {
return Redirect::to('company/settings') return Redirect::to('company/payments')
->withErrors($validator) ->withErrors($validator)
->withInput(); ->withInput();
} }

2
app/views/emails/invoice_paid_html.blade.php
View File

@ -12,7 +12,7 @@
To view your client invoice click the link below: <br/> To view your client invoice click the link below: <br/>
{{ $invoiceLink }} <p/> {{ $invoiceLink }} <p/>
To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/settings">click here</a>. To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/notifications">click here</a>.
</body> </body>
</html> </html>

2
app/views/emails/invoice_paid_text.blade.php
View File

@ -6,4 +6,4 @@ A payment of {{ $paymentAmount }} was made by client {{ $clientName }} towards i
To view your client invoice click the link below: To view your client invoice click the link below:
{{ $invoiceLink }} <p/> {{ $invoiceLink }} <p/>
To adjust your email notification settings please visit http://www.invoiceninja.com/company/settings To adjust your email notification settings please visit http://www.invoiceninja.com/company/notifications

2
app/views/emails/invoice_sent_html.blade.php
View File

@ -9,7 +9,7 @@
The following client {{ $clientName }} was emailed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount}}.<p/> The following client {{ $clientName }} was emailed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount}}.<p/>
To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/settings">click here</a>.<p/> To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/notifications">click here</a>.<p/>
</body> </body>
</html> </html>

2
app/views/emails/invoice_sent_text.blade.php
View File

@ -2,4 +2,4 @@ Dear {{ $userName }},
The following client {{ $clientName }} was emailed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount}}. The following client {{ $clientName }} was emailed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount}}.
To adjust your email notification settings visit this link http://www.invoiceninja.com/company/settings To adjust your email notification settings visit this link http://www.invoiceninja.com/company/notifications

2
app/views/emails/invoice_viewed_html.blade.php
View File

@ -9,7 +9,7 @@
The following client {{ $clientName }} viewed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount}}.<p/> The following client {{ $clientName }} viewed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount}}.<p/>
To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/settings">click here</a>.<p/> To adjust your email notification settings please <a href="http://www.invoiceninja.com/company/notifications">click here</a>.<p/>
</body> </body>
</html> </html>

2
app/views/emails/invoice_viewed_text.blade.php
View File

@ -2,4 +2,4 @@ Dear {{ $userName }},
The following client {{ $clientName }} viewed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount }}. The following client {{ $clientName }} viewed Invoice {{ $invoiceNumber }} for {{ $invoiceAmount }}.
To adjust your email notification settings visit this link http://www.invoiceninja.com/company/settings To adjust your email notification settings visit this link http://www.invoiceninja.com/company/notifications

14
public/js/script.js
View File

@ -1586,7 +1586,7 @@ function displayInvoiceItems(doc, invoice, layout) {
var qtyX = layout.qtyRight - (doc.getStringUnitWidth(qty) * doc.internal.getFontSize()); var qtyX = layout.qtyRight - (doc.getStringUnitWidth(qty) * doc.internal.getFontSize());
var taxX = layout.taxRight - (doc.getStringUnitWidth(tax+'%') * doc.internal.getFontSize()); var taxX = layout.taxRight - (doc.getStringUnitWidth(tax+'%') * doc.internal.getFontSize());
var totalX = layout.lineTotalRight - (doc.getStringUnitWidth(lineTotal) * doc.internal.getFontSize()); var totalX = layout.lineTotalRight - (doc.getStringUnitWidth(lineTotal) * doc.internal.getFontSize());
if (i==0) y -= 4; //if (i==0) y -= 4;
line += numLines; line += numLines;
@ -1629,18 +1629,18 @@ function displayInvoiceItems(doc, invoice, layout) {
} else { } else {
SetPdfColor('Black', doc); SetPdfColor('Black', doc);
} }
doc.text(layout.marginLeft, y, productKey); doc.text(layout.marginLeft, y+2, productKey);
SetPdfColor('Black', doc); SetPdfColor('Black', doc);
doc.setFontType('normal'); doc.setFontType('normal');
doc.text(layout.descriptionLeft, y, notes); doc.text(layout.descriptionLeft, y+2, notes);
doc.text(costX, y, cost); doc.text(costX, y+2, cost);
doc.text(qtyX, y, qty); doc.text(qtyX, y+2, qty);
doc.text(totalX, y, lineTotal); doc.text(totalX, y+2, lineTotal);
if (tax) { if (tax) {
doc.text(taxX, y, tax+'%'); doc.text(taxX, y+2, tax+'%');
} }
} }