Probindo/database-pertani-web
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve merge conflict di controller dan routes

Browse Source
This commit is contained in:
Althaf
2026-07-07 16:16:53 +07:00
parent 11d836713a
commit e1fde05ba0
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Web/Produktivitas/SosialEkonomiController.php
+2 -2
View File
@@ -332,5 +332,5 @@ class SosialEkonomiController extends Controller
->orderBy('nama')
->get();
}
}
}
routes/web.php
+1 -2
View File
@@ -193,7 +193,6 @@ Route::middleware('auth')
Route::resource('petani.lahan-tanaman', App\Http\Controllers\Web\Produktivitas\PetaniLahanController::class);
Route::resource('petani.lahan-tanaman.tanaman', App\Http\Controllers\Web\Produktivitas\PetaniLahanTanamanController::class)->only(['show', 'update', 'destroy']);
Route::resource('petani.praktik-budidaya', App\Http\Controllers\Web\Produktivitas\PraktikBudidayaController::class);
Route::resource('petani.sosial-ekonomi', App\Http\Controllers\Web\Produktivitas\SosialEkonomiController::class);
Route::resource('petani.sosial-ekonomi', App\Http\Controllers\Web\Produktivitas\SosialEkonomiController::class)->only(['index', 'store', 'update']);
Route::resource('petani.akses-pasar', App\Http\Controllers\Web\Produktivitas\AksesPasarController::class);
});