From 5e0d0cac1b816de6e5746ca5d14ca8df033a8d19 Mon Sep 17 00:00:00 2001 From: Linksehat Staging Server Date: Mon, 3 Jun 2024 09:08:11 +0700 Subject: [PATCH] tambah kolom import drugs --- .../Internal/Http/Controllers/Api/DrugController.php | 12 ++++++------ app/Models/Drug.php | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Modules/Internal/Http/Controllers/Api/DrugController.php b/Modules/Internal/Http/Controllers/Api/DrugController.php index f5237e67..dfff2196 100644 --- a/Modules/Internal/Http/Controllers/Api/DrugController.php +++ b/Modules/Internal/Http/Controllers/Api/DrugController.php @@ -135,7 +135,7 @@ class DrugController extends Controller ]); } } - public function downloadTemplate() + public function downloadTemplate() { return Helper::responseJson([ 'file_name' => "Template - Drugs.xlsx", @@ -149,7 +149,6 @@ class DrugController extends Controller $data = Excel::toArray([], $file); $processedData = $this->processCategoryNames($data); - $importedRows = 0; $failedRows = []; @@ -170,6 +169,7 @@ class DrugController extends Controller 'type' => $row['type'], 'dosage' => $row['dosage'], 'remark' => $row['remark'], + 'price' => $row['price'], ] ); $importedRows++; @@ -201,7 +201,7 @@ class DrugController extends Controller $row[] = $data[0][$i]; $header[] = $data[0][0]; } - + $filed = []; foreach ($header[0] as $value) { @@ -212,16 +212,16 @@ class DrugController extends Controller $filed[] = $modelColumn; } } - + $result = []; foreach ($row as $subarray) { $trimmedSubarray = []; for ($i = 0; $i < count($filed); $i++) { $trimmedSubarray[$filed[$i]] = $subarray[$i] ? $subarray[$i] : null; } - + $result[] = $trimmedSubarray; } return $result; - } + } } diff --git a/app/Models/Drug.php b/app/Models/Drug.php index a1fb9655..84028837 100644 --- a/app/Models/Drug.php +++ b/app/Models/Drug.php @@ -26,6 +26,7 @@ class Drug extends Model 'remark', 'selling_unit_id', 'status', + 'price', 'active', ];