Merge remote-tracking branch 'origin/master' into mhmfajar

2022-11-03 09:56:48 +07:00
parent 0bb82dc66a eec877dda3
commit c6f5d129c2
1193 changed files with 45 additions and 5 deletions
--- a/Modules/Client/Config/.gitkeep
+++ b/Modules/Client/Config/.gitkeep
--- a/Modules/Client/Config/config.php
+++ b/Modules/Client/Config/config.php
--- a/Modules/Client/Console/.gitkeep
+++ b/Modules/Client/Console/.gitkeep
--- a/Modules/Client/Database/Migrations/.gitkeep
+++ b/Modules/Client/Database/Migrations/.gitkeep
--- a/Modules/Client/Database/Seeders/.gitkeep
+++ b/Modules/Client/Database/Seeders/.gitkeep
--- a/Modules/Client/Database/Seeders/ClientDatabaseSeeder.php
+++ b/Modules/Client/Database/Seeders/ClientDatabaseSeeder.php
--- a/Modules/Client/Database/factories/.gitkeep
+++ b/Modules/Client/Database/factories/.gitkeep
--- a/Modules/Client/Entities/.gitkeep
+++ b/Modules/Client/Entities/.gitkeep
--- a/Modules/Client/Http/Controllers/.gitkeep
+++ b/Modules/Client/Http/Controllers/.gitkeep
--- a/Modules/Client/Http/Controllers/Api/AuthController.php
+++ b/Modules/Client/Http/Controllers/Api/AuthController.php
--- a/Modules/Client/Http/Controllers/Api/DashboardController.php
+++ b/Modules/Client/Http/Controllers/Api/DashboardController.php
--- a/Modules/Client/Http/Controllers/Api/MemberController.php
+++ b/Modules/Client/Http/Controllers/Api/MemberController.php
--- a/Modules/Client/Http/Controllers/Api/UserController.php
+++ b/Modules/Client/Http/Controllers/Api/UserController.php
--- a/Modules/Client/Http/Controllers/ClientController.php
+++ b/Modules/Client/Http/Controllers/ClientController.php
--- a/Modules/Client/Http/Middleware/.gitkeep
+++ b/Modules/Client/Http/Middleware/.gitkeep
--- a/Modules/Client/Http/Requests/.gitkeep
+++ b/Modules/Client/Http/Requests/.gitkeep
--- a/Modules/Client/Providers/.gitkeep
+++ b/Modules/Client/Providers/.gitkeep
--- a/Modules/Client/Providers/ClientServiceProvider.php
+++ b/Modules/Client/Providers/ClientServiceProvider.php
--- a/Modules/Client/Providers/RouteServiceProvider.php
+++ b/Modules/Client/Providers/RouteServiceProvider.php
--- a/Modules/Client/Resources/assets/.gitkeep
+++ b/Modules/Client/Resources/assets/.gitkeep
--- a/Modules/Client/Resources/assets/js/app.js
+++ b/Modules/Client/Resources/assets/js/app.js
--- a/Modules/Client/Resources/assets/sass/app.scss
+++ b/Modules/Client/Resources/assets/sass/app.scss
--- a/Modules/Client/Resources/lang/.gitkeep
+++ b/Modules/Client/Resources/lang/.gitkeep
--- a/Modules/Client/Resources/views/.gitkeep
+++ b/Modules/Client/Resources/views/.gitkeep
--- a/Modules/Client/Resources/views/index.blade.php
+++ b/Modules/Client/Resources/views/index.blade.php
--- a/Modules/Client/Resources/views/layouts/master.blade.php
+++ b/Modules/Client/Resources/views/layouts/master.blade.php
--- a/Modules/Client/Routes/.gitkeep
+++ b/Modules/Client/Routes/.gitkeep
--- a/Modules/Client/Routes/api.php
+++ b/Modules/Client/Routes/api.php
--- a/Modules/Client/Routes/web.php
+++ b/Modules/Client/Routes/web.php
--- a/Modules/Client/Tests/Feature/.gitkeep
+++ b/Modules/Client/Tests/Feature/.gitkeep
--- a/Modules/Client/Tests/Unit/.gitkeep
+++ b/Modules/Client/Tests/Unit/.gitkeep
--- a/Modules/Client/composer.json
+++ b/Modules/Client/composer.json
--- a/Modules/Client/module.json
+++ b/Modules/Client/module.json
--- a/Modules/Client/package.json
+++ b/Modules/Client/package.json
--- a/Modules/Client/webpack.mix.js
+++ b/Modules/Client/webpack.mix.js
--- a/Modules/Internal/Config/.gitkeep
+++ b/Modules/Internal/Config/.gitkeep
--- a/Modules/Internal/Config/config.php
+++ b/Modules/Internal/Config/config.php
--- a/Modules/Internal/Console/.gitkeep
+++ b/Modules/Internal/Console/.gitkeep
--- a/Modules/Internal/Database/Migrations/.gitkeep
+++ b/Modules/Internal/Database/Migrations/.gitkeep
--- a/Modules/Internal/Database/Seeders/.gitkeep
+++ b/Modules/Internal/Database/Seeders/.gitkeep
--- a/Modules/Internal/Database/Seeders/InternalDatabaseSeeder.php
+++ b/Modules/Internal/Database/Seeders/InternalDatabaseSeeder.php
--- a/Modules/Internal/Database/factories/.gitkeep
+++ b/Modules/Internal/Database/factories/.gitkeep
--- a/Modules/Internal/Entities/.gitkeep
+++ b/Modules/Internal/Entities/.gitkeep
--- a/Modules/Internal/Http/Controllers/.gitkeep
+++ b/Modules/Internal/Http/Controllers/.gitkeep
--- a/Modules/Internal/Http/Controllers/Api/AuthController.php
+++ b/Modules/Internal/Http/Controllers/Api/AuthController.php
--- a/Modules/Internal/Http/Controllers/Api/BenefitController.php
+++ b/Modules/Internal/Http/Controllers/Api/BenefitController.php
--- a/Modules/Internal/Http/Controllers/Api/CorporateBenefitController.php
+++ b/Modules/Internal/Http/Controllers/Api/CorporateBenefitController.php
--- a/Modules/Internal/Http/Controllers/Api/CorporateController.php
+++ b/Modules/Internal/Http/Controllers/Api/CorporateController.php
--- a/Modules/Internal/Http/Controllers/Api/CorporateFormulariumController.php
+++ b/Modules/Internal/Http/Controllers/Api/CorporateFormulariumController.php
--- a/Modules/Internal/Http/Controllers/Api/CorporatePlanController.php
+++ b/Modules/Internal/Http/Controllers/Api/CorporatePlanController.php
--- a/Modules/Internal/Http/Controllers/Api/CorporateServiceController.php
+++ b/Modules/Internal/Http/Controllers/Api/CorporateServiceController.php
--- a/Modules/Internal/Http/Controllers/Api/DiagnosisController.php
+++ b/Modules/Internal/Http/Controllers/Api/DiagnosisController.php
--- a/Modules/Internal/Http/Controllers/Api/DiagnosisExclusionController.php
+++ b/Modules/Internal/Http/Controllers/Api/DiagnosisExclusionController.php
--- a/Modules/Internal/Http/Controllers/Api/DivisionController.php
+++ b/Modules/Internal/Http/Controllers/Api/DivisionController.php
--- a/Modules/Internal/Http/Controllers/Api/DrugController.php
+++ b/Modules/Internal/Http/Controllers/Api/DrugController.php
--- a/Modules/Internal/Http/Controllers/Api/FormulariumController.php
+++ b/Modules/Internal/Http/Controllers/Api/FormulariumController.php
--- a/Modules/Internal/Http/Controllers/Api/MemberController.php
+++ b/Modules/Internal/Http/Controllers/Api/MemberController.php
--- a/Modules/Internal/Http/Controllers/Api/PlanController.php
+++ b/Modules/Internal/Http/Controllers/Api/PlanController.php
--- a/Modules/Internal/Http/Controllers/InternalController.php
+++ b/Modules/Internal/Http/Controllers/InternalController.php
--- a/Modules/Internal/Http/Middleware/.gitkeep
+++ b/Modules/Internal/Http/Middleware/.gitkeep
--- a/Modules/Internal/Http/Requests/.gitkeep
+++ b/Modules/Internal/Http/Requests/.gitkeep
--- a/Modules/Internal/Providers/.gitkeep
+++ b/Modules/Internal/Providers/.gitkeep
--- a/Modules/Internal/Providers/InternalServiceProvider.php
+++ b/Modules/Internal/Providers/InternalServiceProvider.php
--- a/Modules/Internal/Providers/RouteServiceProvider.php
+++ b/Modules/Internal/Providers/RouteServiceProvider.php
--- a/Modules/Internal/Resources/assets/.gitkeep
+++ b/Modules/Internal/Resources/assets/.gitkeep
--- a/Modules/Internal/Resources/assets/js/app.js
+++ b/Modules/Internal/Resources/assets/js/app.js
--- a/Modules/Internal/Resources/assets/sass/app.scss
+++ b/Modules/Internal/Resources/assets/sass/app.scss
--- a/Modules/Internal/Resources/lang/.gitkeep
+++ b/Modules/Internal/Resources/lang/.gitkeep
--- a/Modules/Internal/Resources/views/.gitkeep
+++ b/Modules/Internal/Resources/views/.gitkeep
--- a/Modules/Internal/Resources/views/index.blade.php
+++ b/Modules/Internal/Resources/views/index.blade.php
--- a/Modules/Internal/Resources/views/layouts/master.blade.php
+++ b/Modules/Internal/Resources/views/layouts/master.blade.php
--- a/Modules/Internal/Routes/.gitkeep
+++ b/Modules/Internal/Routes/.gitkeep
--- a/Modules/Internal/Routes/api.php
+++ b/Modules/Internal/Routes/api.php
--- a/Modules/Internal/Routes/web.php
+++ b/Modules/Internal/Routes/web.php
--- a/Modules/Internal/Services/CorporateService.php
+++ b/Modules/Internal/Services/CorporateService.php
--- a/Modules/Internal/Services/ExclusionService.php
+++ b/Modules/Internal/Services/ExclusionService.php
--- a/Modules/Internal/Services/FormulariumService.php
+++ b/Modules/Internal/Services/FormulariumService.php
--- a/Modules/Internal/Services/MemberEnrollmentService.php
+++ b/Modules/Internal/Services/MemberEnrollmentService.php
--- a/Modules/Internal/Tests/Feature/.gitkeep
+++ b/Modules/Internal/Tests/Feature/.gitkeep
--- a/Modules/Internal/Tests/Unit/.gitkeep
+++ b/Modules/Internal/Tests/Unit/.gitkeep
--- a/Modules/Internal/Transformers/CorporateFormulariumResource.php
+++ b/Modules/Internal/Transformers/CorporateFormulariumResource.php
--- a/Modules/Internal/Transformers/CorporateServiceConfigResource.php
+++ b/Modules/Internal/Transformers/CorporateServiceConfigResource.php
--- a/Modules/Internal/Transformers/DiagnosisExclusionResource.php
+++ b/Modules/Internal/Transformers/DiagnosisExclusionResource.php
--- a/Modules/Internal/composer.json
+++ b/Modules/Internal/composer.json
--- a/Modules/Internal/module.json
+++ b/Modules/Internal/module.json
--- a/Modules/Internal/package.json
+++ b/Modules/Internal/package.json
--- a/Modules/Internal/webpack.mix.js
+++ b/Modules/Internal/webpack.mix.js
--- a/Modules/Linksehat/Config/.gitkeep
+++ b/Modules/Linksehat/Config/.gitkeep
--- a/Modules/Linksehat/Config/config.php
+++ b/Modules/Linksehat/Config/config.php
--- a/Modules/Linksehat/Console/.gitkeep
+++ b/Modules/Linksehat/Console/.gitkeep
--- a/Modules/Linksehat/Database/Migrations/.gitkeep
+++ b/Modules/Linksehat/Database/Migrations/.gitkeep
--- a/Modules/Linksehat/Database/Seeders/.gitkeep
+++ b/Modules/Linksehat/Database/Seeders/.gitkeep
--- a/Modules/Linksehat/Database/Seeders/LinksehatDatabaseSeeder.php
+++ b/Modules/Linksehat/Database/Seeders/LinksehatDatabaseSeeder.php
--- a/Modules/Linksehat/Database/factories/.gitkeep
+++ b/Modules/Linksehat/Database/factories/.gitkeep
--- a/Modules/Linksehat/Entities/.gitkeep
+++ b/Modules/Linksehat/Entities/.gitkeep
--- a/Modules/Linksehat/Http/Controllers/.gitkeep
+++ b/Modules/Linksehat/Http/Controllers/.gitkeep
--- a/Modules/Linksehat/Http/Controllers/Api/ArticleController.php
+++ b/Modules/Linksehat/Http/Controllers/Api/ArticleController.php
--- a/Modules/Linksehat/Http/Controllers/Api/AuthController.php
+++ b/Modules/Linksehat/Http/Controllers/Api/AuthController.php
--- a/Modules/Linksehat/Http/Controllers/Api/DashboardController.php
+++ b/Modules/Linksehat/Http/Controllers/Api/DashboardController.php
--- a/Modules/Linksehat/Http/Controllers/Api/DoctorController.php
+++ b/Modules/Linksehat/Http/Controllers/Api/DoctorController.php
@@ -61,10 +61,7 @@ class DoctorController extends Controller

        $doctors = $doctors->paginate($limit);

-        return response()->json([
-            'message' => 'Sukses mengambil data Dokter',
-            'doctors' => Helper::paginateResources(PractitionerRoleToDoctorResource::collection($doctors))
-        ]);
+        return Helper::makeJsonResponse(Helper::paginateResources(PractitionerRoleToDoctorResource::collection($doctors)));
    }

    /**
--- a/Show More
+++ b/Show More