Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions server/src/Http/Controllers/Internal/v1/ContactController.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,18 @@ public function import(ImportRequest $request)
{
$disk = $request->input('disk', config('filesystems.default'));
$files = $request->resolveFilesFromIds();
$importedCount = 0;

foreach ($files as $file) {
try {
Excel::import(new ContactImport(), $file->path, $disk);
$import = new ContactImport();
Excel::import($import, $file->path, $disk);
$importedCount += $import->imported;
} catch (\Throwable $e) {
return response()->error('Invalid file, unable to proccess.');
}
}

return response()->json(['status' => 'ok', 'message' => 'Import completed']);
return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
}
}
7 changes: 5 additions & 2 deletions server/src/Http/Controllers/Internal/v1/DriverController.php
Original file line number Diff line number Diff line change
Expand Up @@ -513,15 +513,18 @@ public function import(ImportRequest $request)
{
$disk = $request->input('disk', config('filesystems.default'));
$files = $request->resolveFilesFromIds();
$importedCount = 0;

foreach ($files as $file) {
try {
Excel::import(new DriverImport(), $file->path, $disk);
$import = new DriverImport();
Excel::import($import, $file->path, $disk);
$importedCount += $import->imported;
} catch (\Throwable $e) {
return response()->error('Invalid file, unable to proccess.');
}
}

return response()->json(['status' => 'ok', 'message' => 'Import completed']);
return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
}
}
7 changes: 5 additions & 2 deletions server/src/Http/Controllers/Internal/v1/FleetController.php
Original file line number Diff line number Diff line change
Expand Up @@ -221,15 +221,18 @@ public function import(ImportRequest $request)
{
$disk = $request->input('disk', config('filesystems.default'));
$files = $request->resolveFilesFromIds();
$importedCount = 0;

foreach ($files as $file) {
try {
Excel::import(new FleetImport(), $file->path, $disk);
$import = new FleetImport();
Excel::import($import, $file->path, $disk);
$importedCount += $import->imported;
} catch (\Throwable $e) {
return response()->error('Invalid file, unable to proccess.');
}
}

return response()->json(['status' => 'ok', 'message' => 'Import completed']);
return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,18 @@ public function import(ImportRequest $request)
{
$disk = $request->input('disk', config('filesystems.default'));
$files = $request->resolveFilesFromIds();
$importedCount = 0;

foreach ($files as $file) {
try {
Excel::import(new FuelReportImport(), $file->path, $disk);
$import = new FuelReportImport();
Excel::import($import, $file->path, $disk);
$importedCount += $import->imported;
} catch (\Throwable $e) {
return response()->error('Invalid file, unable to proccess.');
}
}

return response()->json(['status' => 'ok', 'message' => 'Import completed']);
return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
}
}
7 changes: 5 additions & 2 deletions server/src/Http/Controllers/Internal/v1/IssueController.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,18 @@ public function import(ImportRequest $request)
{
$disk = $request->input('disk', config('filesystems.default'));
$files = $request->resolveFilesFromIds();
$importedCount = 0;

foreach ($files as $file) {
try {
Excel::import(new IssueImport(), $file->path, $disk);
$import = new IssueImport();
Excel::import($import, $file->path, $disk);
$importedCount += $import->imported;
} catch (\Throwable $e) {
return response()->error('Invalid file, unable to proccess.');
}
}

return response()->json(['status' => 'ok', 'message' => 'Import completed']);
return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
}
}
7 changes: 5 additions & 2 deletions server/src/Http/Controllers/Internal/v1/PlaceController.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,18 @@ public function import(ImportRequest $request)
{
$disk = $request->input('disk', config('filesystems.default'));
$files = $request->resolveFilesFromIds();
$importedCount = 0;

foreach ($files as $file) {
try {
Excel::import(new PlaceImport(), $file->path, $disk);
$import = new PlaceImport();
Excel::import($import, $file->path, $disk);
$importedCount += $import->imported;
} catch (\Throwable $e) {
return response()->error('Invalid file, unable to proccess.');
}
}

return response()->json(['status' => 'ok', 'message' => 'Import completed']);
return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
}
}
7 changes: 5 additions & 2 deletions server/src/Http/Controllers/Internal/v1/VehicleController.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,18 @@ public function import(ImportRequest $request)
{
$disk = $request->input('disk', config('filesystems.default'));
$files = $request->resolveFilesFromIds();
$importedCount = 0;

foreach ($files as $file) {
try {
Excel::import(new VehicleImport(), $file->path, $disk);
$import = new VehicleImport();
Excel::import($import, $file->path, $disk);
$importedCount += $import->imported;
} catch (\Throwable $e) {
return response()->error('Invalid file, unable to proccess.');
}
}

return response()->json(['status' => 'ok', 'message' => 'Import completed']);
return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
}
}
7 changes: 5 additions & 2 deletions server/src/Http/Controllers/Internal/v1/VendorController.php
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,19 @@ public function import(ImportRequest $request)
{
$disk = $request->input('disk', config('filesystems.default'));
$files = $request->resolveFilesFromIds();
$importedCount = 0;

foreach ($files as $file) {
try {
Excel::import(new VendorImport(), $file->path, $disk);
$import = new VendorImport();
Excel::import($import, $file->path, $disk);
$importedCount += $import->imported;
} catch (\Throwable $e) {
return response()->error('Invalid file, unable to proccess.');
}
}

return response()->json(['status' => 'ok', 'message' => 'Import completed']);
return response()->json(['status' => 'ok', 'message' => 'Import completed', 'imported' => $importedCount]);
}

