Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

Merge branch 'master' of github.com:invoiceninja/invoiceninja

Browse Source
This commit is contained in:
Hillel Coren 2020-04-02 08:50:04 +03:00
commit 3239a1c041
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Traits/GenerateMigrationResources.php
View File

@ -196,7 +196,7 @@ trait GenerateMigrationResources
private function getClientSettings($client)
{
$settings = new \stdClass;
$settings->currency_id = $client->currency_id ?: $client->account->currency_id;
$settings->currency_id = $client->currency_id ? (string) $client->currency_id : (string) $client->account->currency_id;
if($client->language_id)
$settings->language_id = $client->language_id;
@ -439,13 +439,13 @@ trait GenerateMigrationResources
foreach ($items as $item) {
$transformed[] = [
'id' => $item->id,
'quantity' => $item->qty,
'cost' => $item->cost,
'quantity' => (float)$item->qty,
'cost' => (float)$item->cost,
'product_key' => $item->product_key,
'notes' => $item->notes,
'discount' => $item->discount,
'discount' => (float)$item->discount,
'tax_name1' => $item->tax_name1,
'tax_rate1' => $item->tax_rate1,
'tax_rate1' => (float)$item->tax_rate1,
'date' => $item->created_at,
'custom_value1' => $item->custom_value1,
'custom_value2' => $item->custom_value2,