@@ -4,18 +4,16 @@ |
||
| 4 | 4 | |
| 5 | 5 | namespace Canvas\Api\Controllers; |
| 6 | 6 | |
| 7 | -use Canvas\Models\Users; |
|
| 8 | -use Phalcon\Http\Response; |
|
| 9 | -use Phalcon\Validation\Validator\PresenceOf; |
|
| 10 | -use Canvas\Exception\BadRequestHttpException; |
|
| 11 | -use Canvas\Exception\ServerErrorHttpException; |
|
| 12 | 7 | use Baka\Auth\UsersController as BakaUsersController; |
| 13 | 8 | use Canvas\Contracts\Controllers\ProcessOutputMapperTrait; |
| 14 | 9 | use Canvas\Dto\User as UserDto; |
| 15 | 10 | use Canvas\Http\Exception\InternalServerErrorException; |
| 16 | 11 | use Canvas\Mapper\UserMapper; |
| 17 | -use Canvas\Validation as CanvasValidation; |
|
| 12 | +use Canvas\Models\Users; |
|
| 18 | 13 | use Canvas\Models\UsersAssociatedApps; |
| 14 | +use Canvas\Validation as CanvasValidation; |
|
| 15 | +use Phalcon\Http\Response; |
|
| 16 | +use Phalcon\Validation\Validator\PresenceOf; |
|
| 19 | 17 | |
| 20 | 18 | /** |
| 21 | 19 | * Class UsersController. |
@@ -4,17 +4,17 @@ |
||
| 4 | 4 | |
| 5 | 5 | namespace Canvas\Listener; |
| 6 | 6 | |
| 7 | -use Phalcon\Events\Event; |
|
| 8 | -use Canvas\Models\Users; |
|
| 9 | -use Canvas\Models\Companies; |
|
| 10 | -use Canvas\Models\CompaniesBranches; |
|
| 11 | -use Canvas\Exception\ServerErrorHttpException; |
|
| 12 | 7 | use Baka\Auth\Models\UserCompanyApps; |
| 8 | +use Canvas\Exception\ServerErrorHttpException; |
|
| 13 | 9 | use Canvas\Http\Exception\InternalServerErrorException; |
| 14 | 10 | use Canvas\Models\AppsPlans; |
| 15 | -use Canvas\Models\CompaniesGroups; |
|
| 11 | +use Canvas\Models\Companies; |
|
| 16 | 12 | use Canvas\Models\CompaniesAssociations; |
| 13 | +use Canvas\Models\CompaniesBranches; |
|
| 14 | +use Canvas\Models\CompaniesGroups; |
|
| 15 | +use Canvas\Models\Users; |
|
| 17 | 16 | use Phalcon\Di; |
| 17 | +use Phalcon\Events\Event; |
|
| 18 | 18 | |
| 19 | 19 | class Company |
| 20 | 20 | { |
@@ -3,14 +3,14 @@ |
||
| 3 | 3 | |
| 4 | 4 | namespace Canvas\Models; |
| 5 | 5 | |
| 6 | +use Canvas\Exception\ModelException; |
|
| 7 | +use Canvas\Http\Exception\InternalServerErrorException; |
|
| 8 | +use Canvas\Http\Exception\UnprocessableEntityException; |
|
| 9 | +use Phalcon\Acl\Role as AclRole; |
|
| 6 | 10 | use Phalcon\Di; |
| 7 | 11 | use Phalcon\Validation; |
| 8 | 12 | use Phalcon\Validation\Validator\PresenceOf; |
| 9 | 13 | use Phalcon\Validation\Validator\StringLength; |
| 10 | -use Phalcon\Acl\Role as AclRole; |
|
| 11 | -use Canvas\Exception\ModelException; |
|
| 12 | -use Canvas\Http\Exception\InternalServerErrorException; |
|
| 13 | -use Canvas\Http\Exception\UnprocessableEntityException; |
|
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | 16 | * Class Roles. |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | /** |
| 329 | 329 | * Get the User key for redis. |
| 330 | 330 | * |
| 331 | - * @return string |
|
| 331 | + * @return integer |
|
| 332 | 332 | */ |
| 333 | 333 | public function getKey() : int |
| 334 | 334 | { |
@@ -382,7 +382,6 @@ discard block |
||
| 382 | 382 | /** |
| 383 | 383 | * Strat a free trial. |
| 384 | 384 | * |
| 385 | - * @param Users $user |
|
| 386 | 385 | * @return Subscription |
| 387 | 386 | */ |
| 388 | 387 | public function startFreeTrial() : Subscription |
@@ -515,7 +514,7 @@ discard block |
||
| 515 | 514 | /** |
| 516 | 515 | * update user role for the specific app. |
| 517 | 516 | * |
| 518 | - * @return void |
|
| 517 | + * @return boolean |
|
| 519 | 518 | */ |
| 520 | 519 | protected function updatePermissionRoles(): bool |
| 521 | 520 | { |
@@ -590,7 +589,7 @@ discard block |
||
| 590 | 589 | /** |
| 591 | 590 | * Overwrite the relationship. |
| 592 | 591 | * |
| 593 | - * @return void |
|
| 592 | + * @return string|null |
|
| 594 | 593 | */ |
| 595 | 594 | public function getPhoto() |
| 596 | 595 | { |
@@ -600,7 +599,6 @@ discard block |
||
| 600 | 599 | /** |
| 601 | 600 | * Update the user current default company. |
| 602 | 601 | * |
| 603 | - * @param integer $companyId |
|
| 604 | 602 | * @return void |
| 605 | 603 | */ |
| 606 | 604 | public function switchDefaultCompanyByBranch(int $branchId): void |