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

Merge pull request #3961 from turbo124/master

Browse Source 
Improve handling for fees and limits and stale contacts
This commit is contained in:
David Bomba 2020-08-05 10:14:16 +10:00 committed by GitHub
commit 7cbda60f46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Traits/GenerateMigrationResources.php
View File

@ -223,6 +223,7 @@ trait GenerateMigrationResources
'is_primary' => $contact->is_primary, 'is_primary' => $contact->is_primary,
'send_email' => $contact->send_invoice, 'send_email' => $contact->send_invoice,
'confirmed' => $contact->confirmation_token ? true : false, 'confirmed' => $contact->confirmation_token ? true : false,
'email_verified_at' => $contact->created_at->toDateTimeString(),
'last_login' => $contact->last_login, 'last_login' => $contact->last_login,
'password' => $contact->password, 'password' => $contact->password,
'remember_token' => $contact->remember_token, 'remember_token' => $contact->remember_token,
@ -545,7 +546,7 @@ trait GenerateMigrationResources
'created_at' => $quote->created_at ? $quote->created_at->toDateString() : null, 'created_at' => $quote->created_at ? $quote->created_at->toDateString() : null,
'updated_at' => $quote->updated_at ? $quote->updated_at->toDateString() : null, 'updated_at' => $quote->updated_at ? $quote->updated_at->toDateString() : null,
'deleted_at' => $quote->deleted_at ? $quote->deleted_at->toDateString() : null, 'deleted_at' => $quote->deleted_at ? $quote->deleted_at->toDateString() : null,
'invitations' => $this->getResourceInvitations($quote->invitations, 'quote_id'), //'invitations' => $this->getResourceInvitations($quote->invitations, 'quote_id'),
]; ];
} }
@ -799,14 +800,16 @@ trait GenerateMigrationResources
$fees_and_limits->max_limit = $ags->max_limit; $fees_and_limits->max_limit = $ags->max_limit;
$fees_and_limits->fee_amount = $ags->fee_amount; $fees_and_limits->fee_amount = $ags->fee_amount;
$fees_and_limits->fee_percent = $ags->fee_percent; $fees_and_limits->fee_percent = $ags->fee_percent;
$fees_and_limits->tax_name1 = $ags->tax_name1; $fees_and_limits->fee_tax_name1 = $ags->tax_name1;
$fees_and_limits->tax_rate1 = $ags->tax_rate1; $fees_and_limits->fee_tax_rate1 = $ags->tax_rate1;
$fees_and_limits->tax_name2 = $ags->tax_name2; $fees_and_limits->fee_tax_name2 = $ags->tax_name2;
$fees_and_limits->tax_rate2 = $ags->tax_rate2; $fees_and_limits->fee_tax_rate2 = $ags->tax_rate2;
$fees_and_limits->tax_name3 = ''; $fees_and_limits->fee_tax_name3 = '';
$fees_and_limits->tax_rate3 = 0; $fees_and_limits->fee_tax_rate3 = 0;
return $fees_and_limits; $data = [];
$data[1] = $fees_and_limits;
return $data;
} }
private function getGatewayKeyById($gateway_id) private function getGatewayKeyById($gateway_id)