diff --git a/app/Classes/Modules/Imports/Services/ImportsDebtor.php b/app/Classes/Modules/Imports/Services/ImportsDebtor.php index 1f321e50..2120113a 100644 --- a/app/Classes/Modules/Imports/Services/ImportsDebtor.php +++ b/app/Classes/Modules/Imports/Services/ImportsDebtor.php @@ -18,15 +18,21 @@ class ImportsDebtor implements ToModel, WithHeadingRow, WithBatchInserts, WithVa public function model($row = []) { try { - $reference = preg_split('(-|\(|\)|\/)', $row['2nd_description']); - $reference = $reference[array_key_last($reference)]; - $debtor = $row['code']; - $company = Company::where('reference', $reference)->first(); - if (!$company) { - echo $reference.'
'; + preg_match_all('/([0-9]{3,4}[a-zA-Z]{3,4})/', 'EXC/6219THL, SRW/CIEF/2699TEK', $matches); + + foreach ($matches[0] as $match){ + $reference = $match; + $debtor = $row['code']; + $company = Company::where('reference', $reference)->first(); + if (!$company) { + echo $reference.'
'; // $company->debtor = $debtor; // $company->update(); + } + } +// $reference = preg_split('(-|\(|\)|\/)', $row['2nd_description']); +// $reference = $reference[array_key_last($reference)]; } catch (\Exception $exception){} } diff --git a/app/Http/Controllers/Imports/ImportUpdateDebtorController.php b/app/Http/Controllers/Imports/ImportUpdateDebtorController.php index 22b4fb84..72f998d4 100644 --- a/app/Http/Controllers/Imports/ImportUpdateDebtorController.php +++ b/app/Http/Controllers/Imports/ImportUpdateDebtorController.php @@ -20,9 +20,6 @@ class ImportUpdateDebtorController * @throws \App\Classes\Exceptions\MalformedRequestException */ public function import(Request $request) { - $token = Auth::fromUser(User::find(1)); - $request->headers->set('Authorization', 'Bearer '.$token); - $object = new DocumentObject('', $request->input('files'), '', ApprovalStatus::APPROVED, 'imports'); Excel::import(new ImportsDebtor(), json_decode($object->getFiles()[0])->file_info->original->file); return [];