diff --git a/app/Classes/Modules/Companies/ControllersLogic/ListBusinessTypesLogic.php b/app/Classes/Modules/Companies/ControllersLogic/ListBusinessTypesLogic.php index fc39d1ec..82e840ec 100644 --- a/app/Classes/Modules/Companies/ControllersLogic/ListBusinessTypesLogic.php +++ b/app/Classes/Modules/Companies/ControllersLogic/ListBusinessTypesLogic.php @@ -5,7 +5,7 @@ namespace App\Classes\Modules\Companies\ControllersLogic; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\ValueObjects\Constants\BusinessType; -use App\Http\Resources\BusinessTypeResource; +use App\Http\Resources\GeneralTypeResource; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -39,6 +39,6 @@ class ListBusinessTypesLogic extends AbstractControllerLogic array_push($businessTypes, $type); } - return $this->collectionResponse(BusinessTypeResource::collection($businessTypes)); + return $this->collectionResponse(GeneralTypeResource::collection($businessTypes)); } } \ No newline at end of file diff --git a/app/Classes/Modules/Companies/ControllersLogic/ListCompanyTypesLogic.php b/app/Classes/Modules/Companies/ControllersLogic/ListCompanyTypesLogic.php new file mode 100644 index 00000000..0a9afdfb --- /dev/null +++ b/app/Classes/Modules/Companies/ControllersLogic/ListCompanyTypesLogic.php @@ -0,0 +1,44 @@ + 'Retrieved Company Types', + 'message' => 'You have successfully retrieved a list of Company Types' + ]; + } + + + /** + * @param Request $request + * @return JsonResponse + * @throws \App\Classes\Exceptions\AccessForbiddenException + * @throws \App\Classes\Exceptions\MalformedRequestException + * @throws \App\Classes\Exceptions\RequestValidationException + */ + public function logic(Request $request) : JsonResponse + { + $businessTypes = []; + + foreach(CompanyType::COMPANY_TYPE_LIST as $key => $val) { + $type = (object)["id" => $key, "type" => $val]; + array_push($businessTypes, $type); + } + + return $this->collectionResponse(GeneralTypeResource::collection($businessTypes)); + } +} \ No newline at end of file diff --git a/app/Classes/ValueObjects/Constants/CompanyType.php b/app/Classes/ValueObjects/Constants/CompanyType.php index 135aa700..f16e51c5 100644 --- a/app/Classes/ValueObjects/Constants/CompanyType.php +++ b/app/Classes/ValueObjects/Constants/CompanyType.php @@ -13,4 +13,9 @@ final class CompanyType { self::COMPANY_BUSINESS => 'COMPANY_BUSINESS', ]; + public const COMPANY_TYPE_LIST = [ + self::PERSONAL_BUSINESS => 'Personal Business', + self::COMPANY_BUSINESS => 'Company Business', + ]; + } diff --git a/app/Http/Controllers/Companies/ListCompanyTypesController.php b/app/Http/Controllers/Companies/ListCompanyTypesController.php new file mode 100644 index 00000000..78c6abf9 --- /dev/null +++ b/app/Http/Controllers/Companies/ListCompanyTypesController.php @@ -0,0 +1,20 @@ +execute($request); + } + +} \ No newline at end of file diff --git a/app/Http/Resources/BusinessTypeResource.php b/app/Http/Resources/GeneralTypeResource.php similarity index 88% rename from app/Http/Resources/BusinessTypeResource.php rename to app/Http/Resources/GeneralTypeResource.php index 18e73753..b6dc2348 100644 --- a/app/Http/Resources/BusinessTypeResource.php +++ b/app/Http/Resources/GeneralTypeResource.php @@ -4,7 +4,7 @@ namespace App\Http\Resources; use Illuminate\Http\Resources\Json\JsonResource; -class BusinessTypeResource extends JsonResource +class GeneralTypeResource extends JsonResource { /** * Transform the resource into an array. diff --git a/resources/assets/vue/components/companies/elements/CompanyDetailsComponent.vue b/resources/assets/vue/components/companies/elements/CompanyDetailsComponent.vue index f8b27bd7..ecef9b01 100644 --- a/resources/assets/vue/components/companies/elements/CompanyDetailsComponent.vue +++ b/resources/assets/vue/components/companies/elements/CompanyDetailsComponent.vue @@ -186,7 +186,7 @@ this.$root.$emit('backToCompanyList'); }, getBusinessTypeDesc(type){ - return (type==1) ? 'Company Account':'Personal Account'; + return (type==1) ? 'Company Business':'Personal Business'; }, }, mixins: [componentHandler] diff --git a/routes/company.php b/routes/company.php index 1be568e8..18997c8d 100644 --- a/routes/company.php +++ b/routes/company.php @@ -12,7 +12,8 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani Route::delete('/delete/{id}', 'DeleteCompanyController@destroy')->name('delete'); Route::put('/name-and-debtor/update/{id}', 'UpdateCompanyNameAndDebtorController@update')->name('update.nameAndDebtor'); - Route::get('/business_type/list', 'ListBusinessTypesController@list')->name('business_type.list'); + Route::get('/business-type/list', 'ListBusinessTypesController@list')->name('business_type.list'); + Route::get('/company-type/list', 'ListCompanyTypesController@list')->name('company_type.list'); Route::put('/update/debtor/{id}', 'UpdateCompanyDebtorController@update')->name('delete');