diff --git a/app/Models/CompanyUser.php b/app/Models/CompanyUser.php index 302e68271d13..26f21eccbd1d 100644 --- a/app/Models/CompanyUser.php +++ b/app/Models/CompanyUser.php @@ -47,7 +47,6 @@ class CompanyUser extends Pivot 'is_locked', 'slack_webhook_url', 'shop_restricted', - 'number_years_active', ]; protected $touches = ['user']; diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 77a3e859faaa..6cc11510b541 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -157,6 +157,7 @@ class CompanyTransformer extends EntityTransformer 'oauth_password_required' => (bool)$company->oauth_password_required, 'session_timeout' => (int)$company->session_timeout, 'default_password_timeout' => (int) $company->default_password_timeout, + 'invoice_task_datelog' => (bool) $company->invoice_task_datelog, ]; } diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php index e05ed452bf2d..3a79af0894cb 100644 --- a/app/Transformers/CompanyUserTransformer.php +++ b/app/Transformers/CompanyUserTransformer.php @@ -51,7 +51,7 @@ class CompanyUserTransformer extends EntityTransformer 'archived_at' => (int) $company_user->deleted_at, 'created_at' => (int) $company_user->created_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, ]; } diff --git a/composer.lock b/composer.lock index 0753e3b846a1..1781f3ddc8ab 100644 --- a/composer.lock +++ b/composer.lock @@ -103,16 +103,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.180.0", + "version": "3.180.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "761d06d3d320bd1a0114f9d937eccd1613e1913b" + "reference": "7801112fd8be227954a6ecfbfd85b01ee4a7cae4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/761d06d3d320bd1a0114f9d937eccd1613e1913b", - "reference": "761d06d3d320bd1a0114f9d937eccd1613e1913b", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/7801112fd8be227954a6ecfbfd85b01ee4a7cae4", + "reference": "7801112fd8be227954a6ecfbfd85b01ee4a7cae4", "shasum": "" }, "require": { @@ -187,9 +187,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "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", diff --git a/database/migrations/2021_05_04_231430_add_task_property_to_companies_table.php b/database/migrations/2021_05_04_231430_add_task_property_to_companies_table.php new file mode 100644 index 000000000000..815be572ec4b --- /dev/null +++ b/database/migrations/2021_05_04_231430_add_task_property_to_companies_table.php @@ -0,0 +1,31 @@ +dropColumn('number_years_active'); + }); + + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + } +}