Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 21:14:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changes to schema for expenses, drop redundant columns from company table

Browse Source
This commit is contained in:
David Bomba 2021-01-12 08:57:48 +11:00
parent b76e404401
commit 7d69f5eba3
8 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Requests/Expense/StoreExpenseRequest.php
View File

@ -38,12 +38,9 @@ class StoreExpenseRequest extends Request
if (isset($this->number)) { if (isset($this->number)) {
$rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id); $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id);
} }
// $rules['number'] = 'unique:expenses,number,'.$this->id.',id,company_id,'.auth()->user()->company()->id;
// $rules['contacts.*.email'] = 'nullable|distinct';
//$rules['number'] = new UniqueExpenseNumberRule($this->all());
$rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id;
if(!empty($this->client_id))
$rules['client_id'] = 'bail|sometimes|exists:clients,id,company_id,'.auth()->user()->company()->id;
return $this->globalRules($rules); return $this->globalRules($rules);
} }

2
app/Http/Requests/Expense/UpdateExpenseRequest.php
View File

@ -36,7 +36,7 @@ class UpdateExpenseRequest extends Request
/* Ensure we have a client name, and that all emails are unique*/ /* Ensure we have a client name, and that all emails are unique*/
$rules['country_id'] = 'integer|nullable'; $rules['country_id'] = 'integer|nullable';
//$rules['id_number'] = 'unique:clients,id_number,,id,company_id,' . auth()->user()->company()->id;
$rules['contacts.*.email'] = 'nullable|distinct'; $rules['contacts.*.email'] = 'nullable|distinct';
if (isset($this->number)) { if (isset($this->number)) {

1
app/Models/Company.php
View File

@ -83,7 +83,6 @@ class Company extends BaseModel
'default_task_is_date_based', 'default_task_is_date_based',
'enable_product_discount', 'enable_product_discount',
'expense_inclusive_taxes', 'expense_inclusive_taxes',
'expense_amount_is_pretax',
]; ];
protected $hidden = [ protected $hidden = [

2
app/Models/Expense.php
View File

@ -55,7 +55,7 @@ class Expense extends BaseModel
'tax_amount2', 'tax_amount2',
'tax_amount3', 'tax_amount3',
'uses_inclusive_taxes', 'uses_inclusive_taxes',
'amount_is_pretax', 'calculate_tax_by_amount',
]; ];
protected $casts = [ protected $casts = [

1
app/Models/RecurringInvoice.php
View File

@ -91,6 +91,7 @@ class RecurringInvoice extends BaseModel
'remaining_cycles', 'remaining_cycles',
'auto_bill', 'auto_bill',
'auto_bill_enabled', 'auto_bill_enabled',
'design_id',
]; ];
protected $casts = [ protected $casts = [

8
app/Transformers/CompanyTransformer.php
View File

@ -131,7 +131,7 @@ class CompanyTransformer extends EntityTransformer
'archived_at' => (int) $company->deleted_at, 'archived_at' => (int) $company->deleted_at,
'created_at' =>(int) $company->created_at, 'created_at' =>(int) $company->created_at,
'slack_webhook_url' => (string) $company->slack_webhook_url, 'slack_webhook_url' => (string) $company->slack_webhook_url,
'google_analytics_url' => (string) $company->google_analytics_key, //@deprecate 'google_analytics_url' => (string) $company->google_analytics_key, //@deprecate 1-2-2021
'google_analytics_key' => (string) $company->google_analytics_key, 'google_analytics_key' => (string) $company->google_analytics_key,
'enabled_item_tax_rates' => (int) $company->enabled_item_tax_rates, 'enabled_item_tax_rates' => (int) $company->enabled_item_tax_rates,
'client_can_register' => (bool) $company->client_can_register, 'client_can_register' => (bool) $company->client_can_register,
@ -145,13 +145,13 @@ class CompanyTransformer extends EntityTransformer
'auto_start_tasks' => (bool) $company->auto_start_tasks, 'auto_start_tasks' => (bool) $company->auto_start_tasks,
'invoice_task_documents' => (bool) $company->invoice_task_documents, 'invoice_task_documents' => (bool) $company->invoice_task_documents,
'show_tasks_table' => (bool) $company->show_tasks_table, 'show_tasks_table' => (bool) $company->show_tasks_table,
'use_credits_payment' => 'always', //todo remove 'use_credits_payment' => 'always', // @deprecate 1-2-2021
'default_task_is_date_based' => (bool)$company->default_task_is_date_based, 'default_task_is_date_based' => (bool)$company->default_task_is_date_based,
'enable_product_discount' => (bool)$company->enable_product_discount, 'enable_product_discount' => (bool)$company->enable_product_discount,
'calculate_expense_tax_by_amount' =>(bool)$company->calculate_expense_tax_by_amount, 'calculate_expense_tax_by_amount' =>(bool)$company->calculate_expense_tax_by_amount,
'hide_empty_columns_on_pdf' => false, //@deprecate 'hide_empty_columns_on_pdf' => false, // @deprecate 1-2-2021
'expense_inclusive_taxes' => (bool)$company->expense_inclusive_taxes, 'expense_inclusive_taxes' => (bool)$company->expense_inclusive_taxes,
'expense_amount_is_pretax' =>( bool)$company->expense_amount_is_pretax, 'expense_amount_is_pretax' =>(bool)true, //@deprecate 1-2-2021
]; ];
} }

2
app/Transformers/ExpenseTransformer.php
View File

@ -95,7 +95,7 @@ class ExpenseTransformer extends EntityTransformer
'tax_amount2' => (float) $expense->tax_amount2, 'tax_amount2' => (float) $expense->tax_amount2,
'tax_amount3' => (float) $expense->tax_amount3, 'tax_amount3' => (float) $expense->tax_amount3,
'uses_inclusive_taxes' => (bool) $expense->uses_inclusive_taxes, 'uses_inclusive_taxes' => (bool) $expense->uses_inclusive_taxes,
'amount_is_pretax' => (bool) $expense->amount_is_pretax, 'calculate_tax_by_amount' => (bool) $expense->calculate_tax_by_amount,
]; ];
} }
} }

7
database/migrations/2021_01_11_092056_fix_company_settings_url.php
View File

@ -31,11 +31,18 @@ class FixCompanySettingsUrl extends Migration
Schema::table('companies', function (Blueprint $table) { Schema::table('companies', function (Blueprint $table) {
$table->dropColumn('logo'); $table->dropColumn('logo');
$tbale->dropColumn('expense_amount_is_pretax');
}); });
Schema::table('tasks', function (Blueprint $table) { Schema::table('tasks', function (Blueprint $table) {
$table->dropColumn('start_time'); $table->dropColumn('start_time');
}); });
Schema::table('expenses', function (Blueprint $table) {
$table->dropColumn('expense_amount_is_pretax');
$table->dropColumn('amount_is_pretax');
$table->boolean('calculate_tax_by_amount')->default(false);
});
} }
/** /**