Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move e_invoice null filter into form request

Browse Source
This commit is contained in:
David Bomba 2024-09-03 07:58:37 +10:00
parent fa369e79cf
commit ada65c8da9
9 changed files with 19 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/DocumentController.php
View File

@ -150,7 +150,7 @@ class DocumentController extends BaseController
$document->fill($request->all());
$document->save();
if($document->documentable) {
if($document->documentable) { //@phpstan-ignore-line
$document->documentable->touch();
}

4
app/Http/Requests/Client/UpdateClientRequest.php
View File

@ -136,6 +136,10 @@ class UpdateClientRequest extends Request
$input['shipping_country_id'] = $this->getCountryCode($input['shipping_country_code']);
}
if (isset($input['e_invoice']) && is_array($input['e_invoice'])) {
//ensure it is normalized first!
$input['e_invoice'] = $this->client->filterNullsRecursive($input['e_invoice']);
}
$this->replace($input);
}

5
app/Http/Requests/Company/UpdateCompanyRequest.php
View File

@ -115,6 +115,11 @@ class UpdateCompanyRequest extends Request
$input['smtp_verify_peer'] == 'true' ? true : false;
}
if (isset($input['e_invoice']) && is_array($input['e_invoice'])) {
//ensure it is normalized first!
$input['e_invoice'] = $this->company->filterNullsRecursive($input['e_invoice']);
}
$this->replace($input);
}

5
app/Http/Requests/Invoice/UpdateInvoiceRequest.php
View File

@ -121,6 +121,11 @@ class UpdateInvoiceRequest extends Request
$client = \App\Models\Client::withTrashed()->find($input['client_id']);
$input['due_date'] = \Illuminate\Support\Carbon::parse($input['date'])->addDays((int)$client->getSetting('payment_terms'))->format('Y-m-d');
}
if (isset($input['e_invoice']) && is_array($input['e_invoice'])) {
//ensure it is normalized first!
$input['e_invoice'] = $this->invoice->filterNullsRecursive($input['e_invoice']);
}
$this->replace($input);
}

6
app/Models/BaseModel.php
View File

@ -306,19 +306,19 @@ class BaseModel extends Model
/**
* arrayFilterRecursive
* arrayFilterRecursive nee filterNullsRecursive
*
* Removes null properties from an array
*
* @param array $array
* @return array
*/
public function arrayFilterRecursive(array $array): array
public function filterNullsRecursive(array $array): array
{
foreach ($array as $key => $value) {
if (is_array($value)) {
// Recursively filter the nested array
$array[$key] = $this->arrayFilterRecursive($value);
$array[$key] = $this->filterNullsRecursive($value);
}
// Remove null values
if (is_null($array[$key])) {

7
app/Repositories/ClientRepository.php
View File

@ -76,13 +76,6 @@ class ClientRepository extends BaseRepository
$client->country_id = $company->settings->country_id;
}
if(isset($data['e_invoice']) && is_array($data['e_invoice'])) {
//ensure it is normalized first!
$data['e_invoice'] = $client->arrayFilterRecursive($data['e_invoice']);
$client->e_invoice = $data['e_invoice'];
}
$client->save();
if (! isset($client->number) || empty($client->number) || strlen($client->number) == 0) {

7
app/Repositories/CompanyRepository.php
View File

@ -58,13 +58,6 @@ class CompanyRepository extends BaseRepository
$company->smtp_password = $data['smtp_password'];
}
if(isset($data['e_invoice']) && is_array($data['e_invoice'])){
//ensure it is normalized first!
$data['e_invoice'] = $company->arrayFilterRecursive($data['e_invoice']);
$company->e_invoice = $data['e_invoice'];
}
$company->save();
return $company;

109
public/build/assets/app-e0713224.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/build/manifest.json
View File

@ -9,7 +9,7 @@
]
},
"resources/js/app.js": {
"file": "assets/app-e0713224.js",
"file": "assets/app-234e3402.js",
"imports": [
"_index-08e160a7.js",
"__commonjsHelpers-725317a4.js"