From 37d0f151b8d6642c541d76cda99a5ca5a1bdc324 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 2 Nov 2025 08:17:24 +1100 Subject: [PATCH] Fixes for tests --- app/Export/CSV/BaseExport.php | 21 ++++++++++++++----- .../TaskScheduler/StoreSchedulerRequest.php | 2 +- app/Services/Template/TemplateService.php | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php index f292bcc38f..15e4620a78 100644 --- a/app/Export/CSV/BaseExport.php +++ b/app/Export/CSV/BaseExport.php @@ -12,12 +12,13 @@ namespace App\Export\CSV; -use App\Jobs\Credit\ZipCredits; +use Str; use App\Models\Task; use App\Models\User; use App\Models\Quote; use App\Models\Client; use App\Models\Credit; +use App\Models\Design; use App\Models\Vendor; use App\Utils\Helpers; use App\Models\Company; @@ -27,20 +28,21 @@ use App\Models\Payment; use App\Models\Product; use App\Models\Document; use League\Fractal\Manager; +use App\Jobs\Quote\ZipQuotes; use App\Models\ClientContact; use App\Models\PurchaseOrder; use Illuminate\Support\Carbon; +use App\Jobs\Credit\ZipCredits; use App\Utils\Traits\MakesHash; use App\Models\RecurringInvoice; -use App\Jobs\Document\ZipDocuments; use App\Jobs\Invoice\ZipInvoices; -use App\Jobs\PurchaseOrder\ZipPurchaseOrders; -use App\Jobs\Quote\ZipQuotes; +use App\Jobs\Document\ZipDocuments; use App\Transformers\TaskTransformer; use App\Transformers\PaymentTransformer; use Illuminate\Database\Eloquent\Builder; +use App\Services\Template\TemplateService; +use App\Jobs\PurchaseOrder\ZipPurchaseOrders; use League\Fractal\Serializer\ArraySerializer; -use Str; class BaseExport { @@ -1729,6 +1731,15 @@ $products = str_getcsv($this->input['product_key'], ',', "'"); } + public function exportTemplate(Builder $query, string $template_id) + { + $template = Design::withTrashed()->find($this->decodePrimaryKey($template_id)); + + $template_service = new TemplateService($template); + + // return $template_service->getHtml(); + } + private function resolveEntityFilters(User $user, Builder $query): Builder { $model = get_class($query->getModel()); diff --git a/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php b/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php index eec016dd11..8d42a7ff8b 100644 --- a/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php +++ b/app/Http/Requests/TaskScheduler/StoreSchedulerRequest.php @@ -175,4 +175,4 @@ class StoreSchedulerRequest extends Request 'parameters.invoice_id.required_if' => 'The invoice is required for the payment schedule template.' ]; } - | 'include_deleted' \ No newline at end of file +} \ No newline at end of file diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php index da7f6701c0..343a07a5c2 100644 --- a/app/Services/Template/TemplateService.php +++ b/app/Services/Template/TemplateService.php @@ -565,6 +565,8 @@ class TemplateService ->map(function ($invoice) { $payments = []; + + /** @var Invoice $invoice */ $this->entity = $invoice; if ($invoice->payments ?? false) {