table member dan table benefit
This commit is contained in:
@@ -28,16 +28,16 @@ class PlanController extends Controller
|
||||
public function index(Request $request, $corporate_id)
|
||||
{
|
||||
$plans = Plan::query()
|
||||
->filter($request->all())
|
||||
->where('corporate_id', $corporate_id)
|
||||
// ->whereHas('corporatePlan', function ($corporatePlan) use ($corporate_id) {
|
||||
// $corporatePlan->where('corporate_id', $corporate_id);
|
||||
// })
|
||||
// ->with('corporatePlan')
|
||||
->orderBy('corporate_plan_id', 'ASC')
|
||||
->paginate()
|
||||
->appends($request->all());
|
||||
|
||||
->filter($request->all())
|
||||
->where('corporate_id', $corporate_id)
|
||||
// ->whereHas('corporatePlan', function ($corporatePlan) use ($corporate_id) {
|
||||
// $corporatePlan->where('corporate_id', $corporate_id);
|
||||
// })
|
||||
// ->with('corporatePlan')
|
||||
->orderBy('corporate_plan_id', 'ASC')
|
||||
->paginate()
|
||||
->appends($request->all());
|
||||
|
||||
return $plans;
|
||||
}
|
||||
|
||||
@@ -105,14 +105,14 @@ class PlanController extends Controller
|
||||
{
|
||||
$request->validate([
|
||||
'file' => 'required|file|mimes:xls,xlsx,csv,txt',
|
||||
]);
|
||||
$file_name = now()->getPreciseTimestamp(3).'-'.$request->file('file')->getClientOriginalName();
|
||||
]);
|
||||
$file_name = now()->getPreciseTimestamp(3) . '-' . $request->file('file')->getClientOriginalName();
|
||||
$file = $request->file('file')->storeAs('temp', $file_name);
|
||||
$corporate = Corporate::findOrFail($corporate_id);
|
||||
|
||||
|
||||
$import = $this->importService;
|
||||
$import->read(Storage::path('temp/'.$file_name));
|
||||
$import->write(Storage::disk('public')->path('temp/result-'.$file_name), 'xsls');
|
||||
$import->read(Storage::path('temp/' . $file_name));
|
||||
$import->write(Storage::disk('public')->path('temp/result-' . $file_name), 'xsls');
|
||||
|
||||
$headers_map_to_table_fields = Plan::$doc_headers_to_field_map;
|
||||
|
||||
@@ -142,7 +142,7 @@ class PlanController extends Controller
|
||||
// Create Directly
|
||||
try {
|
||||
$rowResponse = $this->corporateService->handlePlanRow($corporate, $plan_row);
|
||||
|
||||
|
||||
// Write Success Result to File
|
||||
array_push($plan_row, 'SUCCESS');
|
||||
$import->addArrayToRow($plan_row);
|
||||
@@ -160,11 +160,11 @@ class PlanController extends Controller
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
break; //only read first sheet
|
||||
}
|
||||
$import->reader->close();
|
||||
Storage::delete('temp/'.$file_name);
|
||||
Storage::delete('temp/' . $file_name);
|
||||
$import->writer->close();
|
||||
// throw(404);
|
||||
|
||||
@@ -173,8 +173,8 @@ class PlanController extends Controller
|
||||
'total_failed_row' => count($failed_plan_data),
|
||||
'failed_row' => $failed_plan_data,
|
||||
'result_file' => [
|
||||
'url' => Storage::disk('public')->url('temp/result-'.$file_name),
|
||||
'name' => 'result-'.$file_name,
|
||||
'url' => Storage::disk('public')->url('temp/result-' . $file_name),
|
||||
'name' => 'result-' . $file_name,
|
||||
]
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user