From 567e570102e7c0a47e17af5b6004a70643adcad3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 3 Jun 2020 21:05:08 +1000 Subject: [PATCH 1/4] fix for country name --- database/seeds/CountriesSeeder.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/database/seeds/CountriesSeeder.php b/database/seeds/CountriesSeeder.php index 19aac72cc3fe..720bd2df7c6b 100644 --- a/database/seeds/CountriesSeeder.php +++ b/database/seeds/CountriesSeeder.php @@ -189,5 +189,10 @@ class CountriesSeeder extends Seeder } $country->save(); } + + $p = Country::where('country_code', 275)->first(); + $p->name = 'Palestine'; + $p->save(); + } } From cd6ea872320d830718a23a2a973d68a25c411d7a Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Jun 2020 08:18:27 +1000 Subject: [PATCH 2/4] Add bulk actions to company gateway --- .../Controllers/CompanyGatewayController.php | 69 +++++++++++++++++++ routes/api.php | 2 + 2 files changed, 71 insertions(+) diff --git a/app/Http/Controllers/CompanyGatewayController.php b/app/Http/Controllers/CompanyGatewayController.php index 16b13b41e743..9540d75657a3 100644 --- a/app/Http/Controllers/CompanyGatewayController.php +++ b/app/Http/Controllers/CompanyGatewayController.php @@ -424,4 +424,73 @@ class CompanyGatewayController extends BaseController return response()->json([], 200); } + + /** + * Perform bulk actions on the list view + * + * @param BulkCompanyGatewayRequest $request + * @return \Illuminate\Http\Response + * + * + * @OA\Post( + * path="/api/v1/company_gateways/bulk", + * operationId="bulkCompanyGateways", + * tags={"company_gateways"}, + * summary="Performs bulk actions on an array of company_gateways", + * description="", + * @OA\Parameter(ref="#/components/parameters/X-Api-Secret"), + * @OA\Parameter(ref="#/components/parameters/X-Api-Token"), + * @OA\Parameter(ref="#/components/parameters/X-Requested-With"), + * @OA\Parameter(ref="#/components/parameters/index"), + * @OA\RequestBody( + * description="Array of company gateway IDs", + * required=true, + * @OA\MediaType( + * mediaType="application/json", + * @OA\Schema( + * type="array", + * @OA\Items( + * type="integer", + * description="Array of hashed IDs to be bulk 'actioned", + * example="[0,1,2,3]", + * ), + * ) + * ) + * ), + * @OA\Response( + * response=200, + * description="The Company Gateways response", + * @OA\Header(header="X-API-Version", ref="#/components/headers/X-API-Version"), + * @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"), + * @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"), + * @OA\JsonContent(ref="#/components/schemas/CompanyGateway"), + * ), + * @OA\Response( + * response=422, + * description="Validation error", + * @OA\JsonContent(ref="#/components/schemas/ValidationError"), + * ), + * @OA\Response( + * response="default", + * description="Unexpected Error", + * @OA\JsonContent(ref="#/components/schemas/Error"), + * ), + * ) + */ + public function bulk() + { + $action = request()->input('action'); + + $ids = request()->input('ids'); + + $company_gateways = CompanyGateway::withTrashed()->find($this->transformKeys($ids)); + + $company_gateways->each(function ($company_gateway, $key) use ($action) { + if (auth()->user()->can('edit', $company_gateway)) { + $this->company_repo->{$action}($client); + } + }); + + return $this->listResponse(CompanyGateway::withTrashed()->whereIn('id', $this->transformKeys($ids))); + } } diff --git a/routes/api.php b/routes/api.php index 58b2e6dbec0f..5f9e1e35a1ba 100644 --- a/routes/api.php +++ b/routes/api.php @@ -102,6 +102,8 @@ Route::group(['middleware' => ['api_db', 'token_auth', 'locale'], 'prefix' => 'a Route::resource('company_gateways', 'CompanyGatewayController'); + Route::post('company_gateways/bulk', 'CompanyGatewayController@bulk')->name('company_gateways.bulk'); + Route::put('company_users/{user}', 'CompanyUserController@update'); Route::resource('group_settings', 'GroupSettingController'); From a44a7db12675c1620fd18d408bdb2cbf012622b6 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Jun 2020 21:33:33 +1000 Subject: [PATCH 3/4] Adjust large test data set --- app/Console/Commands/CreateTestData.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php index 45ac31773554..675a00f36019 100644 --- a/app/Console/Commands/CreateTestData.php +++ b/app/Console/Commands/CreateTestData.php @@ -315,7 +315,7 @@ class CreateTestData extends Command ]); - factory(\App\Models\Product::class, 50)->create([ + factory(\App\Models\Product::class, 15000)->create([ 'user_id' => $user->id, 'company_id' => $company->id, ]); From f6eda5c0f45166343bdb38cc7809870d093ee2e8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 4 Jun 2020 21:35:25 +1000 Subject: [PATCH 4/4] Fixes for unused dependencies --- app/Http/Controllers/SelfUpdateController.php | 1 - config/app.php | 1 - 2 files changed, 2 deletions(-) diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index 9646146972df..a8aad80533d7 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/app/Http/Controllers/SelfUpdateController.php @@ -12,7 +12,6 @@ namespace App\Http\Controllers; use App\Utils\Ninja; -use Codedge\Updater\UpdaterManager; use Composer\Factory; use Composer\IO\NullIO; use Composer\Installer; diff --git a/config/app.php b/config/app.php index 9ac8de0184f2..33ddaf7a8049 100644 --- a/config/app.php +++ b/config/app.php @@ -228,7 +228,6 @@ return [ 'URL' => Illuminate\Support\Facades\URL::class, 'Validator' => Illuminate\Support\Facades\Validator::class, 'View' => Illuminate\Support\Facades\View::class, - 'Updater' => Codedge\Updater\UpdaterFacade::class, /* * Dependency Facades */