diff --git a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php index 184788415ea8..c0bb5bbad037 100644 --- a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php @@ -17,6 +17,7 @@ use App\Models\Client; use App\Models\RecurringInvoice; use App\Utils\Traits\CleanLineItems; use App\Utils\Traits\MakesHash; +use Illuminate\Http\UploadedFile; class StoreRecurringInvoiceRequest extends Request { @@ -43,6 +44,7 @@ class StoreRecurringInvoiceRequest extends Request foreach (range(0, $documents) as $index) { $rules['documents.'.$index] = 'file|mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000'; } + } elseif ($this->input('documents')) { $rules['documents'] = 'file|mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx|max:20000'; } @@ -62,6 +64,16 @@ class StoreRecurringInvoiceRequest extends Request { $input = $this->all(); + // foreach($this->input('documents') as $document) + // { + // if($document instanceof UploadedFile){ + // nlog("i am an uploaded file"); + // nlog($document); + // } + // else + // nlog($document); + // } + if (array_key_exists('design_id', $input) && is_string($input['design_id'])) { $input['design_id'] = $this->decodePrimaryKey($input['design_id']); } diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php index 72258db6fa0e..6d6609534247 100644 --- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php @@ -15,6 +15,7 @@ use App\Http\Requests\Request; use App\Utils\Traits\ChecksEntityStatus; use App\Utils\Traits\CleanLineItems; use App\Utils\Traits\MakesHash; +use Illuminate\Http\UploadedFile; class UpdateRecurringInvoiceRequest extends Request { @@ -57,6 +58,16 @@ class UpdateRecurringInvoiceRequest extends Request { $input = $this->all(); + // foreach($this->input('documents') as $document) + // { + // if($document instanceof UploadedFile){ + // nlog("i am an uploaded file"); + // nlog($document); + // } + // else + // nlog($document); + // } + if (array_key_exists('design_id', $input) && is_string($input['design_id'])) { $input['design_id'] = $this->decodePrimaryKey($input['design_id']); } diff --git a/app/Utils/PhantomJS/Phantom.php b/app/Utils/PhantomJS/Phantom.php index d34f24961026..4c605273227a 100644 --- a/app/Utils/PhantomJS/Phantom.php +++ b/app/Utils/PhantomJS/Phantom.php @@ -88,9 +88,11 @@ class Phantom $pdf = CurlUtils::get($phantom_url); $this->checkMime($pdf, $invitation, $entity); - + $instance = Storage::disk(config('filesystems.default'))->put($file_path, $pdf); +nlog($instance); +nlog($file_path); return $file_path; }