Merge branch 'master' into pajri

This commit is contained in:
pajri
2022-12-19 11:21:48 +07:00
9 changed files with 407 additions and 312 deletions

View File

@@ -3,6 +3,7 @@
namespace Modules\Internal\Http\Controllers\Api;
use App\Models\Benefit;
use App\Models\CorporateBenefit;
use App\Models\MemberBenefit;
use Illuminate\Contracts\Support\Renderable;
use Illuminate\Http\Request;
@@ -18,9 +19,10 @@ class BenefitController extends Controller
*/
public function index(Request $request, $corporate_id)
{
$benefits = Benefit::query()
$benefits = CorporateBenefit::query()
->filter($request->all())
->where('corporate_id', $corporate_id)
->with('benefit')
->paginate()
->appends($request->all());
@@ -89,59 +91,59 @@ class BenefitController extends Controller
public function memberBenefitImport(Request $request, $corporate_id)
{
$request->validate([
'file' => 'required|file|mimes:xls,xlsx,csv,txt',
]);
$file_name = now()->getPreciseTimestamp(3).'-'.$request->file('file')->getClientOriginalName();
$file = $request->file('file')->storeAs('temp', $file_name);
// $request->validate([
// 'file' => 'required|file|mimes:xls,xlsx,csv,txt',
// ]);
// $file_name = now()->getPreciseTimestamp(3).'-'.$request->file('file')->getClientOriginalName();
// $file = $request->file('file')->storeAs('temp', $file_name);
$reader = ReaderEntityFactory::createReaderFromFile(Storage::path('temp/'.$file_name));
$reader->open(Storage::path('temp/'.$file_name));
// $reader = ReaderEntityFactory::createReaderFromFile(Storage::path('temp/'.$file_name));
// $reader->open(Storage::path('temp/'.$file_name));
$headers_map_to_table_fields = Benefit::$doc_headers_to_field_map;
// $headers_map_to_table_fields = Benefit::$doc_headers_to_field_map;
$imported_benefit_data = 0;
$failed_benefit_data = [];
foreach ($reader->getSheetIterator() as $sheet) {
$doc_headers_indexes = [];
foreach ($sheet->getRowIterator() as $index => $row) {
if ($index == 1) { // First Row Must be Header
foreach ($row->getCells() as $index => $cell) {
$doc_headers_indexes[$index] = rtrim($cell->getValue());
}
} else { // Next Row Should be Data
$new_benefit_data = [];
foreach ($row->getCells() as $index => $cell) {
$new_benefit_data[$headers_map_to_table_fields[$doc_headers_indexes[$index]]] = $cell->getValue();
}
// $imported_benefit_data = 0;
// $failed_benefit_data = [];
// foreach ($reader->getSheetIterator() as $sheet) {
// $doc_headers_indexes = [];
// foreach ($sheet->getRowIterator() as $index => $row) {
// if ($index == 1) { // First Row Must be Header
// foreach ($row->getCells() as $index => $cell) {
// $doc_headers_indexes[$index] = rtrim($cell->getValue());
// }
// } else { // Next Row Should be Data
// $new_benefit_data = [];
// foreach ($row->getCells() as $index => $cell) {
// $new_benefit_data[$headers_map_to_table_fields[$doc_headers_indexes[$index]]] = $cell->getValue();
// }
// $imported_plan_data[] = $new_row; // Insert to Array
// Create Directly
$new_benefit_data['corporate_id'] = $corporate_id;
try {
Benefit::updateOrCreate([
'corporate_id' => $corporate_id,
'code' => $new_benefit_data['code']
], $new_benefit_data);
// // $imported_plan_data[] = $new_row; // Insert to Array
// // Create Directly
// $new_benefit_data['corporate_id'] = $corporate_id;
// try {
// Benefit::updateOrCreate([
// 'corporate_id' => $corporate_id,
// 'code' => $new_benefit_data['code']
// ], $new_benefit_data);
$imported_benefit_data++;
} catch(\Exception $e) {
$new_benefit_data['error'] = $e->getMessage();
$failed_benefit_data[] = $new_benefit_data;
}
}
}
// $imported_benefit_data++;
// } catch(\Exception $e) {
// $new_benefit_data['error'] = $e->getMessage();
// $failed_benefit_data[] = $new_benefit_data;
// }
// }
// }
break; //only read first sheet
}
$reader->close();
Storage::delete('temp/'.$file_name);
// throw(404);
// break; //only read first sheet
// }
// $reader->close();
// Storage::delete('temp/'.$file_name);
// // throw(404);
return [
'total_successed_row' => $imported_benefit_data,
'total_failed_row' => count($failed_benefit_data),
'failed_row' => $failed_benefit_data
];
// return [
// 'total_successed_row' => $imported_benefit_data,
// 'total_failed_row' => count($failed_benefit_data),
// 'failed_row' => $failed_benefit_data
// ];
}
}

View File

@@ -7,6 +7,7 @@ use App\Imports\PlansImport;
use App\Models\Benefit;
use App\Models\Claim;
use App\Models\Corporate;
use App\Models\CorporateBenefit;
use App\Models\Plan;
use App\Models\Service;
use App\Models\User;
@@ -347,7 +348,7 @@ class CorporateController extends Controller
// dd($request->toArray());
$file_name = now()->getPreciseTimestamp(3) . '-' . $request->file('file')->getClientOriginalName();
$file = $request->file('file')->storeAs('temp', $file_name);
$corporate = Corporate::findOrFail($corporate_id);
$corporate = Corporate::with(['plans'])->findOrFail($corporate_id);
$import = new ImportService();
$import->read(Storage::path('temp/' . $file_name));
@@ -368,7 +369,7 @@ class CorporateController extends Controller
if ($sheet->getName() == 'Plan') {
$headers_map_to_table_fields = Plan::$doc_headers_to_field_map;
} else if ($sheet->getName() == 'Benefit') {
$headers_map_to_table_fields = Benefit::$doc_headers_to_field_map;
$headers_map_to_table_fields = CorporateBenefit::$doc_headers_to_field_map;
}
// Write Header to File