Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-02 19:04:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Additional logic for updating a payment in form request

Browse Source
This commit is contained in:
David Bomba 2022-01-15 10:54:36 +11:00
parent 8622c4b60a
commit 7fd1446f43
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/Payment/UpdatePaymentRequest.php
View File

@ -71,10 +71,6 @@ class UpdatePaymentRequest extends Request
unset($input['amount']); unset($input['amount']);
} }
// if (isset($input['number'])) {
// unset($input['number']);
// }
if (isset($input['invoices']) && is_array($input['invoices']) !== false) { if (isset($input['invoices']) && is_array($input['invoices']) !== false) {
foreach ($input['invoices'] as $key => $value) { foreach ($input['invoices'] as $key => $value) {
$input['invoices'][$key]['invoice_id'] = $this->decodePrimaryKey($value['invoice_id']); $input['invoices'][$key]['invoice_id'] = $this->decodePrimaryKey($value['invoice_id']);

4
app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php
View File

@ -111,6 +111,10 @@ class StoreRecurringInvoiceRequest extends Request
} }
} }
/* If there is no number, just unset it here. */
if(array_key_exists('number', $input) && ( is_null($input['number']) || empty($input['number'])))
unset($input['number']);
$this->replace($input); $this->replace($input);
} }

11
app/Http/ValidationRules/PaymentAppliedValidAmount.php
View File

@ -42,7 +42,7 @@ class PaymentAppliedValidAmount implements Rule
private function calculateAmounts() :bool private function calculateAmounts() :bool
{ {
$payment = Payment::whereId($this->decodePrimaryKey(request()->segment(4)))->company()->first(); $payment = Payment::withTrashed()->whereId($this->decodePrimaryKey(request()->segment(4)))->company()->first();
if (! $payment) { if (! $payment) {
return false; return false;
@ -53,6 +53,15 @@ class PaymentAppliedValidAmount implements Rule
$payment_amounts = $payment->amount - $payment->refunded - $payment->applied; $payment_amounts = $payment->amount - $payment->refunded - $payment->applied;
if(request()->has('credits')
&& is_array(request()->input('credits'))
&& count(request()->input('credits')) == 0
&& request()->has('invoices')
&& is_array(request()->input('invoices'))
&& count(request()->input('invoices')) == 0){
return true;
}
if (request()->input('credits') && is_array(request()->input('credits'))) { if (request()->input('credits') && is_array(request()->input('credits'))) {
foreach (request()->input('credits') as $credit) { foreach (request()->input('credits') as $credit) {
$payment_amounts += $credit['amount']; $payment_amounts += $credit['amount'];

8
app/Mail/ClientContact/ClientContactResetPasswordObject.php
View File

@ -35,19 +35,19 @@ class ClientContactResetPasswordObject
public function build() public function build()
{ {
$settings = $this->client_contact->client->getMergedSettings();
App::forgetInstance('translator'); App::forgetInstance('translator');
$t = app('translator'); $t = app('translator');
App::setLocale($this->client_contact->preferredLocale()); App::setLocale($this->client_contact->preferredLocale());
$t->replace(Ninja::transformTranslations($this->client_contact->client->getMergedSettings())); $t->replace(Ninja::transformTranslations($settings));
$data = [ $data = [
'title' => ctrans('texts.your_password_reset_link'), 'title' => ctrans('texts.your_password_reset_link'),
'content' => ctrans('texts.reset_password'), 'content' => ctrans('texts.reset_password'),
'url' => route('client.password.reset', ['token' => $this->token, 'email' => $this->client_contact->email]), 'url' => route('client.password.reset', ['token' => $this->token, 'email' => $this->client_contact->email]),
'button' => ctrans('texts.reset'), 'button' => ctrans('texts.reset'),
'signature' => $this->company->settings->email_signature, 'signature' => $settings->email_signature,
'settings' => $this->company->settings, 'settings' => $settings,
'company' => $this->company, 'company' => $this->company,
'logo' => $this->company->present()->logo(), 'logo' => $this->company->present()->logo(),
]; ];