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

Fix PaymentRepository data parameter (#3217)

Browse Source 
* Fix PaymentRepository.php parameters

* Apply formatting

* Fix return when $data['invoice'] !== $invoice_total_adjustment

* Pass $request->all() instead of whole request

* Pass $request->all() on update method
This commit is contained in:
Benjamin Beganović 2020-01-17 22:10:38 +01:00 committed by David Bomba
parent 1d55e8aa3f
commit 67c485c1b8
2 changed files with 50 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/PaymentController.php
View File

@ -106,7 +106,7 @@ class PaymentController extends BaseController
public function index(PaymentFilters $filters)
{
$payments = Payment::filter($filters);
return $this->listResponse($payments);
}
@ -236,7 +236,7 @@ class PaymentController extends BaseController
*/
public function store(StorePaymentRequest $request)
{
$payment = $this->payment_repo->save($request, PaymentFactory::create(auth()->user()->company()->id, auth()->user()->id));
$payment = $this->payment_repo->save($request->all(), PaymentFactory::create(auth()->user()->company()->id, auth()->user()->id));
return $this->itemResponse($payment);
}
@ -354,7 +354,7 @@ class PaymentController extends BaseController
{
return $this->itemResponse($payment);
}
/**
* Update the specified resource in storage.
*
@ -411,8 +411,8 @@ class PaymentController extends BaseController
{
if($request->entityIsDeleted($payment))
return $request->disallowUpdate();
$payment = $this->payment_repo->save($request, $payment);
$payment = $this->payment_repo->save($request->all(), $payment);
return $this->itemResponse($payment);
}
@ -535,7 +535,7 @@ class PaymentController extends BaseController
public function bulk()
{
$action = request()->input('action');
$ids = request()->input('ids');
$payments = Payment::withTrashed()->find($this->transformKeys($ids));

91
app/Repositories/PaymentRepository.php
View File

@ -35,63 +35,63 @@ class PaymentRepository extends BaseRepository
public function __construct(CreditRepository $credit_repo)
{
$this->credit_repo = $credit_repo;
}
}
public function getClassName()
{
return Payment::class;
}
/**
* Saves and updates a payment. //todo refactor to handle refunds and payments.
*
*
* @param Request $request the request object
* @param Payment $payment The Payment object
* @return Object Payment $payment
*
*
* @param array $data the request object
* @param Payment $payment The Payment object
* @return Payment|null Payment $payment
*/
public function save(Request $request, Payment $payment) : ?Payment
public function save(array $data, Payment $payment): ?Payment
{
if($payment->amount >= 0)
return $this->applyPayment($request, $payment);
return $this->refundPayment($request, $payment);
if ($payment->amount >= 0)
return $this->applyPayment($data, $payment);
return $this->refundPayment($data, $payment);
}
/**
* Handles a positive payment request
* @param Request $request The request object
* @param Payment $payment The $payment entity
* @param array $data The data object
* @param Payment $payment The $payment entity
* @return Payment The updated/created payment object
*/
private function applyPayment(Request $request, Payment $payment) :?Payment
private function applyPayment(array $data, Payment $payment): ?Payment
{
$payment->fill($request->all());
$payment->fill($data);
$payment->status_id = Payment::STATUS_COMPLETED;
$payment->save();
if(!$payment->number)
if (!$payment->number)
$payment->number = $payment->client->getNextPaymentNumber($payment->client);
//we only ever update the ACTUAL amount of money transferred
UpdateClientPaidToDate::dispatchNow($payment->client, $payment->amount, $payment->company);
$invoice_totals = 0;
$credit_totals = 0;
if ($request->input('invoices') && is_array($request->input('invoices'))) {
$invoice_totals = array_sum(array_column($request->input('invoices'),'amount'));
if (array_key_exists('invoices', $data) && is_array($data['invoices'])) {
$invoices = Invoice::whereIn('id', array_column($request->input('invoices'), 'invoice_id'))->company()->get();
$invoice_totals = array_sum(array_column($data['invoices'], 'amount'));
$invoices = Invoice::whereIn('id', array_column($data['invoices'], 'invoice_id'))->company()->get();
$payment->invoices()->saveMany($invoices);
foreach ($request->input('invoices') as $paid_invoice) {
foreach ($data['invoices'] as $paid_invoice) {
$invoice = Invoice::whereId($paid_invoice['invoice_id'])->company()->first();
if ($invoice) {
@ -103,20 +103,18 @@ class PaymentRepository extends BaseRepository
ApplyClientPayment::dispatchNow($payment, $payment->company);
}
if($request->input('credits') && is_array($request->input('credits')))
{
if (array_key_exists('credits', $data) && is_array($data['credits'])) {
$credit_totals = array_sum(array_column($request->input('credits'),'amount'));
$credits = Credit::whereIn('id', array_column($request->input('credits'), 'credit_id'))->company()->get();
$credit_totals = array_sum(array_column($data['credits'], 'amount'));
$credits = Credit::whereIn('id', array_column($data['credits'], 'credit_id'))->company()->get();
$payment->credits()->saveMany($credits);
foreach ($request->input('credits') as $paid_credit)
{
foreach ($data['credits'] as $paid_credit) {
$credit = Credit::whereId($paid_credit['credit_id'])->company()->first();
if($credit)
if ($credit)
ApplyCreditPayment::dispatchNow($paid_credit, $payment, $paid_credit['amount'], $credit->company);
}
@ -126,9 +124,9 @@ class PaymentRepository extends BaseRepository
$invoice_totals -= $credit_totals;
if($invoice_totals == $payment->amount)
if ($invoice_totals == $payment->amount)
$payment->applied = $payment->amount;
elseif($invoice_totals < $payment->amount)
elseif ($invoice_totals < $payment->amount)
$payment->applied = $invoice_totals;
//UpdateInvoicePayment::dispatchNow($payment);
@ -138,36 +136,35 @@ class PaymentRepository extends BaseRepository
}
private function refundPayment(Request $request, Payment $payment) :?Payment
private function refundPayment(array $data, Payment $payment): string
{
//temp variable to sum the total refund/credit amount
$invoice_total_adjustment = 0;
if($request->has('invoices') && is_array($request->input('invoices'))){
foreach($request->input('invoices') as $adjusted_invoice) {
if (array_key_exists('invoices', $data) && is_array($data['invoices'])) {
foreach ($data['invoices'] as $adjusted_invoice) {
$invoice = Invoice::whereId($adjusted_invoice['invoice_id'])->company()->first();
$invoice_total_adjustment += $adjusted_invoice['amount'];
if(array_key_exists('credits', $adjusted_invoice)){
if (array_key_exists('credits', $adjusted_invoice)) {
//process and insert credit notes
foreach($adjusted_invoice['credits'] as $credit){
foreach ($adjusted_invoice['credits'] as $credit) {
$credit = $this->credit_repo->save($credit, CreditFactory::create(auth()->user()->company()->id, auth()->user()->id), $invoice);
}
}
else {
//todo - generate Credit Note for $amount on $invoice - the assumption here is that it is a FULL refund
} else {
//todo - generate Credit Note for $amount on $invoice - the assumption here is that it is a FULL refund
}
}
if($request->input('amount') != $invoice_total_adjustment)
if (array_key_exists('amount', $data) && $data['amount'] != $invoice_total_adjustment)
return 'Amount must equal the sum of invoice adjustments';
}
@ -178,10 +175,10 @@ class PaymentRepository extends BaseRepository
//adjust clients paid to date
$client = $payment->client;
$client->paid_to_date += $invoice_total_adjustment;
$payment->save();
$client->save();
}
}