Astral04/studiobeve.no
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add massage as a third vertical, driven by a config registry

Browse Source 
Introduces /massage alongside barber and beauty: landing page, booking
flow, admin support, home tile and SEO entries, in all three languages.

Architecture
- application/config/verticals.php + vertical_helper.php: one registry
  entry per vertical (branding, assets, views, behaviour flags). A fourth
  vertical is a config entry plus content files.
- Strangler: barber and beauty keep pointing at their existing view files,
  so their rendered HTML is unchanged. Only massage uses the new generic
  pages/vertical-*.php and includes/vertical-*.php views, which collapse
  the four duplicated per-language nav/footer branches into one.
- Pages::vertical() + one route; booking(), booking_finished(),
  _booking_error() and manage_booking() are now registry-driven.

Worker/vertical coupling
- getActiveWorkers() derives the vertical from services.service_category_id
  instead of the workers.is_barber / is_beauty flags, which were a
  hand-maintained cache of exactly that fact. Verified against production
  data: the derived set reproduced the stored flags for every worker, in
  both verticals. No schema change was needed for massage.
- The legacy flags are now written through from the category so a rollback
  cannot strand a new worker, and the admin worker UI shows the derived
  verticals read-only instead of two dropdowns that controlled nothing.

Bug fixes found along the way (all pre-existing)
- booking_process() had no server-side category guard; cross-vertical
  mixing was prevented only by client-side JS.
- add-service-form / add-worker-form emitted `selected` on every category
  option, so the newest category silently became the default.
- update-service-form offered only barber/beauty, so editing a service of
  any other type silently rewrote it.
- getWorkerScheduleByDay ignored schedule overrides while getAvailableTimes
  honoured them, so slots could be shown and then rejected. Added an
  override-aware getWorkerScheduleForDate() and used it in both guards.
- Booking lists dereferenced a null service if one had been hard-deleted.
- main.css: .tiles was tuned for exactly two tiles, including an
  absolutely-positioned .style1 at the 1280px breakpoint.

Massage-specific behaviour, opt-in per vertical
- strip_category_prefix: grouped service lists show "50 min" under the
  treatment heading rather than repeating the full name. The full name is
  carried in data-service-name so the totals panel stays unambiguous, and
  services.service_name is untouched for emails and admin.
- single_service_booking: one treatment per booking, enforced in the UI and
  in booking_process(). Re-clicking the selection releases it.
- Displayed treatment time (50/80/110 min) is in the service name; the
  booked slot (60/90/120 min) is service_time and covers changing and
  payment. service_time is never shown to the guest.

DB migrations for dev/prod are in documents/ - additive only, no ALTER.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Ubuntu
2026-08-13 16:34:47 +00:00
co-authored by Claude Opus 5
parent 0fd7f7a7a5
commit 5c30467fbd
61 changed files with 7130 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/Admin.php
+10 -6
View File
@@ -298,8 +298,9 @@ class Admin extends CI_Controller {
}
if(isset($_POST['addNewService'])){
$allowedServiceTypes = array('barber', 'beauty', 'massage');
$serviceArray = array(
'service_type' => $_POST['service_type'],
'service_type' => (isset($_POST['service_type']) && in_array($_POST['service_type'], $allowedServiceTypes, true)) ? $_POST['service_type'] : 'beauty',
'service_category_no' => $_POST['service_category_no'],
'service_category_en' => $_POST['service_category_en'],
'service_category_hu' => $_POST['service_category_hu'],
@@ -320,8 +321,10 @@ class Admin extends CI_Controller {
}
if(isset($_POST['updateService'])){
$allowedServiceTypes = array('barber', 'beauty', 'massage');
$existingService = $this->Service_model->getServiceById($_POST['service_id']);
$serviceArray = array(
'service_type' => $_POST['service_type'],
'service_type' => (isset($_POST['service_type']) && in_array($_POST['service_type'], $allowedServiceTypes, true)) ? $_POST['service_type'] : ($existingService ? $existingService->service_type : 'beauty'),
'service_category_no' => $_POST['service_category_no'],
'service_category_en' => $_POST['service_category_en'],
'service_category_hu' => $_POST['service_category_hu'],
@@ -542,6 +545,8 @@ class Admin extends CI_Controller {
$data['serviceCategories'] = $this->Service_model->getAllServiceCategories();
$data['selectedItem'] = $this->Service_model->getWorkerById($worker_id);
// Verticals are derived from the worker's service category, not stored.
$data['workerVerticals'] = $this->Service_model->getVerticalsForWorker($worker_id);
$this->load->view('admin/update-worker', $data);
}
else{
@@ -597,11 +602,12 @@ class Admin extends CI_Controller {
}
// is_beauty / is_barber are no longer submitted by the form - the
// vertical is derived from service_category_id. Service_model
// keeps the legacy columns consistent on write.
$workerArray = array(
'worker_name' => $_POST['worker_name'],
'worker_info' => $_POST['worker_info'],
'is_beauty' => $_POST['is_beauty'],
'is_barber' => $_POST['is_barber'],
'worker_profile_img' => $data['worker_img'],
'service_category_id' => $_POST['service_category_id'],
'is_active' => $_POST['is_active']
@@ -615,8 +621,6 @@ class Admin extends CI_Controller {
$workerArray = array(
'worker_name' => $_POST['worker_name'],
'worker_info' => $_POST['worker_info'],
'is_beauty' => $_POST['is_beauty'],
'is_barber' => $_POST['is_barber'],
'service_category_id' => $_POST['service_category_id'],
'is_active' => $_POST['is_active'],
'google_calendar_id' => isset($_POST['google_calendar_id']) ? $_POST['google_calendar_id'] : '',