gitmedia/gruene-seele
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Warenwirtschaft: Review-Fix — Altdaten-PDFs zentral regenerieren (ensureFilesOnDisk)

Browse source 
document('combined') lief bei fehlender Alt-PDF ungeprüft in eine
PDFMerger-Exception (500); der Sammel-Druck prüfte nur den Lieferschein,
eine fehlende Rechnungs-PDF ließ den ganzen Batch platzen. Neue zentrale
InvoiceRepository::ensureFilesOnDisk() ersetzt den dreifach kopierten
Altdaten-Check (MailLogistic 2x, batchDocuments); Merge-/Response-Code im
OrderFulfillmentController zu mergedPdf()/pdfResponse() dedupliziert.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Kevin Adametz 2026-07-20 12:28:41 +00:00
parent 8ad0f65947
commit f28f4b4b68
5 changed files with 242 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

226
app/Repositories/InvoiceRepository.php
View file

@ -2,26 +2,28 @@
namespace App\Repositories;
use PDF;
use Storage;
use App\Models\Attribute;
use App\Services\Invoice;
use App\Libraries\InvoicePDF;
use App\Models\Attribute;
use App\Models\ShoppingOrder;
use App\Services\Invoice;
use App\Services\MyPDFMerger;
use App\Services\UserService;
use App\Repositories\BaseRepository;
class InvoiceRepository extends BaseRepository {
use PDF;
use Storage;
class InvoiceRepository extends BaseRepository
{
private $invoice_date;
private $invoice_number;
private $filename;
private $dir;
private $delivery_dir;
private $delivery_filename;
private $delivery_filename;
public function __construct(ShoppingOrder $model)
{
@ -30,10 +32,10 @@ class InvoiceRepository extends BaseRepository {
public function create($request = [])
{
//need invoice $data
// need invoice $data
$number = Invoice::getInvoiceNumber();
$this->invoice_date = isset($request['invoice_date']) ? $request['invoice_date'] : $this->model->created_at->format("d.m.Y");
$invoice_send_mail = isset($request['invoice_send_mail']) ? true: false;
$this->invoice_date = isset($request['invoice_date']) ? $request['invoice_date'] : $this->model->created_at->format('d.m.Y');
$invoice_send_mail = isset($request['invoice_send_mail']) ? true : false;
$this->invoice_number = Invoice::createInvoiceNumber($number, $this->invoice_date);
$this->dir = Invoice::getInvoiceStorageDir($this->invoice_date);
$this->filename = Invoice::makeInvoiceFilename($this->invoice_number);
@ -43,11 +45,11 @@ class InvoiceRepository extends BaseRepository {
$this->makePDF();
$invoice_file = [
'filename' => $this->filename,
'dir' => $this->dir,
'disk' => 'public',
'invoice_number' => $this->invoice_number,
'invoice_date' => $this->invoice_date,
'filename' => $this->filename,
'dir' => $this->dir,
'disk' => 'public',
'invoice_number' => $this->invoice_number,
'invoice_date' => $this->invoice_date,
];
$delivery_file = [
@ -63,21 +65,22 @@ class InvoiceRepository extends BaseRepository {
$this->model->save();
Invoice::makeNextInvoiceNumber();
if($invoice_send_mail){
Invoice::sendInvoiceMail($this->model);
if ($invoice_send_mail) {
Invoice::sendInvoiceMail($this->model);
}
return true;
}
public function update($request = []){
if(isset($this->model->invoice['filename'])){
public function update($request = [])
{
if (isset($this->model->invoice['filename'])) {
$this->invoice_date = isset($request['invoice_date']) ? $request['invoice_date'] : Invoice::getDate($this->model);
$invoice_send_mail = isset($request['invoice_send_mail']) ? true: false;
$invoice_send_mail = isset($request['invoice_send_mail']) ? true : false;
$this->invoice_number = Invoice::getNumber($this->model);
$this->dir = Invoice::getDir($this->model);
$this->filename = Invoice::getFilename($this->model);
$this->delivery_dir = Invoice::getDeliveryDir($this->model);
$this->delivery_filename = Invoice::getDeliveryFilename($this->model);
@ -103,140 +106,173 @@ class InvoiceRepository extends BaseRepository {
$this->model->invoice_number = $this->invoice_number;
$this->model->save();
if($invoice_send_mail){
if ($invoice_send_mail) {
Invoice::sendInvoiceMail($this->model);
}
return true;
}
return true;
}
return null;
}
private function makePDF(){
/**
* Altdaten-Reparatur an EINER Stelle (Review 20.07.2026): Rechnung und/oder
* Lieferschein fehlen auf der Platte, obwohl die DB-Metadaten existieren
* (z. B. Storage-Umzug). Regeneriert beide Dateien mit bestehender Nummer.
* Vorher war der Check dreifach kopiert (MailLogistic 2x, batchDocuments) und
* prüfte im Sammel-Druck nur den Lieferschein — eine fehlende Rechnungs-PDF
* ließ den ganzen Batch mit einer Exception platzen.
*
* @return bool true = beide Dateien liegen (ggf. nach Regeneration) auf der Platte
*/
public function ensureFilesOnDisk(): bool
{
if (! Invoice::isInvoice($this->model)) {
return false;
}
$invoicePath = Invoice::getDownloadPath($this->model);
$deliveryPath = Invoice::getDownloadPathDelivery($this->model);
if (! Storage::disk('public')->exists($invoicePath) || ! Storage::disk('public')->exists($deliveryPath)) {
$this->update([]);
}
return Storage::disk('public')->exists($invoicePath)
&& Storage::disk('public')->exists($deliveryPath);
}
private function makePDF()
{
$data = [
'shopping_order' => $this->model,
'invoice_date' => $this->invoice_date,
'invoice_number' => $this->invoice_number,
];
if($this->model->auth_user_id){
if ($this->model->auth_user_id) {
UserService::checkUserTaxShippingCountry($this->model->auth_user, $this->model->country_id);
$data = array_merge($data, UserService::getYardInfo());
}
}
$data['delivery_items'] = $this->prepairForDelivery();
if(!Storage::disk('public')->exists( $this->dir )){
Storage::disk('public')->makeDirectory($this->dir); //creates directory
if (! Storage::disk('public')->exists($this->dir)) {
Storage::disk('public')->makeDirectory($this->dir); // creates directory
}
if(!Storage::disk('public')->exists( $this->delivery_dir )){
Storage::disk('public')->makeDirectory($this->delivery_dir); //creates directory
if (! Storage::disk('public')->exists($this->delivery_dir)) {
Storage::disk('public')->makeDirectory($this->delivery_dir); // creates directory
}
$path = Storage::disk('public')->path('');
$pdf_file = new InvoicePDF('pdf.invoice');
$pdf_file->create($data, $this->filename, 'save', $path.$this->dir);
$pdfMerger = new MyPDFMerger();
$pdfMerger = new MyPDFMerger;
$pdfMerger->addPDF($path.$this->dir.$this->filename);
$file = $pdfMerger->myMerge('string', $this->filename, 'template_invoice_de');
Storage::disk('public')->put($this->dir.$this->filename, $file);
$pdf_file = new InvoicePDF('pdf.delivery');
$pdf_file->create($data, $this->delivery_filename, 'save', $path.$this->delivery_dir);
$pdfMerger = new MyPDFMerger();
$pdfMerger = new MyPDFMerger;
$pdfMerger->addPDF($path.$this->delivery_dir.$this->delivery_filename);
$file = $pdfMerger->myMerge('string', $this->delivery_filename, 'template_delivery_de');
Storage::disk('public')->put($this->delivery_dir.$this->delivery_filename, $file);
}
//sort white label products
private function prepairForDelivery(){
// sort white label products
private function prepairForDelivery()
{
$shopping_order = $this->model;
$wl_items = [];
$items = [];
$counter = 1;
$count = 10000;
foreach($shopping_order->shopping_order_items as $shopping_order_item){
foreach ($shopping_order->shopping_order_items as $shopping_order_item) {
$labels = [];
$sorter = 0;
if($shopping_order_item->product->whitelabel){
if ($shopping_order_item->product->whitelabel) {
//get white label default etikett (s)
//ist ausschlaggebend für die etikettierung, ob 1 oder mehr etiketten
if($shopping_order_item->product->whitelabel_images){
foreach($shopping_order_item->product->whitelabel_images as $whitelabel_image){
// get white label default etikett (s)
// ist ausschlaggebend für die etikettierung, ob 1 oder mehr etiketten
if ($shopping_order_item->product->whitelabel_images) {
foreach ($shopping_order_item->product->whitelabel_images as $whitelabel_image) {
$labels[] = $whitelabel_image;
}
}
//has white label user etikett
if($shopping_order->auth_user){
// has white label user etikett
if ($shopping_order->auth_user) {
$whitelabel_product = $shopping_order->auth_user->whitelabel_products()->where('product_id', '=', $shopping_order_item->product->id)->first();
if($whitelabel_product && $whitelabel_product->whitelabel_images){
foreach($whitelabel_product->whitelabel_images as $whitelabel_image){
if($whitelabel_image->attributes && is_array($whitelabel_image->attributes)){
foreach($labels as $key => $label){
foreach($whitelabel_image->attributes as $attribute){
if(in_array($attribute, $label->attributes)){
//found and overwrite
if(!$this->model->user_white_label){
$this->model->user_white_label = true;
$this->model->save();
}
$labels[$key] = $whitelabel_image;
if ($whitelabel_product && $whitelabel_product->whitelabel_images) {
foreach ($whitelabel_product->whitelabel_images as $whitelabel_image) {
if ($whitelabel_image->attributes && is_array($whitelabel_image->attributes)) {
foreach ($labels as $key => $label) {
foreach ($whitelabel_image->attributes as $attribute) {
if (in_array($attribute, $label->attributes)) {
// found and overwrite
if (! $this->model->user_white_label) {
$this->model->user_white_label = true;
$this->model->save();
}
$labels[$key] = $whitelabel_image;
}
}
}
}
}
}
}
foreach($labels as $key=>$label){
//label hat attribue
$varinats = [];
if($label->attributes && is_array($label->attributes)){
foreach($label->attributes as $attribute){
if($attribute = Attribute::find($attribute)){
if(!isset($varinats[$attribute->value])){
foreach ($labels as $key => $label) {
// label hat attribue
$varinats = [];
if ($label->attributes && is_array($label->attributes)) {
foreach ($label->attributes as $attribute) {
if ($attribute = Attribute::find($attribute)) {
if (! isset($varinats[$attribute->value])) {
$temp = explode('#', $attribute->value);
$sorter = $temp[1] > $sorter ? $temp[1] : $sorter;
$label->varinat = [
'key' => $attribute->value,
'id' => $attribute->id,
'vol' => (float) $temp[0],
'size' => (float) $temp[1],
'name' => $label->product_id ? 'Standard' : $attribute->name,
];
}
}
}
}else{
//sonst auf standard zurückgreifen
if($shopping_order_item->product->attribute_variants){
foreach($shopping_order_item->product->attribute_variants as $attribute_variant){
if(!isset($varinats[$attribute_variant->attribute->value])){
$temp = explode('#', $attribute_variant->attribute->value);
$sorter = $temp[1] > $sorter ? $temp[1] : $sorter;
$label->varinat = [
'key' => $attribute_variant->attribute->value,
'id' => $attribute_variant->attribute->id,
'vol' => (float) $temp[0],
'size' => (float) $temp[1],
'name' => 'Standard',
];
'key' => $attribute->value,
'id' => $attribute->id,
'vol' => (float) $temp[0],
'size' => (float) $temp[1],
'name' => $label->product_id ? 'Standard' : $attribute->name,
];
}
}
}
}
} else {
// sonst auf standard zurückgreifen
if ($shopping_order_item->product->attribute_variants) {
foreach ($shopping_order_item->product->attribute_variants as $attribute_variant) {
if (! isset($varinats[$attribute_variant->attribute->value])) {
$temp = explode('#', $attribute_variant->attribute->value);
$sorter = $temp[1] > $sorter ? $temp[1] : $sorter;
$label->varinat = [
'key' => $attribute_variant->attribute->value,
'id' => $attribute_variant->attribute->id,
'vol' => (float) $temp[0],
'size' => (float) $temp[1],
'name' => 'Standard',
];
}
}
}
}
}
//sorten of white label products
// sorten of white label products
$sorter = intval((float) $sorter * 100 + $counter++);
$shopping_order_item->labels = $labels;
$wl_items[$sorter] = $shopping_order_item;
}else{
$wl_items[$sorter] = $shopping_order_item;
} else {
$items[$count++] = $shopping_order_item;
}
}
//kleine zuerst
// kleine zuerst
ksort($wl_items);
return array_merge($wl_items, $items);
}
}
}