diff --git a/Dockerfile b/Dockerfile index 3dda7471..11af6ee4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -90,7 +90,6 @@ RUN apt-get update && apt-get install -y \ && docker-php-ext-install -j$(nproc) gd - COPY --chown=www-data:www-data --from=composer /app /var/www/html diff --git a/app/Http/Controllers/Admin/FundSupportedPoolController.php b/app/Http/Controllers/Admin/FundSupportedPoolController.php index 37f363c5..81340be7 100644 --- a/app/Http/Controllers/Admin/FundSupportedPoolController.php +++ b/app/Http/Controllers/Admin/FundSupportedPoolController.php @@ -42,7 +42,7 @@ public function index(Request $request) { if($request->ajax()) { - // store the filter + // store the filter $filter = $request->except("draw", "columns", "order", "start", "length", "search", "_"); session(['settings_fund_supported_pools_filter' => $filter]); @@ -106,12 +106,12 @@ public function index(Request $request) ->make(true); } - // restore filter if required + // restore filter if required $filter = []; if (str_contains( url()->previous(), 'settings/fund-supported-pools')) { $filter = session('settings_fund_supported_pools_filter'); } else { - $filter['effective_type']= 'C'; + $filter['effective_type']= 'C'; } $regions = Region::orderBy('name')->get(); @@ -601,7 +601,7 @@ public function destroy($id, Request $request) if ($pool->hasPledge() && $pool->start_date < today()) { return response()->json([ 'title' => "Invalid delete!", - 'message' => 'The Fund Support Pool "' . $pool->region->name . '" cannot be deleted, it is being referenced on pledge(s).'], 403); + 'message' => 'The Fund Supported Pool "' . $pool->region->name . '" cannot be deleted, it is being referenced on pledge(s).'], 403); } // $validator = Validator::make(request()->all(), [ diff --git a/app/Http/Controllers/Admin/RegionController.php b/app/Http/Controllers/Admin/RegionController.php index f9256f27..b8026228 100644 --- a/app/Http/Controllers/Admin/RegionController.php +++ b/app/Http/Controllers/Admin/RegionController.php @@ -36,8 +36,8 @@ public function index(Request $request) { return Datatables::of($regions) ->addColumn('action', function ($region) { - return 'Show' . - 'Edit' . + return 'Show' . + 'Edit' . 'Delete'; }) @@ -71,7 +71,7 @@ public function store(RegionRequest $request) return response()->json($region); } - + } /** @@ -90,12 +90,12 @@ public function show(Request $request, $id) $region->updated_by_name = $region->updated_by ? $region->updated_by->name : ''; $region->formatted_created_at = $region->created_at->format('Y-m-d H:i:s'); $region->formatted_updated_at = $region->updated_at->format('Y-m-d H:i:s'); - // $region->updated_at = date_timezone_set($region->updated_at, timezone_open('America/Vancouver')); + // $region->updated_at = date_timezone_set($region->updated_at, timezone_open('America/Vancouver')); unset($region->created_by ); unset($region->updated_by ); return response()->json($region); } - + } /** @@ -125,7 +125,7 @@ public function update(RegionRequest $request, $id) $region = Region::where('id', $id)->first(); $region->fill( $request->all() ); $region->save(); - + return response()->json($region); } } @@ -143,12 +143,12 @@ public function destroy(Request $request, $id) if ($region->hasFSPool) { return response()->json([ 'title' => "Invalid delete!", - 'message' => 'The Region "' . $region->code . ' - ' . $region->name . '" cannot be deleted, it is being referenced on the Fund Support Pool(s).'], 403); + 'message' => 'The Region "' . $region->code . ' - ' . $region->name . '" cannot be deleted, it is being referenced on the Fund Supported Pool(s).'], 403); } $region->updated_by_id = Auth::Id(); $region->save(); - + $region->delete(); return response()->noContent(); diff --git a/openshift/app/pecsf-dc.yml b/openshift/app/pecsf-dc.yml index 231b1b01..200815f9 100644 --- a/openshift/app/pecsf-dc.yml +++ b/openshift/app/pecsf-dc.yml @@ -98,7 +98,6 @@ objects: lifecycle: postStart: exec: - command: ["/bin/sh", "-c", "php /var/www/html/artisan queue:work --tries=3 --timeout=0 --memory=512 >> /var/www/html/storage/logs/queue-work.log & "] restartPolicy: Always imagePullPolicy: Always diff --git a/resources/views/admin-campaign/fund-supported-pools/index.blade.php b/resources/views/admin-campaign/fund-supported-pools/index.blade.php index 70cc0946..12f0d59f 100644 --- a/resources/views/admin-campaign/fund-supported-pools/index.blade.php +++ b/resources/views/admin-campaign/fund-supported-pools/index.blade.php @@ -10,7 +10,7 @@