/**
Expand Down
7 changes: 7 additions & 0 deletions server/src/Imports/ContactImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@

class ContactImport implements ToCollection, WithHeadingRow
{
/**
* Counter for successfully imported rows.
*
* @var int
*/
public int $imported = 0;
/**
* @return Collection
*/
Expand All @@ -20,6 +26,7 @@ public function collection(Collection $rows)
}

Contact::createFromImport($row, true);
$this->imported++;
}
}
}
7 changes: 7 additions & 0 deletions server/src/Imports/DriverImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@

class DriverImport implements ToCollection, WithHeadingRow
{
/**
* Counter for successfully imported rows.
*
* @var int
*/
public int $imported = 0;
/**
* @return Collection
*/
Expand All @@ -20,6 +26,7 @@ public function collection(Collection $rows)
}

Driver::createFromImport($row, true);
$this->imported++;
}
}
}
7 changes: 7 additions & 0 deletions server/src/Imports/FleetImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@

class FleetImport implements ToCollection, WithHeadingRow
{
/**
* Counter for successfully imported rows.
*
* @var int
*/
public int $imported = 0;
/**
* @return Collection
*/
Expand All @@ -20,6 +26,7 @@ public function collection(Collection $rows)
}

Fleet::createFromImport($row, true);
$this->imported++;
}
}
}
8 changes: 8 additions & 0 deletions server/src/Imports/FuelReportImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@

class FuelReportImport implements ToCollection, WithHeadingRow
{
/**
* Counter for successfully imported rows.
*
* @var int
*/
public int $imported = 0;

/**
* @return Collection
*/
Expand All @@ -20,6 +27,7 @@ public function collection(Collection $rows)
}

FuelReport::createFromImport($row, true);
$this->imported++;
}
}
}
8 changes: 8 additions & 0 deletions server/src/Imports/IssueImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@

class IssueImport implements ToCollection, WithHeadingRow
{
/**
* Counter for successfully imported rows.
*
* @var int
*/
public int $imported = 0;

/**
* @return Collection
*/
Expand All @@ -20,6 +27,7 @@ public function collection(Collection $rows)
}

Issue::createFromImport($row, true);
$this->imported++;
}
}
}
8 changes: 8 additions & 0 deletions server/src/Imports/PlaceImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@

class PlaceImport implements ToCollection, WithHeadingRow
{
/**
* Counter for successfully imported rows.
*
* @var int
*/
public int $imported = 0;

/**
* @return Collection
*/
Expand All @@ -20,6 +27,7 @@ public function collection(Collection $rows)
}

Place::createFromImport($row, true);
$this->imported++;
}
}
}
8 changes: 8 additions & 0 deletions server/src/Imports/VehicleImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@

class VehicleImport implements ToCollection, WithHeadingRow
{
/**
* Counter for successfully imported rows.
*
* @var int
*/
public int $imported = 0;

/**
* @return Collection
*/
Expand All @@ -20,6 +27,7 @@ public function collection(Collection $rows)
}

Vehicle::createFromImport($row, true);
$this->imported++;
}
}
}
8 changes: 8 additions & 0 deletions server/src/Imports/VendorImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@

class VendorImport implements ToCollection, WithHeadingRow
{
/**
* Counter for successfully imported rows.
*
* @var int
*/
public int $imported = 0;

/**
* @return Collection
*/
Expand All @@ -20,6 +27,7 @@ public function collection(Collection $rows)
}

Vendor::createFromImport($row, true);
$this->imported++;
}
}
}
Loading