gitkwesi/click-erp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixes, AM change feature, refactoring

Browse Source
This commit is contained in:
Kwesi Banson Jnr
2025-11-23 14:40:32 +00:00
parent eabf61b7da
commit d5ac7391dd
41 changed files with 1559 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/OfficeLocationsController.php
View File

@@ -18,8 +18,9 @@ class OfficeLocationsController extends Controller
'offices_arr' => $offices_arr,
'current_user' => session('current_user')
];
// dd($data);
// dd($offices_arr->isEmpty());
return view('officelocations.index', $data);
return view('officelocations.index-new', $data);
}
public function showfiles($id){
$branch_files = Models\BranchFile::where('branch_id', $id)->get();
@@ -55,7 +56,7 @@ class OfficeLocationsController extends Controller
public function create()
{
$countries = Models\Country::pluck('en_short_name','en_short_name');
$staffmembers = Models\StaffMember::pluck('name', 'id');
$staffmembers = Models\SystemUser::pluck('name', 'id'); //system users
$data = [
'page_title' => 'Add Office Location',
'countries' => $countries,
@@ -85,7 +86,6 @@ class OfficeLocationsController extends Controller
'street_name' => 'sometimes',
'physical_address' => 'required',
'postal_address' => 'required',
'block_number' => 'sometimes',
'city_town' => 'required',
'country' => 'required|unique:office_locations,country',
'country_manager_id' => 'required',
@@ -102,6 +102,7 @@ class OfficeLocationsController extends Controller
$office_arr['user_id'] = session('current_user.id');
$office_arr['flag_url'] = $flag_url;
$office_arr['city'] = $request->city_town;
$result = Models\OfficeLocation::create($office_arr);
Session::flash('success_message', 'Office Location successfully added');
return redirect(url('officelocations'));
@@ -133,13 +134,13 @@ class OfficeLocationsController extends Controller
'country_manager_id' => 'required',
'office_phone' => 'required'
]);
// dd($request->all());
$office = Models\OfficeLocation::findOrFail($id);
$office->street_name = $request->street_name ?? "";
$office->physical_address = $request->physical_address;
$office->postal_address = $request->postal_address;
$office->block_number = $request->block_number;
$office->city = $request->city_town;
$office->country = $request->country;
$office->country_manager_id = $request->country_manager_id;
$office->office_phone = $request->office_phone;
@@ -208,10 +209,12 @@ class OfficeLocationsController extends Controller
$request->validate([
'document_one_name' => 'required',
'id' => 'required',
'validity_period_one' => 'sometimes',
'document_one' => 'max:10240|mimes:png,jpg,jpeg,bmp,pdf,doc,docx,xlx,xlsx,pptx,ppt',
]);
$document = Models\BranchFile::findOrFail($request->id);
$document->name = $request->document_one_name;
$document->validity_period = $request->validity_period_one;
if ($request->has('document_one')) {
if ($request->file('document_one')->isValid()) {
$filename = "erp_" . time() . str_random(6) . "." . $request->document_one->extension();