diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php index 6083c136d9a7..97c0c68d04be 100644 --- a/app/Http/Controllers/PreviewController.php +++ b/app/Http/Controllers/PreviewController.php @@ -71,7 +71,6 @@ class PreviewController extends BaseController $ps = new PdfService($invitation, 'product', [ 'client' => $client ?? false, - // 'vendor' => $vendor ?? false, "{$entity_prop}s" => [$entity_obj], ]); diff --git a/app/Http/Controllers/PreviewPurchaseOrderController.php b/app/Http/Controllers/PreviewPurchaseOrderController.php index e0dbd3343029..c04748adab12 100644 --- a/app/Http/Controllers/PreviewPurchaseOrderController.php +++ b/app/Http/Controllers/PreviewPurchaseOrderController.php @@ -191,7 +191,7 @@ class PreviewPurchaseOrderController extends BaseController $invitation->setRelation($request->entity, $entity_obj); } - + $ps = new PdfService($invitation, 'purchase_order', [ 'client' => $entity_obj->client ?? false, 'vendor' => $vendor ?? false, diff --git a/app/Http/Requests/Preview/PreviewPurchaseOrderRequest.php b/app/Http/Requests/Preview/PreviewPurchaseOrderRequest.php index 4ec935f7de4e..b553eb87645c 100644 --- a/app/Http/Requests/Preview/PreviewPurchaseOrderRequest.php +++ b/app/Http/Requests/Preview/PreviewPurchaseOrderRequest.php @@ -58,7 +58,11 @@ class PreviewPurchaseOrderRequest extends Request $input['amount'] = 0; $input['balance'] = 0; $input['number'] = isset($input['number']) ? $input['number'] : ctrans('texts.live_preview').' #'.rand(0, 1000); //30-06-2023 - + + if($input['entity_id'] ?? false) { + $input['entity_id'] = $this->decodePrimaryKey($input['entity_id'], true); + } + $this->replace($input); } diff --git a/app/Models/PurchaseOrder.php b/app/Models/PurchaseOrder.php index 45dc8dc68181..4c4804c1f2a8 100644 --- a/app/Models/PurchaseOrder.php +++ b/app/Models/PurchaseOrder.php @@ -117,6 +117,14 @@ class PurchaseOrder extends BaseModel use SoftDeletes; use MakesDates; + protected $hidden = [ + 'id', + 'private_notes', + 'user_id', + 'vendor_id', + 'company_id', + ]; + protected $fillable = [ 'number', 'discount', diff --git a/app/Services/Pdf/PdfConfiguration.php b/app/Services/Pdf/PdfConfiguration.php index 4dfd3f88acfc..a28789321409 100644 --- a/app/Services/Pdf/PdfConfiguration.php +++ b/app/Services/Pdf/PdfConfiguration.php @@ -221,7 +221,6 @@ class PdfConfiguration $this->vendor = $this->entity->vendor; $this->vendor_contact = $this->service->invitation->contact; $this->path = $this->vendor->purchase_order_filepath($this->service->invitation); - $this->entity_design_id = 'invoice_design_id'; $this->entity_design_id = 'purchase_order_design_id'; $this->settings = $this->vendor->company->settings; $this->settings_object = $this->vendor; @@ -274,6 +273,7 @@ class PdfConfiguration */ private function setDesign(): self { + $design_id = $this->entity->design_id ?: $this->decodePrimaryKey($this->settings_object->getSetting($this->entity_design_id)); $this->design = Design::withTrashed()->find($design_id) ?? Design::withTrashed()->find(2);