1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00

Bug fixes

This commit is contained in:
Hillel Coren 2014-05-01 20:20:52 +03:00
parent 36588f061c
commit 668fbd47fa
3 changed files with 313 additions and 4478 deletions

View File

@ -45,6 +45,13 @@ class SendRecurringInvoices extends Command {
$invoice->amount = $recurInvoice->amount; $invoice->amount = $recurInvoice->amount;
$invoice->balance = $recurInvoice->amount; $invoice->balance = $recurInvoice->amount;
$invoice->invoice_date = date_create()->format('Y-m-d'); $invoice->invoice_date = date_create()->format('Y-m-d');
$invoice->discount = $recurInvoice->discount;
$invoice->po_number = $recurInvoice->po_number;
$invoice->public_notes = $recurInvoice->public_notes;
$invoice->terms = $recurInvoice->terms;
$invoice->tax_name = $recurInvoice->tax_name;
$invoice->tax_rate = $recurInvoice->tax_rate;
$invoice->invoice_design_id = $recurInvoice->invoice_design_id;
if ($invoice->client->payment_terms) if ($invoice->client->payment_terms)
{ {
@ -61,6 +68,8 @@ class SendRecurringInvoices extends Command {
$item->cost = $recurItem->cost; $item->cost = $recurItem->cost;
$item->notes = Utils::processVariables($recurItem->notes); $item->notes = Utils::processVariables($recurItem->notes);
$item->product_key = Utils::processVariables($recurItem->product_key); $item->product_key = Utils::processVariables($recurItem->product_key);
$item->tax_name = $recurItem->tax_name;
$item->tax_rate = $recurItem->tax_rate;
$invoice->invoice_items()->save($item); $invoice->invoice_items()->save($item);
} }

View File

@ -42,7 +42,7 @@
<div class="col-md-3 one"> <div class="col-md-3 one">
<div class="box"> <div class="box">
<div class="icon"><span class="img-wrap"><img src="{{ asset('images/icon-free.png') }}"></span></div> <div class="icon"><span class="img-wrap"><img src="{{ asset('images/icon-free.png') }}"></span></div>
<h2>100% Free. Always.</h2> <h2>Free, Always</h2>
<p>Invoicing with no monthly fee, because you have enough bills already! Free, now and forever! Quality invoicing to build your business and get paid.</p> <p>Invoicing with no monthly fee, because you have enough bills already! Free, now and forever! Quality invoicing to build your business and get paid.</p>
</div> </div>
</div> </div>

File diff suppressed because one or more lines are too long