diff --git a/app/Adapters/Purchases/MoneyExpenseExchangeRateRecorder.php b/app/Adapters/Purchases/MoneyExpenseExchangeRateRecorder.php index 97029078..3355f144 100644 --- a/app/Adapters/Purchases/MoneyExpenseExchangeRateRecorder.php +++ b/app/Adapters/Purchases/MoneyExpenseExchangeRateRecorder.php @@ -10,6 +10,6 @@ class MoneyExpenseExchangeRateRecorder implements ExpenseExchangeRateRecorder { public function record(Expense $expense): void { - ExchangeRateLog::addExchangeRateLog($expense); + ExchangeRateLog::addExchangeRateLog(model: $expense); } } diff --git a/app/Adapters/Receivables/MoneyPaymentExchangeRateRecorder.php b/app/Adapters/Receivables/MoneyPaymentExchangeRateRecorder.php index c6ee1204..2ca32cf5 100644 --- a/app/Adapters/Receivables/MoneyPaymentExchangeRateRecorder.php +++ b/app/Adapters/Receivables/MoneyPaymentExchangeRateRecorder.php @@ -10,6 +10,6 @@ class MoneyPaymentExchangeRateRecorder implements PaymentExchangeRateRecorder { public function record(Payment $payment): void { - ExchangeRateLog::addExchangeRateLog($payment); + ExchangeRateLog::addExchangeRateLog(model: $payment); } } diff --git a/app/Platform/Modules/Http/Controllers/Admin/ModulesController.php b/app/Platform/Modules/Http/Controllers/Admin/ModulesController.php index 895ea456..f8bbb147 100644 --- a/app/Platform/Modules/Http/Controllers/Admin/ModulesController.php +++ b/app/Platform/Modules/Http/Controllers/Admin/ModulesController.php @@ -74,9 +74,9 @@ class ModulesController extends Controller $installedModule->enable(); $module->refresh(); - ModuleEnabledEvent::dispatch($module); + event(new ModuleEnabledEvent($module)); - return response()->json(['success' => true]); + return new JsonResponse(['success' => true]); } public function disable(string $module, DatabaseActivator $activator): JsonResponse diff --git a/app/Platform/Modules/Http/Resources/ModuleResource.php b/app/Platform/Modules/Http/Resources/ModuleResource.php index a054c85b..ea1ac4a6 100644 --- a/app/Platform/Modules/Http/Resources/ModuleResource.php +++ b/app/Platform/Modules/Http/Resources/ModuleResource.php @@ -11,7 +11,7 @@ use Illuminate\Support\Facades\File; class ModuleResource extends JsonResource { /** - * Transform the resource into an array. + * Merge one marketplace catalog row with locally installed module state. * * @param Request $request * @return array|Arrayable|\JsonSerializable diff --git a/app/Platform/Modules/routes/web.php b/app/Platform/Modules/routes/web.php index d78c0d8a..ef16567d 100644 --- a/app/Platform/Modules/routes/web.php +++ b/app/Platform/Modules/routes/web.php @@ -5,6 +5,8 @@ use App\Platform\Modules\Http\Controllers\Assets\StyleController; use Illuminate\Support\Facades\Route; Route::middleware('web')->group(function () { - Route::get('/modules/styles/{style}', StyleController::class); - Route::get('/modules/scripts/{script}', ScriptController::class); + Route::prefix('modules')->group(function () { + Route::get('styles/{style}', StyleController::class); + Route::get('scripts/{script}', ScriptController::class); + }); });