deplay phase 1
This commit is contained in:
parent
e3dc1afd8e
commit
5a7478907e
68 changed files with 2831 additions and 818 deletions
|
|
@ -0,0 +1,30 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Phase 2 — Schritt 1: customer → contacts
|
||||
*
|
||||
* Benennt die Tabelle um. Alle Foreign Keys, die auf `customer` zeigen,
|
||||
* werden von MySQL automatisch mitgezogen (ON DELETE / ON UPDATE bleiben).
|
||||
*
|
||||
* Rollback: benennt `contacts` zurück in `customer`.
|
||||
*
|
||||
* HINWEIS: Vor dem Deployment sicherstellen, dass die App-Models
|
||||
* bereits $table = 'contacts' verwenden, ODER die Migration vor dem
|
||||
* Code-Deployment ausführen und im Notfall zurückrollen.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
// MySQL: RENAME TABLE ist ein atomarer DDL-Befehl
|
||||
DB::statement('RENAME TABLE `customer` TO `contacts`');
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
DB::statement('RENAME TABLE `contacts` TO `customer`');
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Phase 2 — Schritt 2: lead → inquiries
|
||||
*
|
||||
* Benennt die Tabelle um. Abhängige Tabellen:
|
||||
* - lead_mails (lead_id FK → wird mitgezogen)
|
||||
* - lead_files (lead_id FK → wird mitgezogen)
|
||||
* - lead_notices (lead_id FK → wird mitgezogen)
|
||||
* - lead_participant (lead_id FK → wird mitgezogen)
|
||||
* - booking (lead_id FK → wird mitgezogen)
|
||||
* - customer_mails (lead_id FK → wird mitgezogen)
|
||||
*
|
||||
* Rollback: benennt `inquiries` zurück in `lead`.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
DB::statement('RENAME TABLE `lead` TO `inquiries`');
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
DB::statement('RENAME TABLE `inquiries` TO `lead`');
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Phase 2 — Schritt 3: booking.lead_id → booking.inquiry_id
|
||||
*
|
||||
* Benennt die Spalte und den Foreign Key um.
|
||||
* inquiry_id bleibt nullable (Direktbuchungen ohne Anfrage sind erlaubt).
|
||||
*
|
||||
* Rollback: benennt inquiry_id zurück in lead_id.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
// Foreign Key muss zuerst gedroppt werden, bevor die Spalte umbenannt wird
|
||||
Schema::table('booking', function (Blueprint $table) {
|
||||
// Drop existing FK (Name aus DB-Schema)
|
||||
$table->dropForeign('booking_lead_id_lead_id');
|
||||
});
|
||||
|
||||
DB::statement('ALTER TABLE `booking` RENAME COLUMN `lead_id` TO `inquiry_id`');
|
||||
|
||||
Schema::table('booking', function (Blueprint $table) {
|
||||
// Neuen FK auf umbenannte Tabelle setzen
|
||||
$table->foreign('inquiry_id', 'booking_inquiry_id_inquiries_id')
|
||||
->references('id')->on('inquiries')
|
||||
->onDelete('no action')
|
||||
->onUpdate('no action');
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('booking', function (Blueprint $table) {
|
||||
$table->dropForeign('booking_inquiry_id_inquiries_id');
|
||||
});
|
||||
|
||||
DB::statement('ALTER TABLE `booking` RENAME COLUMN `inquiry_id` TO `lead_id`');
|
||||
|
||||
Schema::table('booking', function (Blueprint $table) {
|
||||
$table->foreign('lead_id', 'booking_lead_id_lead_id')
|
||||
->references('id')->on('lead')
|
||||
->onDelete('no action')
|
||||
->onUpdate('no action');
|
||||
});
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,123 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Phase 3 — Schritt 1: Neue participants-Tabelle erstellen und Daten migrieren
|
||||
*
|
||||
* Konsolidiert lead_participant + participant in eine einheitliche Tabelle.
|
||||
* Die alten Tabellen bleiben zunächst erhalten (werden in Phase 3 Schritt 2
|
||||
* nach Abschluss der Tests gedroppt).
|
||||
*
|
||||
* Neue Felder:
|
||||
* - inquiry_id : FK auf inquiries (war: lead_participant.lead_id)
|
||||
* - booking_id : FK auf booking (war: participant.booking_id)
|
||||
* - participant_pass : nur bei Buchungs-Teilnehmern relevant
|
||||
* - participant_storno: nur bei Buchungs-Teilnehmern relevant
|
||||
* - is_lead_contact : markiert den Hauptkontakt aus lead.participant_name
|
||||
*
|
||||
* Rollback: droppt die neue Tabelle (alte Tabellen bleiben unverändert).
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('participants_unified', function (Blueprint $table) {
|
||||
$table->id();
|
||||
|
||||
// Kontext-FKs — genau einer ist gesetzt, der andere NULL
|
||||
$table->unsignedBigInteger('inquiry_id')->nullable();
|
||||
$table->unsignedBigInteger('booking_id')->nullable();
|
||||
|
||||
// Teilnehmerdaten
|
||||
$table->string('participant_name')->nullable();
|
||||
$table->string('participant_firstname')->nullable();
|
||||
$table->date('participant_birthdate')->nullable();
|
||||
$table->unsignedBigInteger('participant_salutation_id')->nullable();
|
||||
$table->boolean('participant_child')->default(false);
|
||||
$table->integer('nationality_id')->nullable();
|
||||
|
||||
// Nur bei Buchungs-Teilnehmern
|
||||
$table->boolean('participant_pass')->default(false);
|
||||
$table->boolean('participant_storno')->default(false);
|
||||
|
||||
// Markiert den Hauptreisenden aus lead.participant_name
|
||||
$table->boolean('is_lead_contact')->default(false);
|
||||
|
||||
$table->timestamps();
|
||||
|
||||
$table->index('inquiry_id');
|
||||
$table->index('booking_id');
|
||||
|
||||
$table->foreign('inquiry_id', 'pu_inquiry_id_fk')
|
||||
->references('id')->on('inquiries')
|
||||
->onDelete('cascade');
|
||||
|
||||
$table->foreign('booking_id', 'pu_booking_id_fk')
|
||||
->references('id')->on('booking')
|
||||
->onDelete('cascade');
|
||||
|
||||
$table->foreign('participant_salutation_id', 'pu_salutation_id_fk')
|
||||
->references('id')->on('salutation')
|
||||
->onDelete('set null');
|
||||
});
|
||||
|
||||
// ── Daten migrieren ─────────────────────────────────────────────────
|
||||
|
||||
// 1. Aus lead_participant → inquiry_id gesetzt
|
||||
DB::statement("
|
||||
INSERT INTO participants_unified
|
||||
(inquiry_id, booking_id, participant_name, participant_firstname,
|
||||
participant_birthdate, participant_salutation_id, participant_child,
|
||||
nationality_id, is_lead_contact, created_at, updated_at)
|
||||
SELECT
|
||||
lead_id, NULL,
|
||||
participant_name, participant_firstname,
|
||||
participant_birthdate, participant_salutation_id, participant_child,
|
||||
nationality_id, 0,
|
||||
NOW(), NOW()
|
||||
FROM lead_participant
|
||||
");
|
||||
|
||||
// 2. Aus lead.participant_name → Hauptreisende-Datensätze (is_lead_contact = 1)
|
||||
DB::statement("
|
||||
INSERT INTO participants_unified
|
||||
(inquiry_id, booking_id, participant_name, participant_firstname,
|
||||
participant_birthdate, participant_salutation_id, participant_child,
|
||||
nationality_id, is_lead_contact, created_at, updated_at)
|
||||
SELECT
|
||||
id, NULL,
|
||||
participant_name, participant_firstname,
|
||||
participant_birthdate, participant_salutation_id, 0,
|
||||
NULL, 1,
|
||||
NOW(), NOW()
|
||||
FROM inquiries
|
||||
WHERE participant_name IS NOT NULL
|
||||
AND participant_name != ''
|
||||
");
|
||||
|
||||
// 3. Aus participant → booking_id gesetzt
|
||||
DB::statement("
|
||||
INSERT INTO participants_unified
|
||||
(inquiry_id, booking_id, participant_name, participant_firstname,
|
||||
participant_birthdate, participant_salutation_id, participant_child,
|
||||
nationality_id, participant_pass, participant_storno,
|
||||
is_lead_contact, created_at, updated_at)
|
||||
SELECT
|
||||
NULL, booking_id,
|
||||
participant_name, participant_firstname,
|
||||
participant_birthdate, participant_salutation_id, participant_child,
|
||||
nationality_id, participant_pass, participant_storno,
|
||||
0, NOW(), NOW()
|
||||
FROM participant
|
||||
");
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('participants_unified');
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Phase 3 — Schritt 2: Alte Participant-Tabellen droppen
|
||||
*
|
||||
* Voraussetzungen (vor Ausführung prüfen!):
|
||||
* 1. Phase 3 Schritt 1 (participants_unified) läuft stabil in Produktion
|
||||
* 2. Alle Queries / Repositories auf participants_unified umgestellt
|
||||
* 3. Datenmigration durch Vergleich der Zeilenzahlen geprüft:
|
||||
* SELECT COUNT(*) FROM lead_participant;
|
||||
* SELECT COUNT(*) FROM participant;
|
||||
* SELECT COUNT(*) FROM participants_unified WHERE inquiry_id IS NOT NULL;
|
||||
* SELECT COUNT(*) FROM participants_unified WHERE booking_id IS NOT NULL;
|
||||
*
|
||||
* Rollback: NICHT möglich ohne Datenbank-Backup — erst ausführen wenn sicher!
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
// FKs in lead_participant zeigen auf lead (jetzt inquiries) — werden mitgedroppt
|
||||
Schema::dropIfExists('lead_participant');
|
||||
|
||||
// FKs in participant zeigen auf booking — werden mitgedroppt
|
||||
Schema::dropIfExists('participant');
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
// Bewusst leer: das Droppen von Produktionsdaten ist irreversibel.
|
||||
// Für einen vollständigen Rollback bitte Datenbank-Backup einspielen.
|
||||
throw new \RuntimeException(
|
||||
'Phase 3 Schritt 2 kann nicht automatisch zurückgerollt werden. ' .
|
||||
'Bitte Datenbank-Backup einspielen.'
|
||||
);
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,146 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Phase 4 — Schritt 1a: communications-Tabelle erstellen und Daten migrieren
|
||||
*
|
||||
* Konsolidiert lead_mails + customer_mails in eine einheitliche Tabelle.
|
||||
* Die alten Tabellen bleiben zunächst erhalten (werden in Phase 4 Schritt 2 gedroppt).
|
||||
*
|
||||
* Voraussetzung: Phase 2 muss bereits ausgeführt worden sein
|
||||
* (lead → inquiries, customer → contacts).
|
||||
*
|
||||
* Besonderheiten:
|
||||
* - reply_id ist selbst-referenziell; nach beiden INSERTs wird ein Remapping
|
||||
* der alten IDs auf die neuen IDs durchgeführt (via legacy_source + legacy_id).
|
||||
* - travel_country_id existiert nur in customer_mails → nullable, NULL für lead_mails.
|
||||
* - customer_mails hat sowohl lead_id als auch booking_id → beide werden übernommen.
|
||||
*
|
||||
* Rollback: droppt die neue Tabelle (alte Tabellen bleiben unverändert).
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('communications', function (Blueprint $table) {
|
||||
$table->id();
|
||||
|
||||
// Kontext-FKs — bei customer_mails können beide gesetzt sein
|
||||
$table->unsignedBigInteger('inquiry_id')->nullable();
|
||||
$table->unsignedBigInteger('booking_id')->nullable();
|
||||
$table->unsignedBigInteger('contact_id')->nullable();
|
||||
|
||||
// Reply-Chain — kein FK-Constraint (cross-table Remapping)
|
||||
$table->unsignedBigInteger('reply_id')->nullable();
|
||||
|
||||
// Herkunft für Remapping und spätere Analyse
|
||||
$table->enum('legacy_source', ['lead_mail', 'customer_mail']);
|
||||
$table->unsignedBigInteger('legacy_id');
|
||||
|
||||
// Mail-Felder (identisch in beiden Quell-Tabellen)
|
||||
$table->boolean('is_answer')->default(false);
|
||||
$table->string('email')->nullable();
|
||||
$table->text('recipient')->nullable();
|
||||
$table->text('cc')->nullable();
|
||||
$table->text('bcc')->nullable();
|
||||
$table->string('subject')->nullable();
|
||||
$table->text('message')->nullable();
|
||||
$table->boolean('dir')->default(false);
|
||||
$table->unsignedBigInteger('subdir')->nullable();
|
||||
|
||||
// Nur in customer_mails vorhanden
|
||||
$table->unsignedBigInteger('travel_country_id')->nullable();
|
||||
|
||||
$table->boolean('draft')->default(false);
|
||||
$table->boolean('important')->default(false);
|
||||
$table->boolean('send')->default(false);
|
||||
$table->boolean('fail')->default(false);
|
||||
$table->text('error')->nullable();
|
||||
$table->text('forward')->nullable();
|
||||
|
||||
$table->dateTime('sent_at')->nullable();
|
||||
$table->dateTime('scheduled_at')->nullable();
|
||||
$table->dateTime('delivered_at')->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
|
||||
$table->index('inquiry_id');
|
||||
$table->index('booking_id');
|
||||
$table->index('contact_id');
|
||||
$table->index('reply_id');
|
||||
$table->index(['legacy_source', 'legacy_id'], 'comm_legacy_idx');
|
||||
|
||||
$table->foreign('inquiry_id', 'comm_inquiry_id_fk')
|
||||
->references('id')->on('inquiries')
|
||||
->onDelete('cascade');
|
||||
|
||||
$table->foreign('booking_id', 'comm_booking_id_fk')
|
||||
->references('id')->on('booking')
|
||||
->onDelete('cascade');
|
||||
|
||||
$table->foreign('contact_id', 'comm_contact_id_fk')
|
||||
->references('id')->on('contacts')
|
||||
->onDelete('set null');
|
||||
});
|
||||
|
||||
// ── Daten migrieren ─────────────────────────────────────────────────
|
||||
|
||||
// 1. Aus lead_mails → inquiry_id gesetzt
|
||||
DB::statement("
|
||||
INSERT INTO communications
|
||||
(inquiry_id, booking_id, contact_id, is_answer, reply_id,
|
||||
legacy_source, legacy_id,
|
||||
email, recipient, cc, bcc, subject, message,
|
||||
dir, subdir, travel_country_id,
|
||||
draft, important, send, fail, error, forward,
|
||||
sent_at, scheduled_at, delivered_at, created_at, updated_at)
|
||||
SELECT
|
||||
lead_id, NULL, customer_id, is_answer, reply_id,
|
||||
'lead_mail', id,
|
||||
email, recipient, cc, bcc, subject, message,
|
||||
dir, subdir, NULL,
|
||||
draft, important, send, fail, error, forward,
|
||||
sent_at, scheduled_at, delivered_at, created_at, updated_at
|
||||
FROM lead_mails
|
||||
");
|
||||
|
||||
// 2. Aus customer_mails → booking_id gesetzt (kann zusätzlich lead_id haben)
|
||||
DB::statement("
|
||||
INSERT INTO communications
|
||||
(inquiry_id, booking_id, contact_id, is_answer, reply_id,
|
||||
legacy_source, legacy_id,
|
||||
email, recipient, cc, bcc, subject, message,
|
||||
dir, subdir, travel_country_id,
|
||||
draft, important, send, fail, error, forward,
|
||||
sent_at, scheduled_at, delivered_at, created_at, updated_at)
|
||||
SELECT
|
||||
lead_id, booking_id, customer_id, is_answer, reply_id,
|
||||
'customer_mail', id,
|
||||
email, recipient, cc, bcc, subject, message,
|
||||
dir, subdir, travel_country_id,
|
||||
draft, important, send, fail, error, forward,
|
||||
sent_at, scheduled_at, delivered_at, created_at, updated_at
|
||||
FROM customer_mails
|
||||
");
|
||||
|
||||
// 3. Reply-IDs remappen: alte source-table-IDs auf neue communications-IDs umstellen
|
||||
// Funktioniert weil reply_id immer auf eine Mail derselben Quell-Tabelle zeigt.
|
||||
DB::statement("
|
||||
UPDATE communications c1
|
||||
INNER JOIN communications c2
|
||||
ON c1.legacy_source = c2.legacy_source
|
||||
AND c2.legacy_id = c1.reply_id
|
||||
SET c1.reply_id = c2.id
|
||||
WHERE c1.reply_id IS NOT NULL
|
||||
");
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('communications');
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Phase 4 — Schritt 1b: notices-Tabelle erstellen und Daten migrieren
|
||||
*
|
||||
* Konsolidiert lead_notices + booking_notices in eine einheitliche Tabelle.
|
||||
* Die alten Tabellen bleiben zunächst erhalten (werden in Phase 4 Schritt 2 gedroppt).
|
||||
*
|
||||
* Voraussetzung: Phase 2 muss bereits ausgeführt worden sein
|
||||
* (lead → inquiries, customer → contacts).
|
||||
*
|
||||
* Struktur: identisch in beiden Quell-Tabellen — nur inquiry_id vs. booking_id.
|
||||
*
|
||||
* Rollback: droppt die neue Tabelle (alte Tabellen bleiben unverändert).
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('notices', function (Blueprint $table) {
|
||||
$table->id();
|
||||
|
||||
// Kontext-FKs — genau einer ist gesetzt
|
||||
$table->unsignedBigInteger('inquiry_id')->nullable();
|
||||
$table->unsignedBigInteger('booking_id')->nullable();
|
||||
|
||||
// Benutzer-Referenzen (integer wie in den Quell-Tabellen)
|
||||
$table->unsignedInteger('from_user_id');
|
||||
$table->unsignedInteger('to_user_id')->nullable();
|
||||
|
||||
$table->text('message')->nullable();
|
||||
$table->boolean('show')->default(false);
|
||||
$table->boolean('important')->default(false);
|
||||
$table->dateTime('edit_at')->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
|
||||
$table->index('inquiry_id');
|
||||
$table->index('booking_id');
|
||||
$table->index('from_user_id');
|
||||
$table->index('to_user_id');
|
||||
|
||||
$table->foreign('inquiry_id', 'notices_inquiry_id_fk')
|
||||
->references('id')->on('inquiries')
|
||||
->onDelete('cascade');
|
||||
|
||||
$table->foreign('booking_id', 'notices_booking_id_fk')
|
||||
->references('id')->on('booking')
|
||||
->onDelete('cascade');
|
||||
|
||||
$table->foreign('from_user_id', 'notices_from_user_id_fk')
|
||||
->references('id')->on('users')
|
||||
->onDelete('cascade');
|
||||
|
||||
$table->foreign('to_user_id', 'notices_to_user_id_fk')
|
||||
->references('id')->on('users')
|
||||
->onDelete('cascade');
|
||||
});
|
||||
|
||||
// ── Daten migrieren ─────────────────────────────────────────────────
|
||||
|
||||
// 1. Aus lead_notices → inquiry_id gesetzt
|
||||
DB::statement("
|
||||
INSERT INTO notices
|
||||
(inquiry_id, booking_id, from_user_id, to_user_id,
|
||||
message, show, important, edit_at, created_at, updated_at)
|
||||
SELECT
|
||||
lead_id, NULL, from_user_id, to_user_id,
|
||||
message, show, important, edit_at, created_at, updated_at
|
||||
FROM lead_notices
|
||||
");
|
||||
|
||||
// 2. Aus booking_notices → booking_id gesetzt
|
||||
DB::statement("
|
||||
INSERT INTO notices
|
||||
(inquiry_id, booking_id, from_user_id, to_user_id,
|
||||
message, show, important, edit_at, created_at, updated_at)
|
||||
SELECT
|
||||
NULL, booking_id, from_user_id, to_user_id,
|
||||
message, show, important, edit_at, created_at, updated_at
|
||||
FROM booking_notices
|
||||
");
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('notices');
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,118 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
/**
|
||||
* Phase 4 — Schritt 1c: attachments-Tabelle erstellen und Daten migrieren
|
||||
*
|
||||
* Konsolidiert lead_files + booking_files in eine einheitliche Tabelle.
|
||||
* Die alten Tabellen bleiben zunächst erhalten (werden in Phase 4 Schritt 2 gedroppt).
|
||||
*
|
||||
* Voraussetzung: Phase 2 + Phase 4a (communications) müssen bereits ausgeführt sein,
|
||||
* da communication_id auf die neue communications-Tabelle verweist.
|
||||
*
|
||||
* Besonderheiten:
|
||||
* - lead_files hat lead_mail_id (FK auf lead_mails) → wird auf communication_id gemappt
|
||||
* - booking_files hat keinen Mail-Bezug → communication_id bleibt NULL
|
||||
* - Spalte `mine` in den Quell-Tabellen ist ein Tippfehler für mime → hier: mime_type
|
||||
*
|
||||
* Rollback: droppt die neue Tabelle (alte Tabellen bleiben unverändert).
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('attachments', function (Blueprint $table) {
|
||||
$table->id();
|
||||
|
||||
// Kontext-FKs
|
||||
$table->unsignedBigInteger('inquiry_id')->nullable();
|
||||
$table->unsignedBigInteger('booking_id')->nullable();
|
||||
|
||||
// Verknüpfung zur dazugehörigen Mail (nur bei Anfrage-Anhängen)
|
||||
$table->unsignedBigInteger('communication_id')->nullable();
|
||||
|
||||
// Datei-Metadaten
|
||||
$table->string('identifier')->nullable();
|
||||
$table->string('filename');
|
||||
$table->string('dir')->nullable();
|
||||
$table->string('original_name')->nullable();
|
||||
$table->string('ext')->nullable();
|
||||
$table->string('mime_type')->nullable();
|
||||
$table->unsignedInteger('size')->nullable();
|
||||
|
||||
// Herkunft für spätere Analyse / Rollback
|
||||
$table->enum('legacy_source', ['lead_file', 'booking_file']);
|
||||
$table->unsignedBigInteger('legacy_id');
|
||||
|
||||
$table->timestamps();
|
||||
|
||||
$table->index('inquiry_id');
|
||||
$table->index('booking_id');
|
||||
$table->index('communication_id');
|
||||
$table->index('identifier', 'attachments_identifier_idx');
|
||||
$table->index(['legacy_source', 'legacy_id'], 'attachments_legacy_idx');
|
||||
|
||||
$table->foreign('inquiry_id', 'att_inquiry_id_fk')
|
||||
->references('id')->on('inquiries')
|
||||
->onDelete('cascade');
|
||||
|
||||
$table->foreign('booking_id', 'att_booking_id_fk')
|
||||
->references('id')->on('booking')
|
||||
->onDelete('cascade');
|
||||
|
||||
$table->foreign('communication_id', 'att_communication_id_fk')
|
||||
->references('id')->on('communications')
|
||||
->onDelete('set null');
|
||||
});
|
||||
|
||||
// ── Daten migrieren ─────────────────────────────────────────────────
|
||||
|
||||
// 1. Aus lead_files → inquiry_id gesetzt; communication_id wird unten gesetzt
|
||||
DB::statement("
|
||||
INSERT INTO attachments
|
||||
(inquiry_id, booking_id, communication_id,
|
||||
identifier, filename, dir, original_name, ext, mime_type, size,
|
||||
legacy_source, legacy_id, created_at, updated_at)
|
||||
SELECT
|
||||
lead_id, NULL, NULL,
|
||||
identifier, filename, dir, original_name, ext, mine, size,
|
||||
'lead_file', id, created_at, updated_at
|
||||
FROM lead_files
|
||||
");
|
||||
|
||||
// 2. Aus booking_files → booking_id gesetzt
|
||||
DB::statement("
|
||||
INSERT INTO attachments
|
||||
(inquiry_id, booking_id, communication_id,
|
||||
identifier, filename, dir, original_name, ext, mime_type, size,
|
||||
legacy_source, legacy_id, created_at, updated_at)
|
||||
SELECT
|
||||
NULL, booking_id, NULL,
|
||||
identifier, filename, dir, original_name, ext, mine, size,
|
||||
'booking_file', id, created_at, updated_at
|
||||
FROM booking_files
|
||||
");
|
||||
|
||||
// 3. communication_id für lead_files setzen (sofern lead_mail_id gesetzt war)
|
||||
// Nutzt legacy_source + legacy_id der communications-Tabelle.
|
||||
DB::statement("
|
||||
UPDATE attachments a
|
||||
INNER JOIN lead_files lf ON lf.id = a.legacy_id
|
||||
INNER JOIN communications c
|
||||
ON c.legacy_source = 'lead_mail'
|
||||
AND c.legacy_id = lf.lead_mail_id
|
||||
SET a.communication_id = c.id
|
||||
WHERE a.legacy_source = 'lead_file'
|
||||
AND lf.lead_mail_id IS NOT NULL
|
||||
");
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('attachments');
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Phase 4 — Schritt 2a: Alte Mail-Tabellen droppen
|
||||
*
|
||||
* Voraussetzungen (vor Ausführung prüfen!):
|
||||
* 1. Phase 4 Schritt 1a (communications) läuft stabil in Produktion
|
||||
* 2. Alle Queries / Repositories auf communications umgestellt
|
||||
* 3. Datenmigration geprüft:
|
||||
* SELECT COUNT(*) FROM lead_mails;
|
||||
* SELECT COUNT(*) FROM customer_mails;
|
||||
* SELECT COUNT(*) FROM communications WHERE legacy_source = 'lead_mail';
|
||||
* SELECT COUNT(*) FROM communications WHERE legacy_source = 'customer_mail';
|
||||
* 4. Reply-Chain korrekt: spot-check einiger Datensätze mit reply_id
|
||||
*
|
||||
* Rollback: NICHT möglich ohne Datenbank-Backup.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
// lead_files referenziert lead_mails → erst lead_files droppen oder FK bereits weg
|
||||
// (lead_files wird in 400005 gedroppt — daher hier prüfen ob noch FK vorhanden)
|
||||
// Sicherheitshalber: lead_files.lead_mail_id FK zuerst entfernen falls noch vorhanden
|
||||
if (Schema::hasTable('lead_files') && Schema::hasColumn('lead_files', 'lead_mail_id')) {
|
||||
Schema::table('lead_files', function ($table) {
|
||||
$table->dropForeign('lead_files_lead_mail_id_foreign');
|
||||
});
|
||||
}
|
||||
|
||||
Schema::dropIfExists('lead_mails');
|
||||
Schema::dropIfExists('customer_mails');
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
throw new \RuntimeException(
|
||||
'Phase 4 Schritt 2a kann nicht automatisch zurückgerollt werden. ' .
|
||||
'Bitte Datenbank-Backup einspielen.'
|
||||
);
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Phase 4 — Schritt 2b: Alte Notiz-Tabellen droppen
|
||||
*
|
||||
* Voraussetzungen (vor Ausführung prüfen!):
|
||||
* 1. Phase 4 Schritt 1b (notices) läuft stabil in Produktion
|
||||
* 2. Alle Queries / Repositories auf notices umgestellt
|
||||
* 3. Datenmigration geprüft:
|
||||
* SELECT COUNT(*) FROM lead_notices;
|
||||
* SELECT COUNT(*) FROM booking_notices;
|
||||
* SELECT COUNT(*) FROM notices WHERE inquiry_id IS NOT NULL;
|
||||
* SELECT COUNT(*) FROM notices WHERE booking_id IS NOT NULL;
|
||||
*
|
||||
* Rollback: NICHT möglich ohne Datenbank-Backup.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::dropIfExists('lead_notices');
|
||||
Schema::dropIfExists('booking_notices');
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
throw new \RuntimeException(
|
||||
'Phase 4 Schritt 2b kann nicht automatisch zurückgerollt werden. ' .
|
||||
'Bitte Datenbank-Backup einspielen.'
|
||||
);
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Phase 4 — Schritt 2c: Alte Datei-Tabellen droppen
|
||||
*
|
||||
* Voraussetzungen (vor Ausführung prüfen!):
|
||||
* 1. Phase 4 Schritt 1c (attachments) läuft stabil in Produktion
|
||||
* 2. Alle Queries / Repositories auf attachments umgestellt
|
||||
* 3. Datenmigration geprüft:
|
||||
* SELECT COUNT(*) FROM lead_files;
|
||||
* SELECT COUNT(*) FROM booking_files;
|
||||
* SELECT COUNT(*) FROM attachments WHERE legacy_source = 'lead_file';
|
||||
* SELECT COUNT(*) FROM attachments WHERE legacy_source = 'booking_file';
|
||||
* 4. communication_id Verknüpfung geprüft:
|
||||
* SELECT COUNT(*) FROM lead_files WHERE lead_mail_id IS NOT NULL;
|
||||
* SELECT COUNT(*) FROM attachments WHERE legacy_source = 'lead_file' AND communication_id IS NOT NULL;
|
||||
* -- Beide Zahlen sollten übereinstimmen
|
||||
*
|
||||
* Rollback: NICHT möglich ohne Datenbank-Backup.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::dropIfExists('lead_files');
|
||||
Schema::dropIfExists('booking_files');
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
throw new \RuntimeException(
|
||||
'Phase 4 Schritt 2c kann nicht automatisch zurückgerollt werden. ' .
|
||||
'Bitte Datenbank-Backup einspielen.'
|
||||
);
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Modul 6 — Angebote: Ticket A1 / Migration 1 von 7.
|
||||
*
|
||||
* Erstellt die Haupttabelle `offers`. Jeder Datensatz hier ist ein
|
||||
* logisches Angebot (eine Angebotsnummer). Die tatsächlichen Inhalte
|
||||
* (Texte, Positionen, Preise, PDF, Dokumente) liegen versionsweise in
|
||||
* `offer_versions`. Ab dem ersten Versand erzeugt jede Änderung eine
|
||||
* neue Version (Entscheidung 17.1 des Entwicklungsplans).
|
||||
*
|
||||
* VORBEDINGUNG:
|
||||
* - Modul 3 Phase 2 (Tabellen `contacts` + `inquiries`) muss
|
||||
* eingespielt sein. Siehe dev/customer-bookings/umsetzung.md.
|
||||
*
|
||||
* Tabelle `offers.current_version_id` wird als FK erst in der Migration
|
||||
* 2026_04_17_100007 gesetzt (zyklische Abhängigkeit zu `offer_versions`).
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('offers', function (Blueprint $t) {
|
||||
$t->id();
|
||||
$t->string('offer_number', 32)->unique();
|
||||
|
||||
$t->foreignId('contact_id')
|
||||
->constrained('contacts')
|
||||
->restrictOnDelete();
|
||||
|
||||
$t->foreignId('inquiry_id')
|
||||
->nullable()
|
||||
->constrained('inquiries')
|
||||
->nullOnDelete();
|
||||
|
||||
$t->foreignId('booking_id')
|
||||
->nullable()
|
||||
->constrained('booking')
|
||||
->nullOnDelete();
|
||||
|
||||
$t->enum('status', [
|
||||
'draft',
|
||||
'sent',
|
||||
'accepted',
|
||||
'declined',
|
||||
'expired',
|
||||
'withdrawn',
|
||||
])->default('draft');
|
||||
|
||||
// FK wird in 2026_04_17_100007 nachträglich gesetzt
|
||||
$t->unsignedBigInteger('current_version_id')->nullable();
|
||||
|
||||
$t->foreignId('created_by')->constrained('users');
|
||||
|
||||
$t->timestamps();
|
||||
$t->softDeletes();
|
||||
|
||||
$t->index(['status', 'contact_id']);
|
||||
$t->index('inquiry_id');
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('offers');
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,81 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Modul 6 — Angebote: Ticket A1 / Migration 2 von 7.
|
||||
*
|
||||
* Versionstabelle der Angebote. Jede Änderung nach dem ersten Versand
|
||||
* erzeugt hier einen neuen Datensatz (version_no = max+1). Eine Version
|
||||
* kapselt den kompletten Inhalt (Texte, Summe, Gültigkeit, PDF-Pfad,
|
||||
* Status). Positionen (`offer_items`) und Anhänge (`offer_files`) hängen
|
||||
* an einer Version — nicht am übergeordneten `offers`-Datensatz.
|
||||
*
|
||||
* VORBEDINGUNG: 2026_04_17_100001_create_offers_table.php
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('offer_versions', function (Blueprint $t) {
|
||||
$t->id();
|
||||
|
||||
$t->foreignId('offer_id')
|
||||
->constrained('offers')
|
||||
->cascadeOnDelete();
|
||||
|
||||
$t->unsignedInteger('version_no');
|
||||
|
||||
$t->enum('status', [
|
||||
'draft',
|
||||
'sent',
|
||||
'accepted',
|
||||
'declined',
|
||||
'expired',
|
||||
'superseded',
|
||||
])->default('draft');
|
||||
|
||||
$t->date('valid_until')->nullable();
|
||||
$t->decimal('total_price', 10, 2)->default(0);
|
||||
|
||||
$t->string('headline')->nullable();
|
||||
$t->text('intro_text')->nullable();
|
||||
$t->longText('itinerary_text')->nullable();
|
||||
$t->text('closing_text')->nullable();
|
||||
|
||||
// offer_templates wird in Migration 4 erzeugt — FK dort,
|
||||
// hier zunächst nullable + FK wird über Migration 4 nachgeholt
|
||||
$t->unsignedBigInteger('template_id')->nullable();
|
||||
|
||||
$t->string('pdf_path')->nullable();
|
||||
$t->boolean('pdf_archived')->default(false);
|
||||
|
||||
$t->dateTime('sent_at')->nullable();
|
||||
$t->dateTime('accepted_at')->nullable();
|
||||
|
||||
$t->enum('accepted_via', [
|
||||
'customer_link',
|
||||
'admin',
|
||||
'email',
|
||||
])->nullable();
|
||||
|
||||
// Referenz auf zentral hinterlegte Dokument-Vorlagen,
|
||||
// die mit dieser Version (als Anhang) verknüpft sind
|
||||
$t->json('template_document_ids')->nullable();
|
||||
|
||||
$t->foreignId('created_by')->constrained('users');
|
||||
|
||||
$t->timestamps();
|
||||
|
||||
$t->unique(['offer_id', 'version_no']);
|
||||
$t->index(['offer_id', 'status']);
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('offer_versions');
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,68 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Modul 6 — Angebote: Ticket A1 / Migration 3 von 7.
|
||||
*
|
||||
* Einzelne Leistungs-/Positionszeilen einer Angebotsversion.
|
||||
* Hängt an `offer_versions`, NICHT am Offer-Kopf — so bleiben
|
||||
* Positionen einer versendeten Version unveränderlich, während
|
||||
* eine neue Version ihre eigenen Positionen führt.
|
||||
*
|
||||
* `travel_program_id` und `fewo_lodging_id` bleiben FK-frei, solange
|
||||
* Modul 12 (v2-Reiseverwaltung) noch nicht nach Laravel migriert ist.
|
||||
* `metadata` speichert einen Snapshot (Titel, Preis zum Zeitpunkt der
|
||||
* Erstellung), damit Positionen auch nach einer späteren v2-Migration
|
||||
* lesbar bleiben (Risiko R4 im Ticket-Dokument).
|
||||
*
|
||||
* VORBEDINGUNG: 2026_04_17_100002_create_offer_versions_table.php
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('offer_items', function (Blueprint $t) {
|
||||
$t->id();
|
||||
|
||||
$t->foreignId('offer_version_id')
|
||||
->constrained('offer_versions')
|
||||
->cascadeOnDelete();
|
||||
|
||||
$t->unsignedInteger('position')->default(0);
|
||||
|
||||
$t->enum('type', [
|
||||
'travel',
|
||||
'service',
|
||||
'option',
|
||||
'discount',
|
||||
'insurance',
|
||||
'custom',
|
||||
]);
|
||||
|
||||
$t->string('title');
|
||||
$t->text('description')->nullable();
|
||||
|
||||
$t->unsignedInteger('quantity')->default(1);
|
||||
$t->decimal('price_per_unit', 10, 2)->default(0);
|
||||
$t->decimal('total_price', 10, 2)->default(0);
|
||||
|
||||
// Bewusst OHNE FK-Constraint — siehe Risiko R4
|
||||
$t->unsignedBigInteger('travel_program_id')->nullable();
|
||||
$t->unsignedBigInteger('fewo_lodging_id')->nullable();
|
||||
|
||||
$t->json('metadata')->nullable();
|
||||
|
||||
$t->timestamps();
|
||||
|
||||
$t->index(['offer_version_id', 'position']);
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('offer_items');
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,70 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Modul 6 — Angebote: Ticket A1 / Migration 4 von 7.
|
||||
*
|
||||
* Wiederverwendbare Angebotsvorlagen (Text-/Positions-Blueprints, die
|
||||
* sich in Phase C in der Admin-UI pflegen lassen). Eine Vorlage liefert
|
||||
* Default-Texte + Default-Positionen für neue Angebote.
|
||||
*
|
||||
* Zusatz: Nachträgliche FK-Verknüpfung `offer_versions.template_id`,
|
||||
* weil Migration 2 noch nicht auf diese Tabelle verweisen konnte.
|
||||
*
|
||||
* VORBEDINGUNG: 2026_04_17_100002_create_offer_versions_table.php
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('offer_templates', function (Blueprint $t) {
|
||||
$t->id();
|
||||
|
||||
// `branch` existiert schon im CRM — Vorlagen können so pro
|
||||
// Filiale gepflegt werden. Eine spätere Erweiterung auf
|
||||
// `organization_id` (Modul 5) erfolgt additiv.
|
||||
$t->foreignId('branch_id')
|
||||
->nullable()
|
||||
->constrained('branch')
|
||||
->nullOnDelete();
|
||||
|
||||
$t->string('name');
|
||||
$t->text('description')->nullable();
|
||||
|
||||
$t->string('default_headline')->nullable();
|
||||
$t->text('default_intro')->nullable();
|
||||
$t->longText('default_itinerary')->nullable();
|
||||
$t->text('default_closing')->nullable();
|
||||
|
||||
// Array aus [{title, description, type, price_per_unit, quantity}, …]
|
||||
$t->json('default_items')->nullable();
|
||||
|
||||
$t->boolean('is_active')->default(true);
|
||||
$t->foreignId('created_by')->constrained('users');
|
||||
|
||||
$t->timestamps();
|
||||
$t->softDeletes();
|
||||
|
||||
$t->index(['branch_id', 'is_active']);
|
||||
});
|
||||
|
||||
Schema::table('offer_versions', function (Blueprint $t) {
|
||||
$t->foreign('template_id')
|
||||
->references('id')
|
||||
->on('offer_templates')
|
||||
->nullOnDelete();
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('offer_versions', function (Blueprint $t) {
|
||||
$t->dropForeign(['template_id']);
|
||||
});
|
||||
|
||||
Schema::dropIfExists('offer_templates');
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Modul 6 — Angebote: Ticket A1 / Migration 5 von 7.
|
||||
*
|
||||
* Dateiablage für Anhänge einer Angebotsversion (freie Uploads, später
|
||||
* auch PDF-Archivkopien). Struktur ist an `booking_files` angelehnt
|
||||
* (identifier, filename, dir, original_name, ext, mime, size), damit
|
||||
* `FileRepository::store()` direkt wiederverwendet werden kann.
|
||||
*
|
||||
* VORBEDINGUNG: 2026_04_17_100002_create_offer_versions_table.php
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('offer_files', function (Blueprint $t) {
|
||||
$t->id();
|
||||
|
||||
$t->foreignId('offer_version_id')
|
||||
->constrained('offer_versions')
|
||||
->cascadeOnDelete();
|
||||
|
||||
$t->string('identifier', 64)->nullable();
|
||||
$t->string('filename');
|
||||
$t->string('dir');
|
||||
$t->string('original_name');
|
||||
$t->string('ext', 16);
|
||||
$t->string('mine', 128);
|
||||
$t->unsignedBigInteger('size')->default(0);
|
||||
|
||||
$t->boolean('include_in_pdf')->default(true);
|
||||
|
||||
$t->timestamps();
|
||||
|
||||
$t->index(['offer_version_id', 'identifier']);
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('offer_files');
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Modul 6 — Angebote: Ticket A1 / Migration 6 von 7.
|
||||
*
|
||||
* Einmal-Token für den kundenseitigen Freigabe-Link
|
||||
* (/angebot/{token} → Phase D). Pro Angebot + Version genau ein aktiver
|
||||
* Token; bei Neuversand einer neuen Version wird der alte Token
|
||||
* `revoked` gesetzt. Tokens sind SHA-256-Hashes; der Klartext wird
|
||||
* ausschließlich im Mail-Link an den Kunden übergeben.
|
||||
*
|
||||
* VORBEDINGUNG: 2026_04_17_100002_create_offer_versions_table.php
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('offer_access_tokens', function (Blueprint $t) {
|
||||
$t->id();
|
||||
|
||||
$t->foreignId('offer_id')
|
||||
->constrained('offers')
|
||||
->cascadeOnDelete();
|
||||
|
||||
$t->foreignId('offer_version_id')
|
||||
->constrained('offer_versions')
|
||||
->cascadeOnDelete();
|
||||
|
||||
$t->string('token_hash', 64)->unique();
|
||||
$t->dateTime('expires_at')->nullable();
|
||||
$t->dateTime('first_opened_at')->nullable();
|
||||
$t->dateTime('revoked_at')->nullable();
|
||||
|
||||
$t->timestamps();
|
||||
|
||||
$t->index(['offer_id', 'revoked_at']);
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('offer_access_tokens');
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,57 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Modul 6 — Angebote: Ticket A1 / Migration 7 von 7.
|
||||
*
|
||||
* Schließt die FK-Beziehungen, die in den vorherigen Migrationen wegen
|
||||
* zyklischer Abhängigkeiten nicht direkt gesetzt werden konnten:
|
||||
*
|
||||
* 1. `offers.current_version_id` → offer_versions.id (ON DELETE SET NULL)
|
||||
* 2. `bookings.offer_id` → offers.id (ON DELETE SET NULL)
|
||||
*
|
||||
* Letzteres erlaubt die Conversion „Angebot → Buchung" (Ticket B8)
|
||||
* und zeigt im Buchungsdatensatz, aus welchem Angebot er entstanden ist.
|
||||
*
|
||||
* VORBEDINGUNG: alle vorherigen Offers-Migrationen.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('offers', function (Blueprint $t) {
|
||||
$t->foreign('current_version_id')
|
||||
->references('id')
|
||||
->on('offer_versions')
|
||||
->nullOnDelete();
|
||||
});
|
||||
|
||||
Schema::table('booking', function (Blueprint $t) {
|
||||
// `inquiry_id` kommt aus Modul-3 Phase 2 (war vorher `lead_id`)
|
||||
$t->unsignedBigInteger('offer_id')->nullable()->after('inquiry_id');
|
||||
|
||||
$t->foreign('offer_id')
|
||||
->references('id')
|
||||
->on('offers')
|
||||
->nullOnDelete();
|
||||
|
||||
$t->index('offer_id');
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('booking', function (Blueprint $t) {
|
||||
$t->dropForeign(['offer_id']);
|
||||
$t->dropIndex(['offer_id']);
|
||||
$t->dropColumn('offer_id');
|
||||
});
|
||||
|
||||
Schema::table('offers', function (Blueprint $t) {
|
||||
$t->dropForeign(['current_version_id']);
|
||||
});
|
||||
}
|
||||
};
|
||||
132
dev/backups/phase2-offers-2026-04-17/FILES/models/Offer.php
Normal file
132
dev/backups/phase2-offers-2026-04-17/FILES/models/Offer.php
Normal file
|
|
@ -0,0 +1,132 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use App\User;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
|
||||
/**
|
||||
* Angebot (Modul 6).
|
||||
*
|
||||
* Ein Offer ist der logische Angebots-Kopf (Angebotsnummer, Status,
|
||||
* Referenzen). Die Inhalte (Texte, Positionen, PDF) liegen versionsweise
|
||||
* in {@see OfferVersion}. Nach dem ersten Versand ist jede Änderung
|
||||
* eine neue Version (Entscheidung 17.1 Entwicklungsplan).
|
||||
*
|
||||
* @property int $id
|
||||
* @property string $offer_number
|
||||
* @property int $contact_id
|
||||
* @property int|null $inquiry_id
|
||||
* @property int|null $booking_id
|
||||
* @property string $status
|
||||
* @property int|null $current_version_id
|
||||
* @property int $created_by
|
||||
* @property Carbon $created_at
|
||||
* @property Carbon $updated_at
|
||||
* @property Carbon|null $deleted_at
|
||||
* @property-read Contact $contact
|
||||
* @property-read Lead|null $inquiry
|
||||
* @property-read Booking|null $booking
|
||||
* @property-read OfferVersion|null $currentVersion
|
||||
* @property-read Collection|OfferVersion[] $versions
|
||||
* @property-read Collection|OfferAccessToken[] $accessTokens
|
||||
* @property-read User $creator
|
||||
*/
|
||||
class Offer extends Model
|
||||
{
|
||||
use HasFactory, SoftDeletes;
|
||||
|
||||
public const STATUS_DRAFT = 'draft';
|
||||
public const STATUS_SENT = 'sent';
|
||||
public const STATUS_ACCEPTED = 'accepted';
|
||||
public const STATUS_DECLINED = 'declined';
|
||||
public const STATUS_EXPIRED = 'expired';
|
||||
public const STATUS_WITHDRAWN = 'withdrawn';
|
||||
|
||||
public const STATUSES = [
|
||||
self::STATUS_DRAFT,
|
||||
self::STATUS_SENT,
|
||||
self::STATUS_ACCEPTED,
|
||||
self::STATUS_DECLINED,
|
||||
self::STATUS_EXPIRED,
|
||||
self::STATUS_WITHDRAWN,
|
||||
];
|
||||
|
||||
protected $table = 'offers';
|
||||
|
||||
protected $fillable = [
|
||||
'offer_number',
|
||||
'contact_id',
|
||||
'inquiry_id',
|
||||
'booking_id',
|
||||
'status',
|
||||
'current_version_id',
|
||||
'created_by',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'contact_id' => 'int',
|
||||
'inquiry_id' => 'int',
|
||||
'booking_id' => 'int',
|
||||
'current_version_id' => 'int',
|
||||
'created_by' => 'int',
|
||||
];
|
||||
|
||||
public function contact(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Contact::class);
|
||||
}
|
||||
|
||||
public function inquiry(): BelongsTo
|
||||
{
|
||||
// Nach Modul 3 Phase 2: `Lead`-Model bildet die `inquiries`-Tabelle ab
|
||||
return $this->belongsTo(Lead::class, 'inquiry_id');
|
||||
}
|
||||
|
||||
public function booking(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Booking::class);
|
||||
}
|
||||
|
||||
public function currentVersion(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(OfferVersion::class, 'current_version_id');
|
||||
}
|
||||
|
||||
public function versions(): HasMany
|
||||
{
|
||||
return $this->hasMany(OfferVersion::class)->orderBy('version_no');
|
||||
}
|
||||
|
||||
public function accessTokens(): HasMany
|
||||
{
|
||||
return $this->hasMany(OfferAccessToken::class);
|
||||
}
|
||||
|
||||
public function creator(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(User::class, 'created_by');
|
||||
}
|
||||
|
||||
public function scopeStatus(Builder $q, string $status): Builder
|
||||
{
|
||||
return $q->where('status', $status);
|
||||
}
|
||||
|
||||
public function scopeOpen(Builder $q): Builder
|
||||
{
|
||||
return $q->whereIn('status', [self::STATUS_DRAFT, self::STATUS_SENT]);
|
||||
}
|
||||
|
||||
public function isEditable(): bool
|
||||
{
|
||||
return in_array($this->status, [self::STATUS_DRAFT, self::STATUS_SENT], true);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,120 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
/**
|
||||
* Kundenseitiger Zugriffstoken für /angebot/{token} (Modul 6 / Phase D).
|
||||
*
|
||||
* In der Datenbank wird ausschließlich der SHA-256-Hash des Klartext-
|
||||
* Tokens gespeichert. Der Klartext wird einmalig bei der Erzeugung
|
||||
* zurückgegeben (siehe {@see self::generate()}) und an den Kunden
|
||||
* per Mail-Link ausgeliefert.
|
||||
*
|
||||
* Pro Angebot + Version existiert genau ein aktiver Token; wird eine
|
||||
* neue Version versendet, setzt der OfferService den Vorgänger auf
|
||||
* `revoked_at`.
|
||||
*
|
||||
* @property int $id
|
||||
* @property int $offer_id
|
||||
* @property int $offer_version_id
|
||||
* @property string $token_hash
|
||||
* @property Carbon|null $expires_at
|
||||
* @property Carbon|null $first_opened_at
|
||||
* @property Carbon|null $revoked_at
|
||||
* @property Carbon $created_at
|
||||
* @property Carbon $updated_at
|
||||
* @property-read Offer $offer
|
||||
* @property-read OfferVersion $version
|
||||
*/
|
||||
class OfferAccessToken extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
protected $table = 'offer_access_tokens';
|
||||
|
||||
protected $fillable = [
|
||||
'offer_id',
|
||||
'offer_version_id',
|
||||
'token_hash',
|
||||
'expires_at',
|
||||
'first_opened_at',
|
||||
'revoked_at',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'offer_id' => 'int',
|
||||
'offer_version_id' => 'int',
|
||||
'expires_at' => 'datetime',
|
||||
'first_opened_at' => 'datetime',
|
||||
'revoked_at' => 'datetime',
|
||||
];
|
||||
|
||||
public function offer(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Offer::class);
|
||||
}
|
||||
|
||||
public function version(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(OfferVersion::class, 'offer_version_id');
|
||||
}
|
||||
|
||||
public function scopeActive(Builder $q): Builder
|
||||
{
|
||||
return $q->whereNull('revoked_at')
|
||||
->where(function (Builder $q) {
|
||||
$q->whereNull('expires_at')->orWhere('expires_at', '>', now());
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Erzeugt ein neues Token für die angegebene Version und liefert
|
||||
* den Klartext-Token zurück (nur einmalig abrufbar). In der
|
||||
* Datenbank wird nur der Hash persistiert.
|
||||
*/
|
||||
public static function generate(
|
||||
Offer $offer,
|
||||
OfferVersion $version,
|
||||
?Carbon $expiresAt = null
|
||||
): array {
|
||||
$plain = Str::random(48);
|
||||
$hash = hash('sha256', $plain);
|
||||
|
||||
/** @var self $token */
|
||||
$token = self::create([
|
||||
'offer_id' => $offer->id,
|
||||
'offer_version_id' => $version->id,
|
||||
'token_hash' => $hash,
|
||||
'expires_at' => $expiresAt,
|
||||
]);
|
||||
|
||||
return ['plain' => $plain, 'token' => $token];
|
||||
}
|
||||
|
||||
/**
|
||||
* Lookup per Klartext-Token (konstantzeitig via DB-Unique-Index).
|
||||
*/
|
||||
public static function findByPlainToken(string $plain): ?self
|
||||
{
|
||||
return self::where('token_hash', hash('sha256', $plain))->first();
|
||||
}
|
||||
|
||||
public function isActive(): bool
|
||||
{
|
||||
if ($this->revoked_at !== null) {
|
||||
return false;
|
||||
}
|
||||
if ($this->expires_at !== null && $this->expires_at->isPast()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,99 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
||||
/**
|
||||
* Datei-Anhang einer Angebotsversion (Modul 6).
|
||||
*
|
||||
* Struktur ist bewusst an {@see BookingFile} angelehnt (identifier,
|
||||
* filename, dir, original_name, ext, mine, size), damit der vorhandene
|
||||
* `FileRepository::store()` 1:1 wiederverwendet werden kann. `mine`
|
||||
* bleibt so geschrieben (statt `mime`) zur Konsistenz mit der
|
||||
* booking_files-Konvention.
|
||||
*
|
||||
* @property int $id
|
||||
* @property int $offer_version_id
|
||||
* @property string|null $identifier
|
||||
* @property string $filename
|
||||
* @property string $dir
|
||||
* @property string $original_name
|
||||
* @property string $ext
|
||||
* @property string $mine
|
||||
* @property int $size
|
||||
* @property bool $include_in_pdf
|
||||
* @property Carbon $created_at
|
||||
* @property Carbon $updated_at
|
||||
* @property-read OfferVersion $version
|
||||
*/
|
||||
class OfferFile extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
protected $table = 'offer_files';
|
||||
|
||||
protected $fillable = [
|
||||
'offer_version_id',
|
||||
'identifier',
|
||||
'filename',
|
||||
'dir',
|
||||
'original_name',
|
||||
'ext',
|
||||
'mine',
|
||||
'size',
|
||||
'include_in_pdf',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'offer_version_id' => 'int',
|
||||
'size' => 'int',
|
||||
'include_in_pdf' => 'bool',
|
||||
];
|
||||
|
||||
public static array $iconExt = [
|
||||
'default' => 'fa fa-file',
|
||||
'pdf' => 'fa fa-file-pdf',
|
||||
'jpg' => 'fa fa-file-image',
|
||||
'jpeg' => 'fa fa-file-image',
|
||||
'png' => 'fa fa-file-image',
|
||||
'doc' => 'fa fa-file-word',
|
||||
'docx' => 'fa fa-file-word',
|
||||
];
|
||||
|
||||
public function version(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(OfferVersion::class, 'offer_version_id');
|
||||
}
|
||||
|
||||
public function getIconExt(): string
|
||||
{
|
||||
return self::$iconExt[$this->ext] ?? self::$iconExt['default'];
|
||||
}
|
||||
|
||||
public function getURL(bool|string $do = false): string
|
||||
{
|
||||
return route('storage_file', [$this->id, 'offer', $do]);
|
||||
}
|
||||
|
||||
public function getPath(): string
|
||||
{
|
||||
return \Storage::disk('offer')->path($this->dir . $this->filename);
|
||||
}
|
||||
|
||||
public function formatBytes(int $precision = 2): string
|
||||
{
|
||||
$size = $this->size;
|
||||
if ($size <= 0) {
|
||||
return (string) $size;
|
||||
}
|
||||
|
||||
$base = log($size) / log(1024);
|
||||
$suffixes = [' bytes', ' KB', ' MB', ' GB', ' TB'];
|
||||
|
||||
return round(1024 ** ($base - floor($base)), $precision) . $suffixes[floor($base)];
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
|
||||
/**
|
||||
* Position einer Angebotsversion (Modul 6).
|
||||
*
|
||||
* `travel_program_id` und `fewo_lodging_id` bleiben FK-frei, solange
|
||||
* Modul 12 (v2-Reiseverwaltung) noch nicht nach Laravel migriert ist.
|
||||
* `metadata` enthält einen Snapshot der Referenzdaten (Titel, Preis,
|
||||
* Leistungen) — so bleiben Positionen lesbar, auch wenn das Original
|
||||
* später gelöscht / migriert / umbenannt wird.
|
||||
*
|
||||
* @property int $id
|
||||
* @property int $offer_version_id
|
||||
* @property int $position
|
||||
* @property string $type
|
||||
* @property string $title
|
||||
* @property string|null $description
|
||||
* @property int $quantity
|
||||
* @property float $price_per_unit
|
||||
* @property float $total_price
|
||||
* @property int|null $travel_program_id
|
||||
* @property int|null $fewo_lodging_id
|
||||
* @property array|null $metadata
|
||||
* @property Carbon $created_at
|
||||
* @property Carbon $updated_at
|
||||
* @property-read OfferVersion $version
|
||||
*/
|
||||
class OfferItem extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
public const TYPE_TRAVEL = 'travel';
|
||||
public const TYPE_SERVICE = 'service';
|
||||
public const TYPE_OPTION = 'option';
|
||||
public const TYPE_DISCOUNT = 'discount';
|
||||
public const TYPE_INSURANCE = 'insurance';
|
||||
public const TYPE_CUSTOM = 'custom';
|
||||
|
||||
protected $table = 'offer_items';
|
||||
|
||||
protected $fillable = [
|
||||
'offer_version_id',
|
||||
'position',
|
||||
'type',
|
||||
'title',
|
||||
'description',
|
||||
'quantity',
|
||||
'price_per_unit',
|
||||
'total_price',
|
||||
'travel_program_id',
|
||||
'fewo_lodging_id',
|
||||
'metadata',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'offer_version_id' => 'int',
|
||||
'position' => 'int',
|
||||
'quantity' => 'int',
|
||||
'price_per_unit' => 'decimal:2',
|
||||
'total_price' => 'decimal:2',
|
||||
'travel_program_id' => 'int',
|
||||
'fewo_lodging_id' => 'int',
|
||||
'metadata' => 'array',
|
||||
];
|
||||
|
||||
public function version(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(OfferVersion::class, 'offer_version_id');
|
||||
}
|
||||
|
||||
/**
|
||||
* Aus Menge × Einzelpreis den Positions-Gesamtpreis berechnen
|
||||
* (Rabatte negativ — gehört in den Service-Layer zur Summierung).
|
||||
*/
|
||||
public function calculateTotal(): float
|
||||
{
|
||||
return round($this->quantity * (float) $this->price_per_unit, 2);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,77 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use App\User;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
|
||||
/**
|
||||
* Wiederverwendbare Angebots-Vorlage (Modul 6).
|
||||
*
|
||||
* Liefert Default-Texte + Default-Positionen für neue Angebote.
|
||||
* `default_items` ist ein JSON-Array von Positionen im Schema
|
||||
* [{title, description, type, price_per_unit, quantity}, …].
|
||||
*
|
||||
* @property int $id
|
||||
* @property int|null $branch_id
|
||||
* @property string $name
|
||||
* @property string|null $description
|
||||
* @property string|null $default_headline
|
||||
* @property string|null $default_intro
|
||||
* @property string|null $default_itinerary
|
||||
* @property string|null $default_closing
|
||||
* @property array|null $default_items
|
||||
* @property bool $is_active
|
||||
* @property int $created_by
|
||||
* @property Carbon $created_at
|
||||
* @property Carbon $updated_at
|
||||
* @property Carbon|null $deleted_at
|
||||
* @property-read Branch|null $branch
|
||||
* @property-read User $creator
|
||||
*/
|
||||
class OfferTemplate extends Model
|
||||
{
|
||||
use HasFactory, SoftDeletes;
|
||||
|
||||
protected $table = 'offer_templates';
|
||||
|
||||
protected $fillable = [
|
||||
'branch_id',
|
||||
'name',
|
||||
'description',
|
||||
'default_headline',
|
||||
'default_intro',
|
||||
'default_itinerary',
|
||||
'default_closing',
|
||||
'default_items',
|
||||
'is_active',
|
||||
'created_by',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'branch_id' => 'int',
|
||||
'default_items' => 'array',
|
||||
'is_active' => 'bool',
|
||||
'created_by' => 'int',
|
||||
];
|
||||
|
||||
public function branch(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Branch::class);
|
||||
}
|
||||
|
||||
public function creator(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(User::class, 'created_by');
|
||||
}
|
||||
|
||||
public function scopeActive(Builder $q): Builder
|
||||
{
|
||||
return $q->where('is_active', true);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,126 @@
|
|||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use App\User;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||
|
||||
/**
|
||||
* Version eines Angebots (Modul 6).
|
||||
*
|
||||
* Jede versendete Fassung wird hier festgehalten — Texte, Positionen
|
||||
* und PDF bleiben damit unveränderlich, sobald ein Kunde sie per
|
||||
* Freigabe-Link einsehen kann. Neue Änderungen nach dem Versand
|
||||
* erzeugen eine neue Version (version_no = max+1, status = draft).
|
||||
*
|
||||
* @property int $id
|
||||
* @property int $offer_id
|
||||
* @property int $version_no
|
||||
* @property string $status
|
||||
* @property Carbon|null $valid_until
|
||||
* @property float $total_price
|
||||
* @property string|null $headline
|
||||
* @property string|null $intro_text
|
||||
* @property string|null $itinerary_text
|
||||
* @property string|null $closing_text
|
||||
* @property int|null $template_id
|
||||
* @property string|null $pdf_path
|
||||
* @property bool $pdf_archived
|
||||
* @property Carbon|null $sent_at
|
||||
* @property Carbon|null $accepted_at
|
||||
* @property string|null $accepted_via
|
||||
* @property array|null $template_document_ids
|
||||
* @property int $created_by
|
||||
* @property Carbon $created_at
|
||||
* @property Carbon $updated_at
|
||||
* @property-read Offer $offer
|
||||
* @property-read OfferTemplate|null $template
|
||||
* @property-read Collection|OfferItem[] $items
|
||||
* @property-read Collection|OfferFile[] $files
|
||||
* @property-read User $creator
|
||||
*/
|
||||
class OfferVersion extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
public const STATUS_DRAFT = 'draft';
|
||||
public const STATUS_SENT = 'sent';
|
||||
public const STATUS_ACCEPTED = 'accepted';
|
||||
public const STATUS_DECLINED = 'declined';
|
||||
public const STATUS_EXPIRED = 'expired';
|
||||
public const STATUS_SUPERSEDED = 'superseded';
|
||||
|
||||
public const ACCEPTED_VIA_LINK = 'customer_link';
|
||||
public const ACCEPTED_VIA_ADMIN = 'admin';
|
||||
public const ACCEPTED_VIA_MAIL = 'email';
|
||||
|
||||
protected $table = 'offer_versions';
|
||||
|
||||
protected $fillable = [
|
||||
'offer_id',
|
||||
'version_no',
|
||||
'status',
|
||||
'valid_until',
|
||||
'total_price',
|
||||
'headline',
|
||||
'intro_text',
|
||||
'itinerary_text',
|
||||
'closing_text',
|
||||
'template_id',
|
||||
'pdf_path',
|
||||
'pdf_archived',
|
||||
'sent_at',
|
||||
'accepted_at',
|
||||
'accepted_via',
|
||||
'template_document_ids',
|
||||
'created_by',
|
||||
];
|
||||
|
||||
protected $casts = [
|
||||
'offer_id' => 'int',
|
||||
'version_no' => 'int',
|
||||
'valid_until' => 'date',
|
||||
'total_price' => 'decimal:2',
|
||||
'template_id' => 'int',
|
||||
'pdf_archived' => 'bool',
|
||||
'sent_at' => 'datetime',
|
||||
'accepted_at' => 'datetime',
|
||||
'template_document_ids' => 'array',
|
||||
'created_by' => 'int',
|
||||
];
|
||||
|
||||
public function offer(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(Offer::class);
|
||||
}
|
||||
|
||||
public function template(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(OfferTemplate::class, 'template_id');
|
||||
}
|
||||
|
||||
public function items(): HasMany
|
||||
{
|
||||
return $this->hasMany(OfferItem::class)->orderBy('position');
|
||||
}
|
||||
|
||||
public function files(): HasMany
|
||||
{
|
||||
return $this->hasMany(OfferFile::class);
|
||||
}
|
||||
|
||||
public function creator(): BelongsTo
|
||||
{
|
||||
return $this->belongsTo(User::class, 'created_by');
|
||||
}
|
||||
|
||||
public function isEditable(): bool
|
||||
{
|
||||
return $this->status === self::STATUS_DRAFT;
|
||||
}
|
||||
}
|
||||
158
dev/backups/phase2-offers-2026-04-17/MANIFEST.md
Normal file
158
dev/backups/phase2-offers-2026-04-17/MANIFEST.md
Normal file
|
|
@ -0,0 +1,158 @@
|
|||
# Backup: Phase-2 + Offers (Rückbau für Phase-1-Live-Deploy)
|
||||
|
||||
**Erstellt:** 2026-04-17
|
||||
**Zweck:** Der Workspace enthielt gemischt Phase 1 + Phase 2 (Code-Umstellung `inquiry_id`, `$table='contacts'/'inquiries'`) + Offers-Modul. Phase 1 muss zuerst auf Live, dann erst Phase 2 + Offers. Dieses Backup sichert alle **Phase-2- und Offers-Artefakte**, damit sie nach erfolgreichem Phase-1-Live-Deploy per `restore.sh` wieder in den Workspace eingespielt werden können.
|
||||
|
||||
Parallel dazu existiert ein **Tarball-Backup** des gesamten Workspace-Zustands vor dem Rückbau unter `../../../../../backups-safety/workspace-pre-phase1-rollback-2026-04-17.tar.gz` (182 MB) und ein **Git-Commit** `e3dc1af` (lokal auf `master`, nicht gepusht) als doppeltes Sicherheitsnetz.
|
||||
|
||||
---
|
||||
|
||||
## Was im Backup liegt
|
||||
|
||||
### `FILES/migrations/` (18 Migrations-Dateien)
|
||||
|
||||
**Phase 2 (3 Dateien):**
|
||||
- `2025_04_15_200001_phase2_rename_customer_to_contacts.php` — RENAME TABLE customer → contacts
|
||||
- `2025_04_15_200002_phase2_rename_lead_to_inquiries.php` — RENAME TABLE lead → inquiries
|
||||
- `2025_04_15_200003_phase2_rename_booking_lead_id_to_inquiry_id.php` — Spalte `booking.lead_id` → `booking.inquiry_id`
|
||||
|
||||
**Phase 3 (2 Dateien):**
|
||||
- `2025_04_15_300001_phase3_create_participants_unified_table.php`
|
||||
- `2025_04_15_300002_phase3_drop_old_participant_tables.php`
|
||||
|
||||
**Phase 4 (6 Dateien):**
|
||||
- `2025_04_15_400001_phase4_create_communications_table.php`
|
||||
- `2025_04_15_400002_phase4_create_notices_table.php`
|
||||
- `2025_04_15_400003_phase4_create_attachments_table.php`
|
||||
- `2025_04_15_400004_phase4_drop_old_communication_tables.php`
|
||||
- `2025_04_15_400005_phase4_drop_old_notice_tables.php`
|
||||
- `2025_04_15_400006_phase4_drop_old_attachment_tables.php`
|
||||
|
||||
**Offers (7 Dateien):**
|
||||
- `2026_04_17_100001_create_offers_table.php`
|
||||
- `2026_04_17_100002_create_offer_versions_table.php`
|
||||
- `2026_04_17_100003_create_offer_items_table.php`
|
||||
- `2026_04_17_100004_create_offer_templates_table.php`
|
||||
- `2026_04_17_100005_create_offer_files_table.php`
|
||||
- `2026_04_17_100006_create_offer_access_tokens_table.php`
|
||||
- `2026_04_17_100007_add_offer_refs_to_offers_and_bookings.php`
|
||||
|
||||
### `FILES/models/` (6 Offer-Models)
|
||||
|
||||
- `Offer.php` — **neues** Offer-Model des Offers-Moduls (überschreibt das Legacy-Reliese-Model in `app/Models/Offer.php`; Legacy-Version ist in `HEAD^` bzw. Commit `389d5d1`)
|
||||
- `OfferVersion.php`
|
||||
- `OfferItem.php`
|
||||
- `OfferTemplate.php`
|
||||
- `OfferFile.php`
|
||||
- `OfferAccessToken.php`
|
||||
|
||||
### `PATCHES/` (Diffs für Phase-2/Offers-Rückbau)
|
||||
|
||||
Jede Datei enthält den **vollständigen** oder **Phase-1-only**-Diff gegen `HEAD^` (= `389d5d1`, Basis-Live-Stand):
|
||||
|
||||
- `Booking.php.full.diff` — kompletter Vorher-Diff (inkl. Phase-2 + Offers-Änderungen, die zurückgebaut wurden)
|
||||
- `Booking.php.phase1-only.diff` — was nach Rückbau übrig blieb: **nur** `HasFactory` + `$dates`→`$casts datetime` (Laravel-10-Upgrade)
|
||||
- `Customer.php.phase1-only.diff` — Phase-1-Arbeit (SoftDeletes, Merge-Fields, Relations, Global Scope); `$table = 'contacts'` zurück auf `'customer'`
|
||||
- `Lead.php.phase1-only.diff` — `$table = 'inquiries'` zurück auf `'lead'` (+ Phase-1-$casts-Refactoring)
|
||||
- `Contact.php.phase1-only.diff` — komplett neue Datei (Contacts-Modul); `$table = 'contacts'` zurück auf `'customer'`
|
||||
- `filesystems.php.full.diff` — entfernte `offer`-Disk (komplett zurückgerollt; Datei jetzt identisch mit HEAD^)
|
||||
- `Repositories.full.diff` / `Repositories.phase1-only.diff` — BookingPDFRepository (Laravel-10-Upgrade `Storage::disk()->path()`), LeadRepository, CustomerMailRepository
|
||||
- `Controllers.phase1-only.diff` — RequestController (Phase-1-$casts), API/BookingController, Admin/Report*, LeadController, CustomerController, ContactController (komplett neu)
|
||||
- `Services-Commands.phase1-only.diff` — BookingImport, SyncNewsletterKulturreisen (neu), Contacts*Duplicates (neu)
|
||||
- `Views.phase1-only.diff` — (leer, reine Phase-2-Views wurden zurückgerollt)
|
||||
|
||||
---
|
||||
|
||||
## Was im Workspace VERBLEIBT (Phase 1 + Laravel 10)
|
||||
|
||||
**Deploy-ready auf Live** — alle Phase-1-Artefakte, die auf Test bereits laufen:
|
||||
|
||||
### Neue Dateien (Phase 1)
|
||||
- `database/migrations/2025_04_15_100001_phase1_add_merge_fields_to_customer_table.php`
|
||||
- `database/migrations/2025_04_15_100002_phase1_add_soft_delete_to_customer_table.php`
|
||||
- `app/Models/Contact.php` (mit `$table = 'customer'`)
|
||||
- `app/Repositories/ContactRepository.php`
|
||||
- `app/Http/Controllers/ContactController.php`
|
||||
- `app/Console/Commands/ContactsFindDuplicates.php`
|
||||
- `app/Console/Commands/ContactsMergeDuplicates.php`
|
||||
- `resources/views/contact/*.blade.php` (5 Dateien)
|
||||
|
||||
### Modifizierte Dateien (Phase 1 + Laravel 10 Upgrade)
|
||||
- `app/Models/Customer.php` — SoftDeletes, Merge-Fields, Global Scope, Relations
|
||||
- `app/Models/Booking.php` — HasFactory, `$dates`→`$casts datetime`
|
||||
- `app/Models/Lead.php` — Phase-1-$casts-Refactoring
|
||||
- Viele weitere Models mit Laravel-10-Upgrade-Änderungen
|
||||
- `app/Repositories/BookingPDFRepository.php` — `Storage::disk()->path()` statt deprecated `getAdapter()->getPathPrefix()`
|
||||
- `routes/web.php` — `/contacts`, `/contact/*` Routen
|
||||
- `resources/views/layouts/includes/layout-sidenav.blade.php` — Contacts-Menüpunkt
|
||||
- Weitere modifizierte Dateien, u.a. diverse Views, Tests (`tests/Feature/*`, `tests/Unit/*`), Konfiguration (`phpunit.xml`, `config/trustedproxy.php`), Composer/Package-Dateien
|
||||
- `app/Services/MailDirService.php` (neu)
|
||||
- `database/factories/BookingFactory.php`, `CustomerFactory.php`, `LeadFactory.php` (neu)
|
||||
|
||||
**Alle diese Dateien gehen mit dem Phase-1-Live-Deploy mit.**
|
||||
|
||||
---
|
||||
|
||||
## Restore-Anleitung
|
||||
|
||||
### Automatisch (empfohlen)
|
||||
|
||||
```bash
|
||||
bash dev/backups/phase2-offers-2026-04-17/restore.sh
|
||||
```
|
||||
|
||||
Das Script:
|
||||
1. Prüft, ob Phase 2 auf Live eingespielt wurde (erfordert bewusste Bestätigung)
|
||||
2. Spielt die 18 Migrations-Dateien zurück nach `database/migrations/`
|
||||
3. Spielt die 6 Offer-Models zurück nach `app/Models/` (inkl. Überschreiben der Legacy-`Offer.php`)
|
||||
4. Wendet die Phase-2/Offers-Änderungen wieder an (Booking.php inquiry_id + offer()-Relation, Customer/Lead/Contact $table, Repositories, Controllers, Services, Commands, Views, filesystems.php)
|
||||
5. Zeigt einen abschließenden `git status` zur Verifikation
|
||||
|
||||
### Manuell
|
||||
|
||||
Falls das Script fehlschlägt oder man einzelne Teile prüfen möchte:
|
||||
|
||||
**Migrations zurück:**
|
||||
```bash
|
||||
cp dev/backups/phase2-offers-2026-04-17/FILES/migrations/*.php database/migrations/
|
||||
```
|
||||
|
||||
**Models zurück (WARNUNG: überschreibt Legacy-Offer.php):**
|
||||
```bash
|
||||
cp dev/backups/phase2-offers-2026-04-17/FILES/models/*.php app/Models/
|
||||
```
|
||||
|
||||
**Code-Änderungen aus dem WIP-Sicherheits-Commit (`e3dc1af`) zurückholen:**
|
||||
```bash
|
||||
git checkout e3dc1af -- app/Models/Booking.php app/Models/Customer.php app/Models/Contact.php app/Models/Lead.php
|
||||
git checkout e3dc1af -- app/Repositories/BookingPDFRepository.php app/Repositories/LeadRepository.php app/Repositories/CustomerMailRepository.php
|
||||
git checkout e3dc1af -- app/Http/Controllers/RequestController.php app/Http/Controllers/API/BookingController.php
|
||||
git checkout e3dc1af -- app/Http/Controllers/Admin/ReportController.php app/Http/Controllers/Admin/ReportProviderController.php app/Http/Controllers/Admin/ReportLeadsController.php
|
||||
git checkout e3dc1af -- app/Http/Controllers/LeadController.php app/Http/Controllers/CustomerController.php app/Http/Controllers/ContactController.php
|
||||
git checkout e3dc1af -- app/Services/BookingImport.php
|
||||
git checkout e3dc1af -- app/Console/Commands/SyncNewsletterKulturreisen.php app/Console/Commands/ContactsFindDuplicates.php app/Console/Commands/ContactsMergeDuplicates.php
|
||||
git checkout e3dc1af -- resources/views/customer/mail/modal-show-mail-inner.blade.php resources/views/pdf/components/booking_head.blade.php resources/views/pdf/components/booking_header.blade.php
|
||||
git checkout e3dc1af -- config/filesystems.php
|
||||
```
|
||||
|
||||
**Alternative — kompletter Restore aus dem Git-Commit:**
|
||||
```bash
|
||||
git checkout e3dc1af -- .
|
||||
```
|
||||
(Aber dann sind auch die Phase-2-Migrationen in `database/migrations/` wieder da, was richtig ist.)
|
||||
|
||||
---
|
||||
|
||||
## Notfall-Rollback (alles rückgängig, auch Phase-1-Rückbau)
|
||||
|
||||
Falls der Phase-1-Rückbau komplett falsch war und man zum Ausgangszustand zurück will:
|
||||
|
||||
```bash
|
||||
# Option A: Git
|
||||
git reset --hard e3dc1af # setzt Workspace auf den WIP-Sicherheits-Commit
|
||||
|
||||
# Option B: Tarball (falls Git nicht funktioniert)
|
||||
cd /workspace/mein.sterntours.de
|
||||
rm -rf * .[a-z]* # Vorsicht! Löscht alles außer dem übergeordneten Dir
|
||||
tar -xzf ../backups-safety/workspace-pre-phase1-rollback-2026-04-17.tar.gz
|
||||
```
|
||||
|
|
@ -0,0 +1,110 @@
|
|||
diff --git a/app/Models/Booking.php b/app/Models/Booking.php
|
||||
index 79a91ba..f3bf11c 100644
|
||||
--- a/app/Models/Booking.php
|
||||
+++ b/app/Models/Booking.php
|
||||
@@ -9,6 +9,7 @@ namespace App\Models;
|
||||
use Carbon\Carbon;
|
||||
use App\Services\Util;
|
||||
use App\Services\Passolution;
|
||||
+use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
|
||||
@@ -18,7 +19,7 @@ use Illuminate\Database\Eloquent\Collection;
|
||||
* @property int $id
|
||||
* @property Carbon $booking_date
|
||||
* @property int $customer_id
|
||||
- * @property int $lead_id
|
||||
+ * @property int $inquiry_id
|
||||
* @property bool $new_drafts
|
||||
* @property int $sf_guard_user_id
|
||||
* @property int $branch_id
|
||||
@@ -203,13 +204,16 @@ use Illuminate\Database\Eloquent\Collection;
|
||||
*/
|
||||
class Booking extends Model
|
||||
{
|
||||
+ use HasFactory;
|
||||
+
|
||||
protected $connection = 'mysql';
|
||||
|
||||
protected $table = 'booking';
|
||||
|
||||
protected $casts = [
|
||||
'customer_id' => 'int',
|
||||
- 'lead_id' => 'int',
|
||||
+ 'inquiry_id' => 'int',
|
||||
+ 'offer_id' => 'int',
|
||||
'new_drafts' => 'bool',
|
||||
'sf_guard_user_id' => 'int',
|
||||
'branch_id' => 'int',
|
||||
@@ -237,25 +241,24 @@ class Booking extends Model
|
||||
'is_rail_fly' => 'bool',
|
||||
'comfort' => 'bool',
|
||||
'airline_ids' => 'array',
|
||||
- 'participant_pass' => 'bool'
|
||||
- ];
|
||||
-
|
||||
- protected $dates = [
|
||||
- 'booking_date',
|
||||
- 'start_date',
|
||||
- 'end_date',
|
||||
- 'participant_birthdate',
|
||||
- 'final_payment_date',
|
||||
- 'refund_date',
|
||||
- 'lawyer_date',
|
||||
- 'xx_tkt_date'
|
||||
-
|
||||
- ];
|
||||
+ 'participant_pass' => 'bool',
|
||||
+ 'booking_date' => 'datetime',
|
||||
+ 'start_date' => 'datetime',
|
||||
+ 'end_date' => 'datetime',
|
||||
+ 'participant_birthdate' => 'datetime',
|
||||
+ 'final_payment_date' => 'datetime',
|
||||
+ 'refund_date' => 'datetime',
|
||||
+ 'lawyer_date' => 'datetime',
|
||||
+ 'xx_tkt_date' => 'datetime',
|
||||
+ ];
|
||||
+
|
||||
+
|
||||
|
||||
protected $fillable = [
|
||||
'booking_date',
|
||||
'customer_id',
|
||||
- 'lead_id',
|
||||
+ 'inquiry_id',
|
||||
+ 'offer_id',
|
||||
'new_drafts',
|
||||
'sf_guard_user_id',
|
||||
'branch_id',
|
||||
@@ -392,9 +395,29 @@ class Booking extends Model
|
||||
return $this->belongsTo(Customer::class);
|
||||
}
|
||||
|
||||
+ /**
|
||||
+ * Lead/Inquiry der Buchung.
|
||||
+ * FK-Spalte `inquiry_id` (vormals `lead_id` — Modul 3 Phase 2 Rename).
|
||||
+ * Methodenname bleibt `lead()` für Legacy-Kompatibilität; {@see self::inquiry()}
|
||||
+ * ist der fachlich korrekte Alias und sollte in neuem Code verwendet werden.
|
||||
+ */
|
||||
public function lead()
|
||||
{
|
||||
- return $this->belongsTo(Lead::class);
|
||||
+ return $this->belongsTo(Lead::class, 'inquiry_id');
|
||||
+ }
|
||||
+
|
||||
+ public function inquiry()
|
||||
+ {
|
||||
+ return $this->belongsTo(Lead::class, 'inquiry_id');
|
||||
+ }
|
||||
+
|
||||
+ /**
|
||||
+ * Angebot, aus dem diese Buchung entstanden ist (Modul 6, Ticket B8).
|
||||
+ * Nullable — nicht jede Buchung hat einen Angebots-Vorlauf.
|
||||
+ */
|
||||
+ public function offer()
|
||||
+ {
|
||||
+ return $this->belongsTo(\App\Models\Offer::class);
|
||||
}
|
||||
|
||||
public function sf_guard_user()
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
diff --git a/app/Models/Booking.php b/app/Models/Booking.php
|
||||
index 79a91ba..3d61b89 100644
|
||||
--- a/app/Models/Booking.php
|
||||
+++ b/app/Models/Booking.php
|
||||
@@ -9,6 +9,7 @@ namespace App\Models;
|
||||
use Carbon\Carbon;
|
||||
use App\Services\Util;
|
||||
use App\Services\Passolution;
|
||||
+use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
|
||||
@@ -203,6 +204,8 @@ use Illuminate\Database\Eloquent\Collection;
|
||||
*/
|
||||
class Booking extends Model
|
||||
{
|
||||
+ use HasFactory;
|
||||
+
|
||||
protected $connection = 'mysql';
|
||||
|
||||
protected $table = 'booking';
|
||||
@@ -237,20 +240,18 @@ class Booking extends Model
|
||||
'is_rail_fly' => 'bool',
|
||||
'comfort' => 'bool',
|
||||
'airline_ids' => 'array',
|
||||
- 'participant_pass' => 'bool'
|
||||
- ];
|
||||
-
|
||||
- protected $dates = [
|
||||
- 'booking_date',
|
||||
- 'start_date',
|
||||
- 'end_date',
|
||||
- 'participant_birthdate',
|
||||
- 'final_payment_date',
|
||||
- 'refund_date',
|
||||
- 'lawyer_date',
|
||||
- 'xx_tkt_date'
|
||||
-
|
||||
- ];
|
||||
+ 'participant_pass' => 'bool',
|
||||
+ 'booking_date' => 'datetime',
|
||||
+ 'start_date' => 'datetime',
|
||||
+ 'end_date' => 'datetime',
|
||||
+ 'participant_birthdate' => 'datetime',
|
||||
+ 'final_payment_date' => 'datetime',
|
||||
+ 'refund_date' => 'datetime',
|
||||
+ 'lawyer_date' => 'datetime',
|
||||
+ 'xx_tkt_date' => 'datetime',
|
||||
+ ];
|
||||
+
|
||||
+
|
||||
|
||||
protected $fillable = [
|
||||
'booking_date',
|
||||
|
|
@ -0,0 +1,170 @@
|
|||
diff --git a/app/Models/Contact.php b/app/Models/Contact.php
|
||||
new file mode 100644
|
||||
index 0000000..6d941e8
|
||||
--- /dev/null
|
||||
+++ b/app/Models/Contact.php
|
||||
@@ -0,0 +1,164 @@
|
||||
+<?php
|
||||
+
|
||||
+namespace App\Models;
|
||||
+
|
||||
+use App\Models\Sym\TravelCountry;
|
||||
+use Carbon\Carbon;
|
||||
+use Illuminate\Database\Eloquent\Builder;
|
||||
+use Illuminate\Database\Eloquent\Collection;
|
||||
+use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
+use Illuminate\Database\Eloquent\Model;
|
||||
+use Illuminate\Database\Eloquent\SoftDeletes;
|
||||
+
|
||||
+/**
|
||||
+ * Kontakt-Modell — saubere Neuimplementierung auf Basis der customer-Tabelle.
|
||||
+ *
|
||||
+ * Unterschiede zum alten Customer-Modell:
|
||||
+ * - Global Scope schließt zusammengeführte Duplikate (merged_into_id IS NOT NULL) aus
|
||||
+ * - merged_into_id + merged_at in $fillable
|
||||
+ * - mergedInto() / mergedContacts() Beziehungen
|
||||
+ *
|
||||
+ * Tabellen-Name: 'customer' (wird in Phase 2 in 'contacts' umbenannt).
|
||||
+ *
|
||||
+ * @property int $id
|
||||
+ * @property int|null $salutation_id
|
||||
+ * @property string|null $title
|
||||
+ * @property string|null $name
|
||||
+ * @property string|null $firstname
|
||||
+ * @property Carbon|null $birthdate
|
||||
+ * @property string|null $company
|
||||
+ * @property string|null $street
|
||||
+ * @property string|null $zip
|
||||
+ * @property string|null $city
|
||||
+ * @property string|null $email
|
||||
+ * @property string|null $phone
|
||||
+ * @property string|null $phonebusiness
|
||||
+ * @property string|null $phonemobile
|
||||
+ * @property string|null $fax
|
||||
+ * @property int|null $merged_into_id
|
||||
+ * @property Carbon|null $merged_at
|
||||
+ * @property Carbon $created_at
|
||||
+ * @property Carbon $updated_at
|
||||
+ * @property-read Contact|null $mergedInto
|
||||
+ * @property-read Collection|Contact[] $mergedContacts
|
||||
+ * @property-read Collection|Lead[] $leads
|
||||
+ * @property-read Collection|Booking[] $bookings
|
||||
+ */
|
||||
+class Contact extends Model
|
||||
+{
|
||||
+ use HasFactory, SoftDeletes;
|
||||
+
|
||||
+ protected $connection = 'mysql';
|
||||
+
|
||||
+ protected $table = 'customer';
|
||||
+
|
||||
+ protected $casts = [
|
||||
+ 'salutation_id' => 'int',
|
||||
+ 'credit_card_type_id' => 'int',
|
||||
+ 'country_id' => 'int',
|
||||
+ 'merged_into_id' => 'int',
|
||||
+ 'birthdate' => 'datetime',
|
||||
+ 'credit_card_expiration_date' => 'datetime',
|
||||
+ 'merged_at' => 'datetime',
|
||||
+ ];
|
||||
+
|
||||
+ protected $fillable = [
|
||||
+ 'salutation_id',
|
||||
+ 'title',
|
||||
+ 'name',
|
||||
+ 'firstname',
|
||||
+ 'birthdate',
|
||||
+ 'company',
|
||||
+ 'street',
|
||||
+ 'zip',
|
||||
+ 'city',
|
||||
+ 'email',
|
||||
+ 'phone',
|
||||
+ 'phonebusiness',
|
||||
+ 'phonemobile',
|
||||
+ 'fax',
|
||||
+ 'bank',
|
||||
+ 'bank_code',
|
||||
+ 'bank_account_number',
|
||||
+ 'credit_card_type_id',
|
||||
+ 'credit_card_number',
|
||||
+ 'credit_card_expiration_date',
|
||||
+ 'participants_remarks',
|
||||
+ 'miscellaneous_remarks',
|
||||
+ 'country_id',
|
||||
+ 'merged_into_id',
|
||||
+ 'merged_at',
|
||||
+ ];
|
||||
+
|
||||
+ /**
|
||||
+ * Globaler Scope: zusammengeführte Duplikate werden standardmäßig ausgeblendet.
|
||||
+ * Für Zugriff auf alle inkl. Duplikate: Contact::withoutGlobalScope('not_merged')
|
||||
+ */
|
||||
+ protected static function booted(): void
|
||||
+ {
|
||||
+ static::addGlobalScope('not_merged', function (Builder $query) {
|
||||
+ $query->whereNull('merged_into_id');
|
||||
+ });
|
||||
+ }
|
||||
+
|
||||
+ // ── Beziehungen ──────────────────────────────────────────────────────────
|
||||
+
|
||||
+ public function mergedInto(): \Illuminate\Database\Eloquent\Relations\BelongsTo
|
||||
+ {
|
||||
+ return $this->belongsTo(Contact::class, 'merged_into_id')
|
||||
+ ->withoutGlobalScope('not_merged');
|
||||
+ }
|
||||
+
|
||||
+ public function mergedContacts(): \Illuminate\Database\Eloquent\Relations\HasMany
|
||||
+ {
|
||||
+ return $this->hasMany(Contact::class, 'merged_into_id')
|
||||
+ ->withoutGlobalScope('not_merged');
|
||||
+ }
|
||||
+
|
||||
+ public function leads(): \Illuminate\Database\Eloquent\Relations\HasMany
|
||||
+ {
|
||||
+ return $this->hasMany(Lead::class, 'customer_id')->orderByDesc('created_at');
|
||||
+ }
|
||||
+
|
||||
+ public function bookings(): \Illuminate\Database\Eloquent\Relations\HasMany
|
||||
+ {
|
||||
+ return $this->hasMany(Booking::class, 'customer_id')->orderByDesc('created_at');
|
||||
+ }
|
||||
+
|
||||
+ public function salutation(): \Illuminate\Database\Eloquent\Relations\BelongsTo
|
||||
+ {
|
||||
+ return $this->belongsTo(Salutation::class);
|
||||
+ }
|
||||
+
|
||||
+ public function travel_country(): \Illuminate\Database\Eloquent\Relations\BelongsTo
|
||||
+ {
|
||||
+ return $this->belongsTo(TravelCountry::class, 'country_id');
|
||||
+ }
|
||||
+
|
||||
+ // ── Hilfsmethoden ────────────────────────────────────────────────────────
|
||||
+
|
||||
+ public function fullName(): string
|
||||
+ {
|
||||
+ if ($this->firstname) {
|
||||
+ return $this->firstname . ' ' . $this->name;
|
||||
+ }
|
||||
+ return (string) $this->name;
|
||||
+ }
|
||||
+
|
||||
+ public function isMerged(): bool
|
||||
+ {
|
||||
+ return $this->merged_into_id !== null;
|
||||
+ }
|
||||
+
|
||||
+ public static function getCountriesArray(): \Illuminate\Support\Collection
|
||||
+ {
|
||||
+ return TravelCountry::where('is_customer_country', 1)->get()->pluck('name', 'id');
|
||||
+ }
|
||||
+
|
||||
+ public static $salutationType = [
|
||||
+ 1 => 'Herr',
|
||||
+ 2 => 'Frau',
|
||||
+ 3 => 'Divers/keine Anrede',
|
||||
+ 4 => 'Firma',
|
||||
+ ];
|
||||
+}
|
||||
|
|
@ -0,0 +1,372 @@
|
|||
diff --git a/app/Http/Controllers/API/BookingController.php b/app/Http/Controllers/API/BookingController.php
|
||||
index e47cd07..a020ad4 100755
|
||||
--- a/app/Http/Controllers/API/BookingController.php
|
||||
+++ b/app/Http/Controllers/API/BookingController.php
|
||||
@@ -8,42 +8,35 @@ use App\Services\BookingImport;
|
||||
|
||||
class BookingController extends Controller
|
||||
{
|
||||
- private $successStatus = 200;
|
||||
- private $successKey = 'f6077389c9ce710e554763a5de02c8ec';
|
||||
-
|
||||
- protected $draftRepo;
|
||||
+ private int $successStatus = 200;
|
||||
+ private string $successKey;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
-
|
||||
+ $this->successKey = config('app.success_key');
|
||||
}
|
||||
|
||||
public function import()
|
||||
{
|
||||
|
||||
$request = \Request::all();
|
||||
- if(!isset($request['key']) || $request['key'] !== $this->successKey){
|
||||
+ if (!isset($request['key']) || $request['key'] !== $this->successKey) {
|
||||
return response()->json(['error' => "key"], 401);
|
||||
}
|
||||
$travel_booking = TravelBooking::find($request['travel_booking_id']);
|
||||
|
||||
- //# vor testing
|
||||
- //$travel_booking = TravelBooking::find(2922);
|
||||
- if(!isset($travel_booking) || !$travel_booking){
|
||||
+ if (!$travel_booking) {
|
||||
return response()->json(['error' => 'no-booking-found'], $this->successStatus);
|
||||
}
|
||||
|
||||
$booking = BookingImport::importFrom($travel_booking);
|
||||
|
||||
- $ret= [
|
||||
- 'url_v1' => make_old_url('/index.php/booking/'.$booking->id.'/edit'),
|
||||
+ $ret = [
|
||||
+ 'url_v1' => make_old_url('/index.php/booking/' . $booking->id . '/edit'),
|
||||
'url_v3' => route('booking_detail', $booking->id),
|
||||
'lead_id' => $booking->lead_id
|
||||
];
|
||||
return response()->json(['success' => "import", "ret" => $ret], $this->successStatus);
|
||||
- //return response()->json(['error' => 'no-node'], $this->successStatus);
|
||||
|
||||
}
|
||||
-
|
||||
-
|
||||
}
|
||||
diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php
|
||||
new file mode 100644
|
||||
index 0000000..08ef241
|
||||
--- /dev/null
|
||||
+++ b/app/Http/Controllers/ContactController.php
|
||||
@@ -0,0 +1,312 @@
|
||||
+<?php
|
||||
+
|
||||
+namespace App\Http\Controllers;
|
||||
+
|
||||
+use App\Models\Contact;
|
||||
+use App\Repositories\ContactRepository;
|
||||
+use Illuminate\Http\Request;
|
||||
+use Illuminate\Support\Facades\DB;
|
||||
+use Yajra\DataTables\Facades\DataTables;
|
||||
+
|
||||
+class ContactController extends Controller
|
||||
+{
|
||||
+ public function __construct(private readonly ContactRepository $contactRepo)
|
||||
+ {
|
||||
+ $this->middleware(['admin', '2fa']);
|
||||
+ }
|
||||
+
|
||||
+ public function index(): \Illuminate\View\View
|
||||
+ {
|
||||
+ return view('contact.index');
|
||||
+ }
|
||||
+
|
||||
+ public function detail(string $id): \Illuminate\View\View
|
||||
+ {
|
||||
+ if ($id === 'new') {
|
||||
+ $contact = new Contact();
|
||||
+ } else {
|
||||
+ $contact = Contact::with(['salutation', 'leads', 'bookings', 'mergedContacts'])
|
||||
+ ->findOrFail((int) $id);
|
||||
+ }
|
||||
+
|
||||
+ return view('contact.detail', [
|
||||
+ 'contact' => $contact,
|
||||
+ 'id' => $id,
|
||||
+ ]);
|
||||
+ }
|
||||
+
|
||||
+ public function store(Request $request, string $id): \Illuminate\Http\RedirectResponse
|
||||
+ {
|
||||
+ $data = $request->except('_token');
|
||||
+
|
||||
+ if (!isset($data['action'])) {
|
||||
+ abort(403, 'keine Action');
|
||||
+ }
|
||||
+
|
||||
+ if ($id === 'new') {
|
||||
+ $contact = $this->contactRepo->createContact($data);
|
||||
+ \Session()->flash('alert-save', '1');
|
||||
+ return redirect(route('contact_detail', [$contact->id]) . '#collapseContactDetail');
|
||||
+ }
|
||||
+
|
||||
+ $this->contactRepo->updateContact($id, $data);
|
||||
+ \Session()->flash('alert-save', '1');
|
||||
+
|
||||
+ return redirect(route('contact_detail', [$id]) . '#collapseContactDetail');
|
||||
+ }
|
||||
+
|
||||
+ public function history(int $id): \Illuminate\View\View
|
||||
+ {
|
||||
+ $contact = Contact::with([
|
||||
+ 'leads.sf_guard_user',
|
||||
+ 'bookings.travel_country',
|
||||
+ 'bookings.travel_agenda',
|
||||
+ 'bookings.sf_guard_user',
|
||||
+ 'bookings.lead',
|
||||
+ ])->findOrFail($id);
|
||||
+
|
||||
+ return view('contact._detail_history', [
|
||||
+ 'contact' => $contact,
|
||||
+ 'modal' => true,
|
||||
+ ]);
|
||||
+ }
|
||||
+
|
||||
+ public function destroy(int $id): \Illuminate\Http\JsonResponse
|
||||
+ {
|
||||
+ $contact = Contact::withoutGlobalScope('not_merged')->findOrFail($id);
|
||||
+
|
||||
+ $leadsCount = $contact->leads()->count();
|
||||
+ $bookingCount = $contact->bookings()->count();
|
||||
+
|
||||
+ if ($leadsCount > 0 || $bookingCount > 0) {
|
||||
+ return response()->json([
|
||||
+ 'success' => false,
|
||||
+ 'message' => sprintf(
|
||||
+ 'Kontakt kann nicht gelöscht werden: %s%s vorhanden.',
|
||||
+ $leadsCount > 0 ? $leadsCount . ' Anfrage(n)' : '',
|
||||
+ $bookingCount > 0 ? ($leadsCount > 0 ? ' und ' : '') . $bookingCount . ' Buchung(en)' : ''
|
||||
+ ),
|
||||
+ ], 422);
|
||||
+ }
|
||||
+
|
||||
+ $contact->delete();
|
||||
+
|
||||
+ return response()->json(['success' => true]);
|
||||
+ }
|
||||
+
|
||||
+ public function duplicates(): \Illuminate\View\View
|
||||
+ {
|
||||
+ $counts = [
|
||||
+ 'HIGH' => $this->countDuplicateGroups('email'),
|
||||
+ 'MEDIUM' => $this->countDuplicateGroups('name_birthdate'),
|
||||
+ 'LOW' => $this->countDuplicateGroups('name_zip'),
|
||||
+ ];
|
||||
+
|
||||
+ return view('contact.duplicates', compact('counts'));
|
||||
+ }
|
||||
+
|
||||
+ public function getDuplicateGroups(Request $request): \Illuminate\Http\JsonResponse
|
||||
+ {
|
||||
+ $confidence = strtoupper($request->input('confidence', 'HIGH'));
|
||||
+
|
||||
+ $groups = match ($confidence) {
|
||||
+ 'HIGH' => $this->findByEmail(),
|
||||
+ 'MEDIUM' => $this->findByNameBirthdate(),
|
||||
+ 'LOW' => $this->findByNameZip(),
|
||||
+ default => [],
|
||||
+ };
|
||||
+
|
||||
+ // Für jede Gruppe die vollständigen Kontakt-Daten laden
|
||||
+ $result = [];
|
||||
+ foreach ($groups as $ids) {
|
||||
+ $contacts = Contact::withoutGlobalScopes()
|
||||
+ ->withCount(['leads', 'bookings'])
|
||||
+ ->whereIn('id', $ids)
|
||||
+ ->whereNull('merged_into_id')
|
||||
+ ->whereNull('deleted_at')
|
||||
+ ->orderByRaw('FIELD(id, ' . implode(',', $ids) . ')')
|
||||
+ ->get(['id', 'firstname', 'name', 'email', 'zip', 'city', 'phone', 'phonemobile', 'birthdate', 'created_at', 'updated_at']);
|
||||
+
|
||||
+ if ($contacts->count() < 2) {
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ $result[] = [
|
||||
+ 'master' => $contacts->first(),
|
||||
+ 'duplicates' => $contacts->skip(1)->values(),
|
||||
+ ];
|
||||
+ }
|
||||
+
|
||||
+ return response()->json($result);
|
||||
+ }
|
||||
+
|
||||
+ public function merge(Request $request): \Illuminate\Http\JsonResponse
|
||||
+ {
|
||||
+ $masterId = (int) $request->input('master_id');
|
||||
+ $dupeId = (int) $request->input('duplicate_id');
|
||||
+
|
||||
+ if (!$masterId || !$dupeId || $masterId === $dupeId) {
|
||||
+ return response()->json(['success' => false, 'message' => 'Ungültige IDs.'], 422);
|
||||
+ }
|
||||
+
|
||||
+ $master = Contact::withoutGlobalScopes()->find($masterId);
|
||||
+ $dupe = Contact::withoutGlobalScopes()->find($dupeId);
|
||||
+
|
||||
+ if (!$master || !$dupe) {
|
||||
+ return response()->json(['success' => false, 'message' => 'Kontakt nicht gefunden.'], 404);
|
||||
+ }
|
||||
+
|
||||
+ DB::transaction(function () use ($masterId, $dupeId) {
|
||||
+ DB::table('lead')->where('customer_id', $dupeId)->update(['customer_id' => $masterId]);
|
||||
+ DB::table('booking')->where('customer_id', $dupeId)->update(['customer_id' => $masterId]);
|
||||
+ DB::table('customer_mails')->where('customer_id', $dupeId)->update(['customer_id' => $masterId]);
|
||||
+ DB::table('lead_mails')->where('customer_id', $dupeId)->update(['customer_id' => $masterId]);
|
||||
+ DB::table('customer')->where('id', $dupeId)->update([
|
||||
+ 'merged_into_id' => $masterId,
|
||||
+ 'merged_at' => now(),
|
||||
+ ]);
|
||||
+ });
|
||||
+
|
||||
+ return response()->json(['success' => true]);
|
||||
+ }
|
||||
+
|
||||
+ // ── Duplikat-Hilfs-Queries ────────────────────────────────────────────────
|
||||
+
|
||||
+ private function countDuplicateGroups(string $type): int
|
||||
+ {
|
||||
+ return match ($type) {
|
||||
+ 'email' => DB::table('customer')->selectRaw('COUNT(*) as cnt')->whereNotNull('email')->where('email', '!=', '')->whereNull('merged_into_id')->whereNull('deleted_at')->groupBy('email')->havingRaw('COUNT(*) > 1')->get()->count(),
|
||||
+ 'name_birthdate' => DB::table('customer')->selectRaw('COUNT(*) as cnt')->whereNotNull('name')->whereNotNull('firstname')->whereNotNull('birthdate')->whereNull('merged_into_id')->whereNull('deleted_at')->groupBy('name', 'firstname', 'birthdate')->havingRaw('COUNT(*) > 1')->get()->count(),
|
||||
+ 'name_zip' => DB::table('customer')->selectRaw('COUNT(*) as cnt')->whereNotNull('name')->whereNotNull('firstname')->whereNotNull('zip')->where('zip', '!=', '')->whereNull('merged_into_id')->whereNull('deleted_at')->groupBy('name', 'firstname', 'zip')->havingRaw('COUNT(*) > 1')->get()->count(),
|
||||
+ default => 0,
|
||||
+ };
|
||||
+ }
|
||||
+
|
||||
+ private function findByEmail(): array
|
||||
+ {
|
||||
+ return DB::table('customer')
|
||||
+ ->selectRaw('GROUP_CONCAT(id ORDER BY updated_at DESC, id DESC) as ids')
|
||||
+ ->whereNotNull('email')->where('email', '!=', '')
|
||||
+ ->whereNull('merged_into_id')->whereNull('deleted_at')
|
||||
+ ->groupBy('email')->havingRaw('COUNT(*) > 1')
|
||||
+ ->pluck('ids')->map(fn ($s) => array_map('intval', explode(',', $s)))->all();
|
||||
+ }
|
||||
+
|
||||
+ private function findByNameBirthdate(): array
|
||||
+ {
|
||||
+ return DB::table('customer')
|
||||
+ ->selectRaw('GROUP_CONCAT(id ORDER BY updated_at DESC, id DESC) as ids')
|
||||
+ ->whereNotNull('name')->whereNotNull('firstname')->whereNotNull('birthdate')
|
||||
+ ->whereNull('merged_into_id')->whereNull('deleted_at')
|
||||
+ ->groupBy('name', 'firstname', 'birthdate')->havingRaw('COUNT(*) > 1')
|
||||
+ ->pluck('ids')->map(fn ($s) => array_map('intval', explode(',', $s)))->all();
|
||||
+ }
|
||||
+
|
||||
+ private function findByNameZip(): array
|
||||
+ {
|
||||
+ return DB::table('customer')
|
||||
+ ->selectRaw('GROUP_CONCAT(id ORDER BY updated_at DESC, id DESC) as ids')
|
||||
+ ->whereNotNull('name')->whereNotNull('firstname')
|
||||
+ ->whereNotNull('zip')->where('zip', '!=', '')
|
||||
+ ->whereNull('merged_into_id')->whereNull('deleted_at')
|
||||
+ ->groupBy('name', 'firstname', 'zip')->havingRaw('COUNT(*) > 1')
|
||||
+ ->pluck('ids')->map(fn ($s) => array_map('intval', explode(',', $s)))->all();
|
||||
+ }
|
||||
+
|
||||
+ public function restore(int $id): \Illuminate\Http\JsonResponse
|
||||
+ {
|
||||
+ $contact = Contact::onlyTrashed()->withoutGlobalScope('not_merged')->findOrFail($id);
|
||||
+ $contact->restore();
|
||||
+
|
||||
+ return response()->json(['success' => true]);
|
||||
+ }
|
||||
+
|
||||
+ public function getContacts(Request $request): \Illuminate\Http\JsonResponse
|
||||
+ {
|
||||
+ $showDeleted = $request->filled('filter_deleted');
|
||||
+
|
||||
+ // Reihenfolge wichtig: select() zuerst, dann withCount() — sonst überschreibt
|
||||
+ // select() die COUNT-Subqueries die withCount() per addSelect() eingetragen hat.
|
||||
+ $query = $showDeleted
|
||||
+ ? Contact::onlyTrashed()->withoutGlobalScope('not_merged')->select('customer.*')->withCount(['leads', 'bookings'])
|
||||
+ : Contact::select('customer.*')->withCount(['leads', 'bookings']);
|
||||
+
|
||||
+ // Zusatzfilter aus der UI (werden als extra GET-Parameter gesendet)
|
||||
+ if ($request->filled('filter_has_leads')) {
|
||||
+ $query->has('leads');
|
||||
+ }
|
||||
+ if ($request->filled('filter_has_bookings')) {
|
||||
+ $query->has('bookings');
|
||||
+ }
|
||||
+ if ($request->filled('filter_has_email')) {
|
||||
+ $query->whereNotNull('email')->where('email', '!=', '');
|
||||
+ }
|
||||
+
|
||||
+ return DataTables::eloquent($query)
|
||||
+ ->addColumn('action_edit', function (Contact $contact) use ($showDeleted) {
|
||||
+ if ($showDeleted) {
|
||||
+ return '';
|
||||
+ }
|
||||
+ return '<a href="' . route('contact_detail', [$contact->id]) . '" class="btn icon-btn btn-sm btn-primary" title="Öffnen"><span class="fa fa-edit"></span></a>';
|
||||
+ })
|
||||
+ ->addColumn('action_delete', function (Contact $contact) use ($showDeleted) {
|
||||
+ if ($showDeleted) {
|
||||
+ return '<button class="btn icon-btn btn-xs btn-success ml-1 btn-contact-restore" '
|
||||
+ . 'data-id="' . $contact->id . '" '
|
||||
+ . 'data-name="' . e($contact->fullName()) . '" '
|
||||
+ . 'title="Wiederherstellen"><span class="fa fa-undo"></span></button>';
|
||||
+ }
|
||||
+ return '<button class="btn icon-btn btn-xs btn-danger ml-1 btn-contact-delete" '
|
||||
+ . 'data-id="' . $contact->id . '" '
|
||||
+ . 'data-name="' . e($contact->fullName()) . '" '
|
||||
+ . 'title="Löschen"><span class="fa fa-trash"></span></button>';
|
||||
+ })
|
||||
+ ->addColumn('id', function (Contact $contact) use ($showDeleted) {
|
||||
+ if ($showDeleted) {
|
||||
+ return '<span data-order="' . $contact->id . '">' . $contact->id . '</span>';
|
||||
+ }
|
||||
+ return '<a data-order="' . $contact->id . '" href="' . route('contact_detail', [$contact->id]) . '">' . $contact->id . '</a>';
|
||||
+ })
|
||||
+ ->addColumn('raw_id', fn(Contact $contact) => $contact->id)
|
||||
+ ->addColumn('leads_count', fn(Contact $contact) => $contact->leads_count)
|
||||
+ ->addColumn('bookings_count', fn(Contact $contact) => $contact->bookings_count)
|
||||
+ ->addColumn('deleted_at', fn(Contact $contact) => $contact->deleted_at?->format('d.m.Y H:i') ?? '')
|
||||
+ ->orderColumn('id', 'customer.id $1')
|
||||
+ ->orderColumn('deleted_at', 'customer.deleted_at $1')
|
||||
+ ->filterColumn('id', function ($query, $keyword) {
|
||||
+ if ($keyword !== '') {
|
||||
+ $query->where('customer.id', 'LIKE', '%' . $keyword . '%');
|
||||
+ }
|
||||
+ })
|
||||
+ ->filterColumn('name', function ($query, $keyword) {
|
||||
+ if ($keyword !== '') {
|
||||
+ $query->where(function ($q) use ($keyword) {
|
||||
+ $q->where('name', 'LIKE', '%' . $keyword . '%')
|
||||
+ ->orWhere('firstname', 'LIKE', '%' . $keyword . '%');
|
||||
+ });
|
||||
+ }
|
||||
+ })
|
||||
+ ->filter(function ($query) use ($request) {
|
||||
+ $location = $request->input('filter_location');
|
||||
+ if ($location && $location !== '') {
|
||||
+ $query->where(function ($q) use ($location) {
|
||||
+ $q->where('zip', 'LIKE', '%' . $location . '%')
|
||||
+ ->orWhere('city', 'LIKE', '%' . $location . '%');
|
||||
+ });
|
||||
+ }
|
||||
+
|
||||
+ $search = $request->input('search.value');
|
||||
+ if ($search && $search !== '') {
|
||||
+ $query->where(function ($q) use ($search) {
|
||||
+ $q->where('name', 'LIKE', '%' . $search . '%')
|
||||
+ ->orWhere('firstname', 'LIKE', '%' . $search . '%')
|
||||
+ ->orWhere('email', 'LIKE', '%' . $search . '%')
|
||||
+ ->orWhere('phone', 'LIKE', '%' . $search . '%')
|
||||
+ ->orWhere('phonemobile', 'LIKE', '%' . $search . '%');
|
||||
+ });
|
||||
+ }
|
||||
+ }, true)
|
||||
+ ->rawColumns(['action_edit', 'action_delete', 'id'])
|
||||
+ ->make(true);
|
||||
+ }
|
||||
+}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
diff --git a/app/Models/Customer.php b/app/Models/Customer.php
|
||||
index 94e618e..436b3ee 100644
|
||||
--- a/app/Models/Customer.php
|
||||
+++ b/app/Models/Customer.php
|
||||
@@ -9,6 +9,7 @@ namespace App\Models;
|
||||
use App\Models\Sym\TravelCountry;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
+use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
/**
|
||||
@@ -83,6 +84,8 @@ use Illuminate\Database\Eloquent\Model;
|
||||
*/
|
||||
class Customer extends Model
|
||||
{
|
||||
+ use HasFactory;
|
||||
+
|
||||
protected $connection = 'mysql';
|
||||
|
||||
protected $table = 'customer';
|
||||
@@ -90,13 +93,12 @@ class Customer extends Model
|
||||
protected $casts = [
|
||||
'salutation_id' => 'int',
|
||||
'credit_card_type_id' => 'int',
|
||||
- 'country_id' => 'int'
|
||||
- ];
|
||||
+ 'country_id' => 'int',
|
||||
+ 'birthdate' => 'datetime',
|
||||
+ 'credit_card_expiration_date' => 'datetime',
|
||||
+ ];
|
||||
|
||||
- protected $dates = [
|
||||
- 'birthdate',
|
||||
- 'credit_card_expiration_date'
|
||||
- ];
|
||||
+
|
||||
|
||||
protected $fillable = [
|
||||
'salutation_id',
|
||||
|
|
@ -0,0 +1,44 @@
|
|||
diff --git a/app/Models/Lead.php b/app/Models/Lead.php
|
||||
index 8b84b9e..227bd38 100644
|
||||
--- a/app/Models/Lead.php
|
||||
+++ b/app/Models/Lead.php
|
||||
@@ -9,6 +9,7 @@ namespace App\Models;
|
||||
use Carbon\Carbon;
|
||||
use App\Services\Passolution;
|
||||
use App\Models\Lead as ModelsLead;
|
||||
+use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Collection;
|
||||
|
||||
@@ -107,6 +108,8 @@ use Illuminate\Database\Eloquent\Collection;
|
||||
*/
|
||||
class Lead extends Model
|
||||
{
|
||||
+ use HasFactory;
|
||||
+
|
||||
protected $connection = 'mysql';
|
||||
|
||||
protected $table = 'lead';
|
||||
@@ -126,16 +129,14 @@ class Lead extends Model
|
||||
'travelcategory_id' => 'int',
|
||||
'price' => 'float',
|
||||
'pax' => 'int',
|
||||
- 'participant_salutation_id' => 'int'
|
||||
+ 'participant_salutation_id' => 'int',
|
||||
+ 'request_date' => 'datetime',
|
||||
+ 'travelperiod_start' => 'datetime',
|
||||
+ 'travelperiod_end' => 'datetime',
|
||||
+ 'next_due_date' => 'datetime',
|
||||
+ 'participant_birthdate' => 'datetime',
|
||||
];
|
||||
|
||||
- protected $dates = [
|
||||
- 'request_date',
|
||||
- 'travelperiod_start',
|
||||
- 'travelperiod_end',
|
||||
- 'next_due_date',
|
||||
- 'participant_birthdate'
|
||||
- ];
|
||||
|
||||
protected $fillable = [
|
||||
'customer_id',
|
||||
|
|
@ -0,0 +1,159 @@
|
|||
diff --git a/app/Repositories/BookingPDFRepository.php b/app/Repositories/BookingPDFRepository.php
|
||||
index 505ddaf..e5ba139 100644
|
||||
--- a/app/Repositories/BookingPDFRepository.php
|
||||
+++ b/app/Repositories/BookingPDFRepository.php
|
||||
@@ -22,7 +22,7 @@ class BookingPDFRepository extends BaseRepository
|
||||
public function __construct(Booking $model)
|
||||
{
|
||||
$this->model = $model;
|
||||
- $this->prepath = Storage::disk('public')->getAdapter()->getPathPrefix();
|
||||
+ $this->prepath = Storage::disk('public')->path('');
|
||||
}
|
||||
|
||||
public function update($data)
|
||||
@@ -63,13 +63,13 @@ class BookingPDFRepository extends BaseRepository
|
||||
{
|
||||
$document = new stdClass();
|
||||
$document->name = 'registration';
|
||||
- $document->number = $this->model->lead_id;
|
||||
+ $document->number = $this->model->inquiry_id;
|
||||
$document->title = 'BUCHUNGSAUFTRAG';
|
||||
$document->voucher = null;
|
||||
$document->date = now();
|
||||
$document->total = $this->model->getPriceRaw();
|
||||
$dir = $this->getDirPath('pdf', 'booking', $document->date->format('Y'));
|
||||
- $filename = "Buchnungsauftrag-" . $this->model->lead_id . ".pdf";
|
||||
+ $filename = "Buchnungsauftrag-" . $this->model->inquiry_id . ".pdf";
|
||||
$pdf_file = new CreatePDF('pdf.booking_registration');
|
||||
$data = [
|
||||
'booking' => $this->model,
|
||||
@@ -85,7 +85,7 @@ class BookingPDFRepository extends BaseRepository
|
||||
{
|
||||
$document = new stdClass();
|
||||
$document->name = 'confirmation';
|
||||
- $document->number = $this->model->lead_id;
|
||||
+ $document->number = $this->model->inquiry_id;
|
||||
$document->title = 'REISEBESTÄTIGUNG';
|
||||
$document->voucher = null;
|
||||
$document->date = now();
|
||||
@@ -104,7 +104,7 @@ class BookingPDFRepository extends BaseRepository
|
||||
$document->final_payment_date = date('Y-m-d');
|
||||
}
|
||||
$dir = $this->getDirPath('pdf', 'booking', $document->date->format('Y'));
|
||||
- $filename = "Reisebestätigung-" . $this->model->lead_id . ".pdf";
|
||||
+ $filename = "Reisebestätigung-" . $this->model->inquiry_id . ".pdf";
|
||||
|
||||
$pdf_file = new CreatePDF('pdf.booking_confirmation');
|
||||
$data = [
|
||||
@@ -160,14 +160,14 @@ class BookingPDFRepository extends BaseRepository
|
||||
{
|
||||
$document = new stdClass();
|
||||
$document->name = 'voucher';
|
||||
- $document->number = $this->model->lead_id;
|
||||
+ $document->number = $this->model->inquiry_id;
|
||||
$document->name = 'voucher';
|
||||
$document->title = $agency ? 'VOUCHER Agentur' : 'VOUCHER';
|
||||
$document->voucher = $agency ? 'agency' : 'client';
|
||||
$document->date = now();
|
||||
|
||||
$dir = $this->getDirPath('pdf', 'voucher', $document->date->format('Y'));
|
||||
- $filename = ($agency ? 'VoucherAgentur' : 'Voucher') . "-" . $this->model->lead_id . ".pdf";
|
||||
+ $filename = ($agency ? 'VoucherAgentur' : 'Voucher') . "-" . $this->model->inquiry_id . ".pdf";
|
||||
|
||||
$pdf_file = new CreatePDF('pdf.booking_voucher');
|
||||
$data = [
|
||||
@@ -224,7 +224,7 @@ class BookingPDFRepository extends BaseRepository
|
||||
//init document
|
||||
$document = new stdClass();
|
||||
$document->name = $identifier;
|
||||
- $document->number = $this->model->lead_id;
|
||||
+ $document->number = $this->model->inquiry_id;
|
||||
$document->title = 'STORNOBESTÄTIGUNG';
|
||||
$document->voucher = null;
|
||||
$document->date = Carbon::parse($data['storno_print']);
|
||||
@@ -253,7 +253,7 @@ class BookingPDFRepository extends BaseRepository
|
||||
|
||||
|
||||
$dir = $this->getDirPath('pdf', 'storno', $document->date->format('Y'));
|
||||
- $filename = "Reisestornierung -" . $this->model->lead_id . ".pdf";
|
||||
+ $filename = "Reisestornierung -" . $this->model->inquiry_id . ".pdf";
|
||||
|
||||
$pdf_file = new CreatePDF('pdf.booking_storno');
|
||||
$data = [
|
||||
@@ -288,7 +288,9 @@ class BookingPDFRepository extends BaseRepository
|
||||
$fill = [
|
||||
'booking_id' => $this->model->id,
|
||||
'customer_id' => $this->model->customer_id,
|
||||
- 'lead_id' => $this->model->lead_id,
|
||||
+ // booking_documents.lead_id ist ein Shadow-Feld von booking.inquiry_id;
|
||||
+ // die Spalte selbst wird von Phase 2 nicht umbenannt.
|
||||
+ 'lead_id' => $this->model->inquiry_id,
|
||||
'identifier' => $identifier,
|
||||
'filename' => $filename,
|
||||
'dir' => $dir,
|
||||
diff --git a/app/Repositories/CustomerMailRepository.php b/app/Repositories/CustomerMailRepository.php
|
||||
index c1b1226..6397f0c 100644
|
||||
--- a/app/Repositories/CustomerMailRepository.php
|
||||
+++ b/app/Repositories/CustomerMailRepository.php
|
||||
@@ -135,7 +135,8 @@ class CustomerMailRepository extends BaseRepository {
|
||||
$customer_mail->fill([
|
||||
'booking_id' => $booking->id,
|
||||
'customer_id' => $booking->customer_id,
|
||||
- 'lead_id' => $booking->lead_id,
|
||||
+ // customer_mails.lead_id-Spalte bleibt unverändert; Wert kommt aus booking.inquiry_id
|
||||
+ 'lead_id' => $booking->inquiry_id,
|
||||
'is_answer' => $is_answer,
|
||||
'reply_id' => $reply_id,
|
||||
'email' => $mail_from,
|
||||
@@ -153,7 +154,8 @@ class CustomerMailRepository extends BaseRepository {
|
||||
$customer_mail = CustomerMail::create([
|
||||
'booking_id' => $booking->id,
|
||||
'customer_id' => $booking->customer_id,
|
||||
- 'lead_id' => $booking->lead_id,
|
||||
+ // customer_mails.lead_id-Spalte bleibt unverändert; Wert kommt aus booking.inquiry_id
|
||||
+ 'lead_id' => $booking->inquiry_id,
|
||||
'is_answer' => $is_answer,
|
||||
'reply_id' => $reply_id,
|
||||
'email' => $mail_from,
|
||||
@@ -300,7 +302,7 @@ class CustomerMailRepository extends BaseRepository {
|
||||
$value->id = $customer_mail->booking_id;
|
||||
$value->booking = $booking;
|
||||
$value->show = 'single';
|
||||
- $value->lead_title_id = " - (".$value->booking->lead_id.")";
|
||||
+ $value->lead_title_id = " - (".$value->booking->inquiry_id.")";
|
||||
|
||||
|
||||
$tmp = [];
|
||||
@@ -342,7 +344,7 @@ class CustomerMailRepository extends BaseRepository {
|
||||
$value->booking = $booking;
|
||||
$value->show = 'single';
|
||||
$value->draft = true;
|
||||
- $value->lead_title_id = " - (".$value->booking->lead_id.")";
|
||||
+ $value->lead_title_id = " - (".$value->booking->inquiry_id.")";
|
||||
|
||||
}else{
|
||||
//multi
|
||||
@@ -379,8 +381,8 @@ class CustomerMailRepository extends BaseRepository {
|
||||
$value->draft = false;
|
||||
$value->booking = $booking;
|
||||
$value->message = "";
|
||||
- $value->subject = " - (".$value->booking->lead_id.")";
|
||||
- $value->lead_title_id = " - (".$value->booking->lead_id.")";
|
||||
+ $value->subject = " - (".$value->booking->inquiry_id.")";
|
||||
+ $value->lead_title_id = " - (".$value->booking->inquiry_id.")";
|
||||
$value->s_placeholder = "Betreff des Kunden";
|
||||
$value->m_placeholder = "Nachricht des Kunden";
|
||||
if(isset($data['customer_mail_id']) && $customer_mail = CustomerMail::find($data['customer_mail_id'])){
|
||||
diff --git a/app/Repositories/LeadRepository.php b/app/Repositories/LeadRepository.php
|
||||
index 929426d..ad0ac87 100644
|
||||
--- a/app/Repositories/LeadRepository.php
|
||||
+++ b/app/Repositories/LeadRepository.php
|
||||
@@ -134,7 +134,7 @@ class LeadRepository extends BaseRepository {
|
||||
$data = [
|
||||
'booking_date' => date('Y-m-d'), //now
|
||||
'customer_id' => $this->model->customer->id,
|
||||
- 'lead_id' => $this->model->id,
|
||||
+ 'inquiry_id' => $this->model->id,
|
||||
'new_drafts' => 1,
|
||||
'sf_guard_user_id' => $this->model->sf_guard_user_id,
|
||||
'branch_id' => 4,
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/app/Repositories/BookingPDFRepository.php b/app/Repositories/BookingPDFRepository.php
|
||||
index 505ddaf..dc4d313 100644
|
||||
--- a/app/Repositories/BookingPDFRepository.php
|
||||
+++ b/app/Repositories/BookingPDFRepository.php
|
||||
@@ -22,7 +22,7 @@ class BookingPDFRepository extends BaseRepository
|
||||
public function __construct(Booking $model)
|
||||
{
|
||||
$this->model = $model;
|
||||
- $this->prepath = Storage::disk('public')->getAdapter()->getPathPrefix();
|
||||
+ $this->prepath = Storage::disk('public')->path('');
|
||||
}
|
||||
|
||||
public function update($data)
|
||||
|
|
@ -0,0 +1,405 @@
|
|||
diff --git a/app/Console/Commands/ContactsFindDuplicates.php b/app/Console/Commands/ContactsFindDuplicates.php
|
||||
new file mode 100644
|
||||
index 0000000..cef982d
|
||||
--- /dev/null
|
||||
+++ b/app/Console/Commands/ContactsFindDuplicates.php
|
||||
@@ -0,0 +1,160 @@
|
||||
+<?php
|
||||
+
|
||||
+namespace App\Console\Commands;
|
||||
+
|
||||
+use Illuminate\Console\Command;
|
||||
+use Illuminate\Support\Facades\DB;
|
||||
+
|
||||
+/**
|
||||
+ * Phase 1 — Schritt 1: Duplikate identifizieren
|
||||
+ *
|
||||
+ * Sucht Kunden-Datensätze, die vermutlich dieselbe Person repräsentieren.
|
||||
+ * Drei Erkennungs-Stufen (absteigend nach Konfidenz):
|
||||
+ *
|
||||
+ * HIGH — gleiche E-Mail (nicht leer)
|
||||
+ * MEDIUM — gleicher Name + Vorname + Geburtsdatum
|
||||
+ * LOW — gleicher Name + Vorname + PLZ
|
||||
+ *
|
||||
+ * Verwendung:
|
||||
+ * php artisan contacts:find-duplicates
|
||||
+ * php artisan contacts:find-duplicates --export=duplicates.csv
|
||||
+ * php artisan contacts:find-duplicates --confidence=HIGH
|
||||
+ */
|
||||
+class ContactsFindDuplicates extends Command
|
||||
+{
|
||||
+ protected $signature = 'contacts:find-duplicates
|
||||
+ {--export= : Pfad zur CSV-Ausgabedatei}
|
||||
+ {--confidence= : Nur diese Konfidenz-Stufe ausgeben (HIGH|MEDIUM|LOW)}';
|
||||
+
|
||||
+ protected $description = 'Identifiziert doppelte Customer-Datensätze anhand von E-Mail, Name/Geburtsdatum oder Name/PLZ';
|
||||
+
|
||||
+ public function handle(): int
|
||||
+ {
|
||||
+ $this->info('Suche nach Duplikaten in der customer-Tabelle...');
|
||||
+ $this->newLine();
|
||||
+
|
||||
+ $groups = collect();
|
||||
+
|
||||
+ // ── HIGH: gleiche E-Mail ──────────────────────────────────────────
|
||||
+ if ($this->shouldCheck('HIGH')) {
|
||||
+ $emailDupes = DB::table('customer')
|
||||
+ ->select('email', DB::raw('COUNT(*) as cnt'), DB::raw('GROUP_CONCAT(id ORDER BY updated_at DESC) as ids'))
|
||||
+ ->whereNotNull('email')
|
||||
+ ->where('email', '!=', '')
|
||||
+ ->whereNull('merged_into_id')
|
||||
+ ->groupBy('email')
|
||||
+ ->having('cnt', '>', 1)
|
||||
+ ->get();
|
||||
+
|
||||
+ foreach ($emailDupes as $row) {
|
||||
+ $groups->push([
|
||||
+ 'confidence' => 'HIGH',
|
||||
+ 'reason' => 'E-Mail: ' . $row->email,
|
||||
+ 'ids' => $row->ids,
|
||||
+ 'count' => $row->cnt,
|
||||
+ ]);
|
||||
+ }
|
||||
+
|
||||
+ $this->line(sprintf('<fg=green>HIGH</> (gleiche E-Mail): %d Gruppen', $emailDupes->count()));
|
||||
+ }
|
||||
+
|
||||
+ // ── MEDIUM: Name + Vorname + Geburtsdatum ────────────────────────
|
||||
+ if ($this->shouldCheck('MEDIUM')) {
|
||||
+ $nameBdDupes = DB::table('customer')
|
||||
+ ->select(
|
||||
+ 'name', 'firstname', 'birthdate',
|
||||
+ DB::raw('COUNT(*) as cnt'),
|
||||
+ DB::raw('GROUP_CONCAT(id ORDER BY updated_at DESC) as ids')
|
||||
+ )
|
||||
+ ->whereNotNull('name')
|
||||
+ ->whereNotNull('firstname')
|
||||
+ ->whereNotNull('birthdate')
|
||||
+ ->whereNull('merged_into_id')
|
||||
+ ->groupBy('name', 'firstname', 'birthdate')
|
||||
+ ->having('cnt', '>', 1)
|
||||
+ ->get();
|
||||
+
|
||||
+ foreach ($nameBdDupes as $row) {
|
||||
+ $groups->push([
|
||||
+ 'confidence' => 'MEDIUM',
|
||||
+ 'reason' => "Name: {$row->firstname} {$row->name}, GD: {$row->birthdate}",
|
||||
+ 'ids' => $row->ids,
|
||||
+ 'count' => $row->cnt,
|
||||
+ ]);
|
||||
+ }
|
||||
+
|
||||
+ $this->line(sprintf('<fg=yellow>MEDIUM</> (Name+GD): %d Gruppen', $nameBdDupes->count()));
|
||||
+ }
|
||||
+
|
||||
+ // ── LOW: Name + Vorname + PLZ ─────────────────────────────────────
|
||||
+ if ($this->shouldCheck('LOW')) {
|
||||
+ $nameZipDupes = DB::table('customer')
|
||||
+ ->select(
|
||||
+ 'name', 'firstname', 'zip',
|
||||
+ DB::raw('COUNT(*) as cnt'),
|
||||
+ DB::raw('GROUP_CONCAT(id ORDER BY updated_at DESC) as ids')
|
||||
+ )
|
||||
+ ->whereNotNull('name')
|
||||
+ ->whereNotNull('firstname')
|
||||
+ ->whereNotNull('zip')
|
||||
+ ->where('zip', '!=', '')
|
||||
+ ->whereNull('merged_into_id')
|
||||
+ ->groupBy('name', 'firstname', 'zip')
|
||||
+ ->having('cnt', '>', 1)
|
||||
+ ->get();
|
||||
+
|
||||
+ foreach ($nameZipDupes as $row) {
|
||||
+ $groups->push([
|
||||
+ 'confidence' => 'LOW',
|
||||
+ 'reason' => "Name: {$row->firstname} {$row->name}, PLZ: {$row->zip}",
|
||||
+ 'ids' => $row->ids,
|
||||
+ 'count' => $row->cnt,
|
||||
+ ]);
|
||||
+ }
|
||||
+
|
||||
+ $this->line(sprintf('<fg=red>LOW</> (Name+PLZ): %d Gruppen', $nameZipDupes->count()));
|
||||
+ }
|
||||
+
|
||||
+ $this->newLine();
|
||||
+ $this->info(sprintf('Gesamt: %d Duplikat-Gruppen gefunden', $groups->count()));
|
||||
+
|
||||
+ if ($groups->isEmpty()) {
|
||||
+ $this->info('Keine Duplikate — nichts zu tun.');
|
||||
+ return self::SUCCESS;
|
||||
+ }
|
||||
+
|
||||
+ // Tabellen-Ausgabe
|
||||
+ $this->table(
|
||||
+ ['Konfidenz', 'Grund', 'IDs (neueste zuerst)', 'Anzahl'],
|
||||
+ $groups->map(fn ($g) => [$g['confidence'], $g['reason'], $g['ids'], $g['count']])->all()
|
||||
+ );
|
||||
+
|
||||
+ // CSV-Export
|
||||
+ if ($export = $this->option('export')) {
|
||||
+ $this->exportCsv($groups->all(), $export);
|
||||
+ $this->info("CSV gespeichert: {$export}");
|
||||
+ } else {
|
||||
+ $this->newLine();
|
||||
+ $this->line('Tipp: --export=duplicates.csv für CSV-Export');
|
||||
+ $this->line('Tipp: php artisan contacts:merge-duplicates --dry-run zum Prüfen');
|
||||
+ }
|
||||
+
|
||||
+ return self::SUCCESS;
|
||||
+ }
|
||||
+
|
||||
+ private function shouldCheck(string $level): bool
|
||||
+ {
|
||||
+ $filter = strtoupper((string) $this->option('confidence'));
|
||||
+ return $filter === '' || $filter === $level;
|
||||
+ }
|
||||
+
|
||||
+ private function exportCsv(array $groups, string $path): void
|
||||
+ {
|
||||
+ $handle = fopen($path, 'w');
|
||||
+ fputcsv($handle, ['Konfidenz', 'Grund', 'IDs (neueste zuerst)', 'Anzahl']);
|
||||
+ foreach ($groups as $group) {
|
||||
+ fputcsv($handle, [$group['confidence'], $group['reason'], $group['ids'], $group['count']]);
|
||||
+ }
|
||||
+ fclose($handle);
|
||||
+ }
|
||||
+}
|
||||
diff --git a/app/Console/Commands/ContactsMergeDuplicates.php b/app/Console/Commands/ContactsMergeDuplicates.php
|
||||
new file mode 100644
|
||||
index 0000000..e51ca46
|
||||
--- /dev/null
|
||||
+++ b/app/Console/Commands/ContactsMergeDuplicates.php
|
||||
@@ -0,0 +1,233 @@
|
||||
+<?php
|
||||
+
|
||||
+namespace App\Console\Commands;
|
||||
+
|
||||
+use Illuminate\Console\Command;
|
||||
+use Illuminate\Support\Facades\DB;
|
||||
+
|
||||
+/**
|
||||
+ * Phase 1 — Schritt 2: Duplikate zusammenführen
|
||||
+ *
|
||||
+ * Strategie: Der neueste Datensatz (höchstes updated_at, dann höchste id)
|
||||
+ * wird Master. Alle anderen Datensätze derselben Gruppe erhalten
|
||||
+ * merged_into_id = master_id und werden nicht mehr zurückgegeben.
|
||||
+ *
|
||||
+ * Alle FK-Referenzen in lead, booking, customer_mails, lead_mails
|
||||
+ * werden auf den Master umgestellt.
|
||||
+ *
|
||||
+ * Verwendung:
|
||||
+ * php artisan contacts:merge-duplicates --dry-run # Vorschau, keine Änderung
|
||||
+ * php artisan contacts:merge-duplicates --confidence=HIGH # Nur sichere Duplikate
|
||||
+ * php artisan contacts:merge-duplicates # Ausführen
|
||||
+ */
|
||||
+class ContactsMergeDuplicates extends Command
|
||||
+{
|
||||
+ protected $signature = 'contacts:merge-duplicates
|
||||
+ {--dry-run : Zeigt was passieren würde, ohne Daten zu ändern}
|
||||
+ {--confidence= : Nur diese Konfidenz-Stufe verarbeiten (HIGH|MEDIUM|LOW)}
|
||||
+ {--force : Überspringt Sicherheitsabfrage}';
|
||||
+
|
||||
+ protected $description = 'Führt doppelte Customer-Datensätze zusammen (neuester wird Master)';
|
||||
+
|
||||
+ private bool $dryRun = false;
|
||||
+ private int $mergedCount = 0;
|
||||
+ private int $updatedLeads = 0;
|
||||
+ private int $updatedBookings = 0;
|
||||
+
|
||||
+ public function handle(): int
|
||||
+ {
|
||||
+ $this->dryRun = (bool) $this->option('dry-run');
|
||||
+
|
||||
+ if ($this->dryRun) {
|
||||
+ $this->warn('DRY-RUN Modus — keine Daten werden verändert');
|
||||
+ } else {
|
||||
+ $this->warn('ACHTUNG: Diese Operation verändert Produktionsdaten.');
|
||||
+ if (!$this->option('force') && !$this->confirm('Fortfahren?')) {
|
||||
+ $this->info('Abgebrochen.');
|
||||
+ return self::SUCCESS;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ $this->newLine();
|
||||
+
|
||||
+ DB::transaction(function () {
|
||||
+ $this->processLevel(
|
||||
+ 'HIGH',
|
||||
+ fn () => $this->findByEmail()
|
||||
+ );
|
||||
+
|
||||
+ $this->processLevel(
|
||||
+ 'MEDIUM',
|
||||
+ fn () => $this->findByNameBirthdate()
|
||||
+ );
|
||||
+
|
||||
+ $this->processLevel(
|
||||
+ 'LOW',
|
||||
+ fn () => $this->findByNameZip()
|
||||
+ );
|
||||
+ });
|
||||
+
|
||||
+ $this->newLine();
|
||||
+ $this->info(sprintf(
|
||||
+ '%s %d Duplikate zusammengeführt | %d leads aktualisiert | %d bookings aktualisiert',
|
||||
+ $this->dryRun ? '[DRY-RUN]' : '',
|
||||
+ $this->mergedCount,
|
||||
+ $this->updatedLeads,
|
||||
+ $this->updatedBookings
|
||||
+ ));
|
||||
+
|
||||
+ if ($this->dryRun) {
|
||||
+ $this->newLine();
|
||||
+ $this->line('Zum Ausführen: php artisan contacts:merge-duplicates');
|
||||
+ }
|
||||
+
|
||||
+ return self::SUCCESS;
|
||||
+ }
|
||||
+
|
||||
+ // ─────────────────────────────────────────────────────────────────────────
|
||||
+ // Duplikat-Gruppen ermitteln
|
||||
+ // ─────────────────────────────────────────────────────────────────────────
|
||||
+
|
||||
+ private function findByEmail(): array
|
||||
+ {
|
||||
+ return DB::table('customer')
|
||||
+ ->select('email', DB::raw('GROUP_CONCAT(id ORDER BY updated_at DESC, id DESC) as ids'))
|
||||
+ ->whereNotNull('email')
|
||||
+ ->where('email', '!=', '')
|
||||
+ ->whereNull('merged_into_id')
|
||||
+ ->groupBy('email')
|
||||
+ ->having(DB::raw('COUNT(*)'), '>', 1)
|
||||
+ ->pluck('ids')
|
||||
+ ->map(fn ($ids) => explode(',', $ids))
|
||||
+ ->all();
|
||||
+ }
|
||||
+
|
||||
+ private function findByNameBirthdate(): array
|
||||
+ {
|
||||
+ return DB::table('customer')
|
||||
+ ->select(DB::raw('GROUP_CONCAT(id ORDER BY updated_at DESC, id DESC) as ids'))
|
||||
+ ->whereNotNull('name')
|
||||
+ ->whereNotNull('firstname')
|
||||
+ ->whereNotNull('birthdate')
|
||||
+ ->whereNull('merged_into_id')
|
||||
+ ->groupBy('name', 'firstname', 'birthdate')
|
||||
+ ->having(DB::raw('COUNT(*)'), '>', 1)
|
||||
+ ->pluck('ids')
|
||||
+ ->map(fn ($ids) => explode(',', $ids))
|
||||
+ ->all();
|
||||
+ }
|
||||
+
|
||||
+ private function findByNameZip(): array
|
||||
+ {
|
||||
+ return DB::table('customer')
|
||||
+ ->select(DB::raw('GROUP_CONCAT(id ORDER BY updated_at DESC, id DESC) as ids'))
|
||||
+ ->whereNotNull('name')
|
||||
+ ->whereNotNull('firstname')
|
||||
+ ->whereNotNull('zip')
|
||||
+ ->where('zip', '!=', '')
|
||||
+ ->whereNull('merged_into_id')
|
||||
+ ->groupBy('name', 'firstname', 'zip')
|
||||
+ ->having(DB::raw('COUNT(*)'), '>', 1)
|
||||
+ ->pluck('ids')
|
||||
+ ->map(fn ($ids) => explode(',', $ids))
|
||||
+ ->all();
|
||||
+ }
|
||||
+
|
||||
+ // ─────────────────────────────────────────────────────────────────────────
|
||||
+ // Verarbeitung
|
||||
+ // ─────────────────────────────────────────────────────────────────────────
|
||||
+
|
||||
+ private function processLevel(string $level, callable $finder): void
|
||||
+ {
|
||||
+ if ($filter = $this->option('confidence')) {
|
||||
+ if (strtoupper($filter) !== $level) {
|
||||
+ return;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ $groups = $finder();
|
||||
+
|
||||
+ if (empty($groups)) {
|
||||
+ $this->line("[{$level}] Keine Duplikate.");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ $this->line(sprintf('[%s] %d Gruppe(n) gefunden', $level, count($groups)));
|
||||
+
|
||||
+ foreach ($groups as $ids) {
|
||||
+ $masterId = (int) $ids[0]; // erster = neuester
|
||||
+ $duplicateIds = array_map('intval', array_slice($ids, 1));
|
||||
+
|
||||
+ $this->line(sprintf(
|
||||
+ ' Master: #%d ← Duplikate: %s',
|
||||
+ $masterId,
|
||||
+ implode(', ', array_map(fn ($id) => '#' . $id, $duplicateIds))
|
||||
+ ));
|
||||
+
|
||||
+ foreach ($duplicateIds as $dupeId) {
|
||||
+ $this->mergeInto($masterId, $dupeId);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ private function mergeInto(int $masterId, int $dupeId): void
|
||||
+ {
|
||||
+ // 1. Leads umhängen
|
||||
+ $leadCount = DB::table('lead')->where('customer_id', $dupeId)->count();
|
||||
+ if ($leadCount > 0) {
|
||||
+ $this->line(" lead.customer_id: {$leadCount} Zeile(n) → #{$masterId}");
|
||||
+ if (!$this->dryRun) {
|
||||
+ DB::table('lead')
|
||||
+ ->where('customer_id', $dupeId)
|
||||
+ ->update(['customer_id' => $masterId]);
|
||||
+ }
|
||||
+ $this->updatedLeads += $leadCount;
|
||||
+ }
|
||||
+
|
||||
+ // 2. Bookings umhängen
|
||||
+ $bookingCount = DB::table('booking')->where('customer_id', $dupeId)->count();
|
||||
+ if ($bookingCount > 0) {
|
||||
+ $this->line(" booking.customer_id: {$bookingCount} Zeile(n) → #{$masterId}");
|
||||
+ if (!$this->dryRun) {
|
||||
+ DB::table('booking')
|
||||
+ ->where('customer_id', $dupeId)
|
||||
+ ->update(['customer_id' => $masterId]);
|
||||
+ }
|
||||
+ $this->updatedBookings += $bookingCount;
|
||||
+ }
|
||||
+
|
||||
+ // 3. customer_mails umhängen
|
||||
+ $mailCount = DB::table('customer_mails')->where('customer_id', $dupeId)->count();
|
||||
+ if ($mailCount > 0) {
|
||||
+ $this->line(" customer_mails.customer_id: {$mailCount} Zeile(n) → #{$masterId}");
|
||||
+ if (!$this->dryRun) {
|
||||
+ DB::table('customer_mails')
|
||||
+ ->where('customer_id', $dupeId)
|
||||
+ ->update(['customer_id' => $masterId]);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ // 4. lead_mails umhängen
|
||||
+ $leadMailCount = DB::table('lead_mails')->where('customer_id', $dupeId)->count();
|
||||
+ if ($leadMailCount > 0) {
|
||||
+ $this->line(" lead_mails.customer_id: {$leadMailCount} Zeile(n) → #{$masterId}");
|
||||
+ if (!$this->dryRun) {
|
||||
+ DB::table('lead_mails')
|
||||
+ ->where('customer_id', $dupeId)
|
||||
+ ->update(['customer_id' => $masterId]);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ // 5. Duplikat als zusammengeführt markieren
|
||||
+ if (!$this->dryRun) {
|
||||
+ DB::table('customer')
|
||||
+ ->where('id', $dupeId)
|
||||
+ ->update([
|
||||
+ 'merged_into_id' => $masterId,
|
||||
+ 'merged_at' => now(),
|
||||
+ ]);
|
||||
+ }
|
||||
+
|
||||
+ $this->mergedCount++;
|
||||
+ }
|
||||
+}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
diff --git a/config/filesystems.php b/config/filesystems.php
|
||||
index 2318ca2..97762c8 100755
|
||||
--- a/config/filesystems.php
|
||||
+++ b/config/filesystems.php
|
||||
@@ -72,6 +72,12 @@ return [
|
||||
'url' => env('APP_URL').'/storage/booking',
|
||||
'visibility' => 'public',
|
||||
],
|
||||
+ 'offer' => [
|
||||
+ 'driver' => 'local',
|
||||
+ 'root' => storage_path('app/offer'),
|
||||
+ 'url' => env('APP_URL').'/storage/offer',
|
||||
+ 'visibility' => 'public',
|
||||
+ ],
|
||||
'general' => [
|
||||
'driver' => 'local',
|
||||
'root' => storage_path('app/general'),
|
||||
128
dev/backups/phase2-offers-2026-04-17/restore.sh
Executable file
128
dev/backups/phase2-offers-2026-04-17/restore.sh
Executable file
|
|
@ -0,0 +1,128 @@
|
|||
#!/usr/bin/env bash
|
||||
#
|
||||
# Restore-Script: spielt Phase 2 + Offers-Änderungen zurück in den Workspace.
|
||||
# Voraussetzung: Phase 1 wurde erfolgreich auf Live deployed und migriert.
|
||||
#
|
||||
# Nutzung:
|
||||
# bash dev/backups/phase2-offers-2026-04-17/restore.sh # interaktiv
|
||||
# bash dev/backups/phase2-offers-2026-04-17/restore.sh --force # ohne Nachfrage
|
||||
#
|
||||
# Details siehe MANIFEST.md im selben Verzeichnis.
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
BACKUP_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
PROJECT_ROOT="$(cd "${BACKUP_DIR}/../../../" && pwd)"
|
||||
FORCE=false
|
||||
|
||||
for arg in "$@"; do
|
||||
case "$arg" in
|
||||
--force|-f) FORCE=true ;;
|
||||
*) echo "Unbekannte Option: $arg"; exit 1 ;;
|
||||
esac
|
||||
done
|
||||
|
||||
cd "${PROJECT_ROOT}"
|
||||
|
||||
echo "=========================================="
|
||||
echo " Phase-2 + Offers Restore"
|
||||
echo "=========================================="
|
||||
echo
|
||||
echo " Projekt-Root: ${PROJECT_ROOT}"
|
||||
echo " Backup-Ordner: ${BACKUP_DIR}"
|
||||
echo
|
||||
echo " Folgende Änderungen werden zurückgespielt:"
|
||||
echo " - 18 Migrationen (Phase 2, 3, 4, Offers) nach database/migrations/"
|
||||
echo " - 6 Offer-Models nach app/Models/ (inkl. Überschreiben von Legacy-Offer.php)"
|
||||
echo " - Code-Reverts via git checkout \${WIP_COMMIT} -- <datei>"
|
||||
echo
|
||||
|
||||
WIP_COMMIT="e3dc1af"
|
||||
if ! git cat-file -e "${WIP_COMMIT}" 2>/dev/null; then
|
||||
echo "FEHLER: Commit ${WIP_COMMIT} existiert nicht in diesem Repo."
|
||||
echo " Wenn das Repo neu geklont wurde, musst du stattdessen manuell"
|
||||
echo " die Dateien aus dem Tarball wiederherstellen."
|
||||
echo " Siehe MANIFEST.md → Abschnitt 'Manuell'."
|
||||
exit 2
|
||||
fi
|
||||
|
||||
if ! ${FORCE}; then
|
||||
echo
|
||||
read -r -p " Wurde Phase 1 auf Live erfolgreich deployed und migriert? (yes/NO): " answer
|
||||
if [[ "${answer}" != "yes" ]]; then
|
||||
echo " Abbruch. Bitte erst Phase 1 auf Live einspielen."
|
||||
exit 3
|
||||
fi
|
||||
echo
|
||||
read -r -p " Trotzdem fortfahren? (yes/NO): " confirm
|
||||
if [[ "${confirm}" != "yes" ]]; then
|
||||
echo " Abbruch durch User."
|
||||
exit 3
|
||||
fi
|
||||
fi
|
||||
|
||||
echo
|
||||
echo "--- 1/4 --- Migrationen zurückspielen"
|
||||
cp -v "${BACKUP_DIR}/FILES/migrations/"*.php database/migrations/
|
||||
echo " → $(ls "${BACKUP_DIR}/FILES/migrations/" | wc -l) Migrationen kopiert"
|
||||
|
||||
echo
|
||||
echo "--- 2/4 --- Offer-Models zurückspielen"
|
||||
cp -v "${BACKUP_DIR}/FILES/models/"*.php app/Models/
|
||||
echo " → 6 Models kopiert (inkl. Überschreiben Legacy-Offer.php)"
|
||||
|
||||
echo
|
||||
echo "--- 3/4 --- Code-Reverts aus Git-Commit ${WIP_COMMIT}"
|
||||
FILES_TO_RESTORE=(
|
||||
"app/Models/Booking.php"
|
||||
"app/Models/Customer.php"
|
||||
"app/Models/Contact.php"
|
||||
"app/Models/Lead.php"
|
||||
"app/Repositories/BookingPDFRepository.php"
|
||||
"app/Repositories/LeadRepository.php"
|
||||
"app/Repositories/CustomerMailRepository.php"
|
||||
"app/Http/Controllers/RequestController.php"
|
||||
"app/Http/Controllers/API/BookingController.php"
|
||||
"app/Http/Controllers/Admin/ReportController.php"
|
||||
"app/Http/Controllers/Admin/ReportProviderController.php"
|
||||
"app/Http/Controllers/Admin/ReportLeadsController.php"
|
||||
"app/Http/Controllers/LeadController.php"
|
||||
"app/Http/Controllers/CustomerController.php"
|
||||
"app/Http/Controllers/ContactController.php"
|
||||
"app/Services/BookingImport.php"
|
||||
"app/Console/Commands/SyncNewsletterKulturreisen.php"
|
||||
"app/Console/Commands/ContactsFindDuplicates.php"
|
||||
"app/Console/Commands/ContactsMergeDuplicates.php"
|
||||
"resources/views/customer/mail/modal-show-mail-inner.blade.php"
|
||||
"resources/views/pdf/components/booking_head.blade.php"
|
||||
"resources/views/pdf/components/booking_header.blade.php"
|
||||
"config/filesystems.php"
|
||||
)
|
||||
for f in "${FILES_TO_RESTORE[@]}"; do
|
||||
git checkout "${WIP_COMMIT}" -- "${f}"
|
||||
echo " ↺ ${f}"
|
||||
done
|
||||
|
||||
echo
|
||||
echo "--- 4/4 --- Verifikation"
|
||||
echo
|
||||
echo " git status (sollte Phase-2 + Offers-Dateien als modifiziert zeigen):"
|
||||
git status --short | head -40
|
||||
echo
|
||||
echo " Verbliebene Phase-2-Marker im Code (sollten nun wieder da sein):"
|
||||
grep -rn "inquiry_id" app/ 2>/dev/null | head -5 || echo " (keine gefunden — Restore eventuell nicht vollständig)"
|
||||
echo
|
||||
|
||||
echo "=========================================="
|
||||
echo " Restore abgeschlossen."
|
||||
echo "=========================================="
|
||||
echo
|
||||
echo " Nächste Schritte:"
|
||||
echo " 1. php -l auf allen geänderten Dateien (Syntax-Check)"
|
||||
echo " 2. composer dump-autoload (neue Models registrieren)"
|
||||
echo " 3. Weiterarbeit an Phase 2 + Offers nach Plan"
|
||||
echo " 4. Phase-2-Migrationen ausführen:"
|
||||
echo " php artisan migrate --path=database/migrations/2025_04_15_200001_phase2_rename_customer_to_contacts.php"
|
||||
echo " php artisan migrate --path=database/migrations/2025_04_15_200002_phase2_rename_lead_to_inquiries.php"
|
||||
echo " php artisan migrate --path=database/migrations/2025_04_15_200003_phase2_rename_booking_lead_id_to_inquiry_id.php"
|
||||
echo
|
||||
Loading…
Add table
Add a link
Reference in a new issue