tambah kolom import drugs
This commit is contained in:
@@ -135,7 +135,7 @@ class DrugController extends Controller
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public function downloadTemplate()
|
public function downloadTemplate()
|
||||||
{
|
{
|
||||||
return Helper::responseJson([
|
return Helper::responseJson([
|
||||||
'file_name' => "Template - Drugs.xlsx",
|
'file_name' => "Template - Drugs.xlsx",
|
||||||
@@ -149,7 +149,6 @@ class DrugController extends Controller
|
|||||||
$data = Excel::toArray([], $file);
|
$data = Excel::toArray([], $file);
|
||||||
|
|
||||||
$processedData = $this->processCategoryNames($data);
|
$processedData = $this->processCategoryNames($data);
|
||||||
|
|
||||||
$importedRows = 0;
|
$importedRows = 0;
|
||||||
$failedRows = [];
|
$failedRows = [];
|
||||||
|
|
||||||
@@ -170,6 +169,7 @@ class DrugController extends Controller
|
|||||||
'type' => $row['type'],
|
'type' => $row['type'],
|
||||||
'dosage' => $row['dosage'],
|
'dosage' => $row['dosage'],
|
||||||
'remark' => $row['remark'],
|
'remark' => $row['remark'],
|
||||||
|
'price' => $row['price'],
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
$importedRows++;
|
$importedRows++;
|
||||||
@@ -201,7 +201,7 @@ class DrugController extends Controller
|
|||||||
$row[] = $data[0][$i];
|
$row[] = $data[0][$i];
|
||||||
$header[] = $data[0][0];
|
$header[] = $data[0][0];
|
||||||
}
|
}
|
||||||
|
|
||||||
$filed = [];
|
$filed = [];
|
||||||
foreach ($header[0] as $value)
|
foreach ($header[0] as $value)
|
||||||
{
|
{
|
||||||
@@ -212,16 +212,16 @@ class DrugController extends Controller
|
|||||||
$filed[] = $modelColumn;
|
$filed[] = $modelColumn;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = [];
|
$result = [];
|
||||||
foreach ($row as $subarray) {
|
foreach ($row as $subarray) {
|
||||||
$trimmedSubarray = [];
|
$trimmedSubarray = [];
|
||||||
for ($i = 0; $i < count($filed); $i++) {
|
for ($i = 0; $i < count($filed); $i++) {
|
||||||
$trimmedSubarray[$filed[$i]] = $subarray[$i] ? $subarray[$i] : null;
|
$trimmedSubarray[$filed[$i]] = $subarray[$i] ? $subarray[$i] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$result[] = $trimmedSubarray;
|
$result[] = $trimmedSubarray;
|
||||||
}
|
}
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ class Drug extends Model
|
|||||||
'remark',
|
'remark',
|
||||||
'selling_unit_id',
|
'selling_unit_id',
|
||||||
'status',
|
'status',
|
||||||
|
'price',
|
||||||
'active',
|
'active',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user