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

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2024-05-03 12:44:52 +10:00
parent ac7d8b40fa
commit 9ef6fc8be7
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,11 +11,12 @@
namespace App\DataMapper\Tax; namespace App\DataMapper\Tax;
use App\DataMapper\Tax\ZipTax\Response; use App\Models\Quote;
use App\DataProviders\USStates;
use App\Models\Client; use App\Models\Client;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\Product; use App\Models\Product;
use App\DataProviders\USStates;
use App\DataMapper\Tax\ZipTax\Response;
class BaseRule implements RuleInterface class BaseRule implements RuleInterface
{ {
@ -210,7 +211,7 @@ class BaseRule implements RuleInterface
} }
/** Applies the tax data to the invoice */ /** Applies the tax data to the invoice */
if($this->invoice instanceof Invoice && $tax_data) { if(($this->invoice instanceof Invoice || $this->invoice instanceof Quote) && $tax_data) {
$this->invoice->tax_data = $tax_data; $this->invoice->tax_data = $tax_data;

2
app/Import/Transformer/Csv/TaskTransformer.php
View File

@ -49,7 +49,7 @@ class TaskTransformer extends BaseTransformer
'client_id' => $clientId, 'client_id' => $clientId,
'project_id' => $this->getProjectId($projectId, $clientId), 'project_id' => $this->getProjectId($projectId, $clientId),
'description' => $this->getString($task_data, 'task.description'), 'description' => $this->getString($task_data, 'task.description'),
'status' => $this->getTaskStatusId($task_data), 'status_id' => $this->getTaskStatusId($task_data),
'custom_value1' => $this->getString($task_data, 'task.custom_value1'), 'custom_value1' => $this->getString($task_data, 'task.custom_value1'),
'custom_value2' => $this->getString($task_data, 'task.custom_value2'), 'custom_value2' => $this->getString($task_data, 'task.custom_value2'),
'custom_value3' => $this->getString($task_data, 'task.custom_value3'), 'custom_value3' => $this->getString($task_data, 'task.custom_value3'),