WIP: Sicherheitsnetz vor Phase-1-R\u00fcckbau
Enth\u00e4lt gemischt: Laravel-10-Upgrade + Phase 1 (Contacts-Modul, Duplicats-Commands, Soft-Delete+Merge-Fields) + Phase 2 Code-Umstellungen (inquiry_id, $table='contacts'/'inquiries') + Offers-Modul (Migrationen, Models, offer_id in Booking, offer-Disk in filesystems.php). Phase 2 + Offers werden im folgenden Commit nach dev/backups/phase2-offers-2026-04-17/ verschoben, damit der Workspace auf Phase-1-only (= Test-System-Stand) reduziert ist und direkt auf Live deploybar wird. Tarball-Backup zus\u00e4tzlich unter: ../backups-safety/workspace-pre-phase1-rollback-2026-04-17.tar.gz Made-with: Cursor
This commit is contained in:
parent
389d5d1820
commit
e3dc1afd8e
165 changed files with 21914 additions and 3516 deletions
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Request;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Models\Booking;
|
||||
use App\Models\BookingFile;
|
||||
use App\Models\Participant;
|
||||
|
|
@ -60,11 +60,9 @@ class BookingController extends Controller
|
|||
return view('booking.detail', $data);
|
||||
}
|
||||
|
||||
public function store($id)
|
||||
public function store(Request $request, $id)
|
||||
{
|
||||
// \Session()->flash('alert-save', '1');
|
||||
|
||||
$data = Request::all();
|
||||
$data = $request->all();
|
||||
|
||||
if ($id === "new") {
|
||||
$booking = new Booking();
|
||||
|
|
@ -308,11 +306,11 @@ class BookingController extends Controller
|
|||
return $redirect;
|
||||
}
|
||||
|
||||
public function loadModal()
|
||||
public function loadModal(Request $request)
|
||||
{
|
||||
$data = Request::all();
|
||||
$data = $request->all();
|
||||
$ret = "";
|
||||
if (Request::ajax()) {
|
||||
if ($request->ajax()) {
|
||||
if ($data['action'] === "new-customer-mail" || $data['action'] === "reply-customer-mail" || $data['action'] === "show-customer-mail" || $data['action'] === "edit-customer-mail") {
|
||||
$data['customers'] = [];
|
||||
if ($data['action'] === "new-customer-mail" && isset($data['booking_id']) && $booking = Booking::find($data['booking_id'])) {
|
||||
|
|
@ -374,7 +372,7 @@ class BookingController extends Controller
|
|||
$bookingFileRepo->_set('booking_id', $data['booking_id']);
|
||||
$bookingFileRepo->_set('dir', '/files/' . date('Y/m') . '/');
|
||||
$bookingFileRepo->_set('identifier', 'booking');
|
||||
return $bookingFileRepo->uploadFile(Request::all());
|
||||
return $bookingFileRepo->uploadFile($request->all());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -391,7 +389,7 @@ class BookingController extends Controller
|
|||
return redirect(route('booking_detail', [$booking->id]) . "#collapseBookingOrganisation");
|
||||
}
|
||||
|
||||
public function action($action, $id = false)
|
||||
public function action(Request $request, $action, $id = false)
|
||||
{
|
||||
|
||||
if (!$booking = Booking::find($id)) {
|
||||
|
|
@ -400,7 +398,7 @@ class BookingController extends Controller
|
|||
|
||||
if ($action === 'change_travel_dates') {
|
||||
$draftRepo = new DraftRepository($booking);
|
||||
$draftRepo->change_dates_drafts_from_booking(Request::get('change_travel_start_date'));
|
||||
$draftRepo->change_dates_drafts_from_booking($request->get('change_travel_start_date'));
|
||||
\Session()->flash('alert-success', __('Datum der Reise wurde geändert'));
|
||||
return redirect(route('booking_detail', [$booking->id]) . "#collapseBookingOrganisation");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue