Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 12:14:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move enabled_tax_rates onto company model

Browse Source
This commit is contained in:
David Bomba 2020-06-11 07:56:08 +10:00
parent 7dfc396ffc
commit 7e26a81fb9
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/DataMapper/CompanySettings.php
View File

@ -113,7 +113,7 @@ class CompanySettings extends BaseSettings
public $invoice_terms = ''; public $invoice_terms = '';
public $quote_terms = ''; public $quote_terms = '';
public $invoice_taxes = 0; public $invoice_taxes = 0;
public $enabled_item_tax_rates = 0; // public $enabled_item_tax_rates = 0;
public $invoice_design_id = 'VolejRejNm'; public $invoice_design_id = 'VolejRejNm';
public $quote_design_id = 'VolejRejNm'; public $quote_design_id = 'VolejRejNm';
public $credit_design_id = 'VolejRejNm'; public $credit_design_id = 'VolejRejNm';
@ -344,7 +344,7 @@ class CompanySettings extends BaseSettings
'invoice_design_id' => 'string', 'invoice_design_id' => 'string',
'invoice_fields' => 'string', 'invoice_fields' => 'string',
'invoice_taxes' => 'int', 'invoice_taxes' => 'int',
'enabled_item_tax_rates' => 'int', //'enabled_item_tax_rates' => 'int',
'invoice_footer' => 'string', 'invoice_footer' => 'string',
'invoice_labels' => 'string', 'invoice_labels' => 'string',
'invoice_terms' => 'string', 'invoice_terms' => 'string',

2
app/DataMapper/FreeCompanySettings.php
View File

@ -33,7 +33,7 @@ class FreeCompanySettings extends BaseSettings
public $custom_value3 = ''; public $custom_value3 = '';
public $custom_value4 = ''; public $custom_value4 = '';
public $date_format_id = ''; public $date_format_id = '';
public $enabled_item_tax_rates = 0; // public $enabled_item_tax_rates = 0;
public $expense_number_pattern = ''; public $expense_number_pattern = '';
public $expense_number_counter = 1; public $expense_number_counter = 1;
public $inclusive_taxes = false; public $inclusive_taxes = false;

1
app/Http/Controllers/OpenAPI/CompanySettingsSchema.php
View File

@ -66,7 +66,6 @@
* @OA\Property(property="invoice_terms", type="string", example="Invoice Terms are...", description="The default invoice terms"), * @OA\Property(property="invoice_terms", type="string", example="Invoice Terms are...", description="The default invoice terms"),
* @OA\Property(property="quote_terms", type="string", example="Quote Terms are...", description="The default quote terms"), * @OA\Property(property="quote_terms", type="string", example="Quote Terms are...", description="The default quote terms"),
* @OA\Property(property="invoice_taxes", type="number", example="1", description="Taxes can be applied to the invoice"), * @OA\Property(property="invoice_taxes", type="number", example="1", description="Taxes can be applied to the invoice"),
* @OA\Property(property="enabled_item_tax_rates", type="number", example="1", description="Taxes can be applied to the invoice items"),
* @OA\Property(property="invoice_design_id", type="string", example="1", description="The default design id (invoice, quote etc)"), * @OA\Property(property="invoice_design_id", type="string", example="1", description="The default design id (invoice, quote etc)"),
* @OA\Property(property="quote_design_id", type="string", example="1", description="The default design id (invoice, quote etc)"), * @OA\Property(property="quote_design_id", type="string", example="1", description="The default design id (invoice, quote etc)"),
* @OA\Property(property="invoice_footer", type="string", example="1", description="The default invoice footer"), * @OA\Property(property="invoice_footer", type="string", example="1", description="The default invoice footer"),

4
database/migrations/2020_05_13_035355_add_google_refresh_token_to_users_table.php
View File

@ -20,6 +20,10 @@ class AddGoogleRefreshTokenToUsersTable extends Migration
DB::statement("alter table users modify column oauth_user_token text"); DB::statement("alter table users modify column oauth_user_token text");
Schema::table('companies', function (Blueprint $table){
$table->integer('enabled_item_tax_rates')->default(0);
});
} }
/** /**