diff --git a/app/Http/Controllers/MobileApiController.php b/app/Http/Controllers/MobileApiController.php index dc7d401..4af7f5d 100644 --- a/app/Http/Controllers/MobileApiController.php +++ b/app/Http/Controllers/MobileApiController.php @@ -204,20 +204,21 @@ class MobileApiController extends Controller if ($mark->name === 'Ввод остатков') { continue; } - - if (!$this->checkAvailableCar($started_at, $ended_at, $mark->id)) { - continue; - } +// +// if (!$this->checkAvailableCar($started_at, $ended_at, $mark->id)) { +// continue; +// } $brand = UniModel::model('pipi_auto_brands')->find($mark->brand_id); $tariffs = UniModel::model('pipi_auto_tariffs')->where('model_id', $mark->id)->get(); $equipment = UniModel::model('pipi_auto_equipment')->where('id', $mark->equipment_id)->first(); $class = UniModel::model('pipi_auto_classes')->find($mark->class_id); $bodywork = UniModel::model('pipi_auto_bodywork')->find($mark->bodywork_id); + $photo = UniModel::model('core_files')->find($mark?->photo_id); $path = null; - if ($mark?->photo_id) { - $path = lurl('/download/'.$mark?->photo_id); + if ($photo) { + $path = url('api/files/file/' . ltrim($photo->path, '/')); } $tariffs_new = []; foreach ($tariffs as $tariff) { diff --git a/routes/api.php b/routes/api.php index cec876e..992f708 100644 --- a/routes/api.php +++ b/routes/api.php @@ -15,6 +15,7 @@ use Illuminate\Support\Facades\Route; | */ use App\Http\Controllers\Sync1cApiController; +use Illuminate\Support\Facades\Storage; Route::prefix('1c')->group(function () { Route::post('syncAutoData', [Sync1cApiController::class, 'syncAutoData']); @@ -35,3 +36,8 @@ Route::prefix('mobile')->group(function () { Route::get('/', function (Request $request) { dd(123); }); + + +Route::get('/files/{path}', function ($path) { + return Storage::response($path); +})->where('path', '.*');