Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for Task properties, drop column on company_user table

Browse Source
This commit is contained in:
David Bomba 2021-05-05 09:53:35 +10:00
parent 430e31c1ad
commit 2655ba679b
5 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/CompanyUser.php
View File

@ -47,7 +47,6 @@ class CompanyUser extends Pivot
'is_locked', 'is_locked',
'slack_webhook_url', 'slack_webhook_url',
'shop_restricted', 'shop_restricted',
'number_years_active',
]; ];
protected $touches = ['user']; protected $touches = ['user'];

1
app/Transformers/CompanyTransformer.php
View File

@ -157,6 +157,7 @@ class CompanyTransformer extends EntityTransformer
'oauth_password_required' => (bool)$company->oauth_password_required, 'oauth_password_required' => (bool)$company->oauth_password_required,
'session_timeout' => (int)$company->session_timeout, 'session_timeout' => (int)$company->session_timeout,
'default_password_timeout' => (int) $company->default_password_timeout, 'default_password_timeout' => (int) $company->default_password_timeout,
'invoice_task_datelog' => (bool) $company->invoice_task_datelog,
]; ];
} }

2
app/Transformers/CompanyUserTransformer.php
View File

@ -51,7 +51,7 @@ class CompanyUserTransformer extends EntityTransformer
'archived_at' => (int) $company_user->deleted_at, 'archived_at' => (int) $company_user->deleted_at,
'created_at' => (int) $company_user->created_at, 'created_at' => (int) $company_user->created_at,
'permissions_updated_at' => (int) $company_user->permissions_updated_at, 'permissions_updated_at' => (int) $company_user->permissions_updated_at,
'number_years_active' => (int) $company_user->number_years_active, //'number_years_active' => (int) $company_user->number_years_active,
]; ];
} }

12
composer.lock generated
View File

@ -103,16 +103,16 @@
}, },
{ {
"name": "aws/aws-sdk-php", "name": "aws/aws-sdk-php",
"version": "3.180.0", "version": "3.180.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/aws/aws-sdk-php.git", "url": "https://github.com/aws/aws-sdk-php.git",
"reference": "761d06d3d320bd1a0114f9d937eccd1613e1913b" "reference": "7801112fd8be227954a6ecfbfd85b01ee4a7cae4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/761d06d3d320bd1a0114f9d937eccd1613e1913b", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7801112fd8be227954a6ecfbfd85b01ee4a7cae4",
"reference": "761d06d3d320bd1a0114f9d937eccd1613e1913b", "reference": "7801112fd8be227954a6ecfbfd85b01ee4a7cae4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -187,9 +187,9 @@
"support": { "support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues", "issues": "https://github.com/aws/aws-sdk-php/issues",
"source": "https://github.com/aws/aws-sdk-php/tree/3.180.0" "source": "https://github.com/aws/aws-sdk-php/tree/3.180.1"
}, },
"time": "2021-05-03T20:41:22+00:00" "time": "2021-05-04T18:14:38+00:00"
}, },
{ {
"name": "bacon/bacon-qr-code", "name": "bacon/bacon-qr-code",

31
database/migrations/2021_05_04_231430_add_task_property_to_companies_table.php Normal file
View File

@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AddTaskPropertyToCompaniesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('company_user', function (Blueprint $table) {
$table->dropColumn('number_years_active');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
}
}