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:25:58 +03:00
parent af5f659d24
commit 3b4220cede
3 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/controllers/PaymentController.php
View File

@ -1,16 +1,18 @@
<?php
use ninja\repositories\PaymentRepository;
use ninja\repositories\InvoiceRepository;
class PaymentController extends \BaseController
{
protected $creditRepo;
public function __construct(PaymentRepository $paymentRepo)
public function __construct(PaymentRepository $paymentRepo, InvoiceRepository $invoiceRepo)
{
parent::__construct();
$this->paymentRepo = $paymentRepo;
$this->invoiceRepo = $invoiceRepo;
}
public function index()
@ -326,12 +328,7 @@ class PaymentController extends \BaseController
if ($response->isSuccessful())
{
$payment = self::createPayment($invitation, $ref);
$invoice->invoice_status_id = INVOICE_STATUS_PAID;
$invoice->save();
Event::fire('invoice.paid', $payment);
Session::flash('message', trans('texts.applied_payment'));
return Redirect::to('view/' . $payment->invitation->invitation_key);
}
@ -379,12 +376,7 @@ class PaymentController extends \BaseController
if (strtolower($response->status) == 'success')
{
$payment = self::createPayment($invitation, $response->response_message);
$invoice->invoice_status_id = INVOICE_STATUS_PAID;
$invoice->save();
Event::fire('invoice.paid', $payment);
Session::flash('message', trans('texts.applied_payment'));
return Redirect::to('view/' . $payment->invitation->invitation_key);
}
@ -416,12 +408,12 @@ class PaymentController extends \BaseController
$account->pro_plan_paid = date_create()->format('Y-m-d');
$account->save();
}
if ($invoice->is_quote)
{
$invoice = $this->invoiceRepo->cloneInvoice($invoice, $invoice->id);
$invoice = $this->invoiceRepo->cloneInvoice($invoice, $invoice->id, $invitation);
}
$payment = Payment::createNew($invitation);
$payment->invitation_id = $invitation->id;
$payment->account_gateway_id = $accountGateway->id;
@ -431,14 +423,19 @@ class PaymentController extends \BaseController
$payment->contact_id = $invitation->contact_id;
$payment->transaction_reference = $ref;
$payment->payment_date = date_create()->format('Y-m-d');
if ($payerId)
{
$payment->payer_id = $payerId;
}
$payment->save();
$invoice->invoice_status_id = INVOICE_STATUS_PAID;
$invoice->save();
Event::fire('invoice.paid', $payment);
return $payment;
}
@ -461,12 +458,7 @@ class PaymentController extends \BaseController
if ($response->isSuccessful())
{
$payment = self::createPayment($invitation, $ref, $payerId);
$invoice->invoice_status_id = INVOICE_STATUS_PAID;
$invoice->save();
Event::fire('invoice.paid', $payment);
$payment = self::createPayment($invitation, $ref, $payerId);
Session::flash('message', trans('texts.applied_payment'));
return Redirect::to('view/' . $invitation->invitation_key);

2
app/ninja/mailers/ContactMailer.php
View File

@ -67,7 +67,7 @@ class ContactMailer extends Mailer {
'clientName' => $payment->client->getDisplayName(),
'emailFooter' => $payment->account->email_footer,
'paymentAmount' => Utils::formatMoney($payment->amount, $payment->client->currency_id),
'showNinjaFooter' => !$invoice->account->isPro() || !Utils::isNinjaProd()
'showNinjaFooter' => !$payment->account->isPro() || !Utils::isNinjaProd()
];
$user = $payment->invitation->user;

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

@ -318,9 +318,11 @@ class InvoiceRepository
return $invoice;
}
public function cloneInvoice($invoice, $quotePublicId = null)
public function cloneInvoice($invoice, $quotePublicId = null, $invitation = null)
{
$clone = Invoice::createNew();
$invoice->load('invitations', 'invoice_items');
$clone = Invoice::createNew($invitation ? $invitation : $invoice);
$clone->balance = $invoice->amount;
$clone->invoice_number = $invoice->account->getNextInvoiceNumber();
@ -351,7 +353,7 @@ class InvoiceRepository
$clone->is_quote = false;
$clone->quote_id = $quotePublicId;
}
$clone->save();
if ($quotePublicId)
@ -359,7 +361,7 @@ class InvoiceRepository
$invoice->quote_invoice_id = $clone->public_id;
$invoice->save();
}
foreach ($invoice->invoice_items as $item)
{
$cloneItem = InvoiceItem::createNew();