Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 09:04:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge support for purchase order PDF generation

Browse Source
This commit is contained in:
David Bomba 2023-10-26 17:51:28 +11:00
parent 55ba708fd0
commit 2c8dde7f20
9 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/PurchaseOrderController.php
View File

@ -515,7 +515,6 @@ class PurchaseOrderController extends BaseController
if ($action == 'bulk_print' && $user->can('view', $purchase_orders->first())) { if ($action == 'bulk_print' && $user->can('view', $purchase_orders->first())) {
$paths = $purchase_orders->map(function ($purchase_order) { $paths = $purchase_orders->map(function ($purchase_order) {
return (new CreateRawPdf($purchase_order->invitations->first()))->handle(); return (new CreateRawPdf($purchase_order->invitations->first()))->handle();
// return (new \App\Jobs\Vendor\CreatePurchaseOrderPdf($purchase_order->invitations->first()))->rawPdf();
}); });
$merge = (new PdfMerge($paths->toArray()))->run(); $merge = (new PdfMerge($paths->toArray()))->run();

1
app/Http/Controllers/VendorPortal/InvitationController.php
View File

@ -14,7 +14,6 @@ namespace App\Http\Controllers\VendorPortal;
use App\Events\Misc\InvitationWasViewed; use App\Events\Misc\InvitationWasViewed;
use App\Events\PurchaseOrder\PurchaseOrderWasViewed; use App\Events\PurchaseOrder\PurchaseOrderWasViewed;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Jobs\Vendor\CreatePurchaseOrderPdf;
use App\Models\PurchaseOrderInvitation; use App\Models\PurchaseOrderInvitation;
use App\Utils\Ninja; use App\Utils\Ninja;
use App\Utils\Traits\MakesDates; use App\Utils\Traits\MakesDates;

1
app/Http/Controllers/VendorPortal/PurchaseOrderController.php
View File

@ -23,7 +23,6 @@ use Illuminate\Support\Facades\Cache;
use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\Factory;
use App\Models\PurchaseOrderInvitation; use App\Models\PurchaseOrderInvitation;
use App\Events\Misc\InvitationWasViewed; use App\Events\Misc\InvitationWasViewed;
use App\Jobs\Vendor\CreatePurchaseOrderPdf;
use App\Events\PurchaseOrder\PurchaseOrderWasViewed; use App\Events\PurchaseOrder\PurchaseOrderWasViewed;
use App\Events\PurchaseOrder\PurchaseOrderWasAccepted; use App\Events\PurchaseOrder\PurchaseOrderWasAccepted;
use App\Http\Requests\VendorPortal\PurchaseOrders\ShowPurchaseOrderRequest; use App\Http\Requests\VendorPortal\PurchaseOrders\ShowPurchaseOrderRequest;

3
app/Http/Livewire/PdfSlot.php
View File

@ -13,7 +13,6 @@
namespace App\Http\Livewire; namespace App\Http\Livewire;
use App\Jobs\Invoice\CreateEInvoice; use App\Jobs\Invoice\CreateEInvoice;
use App\Jobs\Vendor\CreatePurchaseOrderPdf;
use App\Libraries\MultiDB; use App\Libraries\MultiDB;
use App\Models\CreditInvitation; use App\Models\CreditInvitation;
use App\Models\InvoiceInvitation; use App\Models\InvoiceInvitation;
@ -104,7 +103,7 @@ class PdfSlot extends Component
}, $file_name, $headers); }, $file_name, $headers);
} }
public function downloadEInvoice() public function downloadEInvoice()
{ {

1
app/Jobs/Vendor/CreatePurchaseOrderPdf.php vendored
View File

@ -35,6 +35,7 @@ use App\Services\PdfMaker\Design as PdfDesignModel;
use App\Services\PdfMaker\Design as PdfMakerDesign; use App\Services\PdfMaker\Design as PdfMakerDesign;
use App\Services\PdfMaker\PdfMaker as PdfMakerService; use App\Services\PdfMaker\PdfMaker as PdfMakerService;
/** @deprecated 26-10-2023 5.7.30x */
class CreatePurchaseOrderPdf implements ShouldQueue class CreatePurchaseOrderPdf implements ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, NumberFormatter, MakesInvoiceHtml, PdfMaker, MakesHash, PageNumbering; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, NumberFormatter, MakesInvoiceHtml, PdfMaker, MakesHash, PageNumbering;

2
app/Mail/Engine/PurchaseOrderEmailEngine.php
View File

@ -15,7 +15,6 @@ use App\Utils\Ninja;
use App\Utils\Number; use App\Utils\Number;
use App\Models\Vendor; use App\Models\Vendor;
use App\Models\Account; use App\Models\Account;
use App\Utils\HtmlEngine;
use App\Models\PurchaseOrder; use App\Models\PurchaseOrder;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use App\Utils\VendorHtmlEngine; use App\Utils\VendorHtmlEngine;
@ -23,7 +22,6 @@ use App\Jobs\Entity\CreateRawPdf;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\URL; use Illuminate\Support\Facades\URL;
use App\DataMapper\EmailTemplateDefaults; use App\DataMapper\EmailTemplateDefaults;
use App\Jobs\Vendor\CreatePurchaseOrderPdf;
class PurchaseOrderEmailEngine extends BaseEmailEngine class PurchaseOrderEmailEngine extends BaseEmailEngine
{ {

1
app/Models/BaseModel.php
View File

@ -13,7 +13,6 @@ namespace App\Models;
use App\Jobs\Entity\CreateRawPdf; use App\Jobs\Entity\CreateRawPdf;
use App\Jobs\Util\WebhookHandler; use App\Jobs\Util\WebhookHandler;
use App\Jobs\Vendor\CreatePurchaseOrderPdf;
use App\Models\Traits\Excludable; use App\Models\Traits\Excludable;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use App\Utils\Traits\UserSessionAttributes; use App\Utils\Traits\UserSessionAttributes;

4
app/Services/Email/EmailDefaults.php
View File

@ -14,13 +14,9 @@ namespace App\Services\Email;
use App\DataMapper\EmailTemplateDefaults; use App\DataMapper\EmailTemplateDefaults;
use App\Jobs\Entity\CreateRawPdf; use App\Jobs\Entity\CreateRawPdf;
use App\Jobs\Invoice\CreateUbl; use App\Jobs\Invoice\CreateUbl;
use App\Jobs\Vendor\CreatePurchaseOrderPdf;
use App\Models\Account; use App\Models\Account;
use App\Models\Credit;
use App\Models\Expense; use App\Models\Expense;
use App\Models\Invoice; use App\Models\Invoice;
use App\Models\PurchaseOrder;
use App\Models\Quote;
use App\Models\Task; use App\Models\Task;
use App\Utils\Ninja; use App\Utils\Ninja;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;

2
app/Services/PurchaseOrder/GetPurchaseOrderPdf.php
View File

@ -12,11 +12,9 @@
namespace App\Services\PurchaseOrder; namespace App\Services\PurchaseOrder;
use App\Jobs\Entity\CreateRawPdf; use App\Jobs\Entity\CreateRawPdf;
use App\Jobs\Vendor\CreatePurchaseOrderPdf;
use App\Models\PurchaseOrder; use App\Models\PurchaseOrder;
use App\Models\VendorContact; use App\Models\VendorContact;
use App\Services\AbstractService; use App\Services\AbstractService;
use Illuminate\Support\Facades\Storage;
class GetPurchaseOrderPdf extends AbstractService class GetPurchaseOrderPdf extends AbstractService
{ {