arifal/sibedas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
arifal
2025-03-07 14:52:51 +07:00
parent c529a5d511 fbfa2a37bb
commit 0431945a42
40 changed files with 817 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/TourismController.php
View File

@@ -39,7 +39,7 @@ class TourismController extends Controller
$tourisms->village_name = $village ? $village->village_name : null;
$district = DB::table('districts')->where('district_code', $tourisms->district_code)->first();
$tourisms->district_name = $village ? $village->village_name : null;
$tourisms->district_name = $district ? $district->district_name : null;
return $tourisms;
});

1
app/Http/Controllers/Api/UsersController.php
View File

@@ -11,6 +11,7 @@ use App\Traits\GlobalApiResponse;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
class UsersController extends Controller
{