mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-07 11:04:41 -04:00
Bug fixes
This commit is contained in:
parent
0097f0c192
commit
c9b7f79d7c
@ -24,7 +24,8 @@ class SendRecurringInvoices extends Command {
|
|||||||
|
|
||||||
$today = new DateTime();
|
$today = new DateTime();
|
||||||
|
|
||||||
$invoices = Invoice::with('account.timezone', 'invoice_items')->whereRaw('is_recurring is true AND start_date <= ? AND (end_date IS NULL OR end_date >= ?)', array($today, $today))->get();
|
$invoices = Invoice::with('account.timezone', 'invoice_items')
|
||||||
|
->whereRaw('is_deleted IS FALSE AND deleted_at IS NULL AND is_recurring IS TRUE AND start_date <= ? AND (end_date IS NULL OR end_date >= ?)', array($today, $today))->get();
|
||||||
$this->info(count($invoices) . ' recurring invoice(s) found');
|
$this->info(count($invoices) . ' recurring invoice(s) found');
|
||||||
|
|
||||||
foreach ($invoices as $recurInvoice)
|
foreach ($invoices as $recurInvoice)
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
|
|
||||||
function submitForm(action) {
|
function submitForm(action) {
|
||||||
if (action == 'delete') {
|
if (action == 'delete') {
|
||||||
if (!confirm('Are you sure')) {
|
if (!confirm('Are you sure?')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -67,7 +67,7 @@
|
|||||||
<div class="icon pdf"><span class="img-wrap"><img src="{{ asset('images/icon-pdf.png') }}"></span></div>
|
<div class="icon pdf"><span class="img-wrap"><img src="{{ asset('images/icon-pdf.png') }}"></span></div>
|
||||||
<h2>Live .PDF View</h2>
|
<h2>Live .PDF View</h2>
|
||||||
<!--<p>Create beautiful email-ready .PDF invoices created instantly as you type. Our ‘Save & send’ feature saves you time and impresses clients.</p>-->
|
<!--<p>Create beautiful email-ready .PDF invoices created instantly as you type. Our ‘Save & send’ feature saves you time and impresses clients.</p>-->
|
||||||
<p>See how your edited invoice will look as a print-friendly pdf while you make the changes. Our pdf generator works in real time while you do, on the same screen. You can even preview four beautiful preset designs. Just create, save, send, and you’re done!</p>
|
<p>See how your edited invoice will look as a print-friendly pdf while you make the changes. Our pdf generator works in real time as you make your changes. You can even preview four beautiful preset designs. Just create, save, send, and you’re done!</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user