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

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-05-25 17:48:00 +03:00
parent 3b4220cede
commit 36114d251f
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/PaymentController.php
View File

@ -411,7 +411,7 @@ class PaymentController extends \BaseController
if ($invoice->is_quote) if ($invoice->is_quote)
{ {
$invoice = $this->invoiceRepo->cloneInvoice($invoice, $invoice->id, $invitation); $invoice = $this->invoiceRepo->cloneInvoice($invoice, $invoice->id);
} }
$payment = Payment::createNew($invitation); $payment = Payment::createNew($invitation);
@ -430,10 +430,10 @@ class PaymentController extends \BaseController
} }
$payment->save(); $payment->save();
$invoice->invoice_status_id = INVOICE_STATUS_PAID; $invoice->invoice_status_id = INVOICE_STATUS_PAID;
$invoice->save(); $invoice->save();
Event::fire('invoice.paid', $payment); Event::fire('invoice.paid', $payment);
return $payment; return $payment;

2
app/models/EntityModel.php
View File

@ -12,7 +12,7 @@ class EntityModel extends Eloquent
$className = get_called_class(); $className = get_called_class();
$entity = new $className(); $entity = new $className();
if ($parent) if ($parent)
{ {
$entity->user_id = $parent->user_id; $entity->user_id = $parent->user_id;
$entity->account_id = $parent->account_id; $entity->account_id = $parent->account_id;

8
app/ninja/repositories/InvoiceRepository.php
View File

@ -318,11 +318,11 @@ class InvoiceRepository
return $invoice; return $invoice;
} }
public function cloneInvoice($invoice, $quotePublicId = null, $invitation = null) public function cloneInvoice($invoice, $quotePublicId = null)
{ {
$invoice->load('invitations', 'invoice_items'); $invoice->load('invitations', 'invoice_items');
$clone = Invoice::createNew($invitation ? $invitation : $invoice); $clone = Invoice::createNew($invoice);
$clone->balance = $invoice->amount; $clone->balance = $invoice->amount;
$clone->invoice_number = $invoice->account->getNextInvoiceNumber(); $clone->invoice_number = $invoice->account->getNextInvoiceNumber();
@ -364,7 +364,7 @@ class InvoiceRepository
foreach ($invoice->invoice_items as $item) foreach ($invoice->invoice_items as $item)
{ {
$cloneItem = InvoiceItem::createNew(); $cloneItem = InvoiceItem::createNew($invoice);
foreach ([ foreach ([
'product_id', 'product_id',
@ -383,7 +383,7 @@ class InvoiceRepository
foreach ($invoice->invitations as $invitation) foreach ($invoice->invitations as $invitation)
{ {
$cloneInvitation = Invitation::createNew(); $cloneInvitation = Invitation::createNew($invoice);
$cloneInvitation->contact_id = $invitation->contact_id; $cloneInvitation->contact_id = $invitation->contact_id;
$cloneInvitation->invitation_key = str_random(RANDOM_KEY_LENGTH); $cloneInvitation->invitation_key = str_random(RANDOM_KEY_LENGTH);
$clone->invitations()->save($cloneInvitation); $clone->invitations()->save($cloneInvitation);

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

@ -19,7 +19,7 @@
@if ($showNinjaFooter) @if ($showNinjaFooter)
<p/> <p/>
{{ trans('texts.ninja_email_footer', ['site' => '<a href="https://www.invoiceninja.com/?utm_source=email_footer">Invoice Ninja</a>']) }} {{ trans('texts.ninja_email_footer', ['site' => '<a href="https://www.invoiceninja.com/?utm_source=view_email_footer">Invoice Ninja</a>']) }}
@endif @endif
</body> </body>

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

@ -18,7 +18,7 @@
@if ($showNinjaFooter) @if ($showNinjaFooter)
<p/> <p/>
{{ trans('texts.ninja_email_footer', ['site' => '<a href="https://www.invoiceninja.com/?utm_source=email_footer">Invoice Ninja</a>']) }} {{ trans('texts.ninja_email_footer', ['site' => '<a href="https://www.invoiceninja.com/?utm_source=payment_email_footer">Invoice Ninja</a>']) }}
@endif @endif
</body> </body>