Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-08-11 15:34:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4760 from turbo124/master

Browse Source 
Fixes for client / vendor numbering
This commit is contained in:
David Bomba 2021-01-25 23:29:27 +11:00 committed by GitHub
commit 360f47754b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Traits/GenerateMigrationResources.php
View File

@ -203,6 +203,16 @@ trait GenerateMigrationResources
$clients = [];
foreach ($this->account->clients()->withTrashed()->get() as $client) {
if($this->account->client_number_counter > 0){
$number = $client->id_number;
$id_number = '';
}
else{
$id_number = $client->id_number;
$number = NULL;
}
$clients[] = [
'id' => $client->id,
'company_id' => $client->account_id,
@ -223,7 +233,8 @@ trait GenerateMigrationResources
'size_id' => $client->size_id,
'is_deleted' => $client->is_deleted,
'vat_number' => $client->vat_number,
'id_number' => $client->id_number,
'id_number' => $id_number,
'number' => $number,
'custom_value1' => $client->custom_value1,
'custom_value2' => $client->custom_value2,
'shipping_address1' => $client->shipping_address1,
@ -1613,6 +1624,7 @@ trait GenerateMigrationResources
'is_deleted' => $vendor->is_deleted,
'vat_number' => $vendor->vat_number,
'id_number' => $vendor->id_number,
'number' => NULL,
'custom_value1' => $vendor->custom_value1,
'custom_value2' => $vendor->custom_value2,
'custom_value3' => '',