Merge pull request #810 from OpenSID/dev-791

Upgrade teknis berdasarkan composer audit pada OpenKab

Author: vickyrolanda

app/Http/Controllers/CMS/CategoryController.php

@@ -106,7 +106,7 @@ public function update($id, UpdateCategoryRequest $request)
 
         $category = $this->categoryRepository->update($request->all(), $id);
 
-        Session::flash('success', 'Kategori updated successfully.');
+        Session::flash('success', 'Kategori berhasil diperbarui.');
 
         return redirect(route('categories.index'));
     }

app/Http/Controllers/CMS/DownloadController.php

@@ -137,7 +137,7 @@ public function destroy($id)
 
         $this->downloadRepository->delete($id);
         if (request()->ajax()) {
-            return $this->sendSuccess('Role deleted successfully.');
+            return $this->sendSuccess('File download berhasil dihapus.');
         }
         Session::flash('success', 'File download berhasil dihapus.');
 

app/Http/Controllers/CMS/SlideController.php

@@ -142,7 +142,7 @@ public function destroy($id)
 
         $this->slideRepository->delete($id);
         if (request()->ajax()) {
-            return $this->sendSuccess('Role deleted successfully.');
+            return $this->sendSuccess('Slide berhasil dihapus.');
         }
         Session::flash('success', 'Slide berhasil dihapus.');
 

app/Http/Controllers/DepartmentController.php

@@ -81,7 +81,7 @@ public function edit($id)
         $department = $this->departmentRepository->find($id);
 
         if (empty($department)) {
-            Session::flash('error', 'Departemen not found');
+            Session::flash('error', 'Departemen tidak ditemukan');
 
             return redirect(route('departments.index'));
         }

app/Http/Controllers/PositionController.php

@@ -104,7 +104,7 @@ public function update($id, UpdatePositionRequest $request)
 
         $position = $this->positionRepository->update($request->all(), $id);
 
-        Session::flash('success', 'Jabatan updated successfully.');
+        Session::flash('success', 'Jabatan berhasil diperbarui.');
 
         return redirect(route('positions.index'));
     }
@@ -126,7 +126,7 @@ public function destroy($id)
 
         $this->positionRepository->delete($id);
         if (request()->ajax()) {
-            return $this->sendSuccess('Role berhasil dihapus.');
+            return $this->sendSuccess('Jabatan berhasil dihapus.');
         }
         Session::flash('success', 'Jabatan berhasil dihapus.');
 

app/Http/Transformers/DownloadTransformer.php

@@ -6,6 +6,7 @@
 use App\Models\Enums\StatusEnum;
 use Illuminate\Support\Facades\Storage;
 use League\Fractal\TransformerAbstract;
+use Spatie\Html\Facades\Html;
 
 class DownloadTransformer extends TransformerAbstract
 {
@@ -14,7 +15,7 @@ public function transform(Download $download)
         return [
             'id' => $download->id,
             'title' => $download->title,
-            'url' => $download->url ? link_to(Storage::url($download->url), 'berkas', ['class' => 'text-primary'])->toHtml() : '',
+            'url' => $download->url ? Html::a(Storage::url($download->url), 'berkas')->class('text-primary')->toHtml() : '',
             'description' => $download->description,
             'state' => $download->state == StatusEnum::aktif ? 'Tampilkan' : 'Tidak',
             'created_at' => $download->created_at,

app/Http/Transformers/SlideTransformer.php

@@ -6,6 +6,7 @@
 use App\Models\Enums\StatusEnum;
 use Illuminate\Support\Facades\Storage;
 use League\Fractal\TransformerAbstract;
+use Spatie\Html\Facades\Html;
 
 class SlideTransformer extends TransformerAbstract
 {
@@ -14,7 +15,7 @@ public function transform(Slide $slide)
         return [
             'id' => $slide->id,
             'title' => $slide->title,
-            'url' => $slide->url ? link_to($slide->url, 'tautan', ['class' => 'text-primary'])->toHtml() : '',
+            'url' => $slide->url ? Html::a($slide->url, 'tautan')->class('text-primary')->toHtml() : '',
             'thumbnail' => $slide->thumbnail ? Storage::url($slide->thumbnail) : '',
             'description' => $slide->description,
             'state' => $slide->state == StatusEnum::aktif ? 'Aktif' : 'Non Aktif',

app/Providers/AppServiceProvider.php

@@ -35,8 +35,6 @@ public function boot()
     {
         $this->bootHttps();
         $this->addValidation();
-        // daftarkan manual karena gagal install infyomlabs/adminlte-templates terkendala depedency
-        View::addNamespace('adminlte-templates', resource_path('views/vendor/adminlte-templates'));
         $this->addLogQuery();
 
         if (App::runningInConsole()) {

catatan_rilis.md

@@ -10,4 +10,5 @@ Di rilis ini, versi 2508.0.1 berisi penambahan dan perbaikan yang diminta penggu
 
 #### Perubahan Teknis
 
-1. [#790](https://github.com/OpenSID/OpenKab/issues/790) Upgrade versi laravel dari 9.52.16 menjadi 10.48.29.
+1. [#790](https://github.com/OpenSID/OpenKab/issues/790) Upgrade versi laravel dari 9.52.16 menjadi 10.48.29.
+2. [#791](https://github.com/OpenSID/OpenKab/issues/791) Upgrade teknis berdasarkan composer audit pada OpenKab.

composer.json

@@ -10,7 +10,6 @@
     "require": {
         "php": "^8.1",
         "akaunting/laravel-apexcharts": "^3.0",
-        "akaunting/money": "^5.2",
         "alexusmai/laravel-file-manager": "^3.0",
         "bensampo/laravel-enum": "^6.3",
         "cviebrock/eloquent-sluggable": "^10.0",
@@ -23,14 +22,14 @@
         "laravel/sanctum": "^3.3",
         "laravel/tinker": "^2.8",
         "laravel/ui": "^4.2",
-        "laravelcollective/html": "^6.4",
         "league/flysystem-ftp": "^3.10",
         "openspout/openspout": "^4.24",
         "proengsoft/laravel-jsvalidation": "^4.8",
         "shetabit/visitor": "^4.1",
         "spatie/laravel-activitylog": "^4.7",
         "spatie/laravel-csp": "^2.8",
         "spatie/laravel-fractal": "^6.0",
+        "spatie/laravel-html": "^3.5",
         "spatie/laravel-json-api-paginate": "^1.13",
         "spatie/laravel-permission": "^6.4",
         "spatie/laravel-query-builder": "^5.2",