diff --git a/app/Models/Company.php b/app/Models/Company.php index 575d92138a62..c5fd0465595f 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -82,6 +82,8 @@ class Company extends BaseModel 'is_disabled', 'default_task_is_date_based', 'enable_product_discount', + 'expense_inclusive_taxes', + 'expense_amount_is_pretax', ]; protected $hidden = [ diff --git a/app/Models/Expense.php b/app/Models/Expense.php index f8cc589fa9b5..6b54ef387364 100644 --- a/app/Models/Expense.php +++ b/app/Models/Expense.php @@ -51,6 +51,11 @@ class Expense extends BaseModel 'custom_value3', 'custom_value4', 'number', + 'tax_amount1', + 'tax_amount2', + 'tax_amount3', + 'uses_inclusive_taxes', + 'amount_is_pretax', ]; protected $casts = [ diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 86c08e2bad2c..0e7158f3235e 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -150,6 +150,8 @@ class CompanyTransformer extends EntityTransformer 'enable_product_discount' => (bool)$company->enable_product_discount, 'calculate_expense_tax_by_amount' =>(bool)$company->calculate_expense_tax_by_amount, 'hide_empty_columns_on_pdf' => false, //@deprecate + 'expense_inclusive_taxes' => (bool)$company->expense_inclusive_taxes, + 'expense_amount_is_pretax' =>( bool)$company->expense_amount_is_pretax, ]; } diff --git a/app/Transformers/ExpenseTransformer.php b/app/Transformers/ExpenseTransformer.php index 0cb9f654447b..200e4991a5fc 100644 --- a/app/Transformers/ExpenseTransformer.php +++ b/app/Transformers/ExpenseTransformer.php @@ -91,6 +91,11 @@ class ExpenseTransformer extends EntityTransformer 'archived_at' => (int) $expense->deleted_at, 'created_at' => (int) $expense->created_at, 'project_id' => $this->encodePrimaryKey($expense->project_id), + 'tax_amount1' => (float) $expense->tax_amount1, + 'tax_amount2' => (float) $expense->tax_amount2, + 'tax_amount3' => (float) $expense->tax_amount3, + 'uses_inclusive_taxes' => (bool) $expense->uses_inclusive_taxes, + 'amount_is_pretax' => (bool) $expense->amount_is_pretax, ]; } } diff --git a/database/migrations/2021_01_08_093324_expenses_table_additional_fields.php b/database/migrations/2021_01_08_093324_expenses_table_additional_fields.php index dde8098f7c2c..8d7b7bc5fc5b 100644 --- a/database/migrations/2021_01_08_093324_expenses_table_additional_fields.php +++ b/database/migrations/2021_01_08_093324_expenses_table_additional_fields.php @@ -15,9 +15,9 @@ class ExpensesTableAdditionalFields extends Migration { Schema::table('expenses', function (Blueprint $table) { - $table->decimal('tax_amount1', 20, 6)->change(); - $table->decimal('tax_amount2', 20, 6)->change(); - $table->decimal('tax_amount3', 20, 6)->change(); + $table->decimal('tax_amount1', 20, 6)->default(); + $table->decimal('tax_amount2', 20, 6)->default(); + $table->decimal('tax_amount3', 20, 6)->default(); $table->boolean('uses_inclusive_taxes')->default(0); $table->boolean('amount_is_pretax')->default(1); });