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

remove tax_data from transformers

Browse Source
This commit is contained in:
David Bomba 2023-04-24 12:07:36 +10:00
parent f356ddd845
commit 85b261ab21
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/DataMapper/Tax/BaseRule.php
View File

@ -188,7 +188,7 @@ class BaseRule implements RuleInterface
try { try {
return USStates::getState(strlen($this->client->postal_code) > 1 ? $this->client->postal_code : $this->client->shipping_postal_code); return USStates::getState(strlen($this->client->postal_code) > 1 ? $this->client->postal_code : $this->client->shipping_postal_code);
} catch (\Exception $e) { } catch (\Exception $e) {
return 'CA'; return $this->client->company->country()->iso_3166_2 == 'US' ? $this->client->company->tax_data->seller_subregion : 'CA';
} }
} }

2
app/Transformers/ClientTransformer.php
View File

@ -149,7 +149,7 @@ class ClientTransformer extends EntityTransformer
'number' => (string) $client->number ?: '', 'number' => (string) $client->number ?: '',
'has_valid_vat_number' => (bool) $client->has_valid_vat_number, 'has_valid_vat_number' => (bool) $client->has_valid_vat_number,
'is_tax_exempt' => (bool) $client->is_tax_exempt, 'is_tax_exempt' => (bool) $client->is_tax_exempt,
'tax_data' => $client->tax_data ?: '', // 'tax_data' => $client->tax_data ?: '',
]; ];
} }
} }

2
app/Transformers/InvoiceTransformer.php
View File

@ -149,7 +149,7 @@ class InvoiceTransformer extends EntityTransformer
'paid_to_date' => (float) $invoice->paid_to_date, 'paid_to_date' => (float) $invoice->paid_to_date,
'subscription_id' => $this->encodePrimaryKey($invoice->subscription_id), 'subscription_id' => $this->encodePrimaryKey($invoice->subscription_id),
'auto_bill_enabled' => (bool) $invoice->auto_bill_enabled, 'auto_bill_enabled' => (bool) $invoice->auto_bill_enabled,
'tax_data' => $invoice->tax_data ?: '', // 'tax_data' => $invoice->tax_data ?: '',
]; ];
} }
} }