Compare commits
78
Commits
69fdd0b4b8
...
v0.30.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c455c8adf2 | ||
|
|
dcff693b99 | ||
|
|
3020bd070c | ||
|
|
162827dff7 | ||
|
|
cbb76070d9 | ||
|
|
966f099ffb | ||
|
|
b37ed69557 | ||
|
|
a8fe13e336 | ||
|
|
eadaf3a580 | ||
|
|
dbea4a8d69 | ||
|
|
cd3245df7b | ||
|
|
49ec4333af | ||
|
|
f411dec1da | ||
|
|
ebf8fd7571 | ||
|
|
536fe32e0d | ||
|
|
8293195395 | ||
|
|
d19fe1b6ea | ||
|
|
44a2ddda4a | ||
|
|
52f3036960 | ||
|
|
004f2382cb | ||
|
|
6cf142e35b | ||
|
|
47851d36ec | ||
|
|
c43682ef0c | ||
|
|
332bf92e44 | ||
|
|
cceeb83d5e | ||
|
|
1b06486b2b | ||
|
|
1a7e8704d0 | ||
|
|
6f6ae03428 | ||
|
|
9ce0c625ef | ||
|
|
40888bf197 | ||
|
|
e9d90418fc | ||
|
|
1bcc6acd27 | ||
|
|
359b645c62 | ||
|
|
d6c6bf6a1c | ||
|
|
57d7a716bc | ||
|
|
76b807d672 | ||
|
|
0797e3ab7a | ||
|
|
5f0dbbb734 | ||
|
|
839335ed3f | ||
|
|
0a6958eb9e | ||
|
|
d189a7559a | ||
|
|
7f2ddea240 | ||
|
|
45df93692a | ||
|
|
b806db611f | ||
|
|
c1874c277e | ||
|
|
05f00ed1fd | ||
|
|
569eb310e9 | ||
|
|
0387b38ab3 | ||
|
|
0a51d912a0 | ||
|
|
1214f9b748 | ||
|
|
effbce195c | ||
|
|
dca6944153 | ||
|
|
68ebe35b8e | ||
|
|
ee4d9b7952 | ||
|
|
e5679afa25 | ||
|
|
a55411aaf2 | ||
|
|
088d8cb809 | ||
|
|
492447be51 | ||
|
|
e7c896e168 | ||
|
|
309602fe93 | ||
|
|
9683a31c5e | ||
|
|
667e2ea2e5 | ||
|
|
fd3bbbe7de | ||
|
|
beb7d5faba | ||
|
|
547f07f01e | ||
|
|
ccab9bbb8e | ||
|
|
985f53efa2 | ||
|
|
23643db996 | ||
|
|
099271e0a8 | ||
|
|
01c49485be | ||
|
|
935b1d02f9 | ||
|
|
8fdaeda0ba | ||
|
|
f416e207eb | ||
|
|
c55019d04a | ||
|
|
910d4c5df0 | ||
|
|
f1a0322d3f | ||
|
|
6025ea4304 | ||
|
|
2b8fe5764c |
@@ -0,0 +1,41 @@
|
||||
{
|
||||
"permissions": {
|
||||
"allow": [
|
||||
"Bash(find /home/konstantinos/Projects/RadicalElements/boboko-core/docs/scratch -iname \"*cart*\" 2>/dev/null; find /home/konstantinos/Projects/RadicalElements -iname \"*cart-feature*\" -o -iname \"*feature-survey*\" 2>/dev/null)",
|
||||
"Read(//home/konstantinos/Projects/RadicalElements/**)",
|
||||
"Bash(find /home/konstantinos/Projects/RadicalElements/3dealer -path \"*config/lunar/payments.php\" 2>/dev/null; find /home/konstantinos/Projects/RadicalElements -maxdepth 4 -iname \"*stripe*\" -type d 2>/dev/null)",
|
||||
"Bash(grep -n 'process\\(\\\\|->using\\\\|\\\\$data' /home/konstantinos/Projects/RadicalElements/boboko-core/vendor/filament/actions/src/CreateAction.php)",
|
||||
"Bash(php -l src/Order/Commands/CloseExpiredReturnWindows.php)",
|
||||
"Bash(php -l config/core.php)",
|
||||
"Bash(./bin/dc-core.sh exec *)",
|
||||
"Bash(php -l src/Shipping/Extensions/OrderViewExtension.php)",
|
||||
"Bash(php -l src/Cart/Filament/Resources/CartResource/Pages/ViewCart.php)",
|
||||
"Bash(./bin/dc-core.sh exec app php artisan tinker '--execute= *)",
|
||||
"Bash(mkdir -p /home/konstantinos/Projects/RadicalElements/boboko-core/src/Cart/Http/Controllers)",
|
||||
"Bash(rmdir /home/konstantinos/Projects/RadicalElements/boboko-core/src/Checkout/routes)",
|
||||
"Bash(mkdir -p /home/konstantinos/Projects/RadicalElements/boboko-core/src/Checkout/routes)",
|
||||
"Bash(php -l src/Cart/Http/Controllers/CartController.php)",
|
||||
"Bash(php -l src/Checkout/Http/Controllers/CheckoutController.php)",
|
||||
"Bash(php -l src/Providers/CheckoutModuleServiceProvider.php)",
|
||||
"Bash(php -l src/Providers/CheckoutServiceProvider.php)",
|
||||
"Bash(php -l src/Checkout/routes/checkout.php)",
|
||||
"Bash(php -l config/checkout.php)",
|
||||
"Bash(cp /home/konstantinos/Projects/RadicalElements/3dealer/resources/css/checkout.css /home/konstantinos/Projects/RadicalElements/boboko-core/resources/css/)",
|
||||
"Bash(cp /home/konstantinos/Projects/RadicalElements/3dealer/resources/js/checkout/*.js /home/konstantinos/Projects/RadicalElements/boboko-core/resources/js/checkout/)",
|
||||
"Bash(rm /home/konstantinos/Projects/RadicalElements/3dealer/app/Providers/CheckoutModuleServiceProvider.php)",
|
||||
"Bash(rm -rf /home/konstantinos/Projects/RadicalElements/3dealer/app/Http/Controllers/Checkout)",
|
||||
"Bash(rm /home/konstantinos/Projects/RadicalElements/3dealer/routes/checkout.php)",
|
||||
"Bash(rm -rf /home/konstantinos/Projects/RadicalElements/3dealer/resources/js/checkout)",
|
||||
"Bash(rm /home/konstantinos/Projects/RadicalElements/3dealer/resources/css/checkout.css)",
|
||||
"Bash(composer dump-autoload *)",
|
||||
"Bash(curl -s -o /tmp/checkout_test.html -w \"%{http_code}\\\\n\" http://localhost:8091/en/checkout)",
|
||||
"Read(//tmp/**)",
|
||||
"Bash(curl -s -o /tmp/home_test.html -w \"%{http_code}\\\\n\" http://localhost:8091/en/)",
|
||||
"Bash(php -l bootstrap/providers.php)"
|
||||
],
|
||||
"additionalDirectories": [
|
||||
"/home/konstantinos/Projects/RadicalElements/3dealer/bootstrap",
|
||||
"/home/konstantinos/Projects/RadicalElements/3dealer/config"
|
||||
]
|
||||
}
|
||||
}
|
||||
+745
@@ -4,8 +4,753 @@ All notable changes to this project will be documented in this file.
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
|
||||
|
||||
## [0.30.0] - 2026-09-30
|
||||
### Added
|
||||
- Manual vouchers (an integrated carrier's voucher typed in by hand) can be
|
||||
edited and tracked by hand from the order page: "Edit number" (the number
|
||||
stays required) and "Add tracking update" now show for them, as they do
|
||||
for manual carriers. An In Transit / Collected update dispatches the
|
||||
order and sends the "on its way" email; Delivered marks it delivered and
|
||||
stops tracking polls for it. The carrier's own checkpoints keep coming in
|
||||
alongside.
|
||||
- A shipping method's "Tracking URL" can now be set for every driver, not
|
||||
only `manual`. For an integrated carrier it's copied onto vouchers added
|
||||
with "Add manual voucher", so they get the "Carrier tracking" link in the
|
||||
admin and a "Track your parcel" link in the dispatched email.
|
||||
API-created shipments still send customers to the order page. Vouchers
|
||||
added before this have no link.
|
||||
- The customer's delivery instructions are sent to the carrier: ELTA's
|
||||
remarks (ΠΑΡΑΤΗΡΗΣΕΙΣ, one line, 90 characters) and ACS's
|
||||
`Delivery_Notes`. ELTA labels print them in the ΠΑΡΑΤΗΡΗΣΕΙΣ box (up to 3
|
||||
lines on A4, 2 on A6 and the payment stub).
|
||||
|
||||
### Changed
|
||||
- Tracking polls run one queued job per shipment: `PollShipmentTrackingJob`
|
||||
now only finds the shipments to poll and dispatches a
|
||||
`RefreshShipmentTrackingJob` for each as a batch (`allowFailures`). A
|
||||
slow or failing carrier call only affects its own job, with its own 45s
|
||||
timeout; a failed one is retried by the next poll, five minutes later.
|
||||
Needs the `job_batches` table (Laravel's default jobs migration).
|
||||
- `PollShipmentTrackingJob` is unique, so a scheduled run is dropped while
|
||||
the previous one is still pending. `RefreshShipmentTrackingJob` is unique
|
||||
per shipment, so the same shipment is never refreshed twice at once,
|
||||
which could record a checkpoint twice and fire its emails twice.
|
||||
|
||||
### Fixed
|
||||
- "Add manual voucher" and a manual carrier's "Create Shipment" failed
|
||||
with an SQL error ("missing FROM-clause entry for table lunar_orders")
|
||||
whenever a voucher number was entered: their unique check on the
|
||||
shipments table also excluded the current order's id.
|
||||
|
||||
## [0.29.3] - 2026-09-30
|
||||
### Fixed
|
||||
- Queued shipping jobs did nothing: `PollShipmentTrackingJob` and
|
||||
`SyncCarrierVouchersJob` ran every time but finished in milliseconds
|
||||
without contacting any carrier. The queue worker clears facade instances
|
||||
before each job, and the Shipping manager was bound with `bind()`, so the
|
||||
facade then built a fresh manager with no drivers registered. It's now a
|
||||
singleton. Tracking from the scheduler never worked on a deployed app
|
||||
because of this (a "Sync now" click worked, since it doesn't go through
|
||||
the queue).
|
||||
- ELTA extra parcels are no longer tracked by their own number: ELTA only
|
||||
tracks a multi-parcel send by its main voucher and rejects the extra
|
||||
parcels' numbers ("Λάθος ΣΥΔΕΤΑ"), which logged an error for each of them
|
||||
on every tracking run.
|
||||
|
||||
## [0.29.2] - 2026-09-30
|
||||
### Added
|
||||
- `core.display_timezone` (env `DISPLAY_TIMEZONE`, default `Europe/Athens`):
|
||||
the timezone times are shown in, while they stay stored in the app
|
||||
timezone (UTC). Set as Filament's display timezone, so every admin date
|
||||
column, entry and picker shows local time (and pickers save UTC), and
|
||||
available on dates as `->inDisplayTimezone()` for hand-formatted ones —
|
||||
storefront pages and emails should use it (3dealer's My orders, tracking
|
||||
timeline and order-placed email do).
|
||||
|
||||
### Fixed
|
||||
- Every time in the admin was shown in UTC — 3 hours behind Greek time in
|
||||
summer, 2 in winter — including Carrier Vouchers, Pending Vouchers, the
|
||||
order page's shipments and the order Timeline (whose view core now
|
||||
overrides, `resources/views/lunarpanel`, since Lunar formats its times by
|
||||
hand). Manual tracking updates entered in local time were saved as if
|
||||
they were UTC; they're now converted.
|
||||
- ACS tracking times (Greek time, no offset) were stored as if they were
|
||||
UTC; they're now read as Greek time, like ELTA's.
|
||||
- ELTA multi-parcel sends: Create Shipment with several packages now
|
||||
creates one shipment per parcel straight away (the extra parcels get
|
||||
their voucher numbers when the main voucher is issued, on first print),
|
||||
so the order shows every parcel from the start. Labels follow ELTA's own
|
||||
client: printing the main voucher prints every parcel in one PDF, each
|
||||
parcel is numbered `00k/00n` (previously every label said `001/00n`),
|
||||
the extra parcels show "ΠΟΛΛΑΠΛΗ ΑΠΟΣΤΟΛΗ - MASTER : <main voucher>" and
|
||||
only the COD warning (the amount is collected on the main voucher), and
|
||||
on A4 they use ELTA's separate single-parcel layout (`label-a4-child`).
|
||||
An extra parcel can't be cancelled on its own — ELTA cancels the whole
|
||||
voucher, so cancelling the main parcel cancels them all.
|
||||
- The order page's shipments list now updates right after Create Shipment
|
||||
and Add manual voucher, instead of only on the next page load.
|
||||
- Pending Vouchers kept ELTA vouchers forever (ELTA has no manifest step,
|
||||
which is what took ACS vouchers off the list). A voucher now leaves once
|
||||
its carrier's hand-over step is done: printed for carriers that issue on
|
||||
print (ELTA), on a manifest for carriers that batch (ACS).
|
||||
- "Issued Manifests" is hidden from the menu while no registered carrier
|
||||
uses manifests (ACS is currently off); the page and past manifests stay
|
||||
reachable.
|
||||
- Carrier Vouchers: the list shows each voucher's **Source** again, colored
|
||||
per source (created here green, manual voucher orange, manual carrier
|
||||
grey, from carrier blue), same on the view page. "Reference sent to the
|
||||
carrier" was only filled for vouchers the carrier reported; shipments now
|
||||
save the reference they send (ELTA `pel_ref_no`, ACS `Reference_Key1`,
|
||||
Box Now `orderNumber`), and older ones show what was sent (the order
|
||||
reference, or `{reference}-{id}` for Box Now).
|
||||
- Multi-parcel sends show which voucher is the main one and which parcels
|
||||
belong to it — "Main voucher · parcel 1 of 3", "Parcel 2 of 3 · of
|
||||
NZ…GR" — on the order page, Pending Vouchers and Carrier Vouchers (list
|
||||
and view), via `Shipment::parcelDescription()`.
|
||||
- Shipping options are now resolved by **place, from the inside out**:
|
||||
postcode → state → country → unrestricted, and the first place with
|
||||
usable rates is the whole answer — outer places are not considered. So a
|
||||
postcode zone offering only Box Now at €4 means customers in that
|
||||
postcode get only Box Now at €4, even if an unrestricted zone offers Box
|
||||
Now and ACS at €8. Postcode zones go from the most specific match to the
|
||||
least (an exact postcode beats a `45*` prefix). Previously Lunar mixed
|
||||
every matching zone together and kept whichever rate per method it met
|
||||
first, so the price depended on the order zones were created in.
|
||||
A place whose rates are all unusable (disabled, outside the customer
|
||||
group or schedule, stock, weight limits, or an unregistered driver) falls
|
||||
through to the next one. It finds every zone containing the address in
|
||||
one query and checks customer groups once for all methods, so it runs a
|
||||
fixed ~10 queries — no more than Lunar's own resolver, which grew with
|
||||
each rate. `Modules\Core\Shipping\Support\PlaceShippingRateResolver`
|
||||
replaces 0.29.1's `RegisteredDriverRateResolver` (its unregistered-driver
|
||||
check is part of it).
|
||||
Exclusion lists don't make a place fall through: an excluded product
|
||||
means "can't be shipped there", so a cart holding one gets that place's
|
||||
remaining options — or none — never an outer place's rule.
|
||||
|
||||
## [0.29.1] - 2026-09-30
|
||||
### Fixed
|
||||
- Checkout crashed ("Driver [acs] not supported", a 500) when a shipping
|
||||
method pointed at a driver that is no longer registered — e.g. a carrier
|
||||
commented out while its shipping method still exists in the admin. Such
|
||||
methods are now left out of the options offered at checkout
|
||||
(`Modules\Core\Shipping\Support\RegisteredDriverRateResolver`); the admin
|
||||
is unchanged.
|
||||
- The Box Now locker map at checkout only appeared when the shipping
|
||||
method's **code** was exactly `box-now`; a method with any other code
|
||||
(e.g. `boxnow`) never showed it, and switching options cleared the chosen
|
||||
locker. Box Now is now recognized by its driver being a `BoxNowRateDriver`
|
||||
(`Modules\Core\Shipping\Support\BoxNowShipping`), not by any name. The
|
||||
admin order page's Create Shipment (locker + boxes form) and the
|
||||
shipment's locker line use the same check.
|
||||
|
||||
## [0.29.0] - 2026-09-30
|
||||
### Added
|
||||
- **ELTA Courier** carrier (`elta` shipping driver): rates, shipment creation,
|
||||
tracking, and labels rendered locally in ELTA's own A4 / A6 voucher layout.
|
||||
Configured through `ELTA_*` env variables (`ELTA_APOST_CODE`,
|
||||
`ELTA_USER_CODE`, `ELTA_SENDER_*`, `ELTA_LABEL_PAPER_SIZE`, …). Vouchers
|
||||
are created pending and issued when first printed, so they can be
|
||||
cancelled until then; once issued, ELTA has to cancel them.
|
||||
- **Pending Vouchers** now has an ELTA tab next to ACS. Print opens the label
|
||||
(issuing the voucher), Cancel cancels with the carrier, and **Print
|
||||
selected** returns one combined PDF for carriers that support it (ELTA).
|
||||
Issue Manifest only shows on tabs for carriers that batch (ACS).
|
||||
- **Carrier Vouchers** screen (Sales): every voucher with a number, including
|
||||
the ones carriers report that we don't have (daily sync of the last 14
|
||||
days, plus **Sync now** and **Look up voucher**). Tabs All / Unlinked /
|
||||
Returns. Each sync also brings every voucher it sees up to date: new
|
||||
tracking checkpoints for all of them (ours included), and the carrier's
|
||||
latest details for the ones that came from the carrier. **Status** is ours (normalized, the same on every carrier) and
|
||||
**Carrier status** is the carrier's own wording. A view page per voucher
|
||||
has its details (recipient, COD,
|
||||
extra services, return info, suggested orders, tracking history). Vouchers
|
||||
are never linked to an order automatically: each gets suggested orders
|
||||
(the order its reference points to first, then same postcode and phone or
|
||||
name), and staff link it with **Link to order**. Supported for ELTA, Box
|
||||
Now and ACS
|
||||
(finalized vouchers only).
|
||||
- **Manual carriers**: a new "Manual carrier" shipping driver for couriers
|
||||
without an integration. The shipping method holds the carrier name, an
|
||||
optional tracking URL template (`{number}` = voucher number) and whether the
|
||||
courier collects cash on delivery. Its shipments are created from the order
|
||||
page, and staff add tracking updates by hand; they move the order through
|
||||
dispatched / delivered / failed and send the same emails as integrated
|
||||
carriers.
|
||||
- **Extra services** (Saturday delivery, timed delivery, insurance, …), one
|
||||
normalized list mapped to each carrier's own codes, picked by staff in
|
||||
Create Shipment. Sent to ACS (`Acs_Delivery_Products`, `Insurance_Ammount`,
|
||||
`Appointment_Until_Time`) and ELTA (`pel_sur_*`, `pel_asf_poso`), printed
|
||||
on the ELTA label.
|
||||
- **Add manual voucher** on the order page, for an integrated carrier's
|
||||
voucher that wasn't created here (API down, or the courier wrote his own).
|
||||
It previews what the carrier reports for the number, and its tracking
|
||||
history is picked up like any other shipment.
|
||||
- Customer tracking: the dispatched email lists each shipment's voucher
|
||||
number and links to the order page, which shows the carrier, status and
|
||||
the synced tracking history. Only manual carriers link to the courier's
|
||||
site. New `storefront.orders.*` and `storefront.tracking_status.*` keys —
|
||||
re-run `StorefrontTranslationsSeeder` in consuming apps.
|
||||
- Carrier tracking on the order page's **Timeline**: every checkpoint of the
|
||||
order's shipments (carrier polling or a manual tracking update) is logged
|
||||
as it arrives, showing carrier, voucher, status, location and the
|
||||
carrier's own time. Linking a voucher to an order from Carrier Vouchers
|
||||
adds its history so far.
|
||||
- Every shipment stores its cash-on-delivery amount and extra services; the
|
||||
order page shows them. ACS vouchers now carry the order reference
|
||||
(`Reference_Key1`) so they can be matched back.
|
||||
|
||||
### Changed
|
||||
- Creating a shipment no longer marks the order **dispatched**. It moves to
|
||||
dispatched when the carrier reports picking the parcel up, which is also
|
||||
when the "on its way" email is sent (previously it was never sent after
|
||||
Create Shipment).
|
||||
- `shipments.tracking_reference` and `shipments.order_id` are nullable, and
|
||||
shipments have a `source` (`created`, `manual_voucher`, `manual`,
|
||||
`synced`). New migration.
|
||||
- `SupportsCashCollection::collectsCash()` now receives the shipping method:
|
||||
`collectsCash(ShippingMethod $method)`. Custom shipping drivers implementing
|
||||
it need the new signature.
|
||||
- Create Shipment is available again once all of an order's shipments are
|
||||
cancelled.
|
||||
- The order page shows ELTA and manual carriers by name, and hides Print for
|
||||
shipments without a carrier label.
|
||||
- `OrderStatusUpdated` carries the cause of the write (`$causeClass`, null
|
||||
for writes outside `OrderStatusWriter`).
|
||||
|
||||
### Fixed
|
||||
- Customers got two emails when an order became ready for pickup,
|
||||
dispatched, delivered or completed: the dedicated one and the generic
|
||||
"your order is now …" one, which only skipped a `ready-for-pickup` spelling
|
||||
that is never written. The generic email now skips exactly the writes that
|
||||
send their own email; a manual status change from the admin still sends
|
||||
it.
|
||||
- ELTA labels now print everything ELTA's own client prints (checked
|
||||
field by field against its `SydetaLabelE` / `sydetaE` reports and
|
||||
`print_vg()`): the cash-on-delivery amount and breakdown
|
||||
("ΑΝΤΙΚΑΤΑΒΟΛΗ 17.00", "* ΑΝΑΛΥΣΗ *", "17.00 MΕΤΡΗΤΑ") in the COD column,
|
||||
the A6 bottom banner, both A4 copies and the payment stub (with ΠΟΣΟ), the
|
||||
A4 "* ΠΡΟΣΟΧΗ ΑΝΤΙΚΑΤΑΒΟΛΗ *" / "* Απόδειξη Είσπαξης *" notes, the
|
||||
sender's "Κωδικός:" line, extra services in ELTA's own slots, and
|
||||
"* ΠΟΛΛΑΠΛΗ ΑΠΟΣΤΟΛΗ *". Previously the A6 label showed no COD amount at
|
||||
all. The OCR line is no longer wrapped in doubled `> <` markers, and the
|
||||
volumetric weight is left empty (not 0.000) when none was given.
|
||||
- ELTA tracking texts were almost never recognized: ELTA sends them in
|
||||
unaccented capitals ("ΠΑΡΑΔΟΘΗΚΕ") while the mapping looked for accented
|
||||
words, so most checkpoints came through as Pending. Box Now's `canceled`
|
||||
spelling is now recognized too.
|
||||
- ACS shipments were never detected as delivered: the tracking summary was
|
||||
read from `ACSValueOutput` instead of `ACSTableOutput`.
|
||||
- Re-creating a Box Now shipment after cancelling it failed, because the
|
||||
same `orderNumber` was sent again. Retries now send `{reference}-{id}-2`,
|
||||
`-3`, …
|
||||
|
||||
## [0.28.0] - 2026-09-30
|
||||
### Added
|
||||
- `php artisan boboko:translations:pull` — the reverse of the translation
|
||||
seeders: copies `storefront` / `checkout` / `validation` lines that exist in
|
||||
the database (e.g. added through the Filament Language Lines UI while
|
||||
building a storefront) but not in the matching seeder into that seeder's
|
||||
`lines()`, appended under a marker comment. Keys a seeder already has are
|
||||
never touched. Writes only against a local `../boboko-core` checkout (local
|
||||
mode); `--dry-run` lists the lines from anywhere.
|
||||
- Storefront translations for error pages: `storefront.errors.404_title`,
|
||||
`storefront.errors.404_text`, `storefront.errors.back_home`. Re-run
|
||||
`StorefrontTranslationsSeeder` in consuming apps (or restart the stack) to
|
||||
add them.
|
||||
|
||||
### Changed
|
||||
- `CONTRIBUTE.md` rewritten to match the actual setup: the local/repo modes
|
||||
and the `bin/core-mode` switch, `@boboko/core` as a real npm package (the
|
||||
old "no separate npm package" section was stale), releasing a version,
|
||||
deploying a consumer app with `bin/deploy`, and pulling UI-added
|
||||
translations into the seeders.
|
||||
|
||||
## [0.27.5] - 2026-09-30
|
||||
### Security
|
||||
- OTP codes (both customer login via `UserOtpService` and staff login via
|
||||
`OtpService`) were stored in plaintext in `users.otp_code`/`lunar_staff.otp_code`
|
||||
and compared against the plaintext guess. The staff path was additionally
|
||||
weaker — a loose `!=` comparison with no timing-attack protection and no
|
||||
attempt-limiting at all. Both columns are replaced with `otp_code_hash`
|
||||
(bcrypt, via a `'hashed'` cast — same convention `password` already uses),
|
||||
compared with `Hash::check()`. The cache-backed pending-signup OTP path
|
||||
(an email with no `User` row yet) is hashed the same way. No backfill —
|
||||
any code mid-flight when this deploys is invalidated (codes expire in 10
|
||||
minutes regardless, so the practical impact is limited to a re-request).
|
||||
- `App\Models\User`'s (3dealer) and `Modules\Core\Auth\Models\Staff`'s
|
||||
`$hidden` arrays didn't list `otp_code`/`otp_expires_at`/`otp_attempts`/
|
||||
`pending_email_code_hash`/etc. at all — any serialization of either model
|
||||
(an API response, `Auth::user()` returned somewhere) would have leaked
|
||||
those fields, including the (now-hashed, previously plaintext) OTP code
|
||||
itself. `Staff` additionally never overrode Lunar's own base `$hidden`, so
|
||||
it also lacked `password`/`remember_token` protection until now.
|
||||
|
||||
## [0.27.4] - 2026-09-29
|
||||
### Added
|
||||
- Generic `.bbk-notice` / `.bbk-notice--info` message box and a
|
||||
`--bbk-color-info` custom property in `checkout.css`.
|
||||
- Cart drawer focus handling: focus moves into the drawer on open, stays
|
||||
inside it, returns to the opener on close, and is restored after each
|
||||
cart update. Updates are announced as "Cart updated" instead of re-reading
|
||||
the whole cart. New translation line `checkout.cart.updated` — re-run
|
||||
`CheckoutTranslationsSeeder` in consuming apps to add it.
|
||||
|
||||
### Changed
|
||||
- Cart drawer line: larger remove button on the title row, line total on
|
||||
the quantity-stepper row, and screen-reader labels tied to the product
|
||||
name. `.bbk-cart-item-aside` is removed — hosts restyling it should target
|
||||
`.bbk-cart-item-head` / `.bbk-cart-item-foot` instead.
|
||||
- Order confirmation page: narrower (560px), the confirmation-email note is
|
||||
now an info box under the heading, the order summary comes before
|
||||
shipping/billing (shown side by side), and the order number is prefixed
|
||||
with `#`.
|
||||
|
||||
## [0.27.3] - 2026-09-29
|
||||
### Added
|
||||
- The checkout confirmation page now ends with the store's bank transfer
|
||||
instructions (Store Details → Bank transfer) for a bank transfer order,
|
||||
via `StoreDetailsService::bankTransferInstructionsFor()`. New translation
|
||||
line `checkout.page.confirmation_bank_transfer_heading` — re-run
|
||||
`CheckoutTranslationsSeeder` in consuming apps to add it.
|
||||
|
||||
### Fixed
|
||||
- `StoreDetailsService::bankTransferInstructionsFor()` now fills a
|
||||
`{order_reference}` (or `{{ order_reference }}`) typed into the bank
|
||||
transfer instructions with the order's display reference
|
||||
(`OrderReferenceDisplay`). It previously rendered literally in the order
|
||||
confirmation email.
|
||||
|
||||
## [0.27.2] - 2026-09-29
|
||||
### Fixed
|
||||
- `Modules\Core\Order\Services\TransactionRecorder::record()` — made idempotent
|
||||
on `(order_id, type, reference)`. A successful Stripe payment can legitimately
|
||||
report `PaymentCaptured` twice for the same PaymentIntent (checkout's
|
||||
synchronous capture via `pay()`, then the webhook confirming the same
|
||||
outcome asynchronously via `handleCallback()`), both routing through
|
||||
`resultFromIntent()`. With no dedupe check, this wrote two identical
|
||||
`Transaction` rows for one real payment. Now returns the existing row
|
||||
instead of creating a duplicate.
|
||||
|
||||
## [0.27.1] - 2026-09-29
|
||||
### Added
|
||||
- Temp logger for Stripe webhook
|
||||
|
||||
## [0.27.0] - 2026-09-29
|
||||
|
||||
### Added
|
||||
- `Modules\Core\Shipping\Contracts\SupportsCashCollection` — a shipping driver
|
||||
implements this to say a person is physically present at handoff to collect
|
||||
cash. `AcsRateDriver` implements it (a courier can); `BoxNowRateDriver` and
|
||||
the new `StorePickupRateDriver` don't (an unattended locker or a store
|
||||
clerk deciding to accept cash isn't the same fact as a courier collecting
|
||||
it on delivery). `Modules\Core\Checkout\Services\CheckoutService::
|
||||
getPaymentMethods()` now checks this for cash-on-delivery specifically, so
|
||||
COD is no longer offered alongside Box Now — `RequiresFulfillmentType`
|
||||
alone couldn't distinguish "an unattended carrier" from "an attended one,"
|
||||
both being `carrier`.
|
||||
- `Modules\Core\Shipping\Carriers\StorePickup\StorePickupRateDriver` — a
|
||||
first-party replacement for `lunarphp/table-rate-shipping`'s own
|
||||
`Collection` driver, following the same shape as `AcsRateDriver`/
|
||||
`BoxNowRateDriver`. Fixes two bugs the vendor driver had: it read
|
||||
`ShippingMethod->name` directly instead of decoding the translatable JSON
|
||||
column, so the storefront showed the raw JSON blob instead of a
|
||||
translated name; and it never checked product exclusions the same way
|
||||
the vendor's own generic drivers did.
|
||||
- `Modules\Core\Shipping\Concerns\ExcludesRestrictedProducts` — shared
|
||||
product-exclusion check (a shipping zone's configured "this product can't
|
||||
ship via this method" list), now applied consistently by every
|
||||
first-party driver (ACS, Box Now, Store Pickup). Previously only Lunar's
|
||||
own generic drivers honored exclusions at all — ACS and Box Now silently
|
||||
ignored them.
|
||||
- `Modules\Core\Localization\Database\Seeders\StorefrontTranslationsSeeder`
|
||||
— the `storefront` translation group is now seeded the same way
|
||||
`checkout`/`validation` already are (a dedicated, idempotent seeder run
|
||||
from the entrypoint), rather than as a private method inside
|
||||
`InstallLunarCommand`. `Modules\Core\Localization\Services\
|
||||
StorefrontLabels` is removed; its ~160 lines moved into the new seeder.
|
||||
- `StoreDetailsService::bankTransferInstructionsFor()` — sanitized HTML for
|
||||
a bank transfer order's confirmation email, gated on
|
||||
`OrderStatusFlow::isBankTransfer()`.
|
||||
- `StoreServiceProvider::applyMailFromName()` — listens for
|
||||
`Illuminate\Mail\Events\MessageSending` and renames the From header's
|
||||
display name to Store Details' `mail_from_name`, when set, for every
|
||||
outgoing email app-wide (order notifications, OTP codes, contact form
|
||||
confirmations, etc.), no per-mailable changes needed. Only touches a
|
||||
message whose From address still matches `config('mail.from.address')`
|
||||
— the sending address itself is untouched (a deliverability/domain-
|
||||
authentication concern, not a merchant-editable text field), and a
|
||||
mailable/notification that already set its own explicit sender is left
|
||||
alone entirely.
|
||||
- `Order.meta['locale']` — the shopper's locale at checkout, saved by
|
||||
`CheckoutService::initiatePayment()` so every order notification renders
|
||||
in the locale they actually checked out in (via `Notification::locale()`
|
||||
in `NotificationRegistry::register()`), independent of whatever locale
|
||||
happens to be active when the notification is actually sent (a payment
|
||||
webhook, a queued job, a staff action).
|
||||
- `Order.meta['coupon_code']` — copied from the cart at checkout, so the
|
||||
confirmation email always shows the code the order was actually placed
|
||||
with, rather than reading the cart row (which may since have been
|
||||
cleared/reused).
|
||||
- Contact details on the storefront and product confirmation emails now
|
||||
accept `$order` directly (all 8 order notification views), removing two
|
||||
workarounds: `placed.blade.php` no longer reaches the order through
|
||||
`$lines->first()->order`, and `status-updated.blade.php` no longer
|
||||
reverse-searches a status key from its English label.
|
||||
|
||||
### Changed
|
||||
- The vendor's own generic shipping drivers (`free-shipping`, `flat-rate`,
|
||||
`ship-by`, `collection`) are no longer offered at all — every shipping
|
||||
method now uses a first-party driver (ACS, Box Now, or Store Pickup),
|
||||
each of which declares its own fulfillment type. The `data.fulfillment_type`
|
||||
Select on the shipping method form is removed, along with the
|
||||
merchant-facing fallback it existed for — every registered driver now
|
||||
hardcodes this fact about itself rather than a merchant configuring it
|
||||
per row.
|
||||
- `OrderCapturedNotification` ("payment captured") no longer sends for any
|
||||
payment method except bank transfer. For every other method, placing the
|
||||
order and paying for it are the same moment from the shopper's
|
||||
perspective — `OrderPlacedNotification` already covers it. Bank transfer
|
||||
is the one case where payment confirmation is a genuine, later, separate
|
||||
event (staff marking the order paid once the wire arrives).
|
||||
- `OrderStatusUpdatedNotification` no longer sends for an order's first
|
||||
transition off `awaiting_payment`, except for a bank transfer order —
|
||||
for every other payment method that transition happens in the same
|
||||
request as checkout itself, so it's not new information the shopper
|
||||
hasn't already been told.
|
||||
- `OrderStatusUpdatedNotification`'s subject line now names the order's
|
||||
actual current status ("Your order :reference is now :status") instead
|
||||
of a generic "has been updated."
|
||||
- The checkout page's payment methods now refresh live when the shipping
|
||||
option changes, instead of requiring a full page reload — switching to
|
||||
store pickup correctly drops cash-on-delivery and offers "pay in store"
|
||||
immediately.
|
||||
|
||||
### Fixed
|
||||
- `StoreDetailsService::bankTransferInstructionsFor()` returned the raw
|
||||
Tiptap JSON array `bank_transfer_instructions` is stored as, instead of
|
||||
rendering it to HTML — the order confirmation email for a bank transfer
|
||||
order failed outright (`TypeError`, queued job marked `FAIL`) rather than
|
||||
showing the store's payment instructions. Now converts via Filament's own
|
||||
`RichContentRenderer`, the same converter the admin panel itself uses to
|
||||
render a `RichEditor` field's content read-only.
|
||||
|
||||
## [0.26.5] - 2026-09-28
|
||||
|
||||
### Added
|
||||
- Three new fields on the "Store Details" settings page
|
||||
(`Modules\Core\Store\Filament\Pages\ManageStoreDetails`):
|
||||
- **Contact email** (`contact_email`) — used both as the receiver address for the
|
||||
contact form and shown to customers as the store's contact email.
|
||||
- **Mail from name** (`mail_from_name`) — the sender name on outgoing emails
|
||||
(`MAIL_FROM_NAME`).
|
||||
- **Legal name** (`legal_name`) — the registered company's legal name, distinct
|
||||
from the storefront-facing `name`. Locale-keyed JSON, like `name`/`address`/
|
||||
`bank_transfer_instructions`, since a registered name can legitimately differ
|
||||
per locale.
|
||||
`contact_email`/`mail_from_name` are plain nullable strings, matching
|
||||
`phone`/`tax_identifier`. The migration backfills all four translatable
|
||||
`store_details` columns with an empty per-locale array on any row where they're
|
||||
still `NULL`, and `StoreDetailsService::firstOrCreate()` now seeds `legal_name`
|
||||
the same way it already seeds `name`/`address`/`bank_transfer_instructions` —
|
||||
both needed so `TranslatedText` doesn't silently drop keystrokes on a
|
||||
NULL-starting translatable field (see that service's own docblock).
|
||||
|
||||
## [0.26.4] - 2026-09-28
|
||||
|
||||
### Fixed
|
||||
- Bank transfer orders were never marked placed. `BankTransferPaymentDriver::pay()` had
|
||||
dead code after an early `return` and never dispatched `PaymentDeferred`, so nothing
|
||||
ever set `Order::placed_at` or fired `OrderPlaced` — no order confirmation email, no
|
||||
stock decrement, the order missing from the customer's order history, and checkout
|
||||
erroring out instead of showing the confirmation page. `pay()` now dispatches
|
||||
`PaymentDeferred` the same way `CashOnDeliveryPaymentDriver::pay()` does.
|
||||
- `MarkOrderPlacedOnDeferredPayment` now skips
|
||||
`OrderPaymentResolutionService::resolveDeferredPayment()` for a bank transfer order
|
||||
(`OrderStatusFlow::isBankTransfer()`), so it correctly stays at `awaiting_payment` /
|
||||
unpaid until staff mark it paid, instead of being advanced past that status the moment
|
||||
checkout completes.
|
||||
|
||||
## [0.26.3] - 2026-09-28
|
||||
|
||||
### Added
|
||||
- `Modules\Core\Localization\Database\Seeders\ValidationTranslationsSeeder` — moved in from
|
||||
3dealer's own `database/seeders/`, alongside the existing
|
||||
`Modules\Core\Checkout\Database\Seeders\CheckoutTranslationsSeeder`, so the `validation` and
|
||||
`checkout` translation groups are seeded from core rather than duplicated per consuming app.
|
||||
Same idempotent per-key upsert as `lunar:install`'s own seeding — a key already present (or
|
||||
since edited via the Filament Language Lines UI) is left untouched. Both are run explicitly
|
||||
via `php artisan db:seed --class=...`, wired into 3dealer's entrypoint right after
|
||||
`lunar:install`.
|
||||
- `storefront.auth.captcha_failed` — was referenced by `HCaptcha`, `LoginController`, and
|
||||
`ContactRequest` but never seeded in `StorefrontLabels`, so it silently fell back to the raw
|
||||
key. Re-running `lunar:install` now fills it in for any existing store.
|
||||
|
||||
## [0.26.2] - 2026-09-28
|
||||
|
||||
### Changed
|
||||
- Checkout line-item custom fields (`checkout/partials/line-custom-fields.blade.php`):
|
||||
non-file fields now render inline as a single muted `Label: value` line instead of a
|
||||
separate `<dt>`/`<dd>` pair. File fields keep the stacked label/link layout, with a
|
||||
colon after the label and a small top margin on the value.
|
||||
|
||||
### Fixed
|
||||
- Wishlist routes are now registered inside the `web` middleware group
|
||||
(`WishlistServiceProvider`). Before, `loadRoutesFrom()` loaded them with no middleware,
|
||||
so they had no session, cookies, CSRF protection or authenticated user. That broke
|
||||
anything that depends on the current guest or logged-in user.
|
||||
|
||||
## [0.26.1] - 2026-09-28
|
||||
|
||||
### Added
|
||||
- `Modules\Core\Order\Support\OrderReferenceDisplay` — a human-facing form of
|
||||
`Order::reference` for emails and storefront views. `Lunar\Base\OrderReferenceGenerator`
|
||||
zero-pads the order's own id out to a fixed length (8 characters by default), so a shop's
|
||||
first real orders read as `#00000001` rather than `#1`. This strips leading zeros until the
|
||||
first non-zero digit (falling back to `0` if none remain), purely for display — the raw,
|
||||
padded `reference` is untouched everywhere else (DB lookups, the order-status API, staff
|
||||
search, GDPR exports). Wired into the checkout confirmation page and all customer-facing
|
||||
order notification emails.
|
||||
|
||||
## [0.26.0] - 2026-09-28
|
||||
|
||||
### Added
|
||||
- `Modules\Core\Store\` — a "Store Details" Filament settings page (under Settings) for a
|
||||
shop's own contact/legal details: store name, address (both translatable), phone, tax
|
||||
identifier (ΑΦΜ), company registration number (ΓΕΜΗ), and rich-text bank transfer
|
||||
instructions (IBANs, formatted as a table if needed — `TranslatedText::optionRichtext()`,
|
||||
which ships table insert/edit in its default toolbar). Backed by a single-row
|
||||
`StoreDetails` model, read via `StoreDetailsService::current()` (forever-cached,
|
||||
invalidated by the new `StoreDetailsUpdated` event whenever `StoreDetailsService::update()`
|
||||
is the one write path used — never write to the model directly).
|
||||
|
||||
### Fixed
|
||||
- `StoreDetailsService`'s singleton row was created with every translatable column
|
||||
(`name`/`address`/`bank_transfer_instructions`) left `NULL`. Lunar's own `TranslatedText`
|
||||
Filament component silently discards every keystroke on re-render when the field it edits
|
||||
starts out `NULL` rather than an empty per-locale array — invisible for `PaymentMethod`'s
|
||||
own translatable `name` (always created already-filled, through the same form), but exactly
|
||||
the gap this brand-new singleton hits, since it's created blank and opened for editing in
|
||||
the same visit. The row is now seeded with an empty string per configured language from
|
||||
creation, so every translatable field is editable from the very first save.
|
||||
|
||||
## [0.25.2] - 2026-09-28
|
||||
|
||||
### Fixed
|
||||
- `BankTransferPaymentDriver::pay()` returned `Succeeded` and dispatched `PaymentCaptured`
|
||||
immediately — treating a bank transfer like an instant-success gateway (Stripe), when in
|
||||
reality no money has moved yet. Now returns `Pending` with no event dispatched, so the order
|
||||
stays at `awaiting_payment` with `Order::paid` false, exactly like it should — checkout still
|
||||
completes normally (`CheckoutController` already treats a `Pending` result with no
|
||||
continuation as a placed order). `OrderStatusFlow::canMarkPaid()`/`isBankTransfer()` now also
|
||||
recognize bank transfer, so staff can mark the order paid once the wire arrives, the same
|
||||
"Mark Paid" action cash-on-delivery already uses — but unlike COD's version, this also
|
||||
advances the order's status past `awaiting_payment`, since nothing else ever will.
|
||||
|
||||
## [0.25.1] - 2026-09-28
|
||||
|
||||
### Fixed
|
||||
- `CustomerErasureActionsExtension` (Privacy) added "Request Erasure"/"Request Export" header
|
||||
actions to the Customer edit/view pages but left Lunar's own plain `DeleteAction` in place
|
||||
alongside them — bypassing the grace period, cascades, and audit trail an erasure request
|
||||
provides. That header action is now stripped whenever Privacy is installed, so "Request
|
||||
Erasure" is the only way to remove a Customer.
|
||||
|
||||
## [0.25.0] - 2026-09-28
|
||||
|
||||
### Added
|
||||
- `Modules\Core\Wishlist\` — extracted the wishlist feature's business logic from 3dealer:
|
||||
`WishlistService` (guest cookie / logged-in `wishlist_items` toggle, merge-on-login),
|
||||
`WishlistItem` model, the `wishlist.toggle` route/controller, `MergeGuestWishlistOnLogin`
|
||||
(listens on `Auth\Events\UserAuthenticated`, same pattern as `ClaimGuestOrdersOnLogin`), and
|
||||
the `wishlist-controller.js` Stimulus controller (exported as `registerWishlist()` from this
|
||||
package's JS entry point). Page rendering (the account/guest wishlist list views, and their
|
||||
product-card presentation) stays app-specific, since it depends on each app's own UI
|
||||
components. The `wishlist_items` migration checks `Schema::hasTable()` first, so a consumer
|
||||
that already had its own copy of this table (e.g. 3dealer) isn't broken by this package now
|
||||
also shipping it.
|
||||
|
||||
## [0.24.1] - 2026-09-28
|
||||
|
||||
### Fixed
|
||||
- `CheckoutTranslationsSeeder` was missing five `checkout.page.*` lines actually referenced by
|
||||
the checkout views — `logged_in_as`, `login_prompt`, `login_link`, `wants_invoice`, and
|
||||
`confirmation_login_hint` — left blank on any storefront until seeded by hand.
|
||||
|
||||
## [0.24.0] - 2026-09-28
|
||||
|
||||
### Added
|
||||
- Box Now locker picker support for the newly-extracted checkout module: `CheckoutController::
|
||||
boxNowLockers()`/`selectBoxNowLocker()`, the `bbk-box-now-locker-controller.js` Stimulus
|
||||
controller, its picker markup in `shipping-options.blade.php`, and its styles in
|
||||
`checkout.css` — the routes and translation seeder for this already existed from the previous
|
||||
extraction, but the controller methods and JS/CSS themselves hadn't been carried over, leaving
|
||||
the `checkout.box-now.lockers` route throwing `BadMethodCallException`.
|
||||
- `ProductIndexer`'s `recommendations` entries now include `variant_id` and `has_custom_fields` —
|
||||
previously only `{id, name, price, image}`, which left a recommended product's card with
|
||||
neither an "Add to cart" nor a "Personalize" button, since a storefront card needs one of
|
||||
those two fields to decide which to show at all.
|
||||
- A real `package.json` for this package's JS (Stimulus controllers) and CSS, installed by a
|
||||
consuming app as a normal npm dependency (`file:../boboko-core` in local dev, a tagged git
|
||||
install — `git+https://...#semver:0.x`, mirroring `composer.json`'s own `0.*` constraint — in
|
||||
prod) so `npm install`/`npm update @boboko/core` resolves this package's own JS dependencies
|
||||
(`leaflet`, `@hotwired/stimulus`) transitively, the same way `composer update boboko/*` already
|
||||
does for PHP. A consuming app registers `boboko()` from the new `vite-plugin.js` export in its
|
||||
own `vite.config.js`, which encapsulates every quirk of that installation method (symlink
|
||||
resolution, HMR watching, dependency pre-bundling) so the consumer's own config stays a
|
||||
one-line plugin registration. Consumers import this package's JS from one stable entry point,
|
||||
`resources/js/index.js` (`@boboko/core`'s package root export), rather than reaching into a
|
||||
specific module's internal file layout directly — see this package's `CONTRIBUTE.md` and
|
||||
`docs/modules.md`.
|
||||
|
||||
### Fixed
|
||||
- `Catalog\Recommendations\RandomRule` resolved products via the base `Lunar\Models\Product`
|
||||
directly instead of through `ModelManifest`, silently losing `custom_fields` (which only the
|
||||
registered `Modules\Core\Catalog\Models\Product` subclass can read) for any recommendation it
|
||||
produced. `SameCategoryRule` was already correct, since `Collection::products()` resolves via
|
||||
Lunar's own `Product::modelClass()`.
|
||||
|
||||
## [0.23.0] - 2026-09-25
|
||||
|
||||
### Added
|
||||
- `Modules\Core\Checkout\` - extracted Checkout and Cart view, resources, Controllers,
|
||||
services, etc. to Core
|
||||
|
||||
|
||||
## [0.22.0] - 2026-09-25
|
||||
|
||||
### Added
|
||||
- `Modules\Core\Customer\Services\CustomerEmailChangeService` — changing an account's login
|
||||
email (core's login is passwordless, so the email IS the login): `request()` validates the new
|
||||
address is free and throttled (3 codes/10min), `confirm()` allows 5 wrong guesses per code,
|
||||
re-checks the address is still free, switches it, notifies the old address (masked new
|
||||
address), and claims guest orders for the new email. The pending change lives on the user's
|
||||
own row (`pending_email`/`pending_email_code_hash`/`pending_email_expires_at`/
|
||||
`pending_email_attempts` — new migration), the same convention as the existing OTP login
|
||||
columns, rather than the session — a code arrives by email and is often opened on a different
|
||||
device/session than the one that requested it. New core-owned mailables
|
||||
(`Auth\Mail\EmailChangeCodeMail`/`EmailChangedNoticeMail`) with default views, overridable
|
||||
per-app the same way `UserOtpMail`'s already is. Dispatches a new `Auth\Events\
|
||||
UserEmailChanged` event.
|
||||
- `Modules\Core\Customer\Services\CustomerAccountService::setRecoveryConsent()` — the account's
|
||||
standing "email me a reminder if I don't finish my order" opt-in, written to the customer's
|
||||
meta in the same shape `Checkout\Services\CheckoutService::setRecoveryConsent()` already writes
|
||||
on the cart. Skips the write when nothing changed; dispatches a new `Customer\Events\
|
||||
CustomerRecoveryConsentSet` event (also wired into the existing account-activity audit log).
|
||||
3dealer's own duplicated implementations in `CheckoutController`/`AccountController` now call
|
||||
this instead.
|
||||
- `terms_accepted_at`/`terms_version`/`privacy_policy_version` columns on `users` — recorded once,
|
||||
by a new `Auth\Listeners\RecordLegalAcceptanceForNewUser` (listening on `UserCreated`), the
|
||||
moment a genuinely new signup requests their first OTP code; never touched again for an
|
||||
existing user. Included in the User-scope privacy export (`CustomerDataProvider::
|
||||
exportForUser()`).
|
||||
- ~90 previously-unseeded `storefront.*` translation keys (login/OTP copy, account profile and
|
||||
email-change flow, order history, contact form, product custom-fields and stock-error
|
||||
messages, reviews, wishlist) added to `Localization\Services\StorefrontLabels` — these were
|
||||
already called via `__()`/`trans_choice()` across a consuming app's views with no seeded
|
||||
value at all, silently rendering the raw translation key in production.
|
||||
|
||||
### Fixed
|
||||
- `CustomerAccountService::WRITABLE_PROFILE_FIELDS` listed `vat_no`, but Lunar's `customers`
|
||||
column has been `tax_identifier` since a 2025 Lunar migration — passing `vat_no` was silently
|
||||
dropped by the allowlist, and `tax_identifier` couldn't be written through `updateProfile()` at
|
||||
|
||||
|
||||
### Added
|
||||
- `Modules\Core\Customer\Services\CustomerEmailChangeService` — changing an account's login
|
||||
email (core's login is passwordless, so the email IS the login): `request()` validates the new
|
||||
address is free and throttled (3 codes/10min), `confirm()` allows 5 wrong guesses per code,
|
||||
re-checks the address is still free, switches it, notifies the old address (masked new
|
||||
address), and claims guest orders for the new email. The pending change lives on the user's
|
||||
own row (`pending_email`/`pending_email_code_hash`/`pending_email_expires_at`/
|
||||
`pending_email_attempts` — new migration), the same convention as the existing OTP login
|
||||
columns, rather than the session — a code arrives by email and is often opened on a different
|
||||
device/session than the one that requested it. New core-owned mailables
|
||||
(`Auth\Mail\EmailChangeCodeMail`/`EmailChangedNoticeMail`) with default views, overridable
|
||||
per-app the same way `UserOtpMail`'s already is. Dispatches a new `Auth\Events\
|
||||
UserEmailChanged` event.
|
||||
- `Modules\Core\Customer\Services\CustomerAccountService::setRecoveryConsent()` — the account's
|
||||
standing "email me a reminder if I don't finish my order" opt-in, written to the customer's
|
||||
meta in the same shape `Checkout\Services\CheckoutService::setRecoveryConsent()` already writes
|
||||
on the cart. Skips the write when nothing changed; dispatches a new `Customer\Events\
|
||||
CustomerRecoveryConsentSet` event (also wired into the existing account-activity audit log).
|
||||
3dealer's own duplicated implementations in `CheckoutController`/`AccountController` now call
|
||||
this instead.
|
||||
- `terms_accepted_at`/`terms_version`/`privacy_policy_version` columns on `users` — recorded once,
|
||||
by a new `Auth\Listeners\RecordLegalAcceptanceForNewUser` (listening on `UserCreated`), the
|
||||
moment a genuinely new signup requests their first OTP code; never touched again for an
|
||||
existing user. Included in the User-scope privacy export (`CustomerDataProvider::
|
||||
exportForUser()`).
|
||||
- ~90 previously-unseeded `storefront.*` translation keys (login/OTP copy, account profile and
|
||||
email-change flow, order history, contact form, product custom-fields and stock-error
|
||||
messages, reviews, wishlist) added to `Localization\Services\StorefrontLabels` — these were
|
||||
already called via `__()`/`trans_choice()` across a consuming app's views with no seeded
|
||||
value at all, silently rendering the raw translation key in production.
|
||||
|
||||
### Fixed
|
||||
- `CustomerAccountService::WRITABLE_PROFILE_FIELDS` listed `vat_no`, but Lunar's `customers`
|
||||
column has been `tax_identifier` since a 2025 Lunar migration — passing `vat_no` was silently
|
||||
dropped by the allowlist, and `tax_identifier` couldn't be written through `updateProfile()` at
|
||||
all. Consuming code was working around this with a separate direct `$customer->update(...)`
|
||||
call that bypassed `CustomerProfileUpdated`'s audit trail entirely; that workaround is no
|
||||
longer needed now that the field is correctly allowlisted.
|
||||
|
||||
## [0.21.1] - 2026-09-25
|
||||
|
||||
### Changed
|
||||
- `GuestOrderClaimer` and its `UserAuthenticated` listener moved from 3dealer's own
|
||||
`App\Services`/`App\Listeners` into `Modules\Core\Customer\Services\GuestOrderClaimer` /
|
||||
`Listeners\ClaimGuestOrdersOnLogin`, registered in `CustomerServiceProvider` — attaching a
|
||||
placed guest order to an account once its billing `contact_email` case-insensitively matches
|
||||
the account's email (only ever safe right after the shopper has proved they own that email: a
|
||||
login code, or 3dealer's own email-change confirmation) was already core-appropriate logic
|
||||
with no 3dealer-specific behavior. `Account\EmailController::verify()` now calls the core
|
||||
service directly.
|
||||
|
||||
## [0.21.0] - 2026-09-25
|
||||
|
||||
### Added
|
||||
- `Modules\Core\File` — a generic, storage-backend-agnostic file registry: `Models\File` (a
|
||||
`files` table row per stored file — disk, path, original name, mime, size, a `purpose` tag,
|
||||
and a nullable polymorphic owner), `Services\FileService` (store/retrieve/download/exists/
|
||||
delete/list/`pruneUnowned`, delegating every actual byte-level operation to a
|
||||
`Contracts\FileAdapterInterface` resolved per disk — `Adapters\LocalFileAdapter` today, the
|
||||
same contextual-binding pattern `Shipping\Contracts\CarrierFulfillmentInterface` already uses
|
||||
per carrier, so a future `S3FileAdapter` is one class and one more match arm, nothing else
|
||||
changes), and `Http\Controllers\DownloadFileController` — a signed-URL-only route
|
||||
(`files.download`) any consuming app can mint a link to, serving either inline (a preview) or
|
||||
as a forced download (`?download=1`).
|
||||
- `Modules\Core\File\Http\Controllers\UploadFileController` — an abstract base for "accept an
|
||||
upload, validate it, store it via `FileService`, return its id" endpoints. Which
|
||||
extensions/sizes are acceptable is deliberately left to a concrete subclass's own
|
||||
`purpose()`/`validationRules()` overrides (ordinary server-side PHP, never trusting anything
|
||||
the request itself claims about its own limits) — a real policy decision that can differ per
|
||||
site and even per product/field, not something a shared base class or config file could
|
||||
express safely.
|
||||
- `boboko:file:prune-unowned {purpose}` — deletes every unowned `File` of a given purpose past
|
||||
its grace period (`--hours`, default 24). Generic: any consuming app schedules it once per
|
||||
purpose string it stores files under.
|
||||
- `Modules\Core\Cart\Events\CartLineAdded`/`Checkout\Events\OrderPlaced` listeners
|
||||
(`File\Listeners\AttachCustomFieldFileToCartLine`/`TransferCustomFieldFileOwnership`) that
|
||||
re-point a `File`'s ownership from unowned → the real `CartLine` once one exists, then from
|
||||
that `CartLine` → the `OrderLine` an order is placed with — so a File referenced by a product
|
||||
custom field survives the cart it originated from being cleared, without ever being copied.
|
||||
|
||||
### Changed
|
||||
- The admin order-lines table's collapsible details dropdown (next to the existing price
|
||||
breakdown) now shows a product's custom-field answers (`OrderLine.meta.custom_fields`) — a
|
||||
bordered table matching the existing price-breakdown one, with a thumbnail preview and a
|
||||
download-icon link for a file answer, resolved through `File\Services\FileService`'s signed
|
||||
route. Previously never shown anywhere in the admin.
|
||||
- 3dealer's product custom-field photo upload (`CustomFieldUploadController`), cart line meta
|
||||
(`CartController::customFieldsMeta()`), and pruning (formerly its own `PruneCustomFieldUploads`
|
||||
command) now go through `Modules\Core\File` instead of a bespoke `Crypt::encryptString({disk,
|
||||
path, name, mime})` reference scheme — a cart/order line's file answer is now just a `File`
|
||||
row's `file_id`, with `File` as the single source of truth for every other detail.
|
||||
|
||||
## [0.20.2] - 2026-09-25
|
||||
|
||||
## [0.22.0] - 2026-09-25
|
||||
### Changed
|
||||
- Product custom fields (`Product::$custom_fields`) moved off the main product edit form onto
|
||||
their own "Custom Fields" sub-page (`Modules\Core\Catalog\Filament\Pages\
|
||||
|
||||
+125
-12
@@ -1,35 +1,148 @@
|
||||
# Contributing to boboko-core
|
||||
|
||||
This is a Composer library, not a runnable app — you can't `php artisan serve` it directly. To develop and verify changes, you need a consumer app wired to a local checkout via a Composer path repository, plus a real database, since a large part of this package (Lunar models, migrations, Filament panel resources) can only be meaningfully verified against a live Lunar install.
|
||||
This is a Composer library (and an npm package of the same name — see [JS/CSS](#jscss-a-real-npm-package)), not a runnable app — you can't `php artisan serve` it directly. To develop and verify changes, you need a consumer app wired to a local checkout, plus a real database, since a large part of this package (Lunar models, migrations, Filament panel resources) can only be meaningfully verified against a live Lunar install.
|
||||
|
||||
## Local dev setup
|
||||
|
||||
This works against any consumer app that follows the same convention — `boboko-test`, `boboko-starter`, `boboko-3dealer`, etc. — checked out next to this repo:
|
||||
Consumer apps (`3dealer`, `boboko-test`, …) are checked out next to this repo:
|
||||
|
||||
```
|
||||
RadicalElements/
|
||||
├── boboko-core/ (this repo)
|
||||
└── boboko-test/ (or boboko-starter, boboko-3dealer, ... — consumer app, Docker-based)
|
||||
└── 3dealer/ (or boboko-test, ... — consumer app, Docker-based)
|
||||
```
|
||||
|
||||
Each of these consumer apps ships a `bin/dc-core.sh` helper that wraps the Docker Compose overlay needed to bind-mount a local `boboko-core` checkout into the app container:
|
||||
### Two modes: local and repo
|
||||
|
||||
A consumer app can consume core in one of two modes, and carries the wiring for both. The inactive one is parked under an underscore-prefixed key:
|
||||
|
||||
| | **local** — your `../boboko-core` checkout | **repo** — tagged releases from the forge |
|
||||
|---|---|---|
|
||||
| `composer.json` | `repositories`: path repo `../boboko-core` (`"symlink": true`) | `repositories`: VCS repo `https://code.radical-elements.com/boboko/core.git` |
|
||||
| `package.json` | `@boboko/core`: `file:../boboko-core` | `@boboko/core`: `git+https://code.radical-elements.com/boboko/core.git#semver:0.x` |
|
||||
| Docker Compose | `bin/dc-core.sh` (dev + `docker-compose.core-dev.yml` overlay) | `bin/dc` (dev only) |
|
||||
|
||||
- **The committed state is always repo mode.** Local mode rewrites both lockfiles to point at `../boboko-core`, which doesn't exist on the server — never commit it.
|
||||
- Both sides use an open `0.x` range: `"boboko/core": "0.*"` in Composer, `#semver:0.x` in npm. Don't use a caret: below 1.0.0, `^0.27.0` means `>=0.27.0 <0.28.0` in both tools, so it would silently refuse the next minor.
|
||||
- `docker-compose.core-dev.yml` bind-mounts `../boboko-core` into the containers — at `/var/www/boboko-core` for `app`/`queue`/`scheduler` (where the path repo resolves from `/var/www/html`) and at `/boboko-core` for `vite` (where `file:../boboko-core` resolves from `/app`). Inside the app container, `vendor/boboko/core` is a symlink into that mount.
|
||||
|
||||
### Switching modes: `bin/core-mode`
|
||||
|
||||
Don't swap the keys by hand — each consumer app ships a `bin/core-mode` script:
|
||||
|
||||
```bash
|
||||
./bin/dc-core.sh exec app <command>
|
||||
bin/core-mode # print the current mode
|
||||
bin/core-mode local # work against ../boboko-core
|
||||
bin/core-mode repo # back to tagged releases
|
||||
```
|
||||
|
||||
This is shorthand for `docker compose -f docker-compose.dev.yml -f docker-compose.core-dev.yml exec app <command>`. Use `./bin/dc-core.sh` for everything below instead of typing the full compose invocation.
|
||||
It swaps the `composer.json` / `package.json` wiring, runs `down` with the old mode's Compose wrapper and `up` with the new one, then waits until the entrypoints have re-resolved core. Running it for the mode you're already in skips the edits and just restarts the stack — in repo mode, that's how you pick up a newly pushed tag.
|
||||
|
||||
1. **Path repository.** In the consumer app's `composer.json`, the `repositories` array needs a path entry pointing at `../boboko-core`. If it only exists in a disabled block (e.g. `_repositories`), move it into the live array.
|
||||
2. **Relaxed version constraint.** The consumer app's `composer.json` should require `"boboko/core": "0.*"` (not a tight `^0.0.1` caret) — otherwise Composer rejects newer `0.0.x` versions resolved from the path repo.
|
||||
3. **Bind mount.** The consumer app's `docker-compose.core-dev.yml` overlays `../boboko-core` into the container at `/var/www/boboko-core`, matching where the path repo resolves it relative to `/var/www/html`.
|
||||
4. **Re-resolve after every change.** Composer's path repo does not hot-reload — after editing anything in `boboko-core` (including adding new files, which need autoload discovery), the container needs to re-run `composer update boboko/core`. In `boboko-test`, the entrypoint does this automatically on every dev boot (see `docker/entrypoint.sh`), so `./bin/dc-core.sh up` alone picks up local core changes. If a consumer app's entrypoint doesn't do this yet, run it manually:
|
||||
(`3dealer` has `bin/core-mode` and `bin/deploy`; they're app-agnostic, so other consumer apps can copy them as-is.)
|
||||
|
||||
### Day to day in local mode
|
||||
|
||||
Use `bin/dc-core.sh` for every Compose command (`bin/dc-core.sh exec app …`, `bin/dc-core.sh logs -f`, …) — plain `docker compose` or `bin/dc` leaves the core mount out.
|
||||
|
||||
The dev entrypoints re-resolve core on **every boot**: `docker/entrypoint.sh` runs `composer update "boboko/*"` and `docker/entrypoint-vite.sh` runs `npm update @boboko/core`. So:
|
||||
|
||||
- **Whatever branch is checked out in `../boboko-core` is what the app runs.** Switching core branches switches the app's code — check which branch you're on before debugging "missing" features.
|
||||
- PHP edits to existing files show up immediately (it's a symlink). **New classes, new migrations, or `composer.json` changes** need a re-resolve: restart the stack, or run
|
||||
|
||||
```bash
|
||||
bin/dc-core.sh exec app composer update boboko/core --with-all-dependencies
|
||||
```
|
||||
|
||||
Skipping this is the most common cause of "my change isn't showing up."
|
||||
- In `3dealer`, the app container's `vendor/` is a named Docker volume, so the host's `vendor/` directory is stale — inspect packages inside the container, not on the host.
|
||||
|
||||
## JS/CSS: a real npm package
|
||||
|
||||
Core's Stimulus controllers and CSS ship as the `@boboko/core` npm package, installed into the consumer's `node_modules` — as a symlink to `../boboko-core` in local mode, as a real copy of the tagged release in repo mode. It's a real package (rather than files read out of `vendor/`) so npm installs core's own dependencies (`leaflet`, `@hotwired/stimulus`) transitively, the same way Composer does for PHP.
|
||||
|
||||
Public entry points (`package.json` `exports`):
|
||||
|
||||
| Import | File |
|
||||
|---|---|
|
||||
| `@boboko/core` | `resources/js/index.js` — the stable barrel (`registerCheckout`, `registerWishlist`, …) |
|
||||
| `@boboko/core/vite-plugin` | `vite-plugin.js` — `boboko()` |
|
||||
| `@boboko/core/css/*` | `resources/css/*` |
|
||||
| `@boboko/core/checkout`, `@boboko/core/checkout/*` | `resources/js/checkout/…` |
|
||||
|
||||
A consumer imports from the `@boboko/core` barrel only — not from a module's internal files — so the internal layout here can change without breaking every consumer:
|
||||
|
||||
```js
|
||||
// consumer app's resources/js/app.js
|
||||
import { registerCheckout, registerWishlist } from "@boboko/core";
|
||||
registerCheckout(application);
|
||||
registerWishlist(application);
|
||||
```
|
||||
|
||||
```js
|
||||
// consumer app's vite.config.js
|
||||
import { boboko } from "@boboko/core/vite-plugin";
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [
|
||||
laravel({
|
||||
input: [
|
||||
// Core's structural checkout styles load first, so the app's own theming wins.
|
||||
"node_modules/@boboko/core/resources/css/checkout.css",
|
||||
"resources/css/app.css",
|
||||
"resources/js/app.js",
|
||||
],
|
||||
}),
|
||||
boboko(),
|
||||
],
|
||||
});
|
||||
```
|
||||
|
||||
```php
|
||||
{{-- consumer app's layout --}}
|
||||
@vite(['node_modules/@boboko/core/resources/css/checkout.css', 'resources/css/app.css', 'resources/js/app.js'])
|
||||
```
|
||||
|
||||
`boboko()` owns the Vite settings the local-mode symlink needs, so consumers don't hand-copy them: it excludes `@boboko/core` from dependency pre-bundling (otherwise Vite serves a stale cached copy after you edit core), pre-bundles `leaflet`/`@hotwired/stimulus` explicitly, and turns on `resolve.preserveSymlinks` and `server.watch.followSymlinks` so bare imports resolve from the consumer's `node_modules` and core edits trigger HMR. All of it is a harmless no-op against a real installed copy in repo mode.
|
||||
|
||||
## Translations added in the UI
|
||||
|
||||
Default translation lines ship in core's seeders (`StorefrontTranslationsSeeder`, `CheckoutTranslationsSeeder`, `ValidationTranslationsSeeder`), which every app runs on boot and which only ever add missing keys. Lines added while building a storefront usually start in the Filament Language Lines UI instead. To move them into core:
|
||||
|
||||
```bash
|
||||
bin/dc-core.sh exec app php artisan boboko:translations:pull # local mode: writes into ../boboko-core
|
||||
bin/dc exec app php artisan boboko:translations:pull --dry-run # any mode: just list them
|
||||
```
|
||||
|
||||
It adds every `storefront` / `checkout` / `validation` key that's in the database but not in the matching seeder, appended at the end of `lines()` under a marker comment — move them into the right section before committing. Keys the seeder already has are never touched, even if their text was edited in the UI. `bin/deploy` runs it for you.
|
||||
|
||||
## Releasing a version
|
||||
|
||||
1. Bump `"version"` in **both** `composer.json` and `package.json` — they must match.
|
||||
2. Add a `CHANGELOG.md` entry under the new version. While pre-1.0, a new capability for consuming apps is a **minor** bump (`0.27.x` → `0.28.0`); a fix, redesign or internal swap with no new capability is a **patch** bump.
|
||||
3. Commit, tag `vX.Y.Z`, and push the commit **and** the tag:
|
||||
|
||||
```bash
|
||||
./bin/dc-core.sh exec app composer update boboko/core --with-all-dependencies
|
||||
git tag v0.27.5
|
||||
git push origin master v0.27.5
|
||||
```
|
||||
|
||||
Skipping this step is the most common cause of "my change isn't showing up."
|
||||
A tag alone changes nothing in production — each consumer app has to pick it up and deploy (below).
|
||||
|
||||
## Deploying a consumer app
|
||||
|
||||
Production only ever runs what the app's **committed lockfiles** pin. Each consumer app ships `bin/deploy`, which:
|
||||
|
||||
1. Refuses to run on the wrong branch, with uncommitted changes (other than the core wiring files), or behind `origin`.
|
||||
2. Runs `php artisan boboko:translations:pull` (see [Translations added in the UI](#translations-added-in-the-ui)). In local mode, if it pulls any lines into `../boboko-core`, it stops — commit, tag and push core, then rerun. In repo mode it only checks, and stops if the database has lines core doesn't.
|
||||
3. Runs `bin/core-mode repo` — switching from local mode if needed, restarting either way — so both lockfiles resolve the newest `0.x` tag. It warns if `../boboko-core` has a newer tag than what resolved (usually an unpushed tag).
|
||||
4. Commits the lockfile bump (`Chore: Bumping boboko/core to X.Y.Z`) if there is one, shows what will be pushed, and asks for confirmation.
|
||||
5. Pushes, then runs `vendor/bin/envoy run deploy` against the host in `.env.envoy`.
|
||||
|
||||
Envoy (`Envoy.blade.php`) then, on the server: `git reset --hard` + `git pull`, `docker compose build` (the `production` image target runs `composer install --no-dev` and `npm ci` from the committed lockfiles — this is where the core tag actually lands), `up -d`, caches config/routes/events, restarts `queue` and `scheduler`, and regenerates Stoic thumbnails. The production entrypoint skips Composer entirely and runs migrations (including core's), seeders, the Meilisearch sync, and `artisan optimize`.
|
||||
|
||||
After deploying you're left in repo mode — `bin/core-mode local` to go back.
|
||||
|
||||
When a change spans core and the app (e.g. a core migration plus an app model cast that depends on it), ship them together: tag core first, then commit the app change and deploy — `bin/deploy` bumps the lock to the new tag in the same deploy.
|
||||
|
||||
## Verifying changes against a real database
|
||||
|
||||
|
||||
+9
-3
@@ -2,7 +2,7 @@
|
||||
"name": "boboko/core",
|
||||
"description": "Core module — authentication and shared panel behaviour",
|
||||
"type": "library",
|
||||
"version": "0.20.2",
|
||||
"version": "0.30.0",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Modules\\Core\\": "src/"
|
||||
@@ -18,7 +18,9 @@
|
||||
"lunarphp/search": "*",
|
||||
"lunarphp/meilisearch": "*",
|
||||
"spatie/laravel-translation-loader": "^2.8",
|
||||
"stripe/stripe-php": "^16.6"
|
||||
"stripe/stripe-php": "^16.6",
|
||||
"picqer/php-barcode-generator": "^3.3",
|
||||
"barryvdh/laravel-dompdf": "^3.1"
|
||||
},
|
||||
"require-dev": {
|
||||
"fakerphp/faker": "^1.23",
|
||||
@@ -38,14 +40,18 @@
|
||||
"Modules\\Core\\Providers\\AuthServiceProvider",
|
||||
"Modules\\Core\\Providers\\CustomerServiceProvider",
|
||||
"Modules\\Core\\Providers\\CheckoutServiceProvider",
|
||||
"Modules\\Core\\Providers\\CheckoutModuleServiceProvider",
|
||||
"Modules\\Core\\Providers\\PaymentServiceProvider",
|
||||
"Modules\\Core\\Providers\\LocalizationServiceProvider",
|
||||
"Modules\\Core\\Providers\\CatalogServiceProvider",
|
||||
"Modules\\Core\\Providers\\CartServiceProvider",
|
||||
"Modules\\Core\\Providers\\ReviewServiceProvider",
|
||||
"Modules\\Core\\Providers\\FileServiceProvider",
|
||||
"Modules\\Core\\Providers\\ShippingServiceProvider",
|
||||
"Modules\\Core\\Providers\\OrderServiceProvider",
|
||||
"Modules\\Core\\Providers\\PrivacyServiceProvider"
|
||||
"Modules\\Core\\Providers\\PrivacyServiceProvider",
|
||||
"Modules\\Core\\Providers\\WishlistServiceProvider",
|
||||
"Modules\\Core\\Providers\\StoreServiceProvider"
|
||||
]
|
||||
}
|
||||
},
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
* Per-site settings for the cart + checkout module (see
|
||||
* Modules\Core\Providers\CheckoutModuleServiceProvider). Publishable —
|
||||
* artisan vendor:publish --tag=core-config.
|
||||
*/
|
||||
return [
|
||||
|
||||
/*
|
||||
* Name of the storefront's login route. The checkout's login tab and the
|
||||
* confirmation page link to it with `?redirect=<checkout path>`, so the
|
||||
* login page must send the shopper back there afterwards. null: no login
|
||||
* offered in checkout at all.
|
||||
*/
|
||||
'login_route' => 'login',
|
||||
|
||||
/*
|
||||
* Name of the storefront's product-listing route — where confirmation()
|
||||
* redirects a visit with no placed order to look at (session expired,
|
||||
* direct navigation, a bookmark). route($this, $locale) must resolve.
|
||||
*/
|
||||
'products_route' => 'products',
|
||||
|
||||
/*
|
||||
* ISO 3166-1 alpha-3 code fixing checkout to a single country (a hidden
|
||||
* field, forced server-side — no country picker shown at all). null (the
|
||||
* default) gives the full country/region picker, for a multi-country
|
||||
* store.
|
||||
*/
|
||||
'store_country_iso3' => null,
|
||||
|
||||
/*
|
||||
* The `purpose` tag CartController expects a product custom field's
|
||||
* `file` answer to already carry (see Modules\Core\File\Models\File) —
|
||||
* matches whatever purpose string the host's own upload endpoint
|
||||
* (extending Modules\Core\File\Http\Controllers\UploadFileController)
|
||||
* tags its stored files with. This module never reaches into that
|
||||
* host controller directly; this config value is the one shared
|
||||
* source of truth between the two.
|
||||
*/
|
||||
'custom_field_upload_purpose' => 'custom-field-upload',
|
||||
|
||||
];
|
||||
@@ -16,6 +16,20 @@ return [
|
||||
|
||||
'auto_create_customer_for_user' => true,
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Display Timezone
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Timestamps are stored in the app timezone (UTC). This is the timezone
|
||||
| they're shown in — the admin (Filament's display timezone), the
|
||||
| storefront, emails and the order Timeline. (Carriers that report times
|
||||
| without an offset — ELTA, ACS — are read as Greek time regardless.)
|
||||
|
|
||||
*/
|
||||
|
||||
'display_timezone' => env('DISPLAY_TIMEZONE', 'Europe/Athens'),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Privacy / GDPR data-subject requests
|
||||
@@ -125,6 +139,17 @@ return [
|
||||
'generation_limit' => 3,
|
||||
'generation_decay_minutes' => 10,
|
||||
],
|
||||
|
||||
// Modules\Core\Customer\Services\CustomerEmailChangeService — same
|
||||
// shape/reasoning as auth.otp above, independent limits since this
|
||||
// is a separate flow (changing an existing account's login email,
|
||||
// not logging in).
|
||||
'email_change' => [
|
||||
'max_attempts' => 5,
|
||||
'generation_limit' => 3,
|
||||
'generation_decay_minutes' => 10,
|
||||
'expiry_minutes' => 10,
|
||||
],
|
||||
],
|
||||
|
||||
];
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
<?php
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| ELTA Courier credentials
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| ELTA's API is SOAP (unlike ACS's JSON gateway or Box Now's REST +
|
||||
| OAuth2). Two operation families live at the same endpoint — see
|
||||
| Modules\Core\Shipping\Carriers\Elta\EltaClient's docblock for why only
|
||||
| the "*NEW" family (create/track/station/cancel) is used; the old
|
||||
| family (including its label-print operation) is unreachable with this
|
||||
| account and isn't called anywhere in this integration. Labels are
|
||||
| rendered locally instead — see
|
||||
| Modules\Core\Shipping\Carriers\Elta\EltaLabelRenderer — which is why
|
||||
| sender identity (name/address, unlike PELVGNEW's request which needs
|
||||
| only apost_code) is configured here.
|
||||
|
|
||||
| Set these via environment variables — never commit real values.
|
||||
|
|
||||
| ELTA_SERVICE_LOCATION SOAP endpoint (defaults to the live production
|
||||
| host; only needed if ELTA gives you a separate
|
||||
| sandbox host).
|
||||
| ELTA_USER_CODE Account user code (pel_user_code / pel_user).
|
||||
| ELTA_USER_PASS Account security code — not used by anything the
|
||||
| *NEW family calls; kept only in case ELTA ever
|
||||
| asks for it.
|
||||
| ELTA_APOST_CODE Sender/account code (pel_apost_code).
|
||||
| ELTA_APOST_SUB_CODE Sender sub-code (pel_apost_sub_code).
|
||||
| ELTA_SENDER_NAME Sender name printed on the label — PELVGNEW's
|
||||
| own request has no such field, so this only
|
||||
| matters for our own locally-rendered label.
|
||||
| ELTA_SENDER_ADDRESS Sender street address printed on the label.
|
||||
| ELTA_SENDER_POSTCODE Sender postcode printed on the label.
|
||||
| ELTA_SENDER_AREA Sender area/city printed on the label.
|
||||
| ELTA_SENDER_PHONE Sender phone printed on the label.
|
||||
| ELTA_ORIGIN_STATION_CODE This account's home ELTA station code — shown
|
||||
| on the label as "Γ.Κατάθεσης"/"Από". ELTA's own
|
||||
| client gets this from a PELLOGINNEW response
|
||||
| (user_station); configured here instead so a
|
||||
| label print doesn't need an extra API call.
|
||||
| ELTA_LABEL_PAPER_SIZE "a4" (default, 3 copies per page) or "a6"
|
||||
| (single thermal label) — matches the real
|
||||
| client's own one-time printer-setup choice, not
|
||||
| varied per shipment.
|
||||
|
|
||||
*/
|
||||
|
||||
return [
|
||||
|
||||
'service_location' => env('ELTA_SERVICE_LOCATION', 'http://212.205.47.226:9003'),
|
||||
|
||||
'user_code' => env('ELTA_USER_CODE'),
|
||||
'user_pass' => env('ELTA_USER_PASS'),
|
||||
|
||||
'apost_code' => env('ELTA_APOST_CODE'),
|
||||
'apost_sub_code' => env('ELTA_APOST_SUB_CODE'),
|
||||
|
||||
'sender_name' => env('ELTA_SENDER_NAME'),
|
||||
'sender_address' => env('ELTA_SENDER_ADDRESS'),
|
||||
'sender_postcode' => env('ELTA_SENDER_POSTCODE'),
|
||||
'sender_area' => env('ELTA_SENDER_AREA'),
|
||||
'sender_phone' => env('ELTA_SENDER_PHONE'),
|
||||
'origin_station_code' => env('ELTA_ORIGIN_STATION_CODE'),
|
||||
|
||||
'label_paper_size' => env('ELTA_LABEL_PAPER_SIZE', 'a4'),
|
||||
|
||||
'timeout' => env('ELTA_HTTP_TIMEOUT', 15),
|
||||
|
||||
];
|
||||
@@ -0,0 +1,50 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* A generic, storage-backend-agnostic file registry — Modules\Core\File\
|
||||
* Services\FileService's own backing table. `disk`/`path` are whatever
|
||||
* Laravel's Storage facade already understands (local, s3, ...); this
|
||||
* table adds what Flysystem itself has no concept of: who a file
|
||||
* belongs to, why it was uploaded, and whether anything still needs it.
|
||||
*
|
||||
* `owner_type`/`owner_id` are nullable — a file can (and, for a product
|
||||
* custom-field photo, always does) exist before anything owns it yet: a
|
||||
* shopper picks a photo on the product page and it's uploaded immediately
|
||||
* (see 3dealer's CustomFieldUploadController), well before add-to-cart
|
||||
* gives it a CartLine to belong to. FileService::attachOwner() re-points
|
||||
* these columns once an owner exists, rather than creating a second row
|
||||
* for the same physical file.
|
||||
*
|
||||
* `purpose` (e.g. 'custom-field-upload') lets one table serve unrelated
|
||||
* future features without collision — FileService itself has no
|
||||
* knowledge of what a purpose means, callers scope their own queries by
|
||||
* it.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('files', function (Blueprint $table) {
|
||||
$table->id();
|
||||
$table->string('disk');
|
||||
$table->string('path');
|
||||
$table->string('original_name')->nullable();
|
||||
$table->string('mime')->nullable();
|
||||
$table->unsignedBigInteger('size')->nullable();
|
||||
$table->string('purpose');
|
||||
$table->nullableMorphs('owner');
|
||||
$table->timestamps();
|
||||
|
||||
$table->index(['purpose', 'owner_type', 'owner_id']);
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('files');
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Which terms/privacy policy version an account was created under — the
|
||||
* storefront login page shows a notice ("By continuing, you accept the
|
||||
* Terms of Use and have read the Privacy Policy") that a new signup
|
||||
* implicitly agrees to just by requesting an OTP code, so this is
|
||||
* recorded the moment Modules\Core\Auth\Services\UserOtpService::
|
||||
* generateAndSend()'s firstOrCreate() actually creates the row — never
|
||||
* for an existing user, whose original acceptance (whatever version was
|
||||
* live at the time) must not be silently overwritten by a later config
|
||||
* value. Nullable: every user created before this migration has none of
|
||||
* the three, which is the honest answer ("we don't know what they saw"),
|
||||
* not something to backfill with today's config values.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('users', function (Blueprint $table) {
|
||||
$table->timestamp('terms_accepted_at')->nullable()->after('otp_attempts');
|
||||
$table->string('terms_version')->nullable()->after('terms_accepted_at');
|
||||
$table->string('privacy_policy_version')->nullable()->after('terms_version');
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('users', function (Blueprint $table) {
|
||||
$table->dropColumn(['terms_accepted_at', 'terms_version', 'privacy_policy_version']);
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Backs Modules\Core\Customer\Services\CustomerEmailChangeService — the
|
||||
* pending new-email change lives on the user's own row, same convention
|
||||
* as the existing otp_code/otp_expires_at/otp_attempts columns (Auth\
|
||||
* Services\UserOtpService), rather than the session: a change requested
|
||||
* on one device/session must still be confirmable from another (a code
|
||||
* arrives by email, which is often opened somewhere else entirely), and
|
||||
* a request-scoped session can't survive that.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('users', function (Blueprint $table) {
|
||||
$table->string('pending_email')->nullable()->after('privacy_policy_version');
|
||||
$table->string('pending_email_code_hash')->nullable()->after('pending_email');
|
||||
$table->timestamp('pending_email_expires_at')->nullable()->after('pending_email_code_hash');
|
||||
$table->unsignedTinyInteger('pending_email_attempts')->default(0)->after('pending_email_expires_at');
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('users', function (Blueprint $table) {
|
||||
$table->dropColumn([
|
||||
'pending_email',
|
||||
'pending_email_code_hash',
|
||||
'pending_email_expires_at',
|
||||
'pending_email_attempts',
|
||||
]);
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,42 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* One product on a logged-in user's wishlist. A guest's wishlist lives in a
|
||||
* cookie instead (see Modules\Core\Wishlist\Services\Wishlist) — nothing is
|
||||
* written here until Modules\Core\Wishlist\Listeners\MergeGuestWishlistOnLogin
|
||||
* moves the cookie's ids across on login.
|
||||
*
|
||||
* hasTable() guard: this table previously lived in each consuming app's own
|
||||
* migrations (e.g. 3dealer's create_wishlist_items_table, extracted here) —
|
||||
* Laravel's migrations table tracks by filename, so a consumer that already
|
||||
* ran its own copy would otherwise hit "table already exists" the first time
|
||||
* this migration runs. Skips creation entirely if the table is already
|
||||
* there; a fresh install with no prior wishlist table gets it created here.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
if (Schema::hasTable('wishlist_items')) {
|
||||
return;
|
||||
}
|
||||
|
||||
Schema::create('wishlist_items', function (Blueprint $table) {
|
||||
$table->id();
|
||||
$table->foreignId('user_id')->constrained()->cascadeOnDelete();
|
||||
$table->foreignId('product_id')->constrained('lunar_products')->cascadeOnDelete();
|
||||
$table->timestamps();
|
||||
|
||||
$table->unique(['user_id', 'product_id']);
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('wishlist_items');
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* A single-row table for the store's own contact/legal details — edited via
|
||||
* the Filament "Store Details" settings page (Modules\Core\Store\Filament\
|
||||
* Pages\ManageStoreDetails) and read via Modules\Core\Store\Services\
|
||||
* StoreDetailsService. Not config, since a shop owner needs to change these
|
||||
* (e.g. a new IBAN, a new address) without a code deploy.
|
||||
*
|
||||
* name/address/bank_transfer_instructions are locale-keyed JSON — same
|
||||
* shape/resolution as Modules\Core\Payment\Models\PaymentMethod::$name (see
|
||||
* that model's own docblock): $storeDetails->translate('name'). tax_identifier
|
||||
* (ΑΦΜ) and registration_number (ΓΕΜΗ) are legal identifiers, not
|
||||
* locale-dependent text, so they stay plain strings — same for phone.
|
||||
*
|
||||
* No seeder inserting the singleton row — StoreDetailsService::current()
|
||||
* lazily creates it (all-null) on first read, same shape as any other
|
||||
* firstOrCreate()-backed singleton in this codebase.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::create('store_details', function (Blueprint $table) {
|
||||
$table->id();
|
||||
$table->json('name')->nullable();
|
||||
$table->json('address')->nullable();
|
||||
$table->string('phone')->nullable();
|
||||
$table->string('tax_identifier')->nullable();
|
||||
$table->string('registration_number')->nullable();
|
||||
$table->json('bank_transfer_instructions')->nullable();
|
||||
$table->timestamps();
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::dropIfExists('store_details');
|
||||
}
|
||||
};
|
||||
+57
@@ -0,0 +1,57 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
use Lunar\Models\Language;
|
||||
|
||||
/**
|
||||
* contact_email/mail_from_name join tax_identifier/registration_number/
|
||||
* phone as plain, non-locale-dependent strings on the store_details
|
||||
* singleton (see that table's own migration docblock).
|
||||
*
|
||||
* legal_name is locale-keyed JSON instead — same shape/resolution as
|
||||
* name/address/bank_transfer_instructions (HasTranslations, see
|
||||
* StoreDetails's own docblock) — since a registered company name can
|
||||
* legitimately differ per locale (e.g. a transliterated/translated legal
|
||||
* form). Distinct from the storefront-facing brand name in `name`.
|
||||
*
|
||||
* Backfills every translatable column (name/address/
|
||||
* bank_transfer_instructions/legal_name) with an empty per-locale array
|
||||
* on any row that's still genuinely NULL there — StoreDetailsService::
|
||||
* firstOrCreate() only seeds columns on INSERT, so an existing singleton
|
||||
* row (or one created before a Language row existed, leaving
|
||||
* emptyPerLocale() an empty array at the time) could otherwise keep a
|
||||
* translatable column NULL forever. That's the exact condition
|
||||
* TranslatedText breaks on (see StoreDetailsService's own docblock: a
|
||||
* NULL-starting translatable field silently drops every keystroke and
|
||||
* never persists) — backfilled here for all four columns, not just the
|
||||
* new one, so the same fix covers however the existing row got there.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('store_details', function (Blueprint $table) {
|
||||
$table->string('contact_email')->nullable()->after('phone');
|
||||
$table->string('mail_from_name')->nullable()->after('contact_email');
|
||||
$table->json('legal_name')->nullable()->after('registration_number');
|
||||
});
|
||||
|
||||
$emptyPerLocale = json_encode(
|
||||
Language::query()->pluck('code')->mapWithKeys(fn (string $code) => [$code => ''])->all()
|
||||
);
|
||||
|
||||
foreach (['name', 'address', 'bank_transfer_instructions', 'legal_name'] as $column) {
|
||||
DB::table('store_details')->whereNull($column)->update([$column => $emptyPerLocale]);
|
||||
}
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('store_details', function (Blueprint $table) {
|
||||
$table->dropColumn(['contact_email', 'mail_from_name', 'legal_name']);
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,43 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* otp_code was stored in plaintext (a raw 6-digit string) and compared
|
||||
* with hash_equals() against the plaintext guess in
|
||||
* Modules\Core\Auth\Services\UserOtpService — hash_equals() only
|
||||
* prevents a timing attack, it does nothing to protect the code itself
|
||||
* from anyone with read access to the row. Replaced with a bcrypt hash,
|
||||
* same pattern Modules\Core\Customer\Services\CustomerEmailChangeService
|
||||
* already uses for its own pending_email_code_hash column.
|
||||
*
|
||||
* No backfill: any code mid-flight when this deploys is invalidated —
|
||||
* codes expire in 10 minutes anyway, so the real-world impact is a
|
||||
* shopper re-requesting one, not lost work.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('users', function (Blueprint $table) {
|
||||
$table->string('otp_code_hash')->nullable()->after('password');
|
||||
});
|
||||
|
||||
Schema::table('users', function (Blueprint $table) {
|
||||
$table->dropColumn('otp_code');
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('users', function (Blueprint $table) {
|
||||
$table->string('otp_code', 6)->nullable()->after('password');
|
||||
});
|
||||
|
||||
Schema::table('users', function (Blueprint $table) {
|
||||
$table->dropColumn('otp_code_hash');
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* Same fix as 2026_09_30_000001_hash_otp_code_on_users_table.php, for
|
||||
* staff logins — see that migration's own docblock. This path was
|
||||
* additionally weaker: Modules\Core\Auth\Services\OtpService compared
|
||||
* with a loose != rather than hash_equals(), so it had no timing-attack
|
||||
* protection at all on top of the plaintext storage.
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('lunar_staff', function (Blueprint $table) {
|
||||
$table->string('otp_code_hash')->nullable()->after('password');
|
||||
});
|
||||
|
||||
Schema::table('lunar_staff', function (Blueprint $table) {
|
||||
$table->dropColumn('otp_code');
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('lunar_staff', function (Blueprint $table) {
|
||||
$table->string('otp_code', 6)->nullable()->after('password');
|
||||
});
|
||||
|
||||
Schema::table('lunar_staff', function (Blueprint $table) {
|
||||
$table->dropColumn('otp_code_hash');
|
||||
});
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,37 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Database\Migrations\Migration;
|
||||
use Illuminate\Database\Schema\Blueprint;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
/**
|
||||
* - tracking_reference becomes optional: some carriers only issue the
|
||||
* voucher number when the label is printed (ELTA's pending vouchers).
|
||||
* Still unique — Postgres allows any number of NULLs under a unique index.
|
||||
* - order_id becomes optional: vouchers pulled from a carrier's own list
|
||||
* can exist before they're linked to an order.
|
||||
* - source records where the shipment came from: created (our admin, via
|
||||
* the carrier's API), manual_voucher (an integrated carrier's voucher
|
||||
* typed in by staff), manual (a carrier with no integration), synced
|
||||
* (pulled from a carrier's voucher list).
|
||||
*/
|
||||
return new class extends Migration
|
||||
{
|
||||
public function up(): void
|
||||
{
|
||||
Schema::table('shipments', function (Blueprint $table) {
|
||||
$table->string('tracking_reference')->nullable()->change();
|
||||
$table->unsignedBigInteger('order_id')->nullable()->change();
|
||||
$table->string('source')->default('created')->index()->after('carrier');
|
||||
});
|
||||
}
|
||||
|
||||
public function down(): void
|
||||
{
|
||||
Schema::table('shipments', function (Blueprint $table) {
|
||||
$table->dropColumn('source');
|
||||
$table->unsignedBigInteger('order_id')->nullable(false)->change();
|
||||
$table->string('tracking_reference')->nullable(false)->change();
|
||||
});
|
||||
}
|
||||
};
|
||||
+1
-1
@@ -393,7 +393,7 @@ Because Filament instantiates `Lunar\Admin\Models\Staff` directly (not a subclas
|
||||
```php
|
||||
use Lunar\Admin\Models\Staff as LunarStaff;
|
||||
|
||||
LunarStaff::addActivitylogExcept(['otp_code', 'otp_expires_at', 'password']);
|
||||
LunarStaff::addActivitylogExcept(['otp_code_hash', 'otp_expires_at', 'password']);
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
@@ -122,6 +122,63 @@ Docker Compose merges `volumes:` lists additively across `-f` files, so the over
|
||||
|
||||
---
|
||||
|
||||
## Frontend Assets (JS/CSS)
|
||||
|
||||
A module's JS (Stimulus controllers) and CSS ship as plain source files under `resources/js/` and `resources/css/` — **there is no separate npm package per module.** A module is never `npm install`ed; its frontend assets are read directly by the consuming app's own Vite build, straight out of `vendor/boboko/<module>`.
|
||||
|
||||
This mirrors the PHP story above exactly: Composer already gives every environment one single, unconditional path — `vendor/boboko/<module>` — whether that resolves to a symlink into a sibling checkout (local path repo) or a real installed copy (tagged VCS release). A consumer's `vite.config.js` and JS entry point read from that same path, so there is nothing to toggle on the JS side — whatever Composer resolved is exactly what Vite sees, in both dev and prod, automatically.
|
||||
|
||||
**Each module exposes one stable JS entry point** — `resources/js/index.js` — that re-exports whatever a consumer needs, e.g. `boboko-core`'s:
|
||||
|
||||
```js
|
||||
// boboko-core/resources/js/index.js
|
||||
export { registerCheckout } from './checkout/index.js'
|
||||
```
|
||||
|
||||
A consuming app imports from that one file only, never from a path reaching into a module's internal folder structure directly:
|
||||
|
||||
```js
|
||||
// consumer app's resources/js/app.js
|
||||
import { registerCheckout } from "../../vendor/boboko/core/resources/js/index.js";
|
||||
registerCheckout(application);
|
||||
```
|
||||
|
||||
```php
|
||||
{{-- consumer app's layout --}}
|
||||
@vite(['vendor/boboko/core/resources/css/checkout.css', 'resources/css/app.css', 'resources/js/app.js'])
|
||||
```
|
||||
|
||||
This keeps a module's internal file layout free to change without breaking every consumer's entry point — the same reasoning as PSR-4 namespaces for PHP, just for JS imports.
|
||||
|
||||
**A consuming app's `vite.config.js` needs one addition**, because `vendor/boboko/<module>` is a symlink in local path-repo dev (not a real directory Vite would otherwise watch through):
|
||||
|
||||
```js
|
||||
export default defineConfig({
|
||||
server: {
|
||||
watch: {
|
||||
// vendor/boboko/<module> is a symlink into ../boboko-<module> in
|
||||
// local path-repo dev. Vite/chokidar don't follow symlinks for
|
||||
// watched files by default, so edits to a module's source
|
||||
// wouldn't otherwise trigger HMR. No-op against a real installed
|
||||
// copy (tagged VCS release) in production.
|
||||
followSymlinks: true,
|
||||
},
|
||||
},
|
||||
});
|
||||
```
|
||||
|
||||
Bare imports inside a module's own JS (e.g. `leaflet`, `@hotwired/stimulus`) resolve against the **consumer's** `node_modules` via Node's normal upward resolution walk from `vendor/boboko/<module>/resources/js/...` — no extra config needed, as long as `vendor/boboko/<module>` sits inside the consumer's own directory tree (true for both the symlink and real-copy case). The consumer's Vite Docker service (if any) needs the same bind mount the PHP containers already get, landing at the equivalent path relative to its own working directory:
|
||||
|
||||
```yaml
|
||||
# consumer app's docker-compose.core-dev.yml
|
||||
services:
|
||||
vite:
|
||||
volumes:
|
||||
- ../boboko-core:/app/vendor/boboko/core # match /app to the vite service's actual workdir
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Creating a New Module
|
||||
|
||||
**1. Create the repository and `composer.json`:**
|
||||
|
||||
+3
-2
@@ -30,11 +30,12 @@ Codes expire after **10 minutes**. After a successful validation the code is cle
|
||||
|
||||
### Database
|
||||
|
||||
Two columns on the `lunar_staff` table (added by `2026_05_06_000001_add_otp_to_lunar_staff_table`):
|
||||
Two columns on the `lunar_staff` table (added by `2026_05_06_000001_add_otp_to_lunar_staff_table`,
|
||||
`otp_code` replaced with a hashed column by `2026_09_30_000002_hash_otp_code_on_lunar_staff_table`):
|
||||
|
||||
| Column | Type | Purpose |
|
||||
|---|---|---|
|
||||
| `otp_code` | string, nullable | The generated code |
|
||||
| `otp_code_hash` | string, nullable | Bcrypt hash of the generated code (`'hashed'` cast on `Staff`) |
|
||||
| `otp_expires_at` | timestamp, nullable | Expiry time |
|
||||
|
||||
### Login Page
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"name": "@boboko/core",
|
||||
"version": "0.30.0",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"description": "Portable Stimulus controllers and styles for boboko-core's cart + checkout module. Installed as a real npm dependency (file:../boboko-core in dev, a tagged git install in prod) so a consuming app's `npm install` resolves this package's own dependencies (leaflet, @hotwired/stimulus) transitively, the same way `composer update boboko/*` does for PHP. See CONTRIBUTE.md's \"JS/CSS: a real npm package\" section.",
|
||||
"exports": {
|
||||
".": "./resources/js/index.js",
|
||||
"./checkout": "./resources/js/checkout/index.js",
|
||||
"./checkout/*": "./resources/js/checkout/*",
|
||||
"./css/*": "./resources/css/*",
|
||||
"./vite-plugin": "./vite-plugin.js"
|
||||
},
|
||||
"dependencies": {
|
||||
"@hotwired/stimulus": "^3.2.2",
|
||||
"leaflet": "^1.9.4"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"vite": "^8.0.0"
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,57 @@
|
||||
import { Controller } from '@hotwired/stimulus'
|
||||
import { csrfToken } from './csrf'
|
||||
|
||||
// Sits on an <x-checkout::add-to-cart> <form>. Submits the line to the cart
|
||||
// via fetch and hands the server-rendered cart body to the drawer through the
|
||||
// `bbk-cart:changed` window event. No DOM building here — the drawer
|
||||
// (bbk-cart-controller) owns rendering.
|
||||
export default class extends Controller {
|
||||
static targets = ['error']
|
||||
|
||||
async add(event) {
|
||||
event.preventDefault()
|
||||
|
||||
const form = this.element
|
||||
const submit = form.querySelector('[type="submit"]')
|
||||
|
||||
this.clearError()
|
||||
form.setAttribute('data-bbk-add-to-cart-state', 'loading')
|
||||
if (submit) submit.disabled = true
|
||||
|
||||
try {
|
||||
const response = await fetch(form.action, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': csrfToken(),
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
Accept: 'application/json',
|
||||
},
|
||||
body: new FormData(form),
|
||||
})
|
||||
|
||||
if (!response.ok) {
|
||||
const data = await response.json().catch(() => null)
|
||||
this.showError(data?.error)
|
||||
return
|
||||
}
|
||||
|
||||
window.dispatchEvent(new CustomEvent('bbk-cart:changed', {
|
||||
detail: { html: await response.text() },
|
||||
}))
|
||||
} finally {
|
||||
form.removeAttribute('data-bbk-add-to-cart-state')
|
||||
if (submit) submit.disabled = false
|
||||
}
|
||||
}
|
||||
|
||||
showError(message) {
|
||||
if (!this.hasErrorTarget || !message) return
|
||||
this.errorTarget.textContent = message
|
||||
this.errorTarget.hidden = false
|
||||
}
|
||||
|
||||
clearError() {
|
||||
if (!this.hasErrorTarget) return
|
||||
this.errorTarget.hidden = true
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,220 @@
|
||||
import { Controller } from '@hotwired/stimulus'
|
||||
import L from 'leaflet'
|
||||
import 'leaflet/dist/leaflet.css'
|
||||
import { csrfToken } from './csrf'
|
||||
|
||||
// Box Now's own brand green, used for the pin instead of Leaflet's default
|
||||
// blue teardrop — a small SVG data URI rather than another bundled asset.
|
||||
const PIN_COLOR = '#00c389'
|
||||
const PIN_COLOR_SELECTED = '#0a7a52'
|
||||
|
||||
function pinIcon(color) {
|
||||
const svg = `
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="34" height="46" viewBox="0 0 34 46">
|
||||
<path
|
||||
d="M17 0C7.6 0 0 7.6 0 17c0 12.75 17 29 17 29s17-16.25 17-29C34 7.6 26.4 0 17 0Z"
|
||||
fill="${color}"
|
||||
stroke="#ffffff"
|
||||
stroke-width="1.5"
|
||||
/>
|
||||
<circle cx="17" cy="17" r="7" fill="#ffffff" />
|
||||
</svg>
|
||||
`
|
||||
|
||||
return L.divIcon({
|
||||
className: 'bbk-box-now-pin',
|
||||
html: svg,
|
||||
iconSize: [34, 46],
|
||||
iconAnchor: [17, 46],
|
||||
popupAnchor: [0, -40],
|
||||
})
|
||||
}
|
||||
|
||||
const ICON = pinIcon(PIN_COLOR)
|
||||
const ICON_SELECTED = pinIcon(PIN_COLOR_SELECTED)
|
||||
|
||||
// A self-hosted Leaflet map standing in for Box Now's own Destination Map
|
||||
// JS widget — that widget only talks to Box Now's Production API (see
|
||||
// their Partner API manual §4.1), so it can't be used while developing
|
||||
// against Stage credentials. Same underlying /destinations data, rendered
|
||||
// with OpenStreetMap tiles instead of Box Now's map.
|
||||
//
|
||||
// Visibility is toggled by bbk-checkout-form (see its own
|
||||
// toggleBoxNowLocker()) whenever the "box-now" shipping option becomes
|
||||
// selected/deselected — this controller only owns loading the locker list
|
||||
// once visible, rendering pins, and autosaving the chosen one.
|
||||
export default class extends Controller {
|
||||
static targets = ['map', 'search', 'status', 'chosen']
|
||||
|
||||
static values = {
|
||||
lockersUrl: String,
|
||||
selectUrl: String,
|
||||
loading: String,
|
||||
selectLabel: String,
|
||||
selectedLabel: String,
|
||||
noResults: String,
|
||||
}
|
||||
|
||||
// Athens — a reasonable default center before any locker is loaded.
|
||||
static DEFAULT_CENTER = [37.9838, 23.7275]
|
||||
|
||||
connect() {
|
||||
this.map = null
|
||||
this.markers = new Map()
|
||||
this.selectedId = null
|
||||
this.loaded = false
|
||||
|
||||
if (!this.element.hidden) this.show()
|
||||
}
|
||||
|
||||
disconnect() {
|
||||
this.map?.remove()
|
||||
this.map = null
|
||||
}
|
||||
|
||||
// Called by bbk-checkout-form right after it un-hides this element.
|
||||
show() {
|
||||
this.element.hidden = false
|
||||
|
||||
// Leaflet measures its container's size on init — doing that while
|
||||
// the element (or an ancestor) is still `hidden` produces a
|
||||
// collapsed/blank map, so this is deferred to the same tick `hidden`
|
||||
// is cleared, then Leaflet is nudged once more via invalidateSize().
|
||||
requestAnimationFrame(() => {
|
||||
if (!this.map) this.initMap()
|
||||
this.map.invalidateSize()
|
||||
|
||||
if (!this.loaded) this.loadLockers()
|
||||
})
|
||||
}
|
||||
|
||||
hide() {
|
||||
this.element.hidden = true
|
||||
}
|
||||
|
||||
initMap() {
|
||||
this.map = L.map(this.mapTarget).setView(this.constructor.DEFAULT_CENTER, 10)
|
||||
|
||||
L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
|
||||
attribution: '© OpenStreetMap contributors',
|
||||
maxZoom: 19,
|
||||
}).addTo(this.map)
|
||||
|
||||
// Delegated: popup content is re-inserted by Leaflet on every open,
|
||||
// so a listener bound once on the map's container beats binding (and
|
||||
// losing) one on the button each time a popup renders.
|
||||
this.map.getContainer().addEventListener('click', (event) => {
|
||||
const button = event.target.closest('[data-locker-id]')
|
||||
if (button) this.select(button.dataset.lockerId)
|
||||
})
|
||||
}
|
||||
|
||||
async loadLockers() {
|
||||
this.setStatus(this.loadingValue)
|
||||
|
||||
try {
|
||||
const response = await fetch(this.lockersUrlValue, {
|
||||
headers: { Accept: 'application/json' },
|
||||
})
|
||||
|
||||
if (!response.ok) return
|
||||
|
||||
const { lockers } = await response.json()
|
||||
this.loaded = true
|
||||
this.lockers = new Map(lockers.map((locker) => [String(locker.id), locker]))
|
||||
this.renderMarkers(lockers)
|
||||
this.setStatus('')
|
||||
} catch {
|
||||
this.setStatus('')
|
||||
}
|
||||
}
|
||||
|
||||
renderMarkers(lockers) {
|
||||
this.markers.forEach((marker) => marker.remove())
|
||||
this.markers = new Map(lockers.map((locker) => {
|
||||
const marker = L.marker([locker.lat, locker.lng], { icon: ICON })
|
||||
.addTo(this.map)
|
||||
.bindPopup(this.popupHtml(locker), { maxWidth: 260 })
|
||||
|
||||
return [String(locker.id), marker]
|
||||
}))
|
||||
|
||||
if (this.markers.size) {
|
||||
this.map.fitBounds(L.featureGroup([...this.markers.values()]).getBounds().pad(0.2))
|
||||
}
|
||||
}
|
||||
|
||||
popupHtml(locker) {
|
||||
const isSelected = String(locker.id) === this.selectedId
|
||||
|
||||
return `
|
||||
<div class="bbk-box-now-popup">
|
||||
${locker.image ? `<img class="bbk-box-now-popup-image" src="${locker.image}" alt="">` : ''}
|
||||
<p class="bbk-box-now-popup-name">${locker.name}</p>
|
||||
<p class="bbk-box-now-popup-address">
|
||||
${[locker.addressLine1, locker.addressLine2].filter(Boolean).join(', ')}
|
||||
${locker.postalCode ? ` ${locker.postalCode}` : ''}
|
||||
</p>
|
||||
${locker.note ? `<p class="bbk-box-now-popup-note">${locker.note}</p>` : ''}
|
||||
<button
|
||||
type="button"
|
||||
class="bbk-box-now-popup-select${isSelected ? ' bbk-box-now-popup-select--selected' : ''}"
|
||||
data-locker-id="${locker.id}"
|
||||
${isSelected ? 'disabled' : ''}
|
||||
>
|
||||
${isSelected ? this.selectedLabelValue : this.selectLabelValue}
|
||||
</button>
|
||||
</div>
|
||||
`
|
||||
}
|
||||
|
||||
async select(lockerId) {
|
||||
const locker = this.lockers?.get(String(lockerId))
|
||||
if (!locker) return
|
||||
|
||||
const previousId = this.selectedId
|
||||
this.selectedId = String(lockerId)
|
||||
|
||||
this.restyleMarker(previousId, ICON)
|
||||
this.restyleMarker(this.selectedId, ICON_SELECTED)
|
||||
this.markers.get(this.selectedId)?.setPopupContent(this.popupHtml(locker))
|
||||
|
||||
this.chosenTarget.hidden = false
|
||||
this.chosenTarget.textContent = locker.addressLine1
|
||||
? `${locker.name} — ${locker.addressLine1}`
|
||||
: locker.name
|
||||
|
||||
const body = new FormData()
|
||||
body.append('locker_id', locker.id)
|
||||
body.append('locker_name', locker.name ?? '')
|
||||
body.append('locker_address', locker.addressLine1 ?? '')
|
||||
|
||||
try {
|
||||
await fetch(this.selectUrlValue, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': csrfToken(),
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
Accept: 'application/json',
|
||||
},
|
||||
body,
|
||||
})
|
||||
} catch {
|
||||
// Best-effort autosave, same as the rest of checkout — a failed
|
||||
// save here surfaces later at place-order time via the normal
|
||||
// shipment-creation error path, not as an inline field error.
|
||||
}
|
||||
}
|
||||
|
||||
restyleMarker(lockerId, icon) {
|
||||
if (!lockerId) return
|
||||
this.markers.get(lockerId)?.setIcon(icon)
|
||||
}
|
||||
|
||||
setStatus(text) {
|
||||
if (!this.hasStatusTarget) return
|
||||
|
||||
this.statusTarget.textContent = text
|
||||
this.statusTarget.hidden = !text
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,240 @@
|
||||
import { Controller } from '@hotwired/stimulus'
|
||||
import { csrfToken } from './csrf'
|
||||
|
||||
// Drives the slide-in cart drawer. One instance, on the drawer root in
|
||||
// checkout/drawer.blade.php.
|
||||
//
|
||||
// - listens on window for `bbk-cart:changed` (from bbk-add-to-cart and from
|
||||
// this drawer's own line forms) and swaps in the server-rendered cart body
|
||||
// - handles the in-drawer quantity / remove forms (fetch + method spoofing)
|
||||
// - re-emits `bbk-cart:updated` {count, total} after every render so the host
|
||||
// (e.g. the header bag icon) can react
|
||||
// - dialog focus handling: focus moves into the panel on open, Tab is kept
|
||||
// inside it, and focus returns to whatever opened it on close
|
||||
//
|
||||
// Appearance is entirely CSS-driven: open state is the data-bbk-cart-state
|
||||
// attribute on the root, nothing here touches styles or class lists.
|
||||
export default class extends Controller {
|
||||
static targets = ['panel', 'body', 'error', 'heading', 'status']
|
||||
|
||||
connect() {
|
||||
this.onChanged = this.onChanged.bind(this)
|
||||
this.onKeydown = this.onKeydown.bind(this)
|
||||
this.updateTimers = new Map() // line id -> pending debounce timer
|
||||
|
||||
window.addEventListener('bbk-cart:changed', this.onChanged)
|
||||
window.addEventListener('bbk-cart:open', this.open.bind(this))
|
||||
document.addEventListener('keydown', this.onKeydown)
|
||||
|
||||
// Prime the host with the count rendered server-side on page load.
|
||||
this.emitUpdated(this.element.querySelector('[data-bbk-cart-count]'))
|
||||
}
|
||||
|
||||
disconnect() {
|
||||
window.removeEventListener('bbk-cart:changed', this.onChanged)
|
||||
document.removeEventListener('keydown', this.onKeydown)
|
||||
this.updateTimers.forEach((timer) => clearTimeout(timer))
|
||||
}
|
||||
|
||||
onChanged(event) {
|
||||
if (event.detail?.html) this.replaceBody(event.detail.html)
|
||||
this.open()
|
||||
}
|
||||
|
||||
onKeydown(event) {
|
||||
// Only the drawer instance is a dialog — the checkout page's summary
|
||||
// reuses this controller without a panel.
|
||||
if (!this.hasPanelTarget || this.element.hidden) return
|
||||
|
||||
if (event.key === 'Escape') this.close()
|
||||
if (event.key === 'Tab') this.trapFocus(event)
|
||||
}
|
||||
|
||||
open() {
|
||||
if (!this.element.hidden) return
|
||||
this.returnFocusTo = document.activeElement
|
||||
this.element.hidden = false
|
||||
// Next frame, so the panel transitions from its off-canvas start.
|
||||
requestAnimationFrame(() => {
|
||||
this.element.setAttribute('data-bbk-cart-state', 'open')
|
||||
if (this.hasHeadingTarget) this.headingTarget.focus({ preventScroll: true })
|
||||
})
|
||||
}
|
||||
|
||||
close() {
|
||||
this.element.removeAttribute('data-bbk-cart-state')
|
||||
|
||||
if (this.returnFocusTo?.isConnected) this.returnFocusTo.focus({ preventScroll: true })
|
||||
this.returnFocusTo = null
|
||||
|
||||
const panel = this.panelTarget
|
||||
const done = () => {
|
||||
this.element.hidden = true
|
||||
panel.removeEventListener('transitionend', done)
|
||||
}
|
||||
panel.addEventListener('transitionend', done)
|
||||
}
|
||||
|
||||
// change on a line quantity input, or submit of a line's remove form
|
||||
submit(event) {
|
||||
event.preventDefault()
|
||||
const form = event.target.closest('form')
|
||||
if (!form) return
|
||||
|
||||
// A remove is a deliberate, one-shot action — only the quantity form
|
||||
// (typing, or the +/- stepper below) benefits from debouncing.
|
||||
form.classList.contains('bbk-cart-qty') ? this.scheduleSend(form) : this.send(form)
|
||||
}
|
||||
|
||||
// +/- stepper buttons inside a line
|
||||
step(event) {
|
||||
event.preventDefault()
|
||||
const form = event.target.closest('form')
|
||||
const input = form.querySelector('input[type="number"]')
|
||||
const next = Math.max(0, parseInt(input.value || '0', 10) + Number(event.params.dir))
|
||||
input.value = String(next)
|
||||
this.scheduleSend(form)
|
||||
}
|
||||
|
||||
// Repeated clicks (or spinner nudges) update the input instantly but only
|
||||
// send once they settle for 300ms — sending on every single click was
|
||||
// firing overlapping requests that raced each other and made the drawer
|
||||
// visibly flicker/lag under quick clicking.
|
||||
scheduleSend(form) {
|
||||
const lineId = form.closest('[data-bbk-line-id]')?.dataset.bbkLineId
|
||||
if (!lineId) return this.send(form)
|
||||
|
||||
clearTimeout(this.updateTimers.get(lineId))
|
||||
this.updateTimers.set(lineId, setTimeout(() => {
|
||||
this.updateTimers.delete(lineId)
|
||||
this.send(form)
|
||||
}, 300))
|
||||
}
|
||||
|
||||
async send(form) {
|
||||
this.bodyTarget.setAttribute('aria-busy', 'true')
|
||||
this.clearError()
|
||||
|
||||
try {
|
||||
const response = await fetch(form.action, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': csrfToken(),
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
Accept: 'application/json',
|
||||
},
|
||||
body: new FormData(form),
|
||||
})
|
||||
|
||||
if (response.ok) {
|
||||
this.replaceBody(await response.text())
|
||||
return
|
||||
}
|
||||
|
||||
const data = await response.json().catch(() => null)
|
||||
this.showError(data?.error)
|
||||
|
||||
// The rejected quantity (typed, or from a +/- click) is left
|
||||
// sitting in the input with nothing to correct it — the update
|
||||
// never reached the cart, so the input must be put back to what
|
||||
// the cart actually still holds, not just left showing whatever
|
||||
// was rejected.
|
||||
const input = form.querySelector('[data-bbk-cart-confirmed-quantity]')
|
||||
if (input) input.value = input.dataset.bbkCartConfirmedQuantity
|
||||
} finally {
|
||||
this.bodyTarget.removeAttribute('aria-busy')
|
||||
}
|
||||
}
|
||||
|
||||
// aria-modal hides the page from screen readers but doesn't stop Tab from
|
||||
// walking out of the panel into it — wrap at either end instead.
|
||||
trapFocus(event) {
|
||||
const focusable = [...this.panelTarget.querySelectorAll(
|
||||
'a[href], button:not([disabled]), input:not([disabled]):not([type="hidden"]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])',
|
||||
)].filter((el) => !el.closest('[hidden], [aria-hidden="true"]'))
|
||||
|
||||
if (!focusable.length) return
|
||||
|
||||
const first = focusable[0]
|
||||
const last = focusable[focusable.length - 1]
|
||||
const active = document.activeElement
|
||||
|
||||
if (event.shiftKey && (active === first || !this.panelTarget.contains(active) || (this.hasHeadingTarget && active === this.headingTarget))) {
|
||||
event.preventDefault()
|
||||
last.focus()
|
||||
} else if (!event.shiftKey && (active === last || !this.panelTarget.contains(active))) {
|
||||
event.preventDefault()
|
||||
first.focus()
|
||||
}
|
||||
}
|
||||
|
||||
showError(message) {
|
||||
if (!this.hasErrorTarget || !message) return
|
||||
this.errorTarget.textContent = message
|
||||
this.errorTarget.hidden = false
|
||||
}
|
||||
|
||||
clearError() {
|
||||
if (!this.hasErrorTarget) return
|
||||
this.errorTarget.hidden = true
|
||||
}
|
||||
|
||||
replaceBody(html) {
|
||||
const restore = this.focusSnapshot()
|
||||
this.bodyTarget.innerHTML = html
|
||||
restore()
|
||||
this.announce()
|
||||
this.emitUpdated(this.bodyTarget.querySelector('[data-bbk-cart-count]'))
|
||||
}
|
||||
|
||||
// Swapping the body destroys whatever control had focus (a qty stepper,
|
||||
// a remove button, the coupon field), dropping keyboard/screen-reader
|
||||
// users back at the top of the document. Returns a callback that, after
|
||||
// the swap, re-focuses the equivalent control in the new markup — or the
|
||||
// heading, when that control is gone (e.g. its line was just removed).
|
||||
focusSnapshot() {
|
||||
const active = document.activeElement
|
||||
if (!active || !this.bodyTarget.contains(active)) return () => {}
|
||||
|
||||
let selector = null
|
||||
if (active.id) {
|
||||
selector = `#${CSS.escape(active.id)}`
|
||||
} else {
|
||||
const lineId = active.closest('[data-bbk-line-id]')?.dataset.bbkLineId
|
||||
const dir = active.dataset.bbkCartDirParam
|
||||
const control = ['bbk-cart-qty-input', 'bbk-cart-qty-btn', 'bbk-cart-item-remove']
|
||||
.find((name) => active.classList.contains(name))
|
||||
|
||||
if (lineId && control) {
|
||||
selector = `[data-bbk-line-id="${CSS.escape(lineId)}"] .${control}`
|
||||
+ (dir ? `[data-bbk-cart-dir-param="${CSS.escape(dir)}"]` : '')
|
||||
}
|
||||
}
|
||||
|
||||
return () => {
|
||||
const target = selector && this.bodyTarget.querySelector(selector)
|
||||
if (target) target.focus({ preventScroll: true })
|
||||
else if (this.hasHeadingTarget) this.headingTarget.focus({ preventScroll: true })
|
||||
}
|
||||
}
|
||||
|
||||
// Polite "Cart updated" — cleared first so an identical message is
|
||||
// re-announced on the next update.
|
||||
announce() {
|
||||
if (!this.hasStatusTarget) return
|
||||
const message = this.statusTarget.dataset.bbkCartMessage || ''
|
||||
this.statusTarget.textContent = ''
|
||||
requestAnimationFrame(() => { this.statusTarget.textContent = message })
|
||||
}
|
||||
|
||||
emitUpdated(node) {
|
||||
if (!node) return
|
||||
|
||||
window.dispatchEvent(new CustomEvent('bbk-cart:updated', {
|
||||
detail: {
|
||||
count: parseInt(node.dataset.bbkCartCount || '0', 10),
|
||||
total: parseInt(node.dataset.bbkCartTotal || '0', 10),
|
||||
},
|
||||
}))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,238 @@
|
||||
import { Controller } from '@hotwired/stimulus'
|
||||
import { csrfToken } from './csrf'
|
||||
|
||||
// Drives the checkout page's left column: contact tabs, the same-as-billing
|
||||
// toggle, and — the bulk of it — autosaving the address form and the shipping
|
||||
// method with no submit buttons.
|
||||
//
|
||||
// Flow: any `change` in the address form is debounced ~400ms, then the whole
|
||||
// form is POSTed to saveUrl. The server persists leniently and returns
|
||||
// { errors, shippingOptionsHtml, summaryHtml }. We swap the shipping-options
|
||||
// block in place and hand the summary fragment to the drawer's bbk-cart
|
||||
// controller via the `bbk-cart:changed` window event (same mechanism the drawer
|
||||
// already uses). Shipping-method radios post to selectShippingUrl the same way.
|
||||
export default class extends Controller {
|
||||
static targets = [
|
||||
'sameAsBilling', 'shippingFields',
|
||||
'form', 'shippingOptions', 'status',
|
||||
]
|
||||
|
||||
static values = {
|
||||
saveUrl: String,
|
||||
selectShippingUrl: String,
|
||||
statusSaving: String,
|
||||
statusSaved: String,
|
||||
statusError: String,
|
||||
}
|
||||
|
||||
connect() {
|
||||
this.saveTimer = null
|
||||
this.saveController = null
|
||||
this.statusTimer = null
|
||||
this.shippingPromise = null
|
||||
|
||||
if (this.hasSameAsBillingTarget) this.applySameAsBilling()
|
||||
}
|
||||
|
||||
disconnect() {
|
||||
clearTimeout(this.saveTimer)
|
||||
clearTimeout(this.statusTimer)
|
||||
this.saveController?.abort()
|
||||
}
|
||||
|
||||
// ── Same as billing ────────────────────────────────────────────────
|
||||
|
||||
toggleSameAsBilling() {
|
||||
this.applySameAsBilling()
|
||||
}
|
||||
|
||||
applySameAsBilling() {
|
||||
const on = this.sameAsBillingTarget.checked
|
||||
|
||||
// Checked: shipping *is* billing — copy every value across, then hide +
|
||||
// disable so the browser doesn't submit them; the server reuses billing.
|
||||
// Unchecked: reveal them pre-filled from billing wherever still empty.
|
||||
this.element.querySelectorAll('[name^="billing_"]').forEach((billingField) => {
|
||||
const shippingField = this.element.querySelector(
|
||||
`[name="${billingField.name.replace(/^billing_/, 'shipping_')}"]`,
|
||||
)
|
||||
if (shippingField && (on || !shippingField.value)) {
|
||||
shippingField.value = billingField.value
|
||||
}
|
||||
})
|
||||
|
||||
this.shippingFieldsTarget.hidden = on
|
||||
this.shippingFieldsTarget.querySelectorAll('input, select, textarea').forEach((field) => {
|
||||
field.disabled = on
|
||||
})
|
||||
}
|
||||
|
||||
// ── Autosave ───────────────────────────────────────────────────────
|
||||
|
||||
scheduleSave(event) {
|
||||
// The shipping-method and payment radios live inside this controller's
|
||||
// element too, and this action is bound on .bbk-checkout-main to also
|
||||
// catch the contact email/consent that sit outside the <form>. Only
|
||||
// react to fields that actually belong to the address form.
|
||||
const el = event.target
|
||||
const belongsToForm = el.form?.id === 'bbk-address-form'
|
||||
if (!belongsToForm) return
|
||||
|
||||
// No status during the wait — it only shows once the request is in flight,
|
||||
// so the indicator isn't flickering "saving" on every keystroke.
|
||||
clearTimeout(this.saveTimer)
|
||||
this.saveTimer = setTimeout(() => this.save(), 700)
|
||||
}
|
||||
|
||||
// Called by bbk-payment right before place-order — a debounced save (and
|
||||
// the shipping-option auto-select that happens as part of it) might still
|
||||
// be pending when the shopper clicks "place order"; this guarantees the
|
||||
// server has processed the current form state first.
|
||||
async flush() {
|
||||
clearTimeout(this.saveTimer)
|
||||
await this.save()
|
||||
// A shipping-method radio click fires its own (undebounced) request —
|
||||
// still async, still racy against an immediate "place order" click.
|
||||
if (this.shippingPromise) await this.shippingPromise
|
||||
}
|
||||
|
||||
async save() {
|
||||
this.saveController?.abort()
|
||||
this.saveController = new AbortController()
|
||||
this.setStatus('saving')
|
||||
|
||||
try {
|
||||
const response = await fetch(this.saveUrlValue, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': csrfToken(),
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
Accept: 'application/json',
|
||||
},
|
||||
body: new FormData(this.formTarget),
|
||||
signal: this.saveController.signal,
|
||||
})
|
||||
|
||||
if (!response.ok) return this.setStatus('error')
|
||||
|
||||
this.applyResult(await response.json())
|
||||
this.setStatus('saved')
|
||||
} catch (error) {
|
||||
if (error.name !== 'AbortError') this.setStatus('error')
|
||||
}
|
||||
}
|
||||
|
||||
async selectShipping(event) {
|
||||
this.toggleBoxNowLocker(event.target.dataset.boxNow === 'true')
|
||||
|
||||
// Tracked so flush() can await it — nothing else stops "place order"
|
||||
// (a separate, unrelated click) from racing ahead of this request.
|
||||
this.shippingPromise = this.doSelectShipping(event.target.value)
|
||||
await this.shippingPromise
|
||||
}
|
||||
|
||||
// The dummy Box Now locker <select> (see shipping-options.blade.php)
|
||||
// lives inside the #bbk-shipping-options fragment this controller
|
||||
// re-renders wholesale on every shipping-option change — so its own
|
||||
// Stimulus controller reconnects fresh each time and has no memory of
|
||||
// which option was previously selected. This is the one place that
|
||||
// knows the newly-chosen option, so it also owns showing/hiding the
|
||||
// picker. Whether an option is Box Now comes from the server
|
||||
// (data-box-now, by the method's driver) — the option's value is the
|
||||
// merchant-typed method code, which needn't be "box-now".
|
||||
toggleBoxNowLocker(isBoxNow) {
|
||||
const picker = this.shippingOptionsTarget.querySelector('#bbk-box-now-locker')
|
||||
if (!picker) return
|
||||
|
||||
const controller = this.application.getControllerForElementAndIdentifier(picker, 'bbk-box-now-locker')
|
||||
|
||||
if (isBoxNow) {
|
||||
controller?.show()
|
||||
} else {
|
||||
controller?.hide()
|
||||
}
|
||||
}
|
||||
|
||||
async doSelectShipping(value) {
|
||||
this.saveController?.abort()
|
||||
this.setStatus('saving')
|
||||
|
||||
const body = new FormData()
|
||||
body.append('shipping_option', value)
|
||||
|
||||
try {
|
||||
const response = await fetch(this.selectShippingUrlValue, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': csrfToken(),
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
Accept: 'application/json',
|
||||
},
|
||||
body,
|
||||
})
|
||||
|
||||
if (!response.ok) return this.setStatus('error')
|
||||
|
||||
this.applyResult(await response.json())
|
||||
this.setStatus('saved')
|
||||
} catch {
|
||||
this.setStatus('error')
|
||||
} finally {
|
||||
this.shippingPromise = null
|
||||
}
|
||||
}
|
||||
|
||||
applyResult(data) {
|
||||
this.applyErrors(data.errors || {})
|
||||
|
||||
if (data.shippingOptionsHtml != null) {
|
||||
this.shippingOptionsTarget.innerHTML = data.shippingOptionsHtml
|
||||
}
|
||||
|
||||
if (data.summaryHtml != null) {
|
||||
window.dispatchEvent(new CustomEvent('bbk-cart:changed', {
|
||||
detail: { html: data.summaryHtml },
|
||||
}))
|
||||
}
|
||||
|
||||
// bbk-payment is a sibling controller (both sit on
|
||||
// .bbk-checkout-main), not a target of this one — dispatched as an
|
||||
// event rather than reached into directly, same shape as
|
||||
// bbk-cart:changed above.
|
||||
if (data.paymentMethodsHtml != null) {
|
||||
window.dispatchEvent(new CustomEvent('bbk-checkout:payment-methods-changed', {
|
||||
detail: { html: data.paymentMethodsHtml },
|
||||
}))
|
||||
}
|
||||
}
|
||||
|
||||
applyErrors(errors) {
|
||||
this.element.querySelectorAll('[data-bbk-field-error]').forEach((el) => {
|
||||
const message = errors[el.dataset.bbkFieldError]
|
||||
el.textContent = message || ''
|
||||
el.hidden = !message
|
||||
|
||||
const field = this.element.querySelector(`[name="${el.dataset.bbkFieldError}"]`)
|
||||
field?.classList.toggle('bbk-field-input--error', Boolean(message))
|
||||
})
|
||||
}
|
||||
|
||||
setStatus(state) {
|
||||
if (!this.hasStatusTarget) return
|
||||
|
||||
const text = {
|
||||
saving: this.statusSavingValue,
|
||||
saved: this.statusSavedValue,
|
||||
error: this.statusErrorValue,
|
||||
}[state]
|
||||
|
||||
this.statusTarget.textContent = text
|
||||
this.statusTarget.hidden = false
|
||||
this.statusTarget.dataset.state = state
|
||||
|
||||
clearTimeout(this.statusTimer)
|
||||
if (state === 'saved') {
|
||||
this.statusTimer = setTimeout(() => { this.statusTarget.hidden = true }, 2000)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,304 @@
|
||||
import { Controller } from '@hotwired/stimulus'
|
||||
import { csrfToken } from './csrf'
|
||||
|
||||
const STRIPE_JS = 'https://js.stripe.com/v3/'
|
||||
const POLL_INTERVAL = 1500
|
||||
const POLL_TIMEOUT = 30000
|
||||
|
||||
// The payment step of the checkout page. Sits alongside bbk-checkout-form on
|
||||
// .bbk-checkout-main.
|
||||
//
|
||||
// - selectMethod: radio change -> persist via /payment-method, refresh the
|
||||
// summary (COD fee), mount/unmount the Stripe Payment Element
|
||||
// - placeOrder: the real submit. For Stripe, builds a PaymentMethod client-side
|
||||
// and POSTs it to /place-order, then routes on the JSON result:
|
||||
// { redirect } -> order placed, go to confirmation
|
||||
// { status:'pending', clientSecret } -> 3-D Secure: handleNextAction, then
|
||||
// poll /order-status until the webhook places it
|
||||
// { status:'failed'|'invalid'|'stale', message } -> show inline, re-enable
|
||||
export default class extends Controller {
|
||||
static targets = ['element', 'terms', 'error', 'submit', 'processing', 'processingText', 'methods']
|
||||
|
||||
static values = {
|
||||
selectUrl: String,
|
||||
placeOrderUrl: String,
|
||||
orderStatusUrl: String,
|
||||
stripeKey: String,
|
||||
amount: Number,
|
||||
currency: String,
|
||||
termsRequired: String,
|
||||
chooseMethod: String,
|
||||
genericError: String,
|
||||
processingSlow: String,
|
||||
}
|
||||
|
||||
connect() {
|
||||
this.stripe = null
|
||||
this.elements = null
|
||||
this.paymentElement = null
|
||||
|
||||
this.onSummaryUpdate = (event) => {
|
||||
const total = event.detail?.total
|
||||
if (typeof total === 'number' && this.elements) {
|
||||
this.amountValue = total
|
||||
this.elements.update({ amount: Math.max(total, 1) })
|
||||
}
|
||||
|
||||
// Removing the last line while sitting on the checkout page (via
|
||||
// the order summary's own remove form) must not leave "place
|
||||
// order" clickable with nothing left to charge for — this fires
|
||||
// from both the drawer and the checkout page's own summary
|
||||
// instance, whichever the shopper actually used.
|
||||
const count = event.detail?.count
|
||||
if (typeof count === 'number' && this.hasSubmitTarget) {
|
||||
this.submitTarget.disabled = count === 0
|
||||
}
|
||||
}
|
||||
window.addEventListener('bbk-cart:updated', this.onSummaryUpdate)
|
||||
|
||||
// Fired by bbk-checkout-form after a shipping-option change —
|
||||
// getPaymentMethods() filters by fulfillment type, so the offered
|
||||
// methods (and which one, if any, is still validly selected) can
|
||||
// change without this controller's own element ever reconnecting.
|
||||
this.onPaymentMethodsChanged = (event) => {
|
||||
const html = event.detail?.html
|
||||
if (html == null || !this.hasMethodsTarget) return
|
||||
|
||||
this.methodsTarget.innerHTML = html
|
||||
|
||||
if (!this.selectedIsStripe()) this.unmountStripe()
|
||||
}
|
||||
window.addEventListener('bbk-checkout:payment-methods-changed', this.onPaymentMethodsChanged)
|
||||
|
||||
if (this.selectedIsStripe()) this.mountStripe()
|
||||
}
|
||||
|
||||
disconnect() {
|
||||
window.removeEventListener('bbk-cart:updated', this.onSummaryUpdate)
|
||||
window.removeEventListener('bbk-checkout:payment-methods-changed', this.onPaymentMethodsChanged)
|
||||
this.unmountStripe()
|
||||
}
|
||||
|
||||
// ── Method selection ──────────────────────────────────────────────
|
||||
|
||||
async selectMethod(event) {
|
||||
const isStripe = event.target.dataset.paymentDriver === 'stripe'
|
||||
|
||||
try {
|
||||
const response = await fetch(this.selectUrlValue, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': csrfToken(),
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
Accept: 'application/json',
|
||||
},
|
||||
body: new URLSearchParams({ payment_type: event.target.value }),
|
||||
})
|
||||
if (response.ok) {
|
||||
const data = await response.json()
|
||||
if (data.summaryHtml != null) {
|
||||
window.dispatchEvent(new CustomEvent('bbk-cart:changed', { detail: { html: data.summaryHtml } }))
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
// summary just won't refresh — non-fatal
|
||||
}
|
||||
|
||||
isStripe ? this.mountStripe() : this.unmountStripe()
|
||||
}
|
||||
|
||||
selectedRadio() {
|
||||
return this.element.querySelector('input[name="payment_type"]:checked')
|
||||
}
|
||||
|
||||
selectedIsStripe() {
|
||||
return this.selectedRadio()?.dataset.paymentDriver === 'stripe'
|
||||
}
|
||||
|
||||
// ── Stripe Payment Element ────────────────────────────────────────
|
||||
|
||||
async loadStripe() {
|
||||
if (window.Stripe) return window.Stripe
|
||||
|
||||
await new Promise((resolve, reject) => {
|
||||
const existing = document.querySelector(`script[src="${STRIPE_JS}"]`)
|
||||
if (existing) {
|
||||
existing.addEventListener('load', resolve)
|
||||
existing.addEventListener('error', reject)
|
||||
return
|
||||
}
|
||||
const script = document.createElement('script')
|
||||
script.src = STRIPE_JS
|
||||
script.onload = resolve
|
||||
script.onerror = reject
|
||||
document.head.appendChild(script)
|
||||
})
|
||||
|
||||
return window.Stripe
|
||||
}
|
||||
|
||||
async mountStripe() {
|
||||
if (this.paymentElement || !this.stripeKeyValue) return
|
||||
|
||||
const Stripe = await this.loadStripe()
|
||||
this.stripe = this.stripe || Stripe(this.stripeKeyValue)
|
||||
|
||||
this.elements = this.stripe.elements({
|
||||
mode: 'payment',
|
||||
amount: Math.max(this.amountValue, 1),
|
||||
currency: this.currencyValue,
|
||||
paymentMethodCreation: 'manual',
|
||||
// Card only — matches the server confirming with
|
||||
// automatic_payment_methods.allow_redirects = 'never' (no
|
||||
// return_url in our flow: 3-D Secure resolves in-page via
|
||||
// handleNextAction, never a full-page redirect).
|
||||
paymentMethodTypes: ['card'],
|
||||
})
|
||||
this.paymentElement = this.elements.create('payment')
|
||||
this.paymentElement.mount(this.elementTarget)
|
||||
this.elementTarget.hidden = false
|
||||
}
|
||||
|
||||
unmountStripe() {
|
||||
this.paymentElement?.unmount()
|
||||
this.paymentElement = null
|
||||
this.elements = null
|
||||
|
||||
if (this.hasElementTarget) {
|
||||
this.elementTarget.innerHTML = ''
|
||||
this.elementTarget.hidden = true
|
||||
}
|
||||
}
|
||||
|
||||
// ── Place order ──────────────────────────────────────────────────
|
||||
|
||||
// Sibling controller on the same element (.bbk-checkout-main) — used to
|
||||
// flush a pending debounced address autosave before placing the order.
|
||||
get checkoutForm() {
|
||||
return this.application.getControllerForElementAndIdentifier(this.element, 'bbk-checkout-form')
|
||||
}
|
||||
|
||||
async placeOrder() {
|
||||
this.clearError()
|
||||
this.submitTarget.disabled = true
|
||||
|
||||
// A debounced address save (and the shipping-option auto-select that
|
||||
// happens as part of it) might still be pending — make sure the
|
||||
// server has the latest state before we ask it to place the order.
|
||||
await this.checkoutForm?.flush()
|
||||
|
||||
if (!this.termsTarget.checked) {
|
||||
this.submitTarget.disabled = false
|
||||
this.showError(this.termsRequiredValue)
|
||||
return
|
||||
}
|
||||
|
||||
const radio = this.selectedRadio()
|
||||
if (!radio) {
|
||||
this.submitTarget.disabled = false
|
||||
this.showError(this.chooseMethodValue)
|
||||
return
|
||||
}
|
||||
|
||||
let paymentMethodId = null
|
||||
if (radio.dataset.paymentDriver === 'stripe') {
|
||||
const { error: submitError } = await this.elements.submit()
|
||||
if (submitError) return this.fail(submitError.message)
|
||||
|
||||
const { error: pmError, paymentMethod } = await this.stripe.createPaymentMethod({ elements: this.elements })
|
||||
if (pmError) return this.fail(pmError.message)
|
||||
paymentMethodId = paymentMethod.id
|
||||
}
|
||||
|
||||
let data
|
||||
try {
|
||||
const response = await fetch(this.placeOrderUrlValue, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'X-CSRF-TOKEN': csrfToken(),
|
||||
'X-Requested-With': 'XMLHttpRequest',
|
||||
Accept: 'application/json',
|
||||
},
|
||||
body: new URLSearchParams({
|
||||
payment_type: radio.value,
|
||||
payment_method: paymentMethodId ?? '',
|
||||
terms_accepted: '1',
|
||||
}),
|
||||
})
|
||||
data = await response.json()
|
||||
} catch {
|
||||
return this.fail(this.genericErrorValue)
|
||||
}
|
||||
|
||||
if (data.redirect) {
|
||||
window.location.assign(data.redirect)
|
||||
return
|
||||
}
|
||||
|
||||
if (data.status === 'pending' && data.clientSecret) {
|
||||
await this.resolvePending(data.clientSecret)
|
||||
return
|
||||
}
|
||||
|
||||
// Points at the section that actually needs attention, rather than
|
||||
// leaving a generic error and making the shopper hunt for it — e.g. a
|
||||
// region with 2+ shipping methods needs an explicit pick, easy to miss.
|
||||
if (data.field === 'shipping_option') {
|
||||
document.getElementById('bbk-shipping-options')?.scrollIntoView({ block: 'center', behavior: 'smooth' })
|
||||
this.fail(data.message || data.error || this.genericErrorValue, { scroll: false })
|
||||
return
|
||||
}
|
||||
|
||||
this.fail(data.message || data.error || this.genericErrorValue)
|
||||
}
|
||||
|
||||
async resolvePending(clientSecret) {
|
||||
this.processingTarget.hidden = false
|
||||
|
||||
const { error } = await this.stripe.handleNextAction({ clientSecret })
|
||||
if (error) {
|
||||
this.processingTarget.hidden = true
|
||||
return this.fail(error.message)
|
||||
}
|
||||
|
||||
// 3-D Secure cleared client-side — the webhook places the order. Poll.
|
||||
const startedAt = Date.now()
|
||||
const tick = async () => {
|
||||
try {
|
||||
const response = await fetch(this.orderStatusUrlValue, { headers: { Accept: 'application/json' } })
|
||||
const data = await response.json()
|
||||
if (data.placed && data.redirect) {
|
||||
window.location.assign(data.redirect)
|
||||
return
|
||||
}
|
||||
} catch {
|
||||
// keep polling
|
||||
}
|
||||
|
||||
if (Date.now() - startedAt > POLL_TIMEOUT) {
|
||||
this.processingTextTarget.textContent = this.processingSlowValue
|
||||
return
|
||||
}
|
||||
setTimeout(tick, POLL_INTERVAL)
|
||||
}
|
||||
tick()
|
||||
}
|
||||
|
||||
// ── helpers ──────────────────────────────────────────────────────
|
||||
|
||||
fail(message, { scroll = true } = {}) {
|
||||
this.showError(message, { scroll })
|
||||
this.submitTarget.disabled = false
|
||||
}
|
||||
|
||||
showError(message, { scroll = true } = {}) {
|
||||
this.errorTarget.textContent = message
|
||||
this.errorTarget.hidden = false
|
||||
if (scroll) this.errorTarget.scrollIntoView({ block: 'center', behavior: 'smooth' })
|
||||
}
|
||||
|
||||
clearError() {
|
||||
this.errorTarget.textContent = ''
|
||||
this.errorTarget.hidden = true
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
// Reads the CSRF token from the standard <meta name="csrf-token"> tag every
|
||||
// boboko host renders in its layout <head>. Kept as its own module so both
|
||||
// checkout controllers share one source.
|
||||
export function csrfToken() {
|
||||
return document.querySelector('meta[name="csrf-token"]')?.getAttribute('content') || ''
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
import BbkAddToCartController from './bbk-add-to-cart-controller'
|
||||
import BbkBoxNowLockerController from './bbk-box-now-locker-controller'
|
||||
import BbkCartController from './bbk-cart-controller'
|
||||
import BbkCheckoutFormController from './bbk-checkout-form-controller'
|
||||
import BbkPaymentController from './bbk-payment-controller'
|
||||
|
||||
// Registers the checkout module's Stimulus controllers onto the host app's
|
||||
// Stimulus application. Call once from the host's JS entry point:
|
||||
//
|
||||
// import { registerCheckout } from './checkout'
|
||||
// registerCheckout(application)
|
||||
//
|
||||
// When this module moves to boboko-core this file ships with it unchanged;
|
||||
// only that one import line in the host entry point differs per project.
|
||||
export function registerCheckout(application) {
|
||||
console.log('[@boboko/core] checkout module loaded from', import.meta.url, '- test 2')
|
||||
application.register('bbk-add-to-cart', BbkAddToCartController)
|
||||
application.register('bbk-box-now-locker', BbkBoxNowLockerController)
|
||||
application.register('bbk-cart', BbkCartController)
|
||||
application.register('bbk-checkout-form', BbkCheckoutFormController)
|
||||
application.register('bbk-payment', BbkPaymentController)
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
// Single stable JS entry point for this package. A consuming app imports
|
||||
// from here (`import { … } from "@boboko/core"`), never from a path
|
||||
// reaching into a specific module's internals — so this file's exports can
|
||||
// grow or its modules' internal layout can change without breaking every
|
||||
// consumer's own entry point.
|
||||
//
|
||||
// stoic_embed.js is not re-exported here: per its own docblock, it's a
|
||||
// standalone vendored script meant to be included directly, not imported.
|
||||
export { registerCheckout } from './checkout/index.js'
|
||||
export { registerWishlist } from './wishlist/index.js'
|
||||
@@ -0,0 +1,10 @@
|
||||
import WishlistController from './wishlist-controller'
|
||||
|
||||
// Registers the wishlist module's Stimulus controller onto the host app's
|
||||
// Stimulus application. Call once from the host's JS entry point:
|
||||
//
|
||||
// import { registerWishlist } from '@boboko/core'
|
||||
// registerWishlist(application)
|
||||
export function registerWishlist(application) {
|
||||
application.register('wishlist', WishlistController)
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
import { Controller } from '@hotwired/stimulus'
|
||||
|
||||
// Heart toggle. Posts the form with fetch and reflects the server's answer on
|
||||
// aria-pressed, which the consuming app's own CSS uses to swap the outline
|
||||
// and filled heart. If the request fails, falls back to a normal form submit.
|
||||
export default class extends Controller {
|
||||
static targets = ['button', 'status']
|
||||
|
||||
static values = {
|
||||
addLabel: String,
|
||||
removeLabel: String,
|
||||
addedMessage: String,
|
||||
removedMessage: String,
|
||||
}
|
||||
|
||||
async toggle(event) {
|
||||
event.preventDefault()
|
||||
|
||||
if (this.busy) return
|
||||
this.busy = true
|
||||
|
||||
try {
|
||||
const response = await fetch(this.element.action, {
|
||||
method: 'POST',
|
||||
headers: { Accept: 'application/json', 'X-Requested-With': 'XMLHttpRequest' },
|
||||
body: new FormData(this.element),
|
||||
})
|
||||
|
||||
if (!response.ok) throw new Error(`Wishlist toggle failed: ${response.status}`)
|
||||
|
||||
const { active } = await response.json()
|
||||
|
||||
this.buttonTarget.setAttribute('aria-pressed', active ? 'true' : 'false')
|
||||
this.buttonTarget.setAttribute('aria-label', active ? this.removeLabelValue : this.addLabelValue)
|
||||
this.statusTarget.textContent = active ? this.addedMessageValue : this.removedMessageValue
|
||||
} catch {
|
||||
this.element.submit()
|
||||
} finally {
|
||||
this.busy = false
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 90 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
@@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="151" height="150" viewBox="0 0 151 150"><metadata><rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><rdf:Description><dc:creator>RealFaviconGenerator</dc:creator><dc:source>https://realfavicongenerator.net</dc:source></rdf:Description></rdf:RDF></metadata><image width="151" height="150" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJcAAACWCAYAAADTwxrcAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAOdEVYdFNvZnR3YXJlAEZpZ21hnrGWYwAACYRJREFUeAHtnctuG0cWhv8qJuuRgWSAWU1nMrO28gRuP4FkzANIegJZyAXIStQqQOLA8hOY2ieR/QSmnyDMOgnSuwCJAzLrmF05p6spURSvYpNddfp8gO6UxGb9fc6p21+AoiiKoiiKoiiKoiiKoiiKoiiKoiiKoiiKRAyUxVz2d+j9TvH5o3sZlKVQcY1z2d9FjhQW9+GwS99JMBLVbbLizaCHIV6jhS4JbwDlChXXZT+l93skpkPMFtKydOnvXOD/9zpQGiwuFpXDKX2Wono4onXo40WT02jzxLVZUU3iRfbo3hkaSHPE5YvyUxLWY2wfFtnDpkUxiybAhbrD9zUJi0nof/9Cz+MUDUK+uF72D6hhX8H3/OrFoU0Ce4qGIDstcqTgBg2PLr3yj6QPXcgVV7jCGtEr6zCxApOZFr/p7wcuLIbrwEsIRp64LvsJXdVzxEEquQaTlRZ5uIF7hSEU76vg02MXwpAWubirnyA2HEVaPw4nCjni8mNZdY1jrUsCf2OIQo64Yi+O+cbwk+hikCGub/uHiDEdTuJkRS8Z4jJiGiWVFL3iF5dvjARScNiHECRErgPI4kBKzzF+cQm600t2kMu4prjF5VOiuPEhWPsAAohbXPlWVpNuH5dr5KodAxF3+BR2ijnSyIm95pKXEq/ZReTELq7oG2Amefw3TrziEjjRO0GCyIk5ckkXV/Q0Y/ePUgsqLmVjqLiUjRGvuOTvXo5+V1DskUvuvj9bWDRFTeziyiAXjVw18wPk0kPkxC0uhy5k0pOwEztucVmx4noNAcQtLt9j7EIaBi8gAAkrUUXc5WNkUnZfxy8ui3NIGpIwEGNxGb+4fOF7ARlkEJTmpexblBG9nCz3Zxni4gZxeIa4ycoULwY5E9e+YTLECtdawlwG5YiLG8bgCDFiLHvVdyAMWUtufBc+tvSYAbnIQxBkGu5+12dr8BThw9H2I6nLh2QuFmQb7hjqL07jgtelyRSXr78eImSBeWGJmOaZhdxlzhwRwhTYoBRWB8KRvYZ+JLBwJoJHB0x10ACac2rZt/12rQ6ExpDA3VGTTpNt1nmLbO7hjXm3aQPAafCkKdFqnGaeFHvZPyzNbRNsjkExJcUzBw09+7rZZ1x7kbHtZYrqaLyoRugB6oz3wuLDqPZwN6ENyk4DL/0Rsf69ClRck3j3nN3ijW2MLP596zEOf9Irl9HPB8U6/gYfkq4oiqIoiqIoiqIoihIIWxnn+hVfJNO+/y98nkHZCO6XwpB4minxwHywnW14lYqrj6c7b/GWBiDtnoFLDMyuo4+Y/wR6Dsjosa+HGHb/ic+itw7aNoWQhjTD4E8U4QHgBPPdrnlGoUeDwb3CDqGFHgkuQ8VUIq7f8VVK4jigt30S01oW3vQ3MhJbtwV7dg8nGZSpFILKcUgv2B4JJMW6GJppyHFh/osOKmItcb3B14d0mVVP/I5hOiqym5Tp7piE8Bib8eLnzbkd+nixbjS7k7jKSMVLVlJsBRXZFkQ1Ce9iP1snkq0kLq6pcuSnlPoeY8uU6fLsPXzcQcMgYaUkqueo48gWTpcGR3eJYkuLi4S1S8K6XFSgbxoHc/4+Pj5BQyBhcbSq20OCo9gJRbGV9iIsJa43eMLF+vm6xXpVcBSzsA8lp8myYOdotY9QsGhTBFt6d/hCcf2BrzkNthEYkgVWCot3jW9zrf9yrCCwueL6A0+Oqc4J1tZHqsDcz/geYZ8l2TEfLjZ9mblvkVLhfsjCYrj+ozrwFdWDCYRAUespwj+k9JCe58JtelPFxY1FUeEpIoAFRiP7zyEAilin5VBD+ORok8AO5j3ETv+9/FXdvcIVSWnsLY5GmUEx3AC0ERPUi6Xnncz68S1xlQX8zF8IFY60v+HL0NPJVIoG8j3D2Nih1DHzed8QF6fDEHuGy0LFfRSpfArHqGOAtApoXpPS+dSscUNcAmqX1M93xkMZtaJO6cRpOT11gytx8Xwh4nDjmwuNrdRnNnIX8sie73R2pt0gV+IqJ6Kjh+vFWKJXWQwfQgbHk9GrEFc5TpRCDO4AMSAjao3w68vGKMQ1RC7pIpm0TPOhk0ISpvDauML67wm7SE+KgHE/Fs8vgSS45ziWGi0vpYlxXGsRFmYPIWMDWu1QJWOp0VJKjHLgcRE0L7rLixsRLg8gEYv715/CiRQX43ciBYvM1z2/Lke45roPuQTZgFSXiL2hMVZHWhrfSiCUYK/tLUJO12szmsy2Eov5Mf6BEDHCeom3KW4e2YccKHWh4lI2i4pL2RgqLmVjcG8xg1z+RJhsxcKoRjJ+x4OoYi+UesIZQqQV8UHvy1FoiqZ/8AOEEnBUziCXK3M5SouuB6HkyDMESPniZ5AIm8qVcEEvUlwctYJ2KWRHP4mMXZd9H592IbDAZHdChE0XErHX11UMReTAS4jDhX1NrWCORq6SjFJ+d/RFuRLVdSAITonv4ZOgG6+ou5y46NUd/6IQl7TUGEFK9Ljlva6iwN68nqsRehoTegYhsH8qIsD8j24COdGrM2lteSWud/DOuYzRetOJyq9LSvSyt6/jSlzUIAM2tEXE8M0RS9QaISR6daYZ8t6YuC6dkruIFL45onQZbCFmA+FsWtRibq2KaKHFdoQRFvemE6uNON31PNgbp8DYq36Gjfgtcfk730R1oTGmw0nMhziPMD3OPQRhpuHuGzxhP9RjBA4Ja2BhP5JgulvaKbGLc4LQMeia/+DhvIfMXCxIg5BsiXOBwBlieCLFzblIL7ZosNDLkoxP1Vj0oLkrUan+emwCntjOkR/R5HQHgohAYMXzW+a4lrni4uEJixZfaFBTKZwKJQprRFHge4FlCIvessJilj7753d81Q7BIK482OARCV/sOrQRQdVgDs8olbVXOWV2pVPL2POKGvZ5fRtpzQvqFR5xREWDcD+iTRGjrht7QAI/o8He8xV/bzVxMexCSEU0F/tb60n64/DcSegrHTZJLVFsjePw/K/fERbZXxi2qWjbmEVkWVs943nPpkWrWbifiqOHOYol2BQsqmERrbpYgzuLa8QmRKaiWkwhMn7NTYUOihWJ6vrPVQQbrQ2R7+dwaQvmwap1Gae+IdxLA/eiXF+mLEGZLvep4N67g9AGxYYKh5d8rvUqxfoyVCauSVhsbL5mYBOHPMHUf26zHMPeu3g30whVDYX315AE5510plk18QrYAfX8uuaD4IY6FEVRFEVRFEVRFEVRFEVRFEVRFEVRFEVRFKXJ/A2oC/VTZ0o/1AAAAABJRU5ErkJggg=="></image></svg>
|
||||
|
After Width: | Height: | Size: 3.8 KiB |
@@ -0,0 +1,17 @@
|
||||
@extends('emails.layout')
|
||||
|
||||
@section('content')
|
||||
<p style="margin: 0 0 24px 0;">Use the code below to confirm this address as your account's new email.</p>
|
||||
|
||||
<table role="presentation" cellpadding="0" cellspacing="0" border="0" width="100%" style="margin: 0 0 24px 0; background-color: #f7f6f5; border-radius: 8px;">
|
||||
<tr>
|
||||
<td style="padding: 16px 20px; text-align: center; font-size: 28px; font-weight: bold; letter-spacing: 0.25rem;">
|
||||
{{ $code }}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<p style="margin: 0 0 16px 0;">This code expires in 10 minutes.</p>
|
||||
|
||||
<p style="margin: 0;">If you didn't request this change, you can ignore this email — nothing will change.</p>
|
||||
@endsection
|
||||
@@ -0,0 +1,9 @@
|
||||
@extends('emails.layout')
|
||||
|
||||
@section('content')
|
||||
<p style="margin: 0 0 16px 0;">Your account's login email was changed to <strong>{{ $maskedEmail }}</strong>.</p>
|
||||
|
||||
<p style="margin: 0 0 24px 0;">From now on, login codes will be sent to the new address.</p>
|
||||
|
||||
<p style="margin: 0;">If you didn't make this change, please contact us right away.</p>
|
||||
@endsection
|
||||
@@ -0,0 +1,44 @@
|
||||
{{--
|
||||
<x-checkout::add-to-cart :purchasable="$variantId" />
|
||||
|
||||
A self-contained add-to-cart form. Posts the line via bbk-add-to-cart-controller
|
||||
(fetch) and hands the rendered cart body to the drawer over the
|
||||
`bbk-cart:changed` window event.
|
||||
|
||||
Props:
|
||||
purchasable ProductVariant id. Omit to render no hidden id field — the host
|
||||
must then supply [data-bbk-purchasable-input] itself (e.g. a
|
||||
variant picker writing the selected id into it).
|
||||
quantity Integer for the hidden quantity field, or false to omit it
|
||||
(the host then puts its own name="quantity" control in the slot).
|
||||
|
||||
The button and any quantity control come from the slot, so the host owns all
|
||||
appearance. Extra attributes (class, etc.) land on the <form>.
|
||||
--}}
|
||||
@props([
|
||||
'purchasable' => null,
|
||||
'quantity' => 1,
|
||||
'action' => null,
|
||||
])
|
||||
|
||||
<form
|
||||
method="POST"
|
||||
action="{{ $action ?? route('checkout.cart.add', app()->getLocale()) }}"
|
||||
data-controller="bbk-add-to-cart"
|
||||
data-action="bbk-add-to-cart#add"
|
||||
{{ $attributes->class('bbk-add-to-cart') }}
|
||||
>
|
||||
@csrf
|
||||
|
||||
@if (! is_null($purchasable))
|
||||
<input type="hidden" name="purchasable_id" value="{{ $purchasable }}" data-bbk-purchasable-input>
|
||||
@endif
|
||||
|
||||
@if ($quantity !== false)
|
||||
<input type="hidden" name="quantity" value="{{ $quantity }}">
|
||||
@endif
|
||||
|
||||
{{ $slot }}
|
||||
|
||||
<p class="bbk-add-to-cart-error" data-bbk-add-to-cart-target="error" hidden role="alert"></p>
|
||||
</form>
|
||||
@@ -0,0 +1,15 @@
|
||||
{{--
|
||||
Read-only formatted address. $address is any Lunar address model
|
||||
(OrderAddress / CartAddress) — same column names on both.
|
||||
--}}
|
||||
@props(['address'])
|
||||
|
||||
<address class="bbk-address-lines">
|
||||
<span>{{ trim(($address->first_name ?? '') . ' ' . ($address->last_name ?? '')) }}</span>
|
||||
@if ($address->company_name)<span>{{ $address->company_name }}</span>@endif
|
||||
<span>{{ $address->line_one }}</span>
|
||||
@if ($address->line_two)<span>{{ $address->line_two }}</span>@endif
|
||||
<span>{{ trim(($address->postcode ?? '') . ' ' . ($address->city ?? '')) }}</span>
|
||||
@if ($address->state)<span>{{ $address->state }}</span>@endif
|
||||
@if ($address->contact_phone)<span>{{ $address->contact_phone }}</span>@endif
|
||||
</address>
|
||||
@@ -0,0 +1,29 @@
|
||||
{{--
|
||||
<x-checkout::field name="billing_first_name" label="First name" required />
|
||||
|
||||
Generic labelled text input with old-input repopulation and validation
|
||||
error display — the module's own equivalent of a host x-ui.field, used
|
||||
instead of it per the module's independence rule. All styling is .bbk-field*
|
||||
(resources/css/checkout.css); no host classes.
|
||||
--}}
|
||||
@props([
|
||||
'name',
|
||||
'label',
|
||||
'type' => 'text',
|
||||
'value' => null,
|
||||
'required' => false,
|
||||
])
|
||||
|
||||
<div class="bbk-field">
|
||||
<label class="bbk-field-label" for="bbk-{{ $name }}">{{ $label }}</label>
|
||||
<input
|
||||
type="{{ $type }}"
|
||||
name="{{ $name }}"
|
||||
id="bbk-{{ $name }}"
|
||||
value="{{ old($name, $value) }}"
|
||||
@if ($required) required @endif
|
||||
{{ $attributes->class(['bbk-field-input', 'bbk-field-input--error' => $errors->has($name)]) }}
|
||||
>
|
||||
{{-- Always present so bbk-checkout-form can fill it live on an autosave. --}}
|
||||
<p class="bbk-field-error" data-bbk-field-error="{{ $name }}" @unless ($errors->has($name)) hidden @endunless>{{ $errors->first($name) }}</p>
|
||||
</div>
|
||||
@@ -0,0 +1,52 @@
|
||||
{{--
|
||||
The state/region + country pair for one address (billing or shipping).
|
||||
|
||||
Single-country store ($storeCountry set): region is a <select> of that
|
||||
country's Lunar states, submitting `->name` (table-rate-shipping resolves
|
||||
zones with State::whereName()), and country is a fixed hidden field + label.
|
||||
Otherwise: free-text region + full country <select>, as before.
|
||||
--}}
|
||||
@props([
|
||||
'prefix',
|
||||
'storeCountry' => null,
|
||||
'regions' => [],
|
||||
'countries' => [],
|
||||
'address' => null,
|
||||
])
|
||||
|
||||
<div class="bbk-field-row">
|
||||
@if ($storeCountry)
|
||||
<x-checkout::select
|
||||
:name="$prefix . '_state'"
|
||||
label="{{ __('checkout.page.state') }}"
|
||||
:options="$regions"
|
||||
value-field="name"
|
||||
translation-group="states"
|
||||
:value="$address?->state"
|
||||
placeholder="{{ __('checkout.page.state_placeholder') }}"
|
||||
required
|
||||
/>
|
||||
|
||||
<div class="bbk-field">
|
||||
<span class="bbk-field-label">{{ __('checkout.page.country') }}</span>
|
||||
<p class="bbk-field-static">
|
||||
{{ \Illuminate\Support\Facades\Lang::has("core::countries.{$storeCountry->name}")
|
||||
? __("core::countries.{$storeCountry->name}")
|
||||
: $storeCountry->name }}
|
||||
</p>
|
||||
<input type="hidden" name="{{ $prefix }}_country_id" value="{{ $storeCountry->id }}">
|
||||
</div>
|
||||
@else
|
||||
<x-checkout::field :name="$prefix . '_state'" label="{{ __('checkout.page.state') }}" :value="$address?->state" />
|
||||
|
||||
<x-checkout::select
|
||||
:name="$prefix . '_country_id'"
|
||||
label="{{ __('checkout.page.country') }}"
|
||||
:options="$countries"
|
||||
translation-group="countries"
|
||||
:value="$address?->country_id"
|
||||
placeholder="{{ __('checkout.page.country_placeholder') }}"
|
||||
required
|
||||
/>
|
||||
@endif
|
||||
</div>
|
||||
@@ -0,0 +1,62 @@
|
||||
{{--
|
||||
<x-checkout::select name="billing_country_id" label="Country" :options="$countries" required />
|
||||
<x-checkout::select name="shipping_state" label="Region" :options="$regions" value-field="name" translation-group="states" required />
|
||||
|
||||
`options` is an iterable of models/objects; `label` is always read from
|
||||
`->name`, the submitted value from `->{$valueField}` (default `id`, but e.g.
|
||||
`name` for Lunar states — table-rate-shipping resolves those with
|
||||
State::whereName(), so the address must carry the exact name string).
|
||||
|
||||
`translationGroup` (optional, e.g. "countries"/"states") looks the raw
|
||||
`->name` up in boboko-core's `core::{group}.{name}` lang file (see
|
||||
boboko-core's lang/el/countries.php, lang/el/states.php) for the
|
||||
DISPLAYED label only — the submitted `value` is always the untranslated
|
||||
`->{$valueField}`, since table-rate-shipping/Lunar's Country lookups key
|
||||
off the original English name. Falls back to the raw name when no
|
||||
translation exists for the current locale (e.g. English, or a country
|
||||
outside the covered set).
|
||||
--}}
|
||||
@props([
|
||||
'name',
|
||||
'label',
|
||||
'options' => [],
|
||||
'value' => null,
|
||||
'placeholder' => null,
|
||||
'required' => false,
|
||||
'valueField' => 'id',
|
||||
'translationGroup' => null,
|
||||
])
|
||||
|
||||
@php
|
||||
$optionLabel = function ($option) use ($translationGroup) {
|
||||
if (! $translationGroup) {
|
||||
return $option->name;
|
||||
}
|
||||
|
||||
$key = "core::{$translationGroup}.{$option->name}";
|
||||
|
||||
return \Illuminate\Support\Facades\Lang::has($key) ? __($key) : $option->name;
|
||||
};
|
||||
@endphp
|
||||
|
||||
@php($selected = old($name, $value))
|
||||
|
||||
<div class="bbk-field">
|
||||
<label class="bbk-field-label" for="bbk-{{ $name }}">{{ $label }}</label>
|
||||
<select
|
||||
name="{{ $name }}"
|
||||
id="bbk-{{ $name }}"
|
||||
@if ($required) required @endif
|
||||
{{ $attributes->class(['bbk-field-input', 'bbk-field-input--error' => $errors->has($name)]) }}
|
||||
>
|
||||
@if ($placeholder)
|
||||
<option value="" @selected(! $selected)>{{ $placeholder }}</option>
|
||||
@endif
|
||||
@foreach ($options as $option)
|
||||
<option value="{{ $option->{$valueField} }}" @selected((string) $selected === (string) $option->{$valueField})>
|
||||
{{ $optionLabel($option) }}
|
||||
</option>
|
||||
@endforeach
|
||||
</select>
|
||||
<p class="bbk-field-error" data-bbk-field-error="{{ $name }}" @unless ($errors->has($name)) hidden @endunless>{{ $errors->first($name) }}</p>
|
||||
</div>
|
||||
@@ -0,0 +1,18 @@
|
||||
@props([
|
||||
'name',
|
||||
'label',
|
||||
'value' => null,
|
||||
'required' => false,
|
||||
])
|
||||
|
||||
<div class="bbk-field">
|
||||
<label class="bbk-field-label" for="bbk-{{ $name }}">{{ $label }}</label>
|
||||
<textarea
|
||||
name="{{ $name }}"
|
||||
id="bbk-{{ $name }}"
|
||||
rows="3"
|
||||
@if ($required) required @endif
|
||||
{{ $attributes->class(['bbk-field-input', 'bbk-field-input--error' => $errors->has($name)]) }}
|
||||
>{{ old($name, $value) }}</textarea>
|
||||
<p class="bbk-field-error" data-bbk-field-error="{{ $name }}" @unless ($errors->has($name)) hidden @endunless>{{ $errors->first($name) }}</p>
|
||||
</div>
|
||||
@@ -0,0 +1,162 @@
|
||||
{{--
|
||||
Order confirmation. Reached only via a session flash of the placed order id
|
||||
(CheckoutController::confirmation) — not deep-linkable. $order is a
|
||||
Lunar\Models\Order with lines + shipping/billing addresses eager-loaded.
|
||||
$bankTransferInstructions is already-sanitized HTML from
|
||||
StoreDetailsService::bankTransferInstructionsFor(), or null unless this
|
||||
is a bank transfer order with instructions filled in for this locale.
|
||||
--}}
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('title', __('checkout.page.confirmation_title') . ' — ' . config('app.name'))
|
||||
|
||||
@section('content')
|
||||
<div class="bbk-confirmation">
|
||||
<h1 class="bbk-confirmation-heading">{{ __('checkout.page.confirmation_heading') }}</h1>
|
||||
|
||||
<div class="bbk-notice bbk-notice--info">
|
||||
<svg class="bbk-notice-icon" aria-hidden="true" focusable="false" viewBox="0 0 20 20" width="20" height="20">
|
||||
<circle cx="10" cy="10" r="8.25" fill="none" stroke="currentColor" stroke-width="1.5"/>
|
||||
<path d="M10 9v5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
|
||||
<circle cx="10" cy="6.25" r="1" fill="currentColor"/>
|
||||
</svg>
|
||||
<p class="bbk-notice-text">{{ __('checkout.page.confirmation_email_note') }}</p>
|
||||
</div>
|
||||
|
||||
<dl class="bbk-confirmation-meta">
|
||||
<div class="bbk-confirmation-meta-row">
|
||||
<dt>{{ __('checkout.page.confirmation_order_number') }}</dt>
|
||||
<dd>#{{ \Modules\Core\Order\Support\OrderReferenceDisplay::resolve($order) }}</dd>
|
||||
</div>
|
||||
|
||||
@if ($order->billingAddress?->contact_email)
|
||||
<div class="bbk-confirmation-meta-row">
|
||||
<dt>{{ __('checkout.page.email_label') }}</dt>
|
||||
<dd>{{ $order->billingAddress->contact_email }}</dd>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($paymentMethodName)
|
||||
<div class="bbk-confirmation-meta-row">
|
||||
<dt>{{ __('checkout.page.payment_heading') }}</dt>
|
||||
<dd>{{ $paymentMethodName }}</dd>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($shippingLine = $order->lines->firstWhere('type', 'shipping'))
|
||||
<div class="bbk-confirmation-meta-row">
|
||||
<dt>{{ __('checkout.page.shipping_method_heading') }}</dt>
|
||||
<dd>{{ $shippingLine->description }}</dd>
|
||||
</div>
|
||||
@endif
|
||||
</dl>
|
||||
|
||||
{{-- Guests: logging in with the order's email attaches it to an account
|
||||
(boboko-core's Modules\Core\Customer\Listeners\ClaimGuestOrdersOnLogin),
|
||||
so it shows in their history. --}}
|
||||
@guest
|
||||
@if ($loginRoute = config('checkout.login_route'))
|
||||
<p class="bbk-checkout-note">
|
||||
{{ __('checkout.page.confirmation_login_hint') }}
|
||||
<a href="{{ route($loginRoute) }}">{{ __('checkout.page.login_link') }}</a>
|
||||
</p>
|
||||
@endif
|
||||
@endguest
|
||||
|
||||
<section class="bbk-confirmation-section" aria-labelledby="bbk-confirmation-summary-heading">
|
||||
<h2 class="bbk-confirmation-section-heading" id="bbk-confirmation-summary-heading">
|
||||
{{ __('checkout.page.order_summary_heading') }}
|
||||
</h2>
|
||||
|
||||
<ul class="bbk-confirmation-lines">
|
||||
@foreach ($order->lines->where('type', '!=', 'shipping') as $line)
|
||||
<li class="bbk-confirmation-line">
|
||||
<div class="bbk-cart-item-media">
|
||||
{{-- alt="" — the description is right beside it. --}}
|
||||
@if ($thumb = $line->purchasable?->getThumbnailImage())
|
||||
<img src="{{ $thumb }}" alt="" width="72" height="72" loading="lazy">
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="bbk-confirmation-line-detail">
|
||||
<p class="bbk-confirmation-line-name">
|
||||
{{ $line->description }}
|
||||
<span class="bbk-confirmation-line-qty">
|
||||
<span aria-hidden="true">× {{ $line->quantity }}</span>
|
||||
<span class="bbk-visually-hidden">— {{ __('checkout.cart.quantity') }}: {{ $line->quantity }}</span>
|
||||
</span>
|
||||
</p>
|
||||
|
||||
@if ($line->option)
|
||||
<p class="bbk-cart-item-variant">{{ $line->option }}</p>
|
||||
@endif
|
||||
|
||||
@include('checkout::partials.line-custom-fields', ['line' => $line])
|
||||
</div>
|
||||
|
||||
<p class="bbk-confirmation-line-total">
|
||||
<span class="bbk-visually-hidden">{{ __('checkout.cart.total') }}:</span>
|
||||
{{ $line->sub_total?->formatted() }}
|
||||
</p>
|
||||
</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
|
||||
<div class="bbk-cart-summary">
|
||||
<div class="bbk-cart-summary-row">
|
||||
<span>{{ __('checkout.cart.subtotal') }}</span>
|
||||
<span>{{ $order->sub_total?->formatted() }}</span>
|
||||
</div>
|
||||
|
||||
@if ($order->discount_total?->value > 0)
|
||||
<div class="bbk-cart-summary-row bbk-cart-summary-row--discount">
|
||||
<span>{{ __('checkout.cart.discount') }}</span>
|
||||
<span>−{{ $order->discount_total->formatted() }}</span>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="bbk-cart-summary-row">
|
||||
<span>{{ __('checkout.cart.shipping') }}</span>
|
||||
<span>{{ $order->shipping_total?->formatted() }}</span>
|
||||
</div>
|
||||
|
||||
@if ($order->tax_total?->value > 0)
|
||||
<div class="bbk-cart-summary-row">
|
||||
<span>{{ __('checkout.cart.tax') }}</span>
|
||||
<span>{{ $order->tax_total->formatted() }}</span>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="bbk-cart-summary-row bbk-cart-summary-row--total">
|
||||
<span>{{ __('checkout.cart.total') }}</span>
|
||||
<span>{{ $order->total?->formatted() }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@if ($order->shippingAddress || $order->billingAddress)
|
||||
<div class="bbk-confirmation-section bbk-confirmation-addresses">
|
||||
@if ($order->shippingAddress)
|
||||
<section class="bbk-confirmation-address" aria-labelledby="bbk-confirmation-shipping-heading">
|
||||
<h2 class="bbk-confirmation-address-heading" id="bbk-confirmation-shipping-heading">{{ __('checkout.page.confirmation_shipping_to') }}</h2>
|
||||
<x-checkout::address-lines :address="$order->shippingAddress" />
|
||||
</section>
|
||||
@endif
|
||||
|
||||
@if ($order->billingAddress)
|
||||
<section class="bbk-confirmation-address" aria-labelledby="bbk-confirmation-billing-heading">
|
||||
<h2 class="bbk-confirmation-address-heading" id="bbk-confirmation-billing-heading">{{ __('checkout.page.confirmation_billing') }}</h2>
|
||||
<x-checkout::address-lines :address="$order->billingAddress" />
|
||||
</section>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($bankTransferInstructions)
|
||||
<section class="bbk-confirmation-section bbk-confirmation-bank-transfer" aria-labelledby="bbk-confirmation-bank-transfer-heading">
|
||||
<h2 class="bbk-confirmation-bank-transfer-heading" id="bbk-confirmation-bank-transfer-heading">{{ __('checkout.page.confirmation_bank_transfer_heading') }}</h2>
|
||||
<div class="bbk-confirmation-bank-transfer-body">{!! $bankTransferInstructions !!}</div>
|
||||
</section>
|
||||
@endif
|
||||
</div>
|
||||
@endsection
|
||||
@@ -0,0 +1,44 @@
|
||||
{{--
|
||||
Slide-in cart drawer. Rendered once, globally, from the app layout
|
||||
(@include('checkout::drawer')). Structure only — all styling lives in
|
||||
resources/css/checkout.css under @layer bbk-checkout; the host restyles the
|
||||
.bbk-* classes from its own stylesheet. No host components, no Tailwind.
|
||||
--}}
|
||||
<div class="bbk-cart" data-controller="bbk-cart" hidden>
|
||||
<div class="bbk-cart-backdrop" data-action="click->bbk-cart#close"></div>
|
||||
|
||||
<aside
|
||||
class="bbk-cart-panel"
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-labelledby="bbk-cart-heading"
|
||||
data-bbk-cart-target="panel"
|
||||
>
|
||||
<header class="bbk-cart-panel-header">
|
||||
{{-- tabindex=-1: the controller moves focus here on open, and back
|
||||
here when the focused line is removed from under the user. --}}
|
||||
<h2 class="bbk-cart-heading" id="bbk-cart-heading" tabindex="-1" data-bbk-cart-target="heading">{{ __('checkout.cart.title') }}</h2>
|
||||
<button
|
||||
type="button"
|
||||
class="bbk-cart-dismiss"
|
||||
data-action="bbk-cart#close"
|
||||
aria-label="{{ __('checkout.cart.close') }}"
|
||||
>×</button>
|
||||
</header>
|
||||
|
||||
@include('checkout::partials.cart-error')
|
||||
|
||||
{{-- A short announcement after each update, rather than aria-live on
|
||||
the body itself, which re-read the whole cart on every change. --}}
|
||||
<p
|
||||
class="bbk-visually-hidden"
|
||||
role="status"
|
||||
data-bbk-cart-target="status"
|
||||
data-bbk-cart-message="{{ __('checkout.cart.updated') }}"
|
||||
></p>
|
||||
|
||||
<div class="bbk-cart-panel-body" data-bbk-cart-target="body">
|
||||
@include('checkout::partials.cart-body')
|
||||
</div>
|
||||
</aside>
|
||||
</div>
|
||||
@@ -0,0 +1,285 @@
|
||||
{{--
|
||||
The checkout page. Two columns: left is contact + billing + shipping +
|
||||
shipping method, right is the order summary (the same cart-body partial the
|
||||
drawer uses, minus its own "Checkout" CTA — see .bbk-checkout-summary in
|
||||
checkout.css). Stops short of payment for this slice — see
|
||||
CheckoutController's class docblock.
|
||||
|
||||
$cart, $lines, $billingAddress, $shippingAddress, $shippingOptions,
|
||||
$countries come from CheckoutController::show().
|
||||
--}}
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('title', __('checkout.page.title') . ' — ' . config('app.name'))
|
||||
|
||||
@section('content')
|
||||
<div class="bbk-checkout-page">
|
||||
<h1 class="bbk-checkout-heading">{{ __('checkout.page.title') }}</h1>
|
||||
|
||||
<div class="bbk-checkout">
|
||||
<div
|
||||
class="bbk-checkout-main"
|
||||
data-controller="bbk-checkout-form bbk-payment"
|
||||
data-action="input->bbk-checkout-form#scheduleSave"
|
||||
data-bbk-checkout-form-save-url-value="{{ route('checkout.address.save', app()->getLocale()) }}"
|
||||
data-bbk-checkout-form-select-shipping-url-value="{{ route('checkout.shipping-option.select', app()->getLocale()) }}"
|
||||
data-bbk-checkout-form-status-saving-value="{{ __('checkout.page.saving') }}"
|
||||
data-bbk-checkout-form-status-saved-value="{{ __('checkout.page.saved') }}"
|
||||
data-bbk-checkout-form-status-error-value="{{ __('checkout.page.save_error') }}"
|
||||
data-bbk-payment-select-url-value="{{ route('checkout.payment-method.select', app()->getLocale()) }}"
|
||||
data-bbk-payment-place-order-url-value="{{ route('checkout.place-order', app()->getLocale()) }}"
|
||||
data-bbk-payment-order-status-url-value="{{ route('checkout.order-status', app()->getLocale()) }}"
|
||||
data-bbk-payment-stripe-key-value="{{ config('services.stripe.public_key') }}"
|
||||
data-bbk-payment-amount-value="{{ $cart?->total?->value ?? 0 }}"
|
||||
data-bbk-payment-currency-value="{{ strtolower($cart?->total?->currency?->code ?? 'eur') }}"
|
||||
data-bbk-payment-terms-required-value="{{ __('checkout.page.terms_required') }}"
|
||||
data-bbk-payment-choose-method-value="{{ __('checkout.page.choose_payment_method') }}"
|
||||
data-bbk-payment-generic-error-value="{{ __('checkout.page.payment_failed') }}"
|
||||
data-bbk-payment-processing-slow-value="{{ __('checkout.page.payment_processing_slow') }}"
|
||||
>
|
||||
|
||||
{{-- Contact. Logged in: the order email is the account's (forced
|
||||
server-side in saveAddress()), so there's no field. Guests type
|
||||
their email, plus a login link when config('checkout.login_route')
|
||||
is set; the storefront's login page sends them back here and Lunar
|
||||
merges the guest cart into the account. --}}
|
||||
@php($loginRoute = config('checkout.login_route'))
|
||||
<section class="bbk-checkout-section">
|
||||
@auth
|
||||
<p class="bbk-checkout-logged-in">
|
||||
{{ __('checkout.page.logged_in_as') }} <strong>{{ auth()->user()->email }}</strong>
|
||||
</p>
|
||||
@else
|
||||
@if ($loginRoute)
|
||||
<p class="bbk-checkout-login-prompt">
|
||||
{{ __('checkout.page.login_prompt') }}
|
||||
<a href="{{ route($loginRoute, ['redirect' => route('checkout.show', app()->getLocale(), false)]) }}">{{ __('checkout.page.login_link') }}</a>
|
||||
</p>
|
||||
@endif
|
||||
|
||||
<x-checkout::field
|
||||
name="contact_email"
|
||||
label="{{ __('checkout.page.email_label') }}"
|
||||
type="email"
|
||||
:value="$shippingAddress?->contact_email ?? $billingAddress?->contact_email"
|
||||
required
|
||||
form="bbk-address-form"
|
||||
/>
|
||||
@endauth
|
||||
|
||||
{{-- Abandoned-cart-recovery opt-in. Optional, unticked, never
|
||||
required — direct marketing under ePrivacy (GR L. 3471/2006
|
||||
art. 11), so it needs an explicit opt-in and checkout can't be
|
||||
gated on it. Narrow scope by design (boboko-core's
|
||||
setRecoveryConsent) — a general newsletter opt-in, if wanted,
|
||||
is a separate checkbox. --}}
|
||||
<label class="bbk-checkbox bbk-checkbox--stacked">
|
||||
<input
|
||||
type="checkbox"
|
||||
name="recovery_consent"
|
||||
value="1"
|
||||
form="bbk-address-form"
|
||||
{{ old('recovery_consent', data_get($cart, 'meta.recovery_consent')) ? 'checked' : '' }}
|
||||
>
|
||||
{{ __('checkout.page.recovery_consent') }}
|
||||
</label>
|
||||
</section>
|
||||
|
||||
{{-- Autosaves — no submit button. Any `change` inside .bbk-checkout-main
|
||||
(this form, plus the contact email/consent which sit outside it but
|
||||
link via form="bbk-address-form") is debounced and POSTed as the whole
|
||||
form; the shipping-method radios are excluded in scheduleSave(). --}}
|
||||
<form
|
||||
id="bbk-address-form"
|
||||
method="POST"
|
||||
action="{{ route('checkout.address.save', app()->getLocale()) }}"
|
||||
data-bbk-checkout-form-target="form"
|
||||
>
|
||||
@csrf
|
||||
|
||||
{{-- Billing --}}
|
||||
<section class="bbk-checkout-section">
|
||||
<h2 class="bbk-checkout-section-heading">{{ __('checkout.page.billing_heading') }}</h2>
|
||||
|
||||
<div class="bbk-field-row">
|
||||
<x-checkout::field name="billing_first_name" label="{{ __('checkout.page.first_name') }}" :value="$billingAddress?->first_name" required />
|
||||
<x-checkout::field name="billing_last_name" label="{{ __('checkout.page.last_name') }}" :value="$billingAddress?->last_name" required />
|
||||
</div>
|
||||
|
||||
{{-- Company/ΑΦΜ only when an invoice is wanted. Revealed by CSS
|
||||
(:has on the checkbox), saved/cleared by saveAddress(), and
|
||||
required at place-order. --}}
|
||||
<div class="bbk-invoice">
|
||||
<label class="bbk-checkbox">
|
||||
<input
|
||||
type="checkbox"
|
||||
name="wants_invoice"
|
||||
value="1"
|
||||
aria-controls="bbk-invoice-fields"
|
||||
@checked($wantsInvoice)
|
||||
>
|
||||
{{ __('checkout.page.wants_invoice') }}
|
||||
</label>
|
||||
|
||||
<div class="bbk-field-row bbk-invoice-fields" id="bbk-invoice-fields">
|
||||
<x-checkout::field name="billing_company_name" label="{{ __('checkout.page.company_name') }}" :value="$billingAddress?->company_name" />
|
||||
<x-checkout::field name="billing_tax_identifier" label="{{ __('checkout.page.tax_identifier') }}" :value="$billingAddress?->tax_identifier" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<x-checkout::field name="billing_line_one" label="{{ __('checkout.page.address_line_one') }}" :value="$billingAddress?->line_one" required />
|
||||
|
||||
<div class="bbk-field-row">
|
||||
<x-checkout::field name="billing_city" label="{{ __('checkout.page.city') }}" :value="$billingAddress?->city" required />
|
||||
<x-checkout::field name="billing_postcode" label="{{ __('checkout.page.postcode') }}" :value="$billingAddress?->postcode" required />
|
||||
</div>
|
||||
|
||||
<x-checkout::region-country
|
||||
prefix="billing"
|
||||
:store-country="$storeCountry"
|
||||
:regions="$regions"
|
||||
:countries="$countries"
|
||||
:address="$billingAddress"
|
||||
/>
|
||||
|
||||
<x-checkout::field name="billing_contact_phone" label="{{ __('checkout.page.phone') }}" type="tel" :value="$billingAddress?->contact_phone" />
|
||||
</section>
|
||||
|
||||
{{-- Shipping --}}
|
||||
<section class="bbk-checkout-section">
|
||||
<h2 class="bbk-checkout-section-heading">{{ __('checkout.page.shipping_heading') }}</h2>
|
||||
|
||||
<label class="bbk-checkbox">
|
||||
<input
|
||||
type="checkbox"
|
||||
name="same_as_billing"
|
||||
value="1"
|
||||
data-bbk-checkout-form-target="sameAsBilling"
|
||||
data-action="bbk-checkout-form#toggleSameAsBilling"
|
||||
@checked($shipToBilling)
|
||||
>
|
||||
{{ __('checkout.page.same_as_billing') }}
|
||||
</label>
|
||||
|
||||
<div class="bbk-checkout-shipping-fields" data-bbk-checkout-form-target="shippingFields">
|
||||
<div class="bbk-field-row">
|
||||
<x-checkout::field name="shipping_first_name" label="{{ __('checkout.page.first_name') }}" :value="$shippingAddress?->first_name" required />
|
||||
<x-checkout::field name="shipping_last_name" label="{{ __('checkout.page.last_name') }}" :value="$shippingAddress?->last_name" required />
|
||||
</div>
|
||||
|
||||
<x-checkout::field name="shipping_line_one" label="{{ __('checkout.page.address_line_one') }}" :value="$shippingAddress?->line_one" required />
|
||||
|
||||
<div class="bbk-field-row">
|
||||
<x-checkout::field name="shipping_city" label="{{ __('checkout.page.city') }}" :value="$shippingAddress?->city" required />
|
||||
<x-checkout::field name="shipping_postcode" label="{{ __('checkout.page.postcode') }}" :value="$shippingAddress?->postcode" required />
|
||||
</div>
|
||||
|
||||
<x-checkout::region-country
|
||||
prefix="shipping"
|
||||
:store-country="$storeCountry"
|
||||
:regions="$regions"
|
||||
:countries="$countries"
|
||||
:address="$shippingAddress"
|
||||
/>
|
||||
|
||||
<x-checkout::field name="shipping_contact_phone" label="{{ __('checkout.page.phone') }}" type="tel" :value="$shippingAddress?->contact_phone" />
|
||||
</div>
|
||||
|
||||
<x-checkout::textarea
|
||||
name="shipping_delivery_instructions"
|
||||
label="{{ __('checkout.page.delivery_instructions') }}"
|
||||
:value="$shippingAddress?->delivery_instructions"
|
||||
/>
|
||||
</section>
|
||||
</form>
|
||||
|
||||
<p
|
||||
class="bbk-checkout-status"
|
||||
data-bbk-checkout-form-target="status"
|
||||
role="status"
|
||||
aria-live="polite"
|
||||
hidden
|
||||
></p>
|
||||
|
||||
{{-- Shipping method — resolves from the saved shipping address;
|
||||
re-rendered as a fragment by bbk-checkout-form after each
|
||||
autosave / option change. --}}
|
||||
<section class="bbk-checkout-section">
|
||||
<h2 class="bbk-checkout-section-heading">{{ __('checkout.page.shipping_method_heading') }}</h2>
|
||||
|
||||
<div id="bbk-shipping-options" data-bbk-checkout-form-target="shippingOptions">
|
||||
@include('checkout::partials.shipping-options', [
|
||||
'shippingAddress' => $shippingAddress,
|
||||
'shippingOptions' => $shippingOptions,
|
||||
])
|
||||
</div>
|
||||
</section>
|
||||
|
||||
{{-- Payment --}}
|
||||
<section class="bbk-checkout-section">
|
||||
<h2 class="bbk-checkout-section-heading">{{ __('checkout.page.payment_heading') }}</h2>
|
||||
|
||||
<div id="bbk-payment-methods" data-bbk-payment-target="methods">
|
||||
@include('checkout::partials.payment-methods', [
|
||||
'paymentMethods' => $paymentMethods,
|
||||
'cart' => $cart,
|
||||
])
|
||||
</div>
|
||||
|
||||
{{-- Stripe Payment Element mounts here when a Stripe method is picked. --}}
|
||||
<div class="bbk-payment-element" data-bbk-payment-target="element" hidden></div>
|
||||
|
||||
<label class="bbk-checkbox bbk-checkbox--stacked">
|
||||
<input type="checkbox" data-bbk-payment-target="terms">
|
||||
{!! __('checkout.page.terms_accept', [
|
||||
'terms' => route('legal.terms', app()->getLocale()),
|
||||
'privacy' => route('legal.privacy', app()->getLocale()),
|
||||
]) !!}
|
||||
</label>
|
||||
|
||||
<p class="bbk-checkout-withdrawal">
|
||||
{!! __('checkout.page.withdrawal_notice', [
|
||||
'link' => route('legal.shipping-returns', app()->getLocale()),
|
||||
]) !!}
|
||||
</p>
|
||||
|
||||
<p class="bbk-checkout-error" data-bbk-payment-target="error" role="alert" hidden></p>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
class="bbk-checkout-continue"
|
||||
data-bbk-payment-target="submit"
|
||||
data-action="bbk-payment#placeOrder"
|
||||
@disabled($lines->isEmpty())
|
||||
>
|
||||
{{ __('checkout.page.place_order') }}
|
||||
</button>
|
||||
</section>
|
||||
|
||||
{{-- Fixed overlay while a payment is confirming (3-D Secure / webhook
|
||||
poll). Inside .bbk-checkout-main so bbk-payment can target it. --}}
|
||||
<div class="bbk-checkout-processing" data-bbk-payment-target="processing" hidden>
|
||||
<span class="bbk-spinner" aria-hidden="true"></span>
|
||||
<p data-bbk-payment-target="processingText">{{ __('checkout.page.payment_processing') }}</p>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<aside class="bbk-checkout-aside">
|
||||
<div class="bbk-checkout-summary" data-controller="bbk-cart">
|
||||
<h2 class="bbk-checkout-summary-heading" tabindex="-1" data-bbk-cart-target="heading">{{ __('checkout.page.order_summary_heading') }}</h2>
|
||||
@include('checkout::partials.cart-error')
|
||||
<p
|
||||
class="bbk-visually-hidden"
|
||||
role="status"
|
||||
data-bbk-cart-target="status"
|
||||
data-bbk-cart-message="{{ __('checkout.cart.updated') }}"
|
||||
></p>
|
||||
<div data-bbk-cart-target="body">
|
||||
@include('checkout::partials.cart-body')
|
||||
</div>
|
||||
</div>
|
||||
</aside>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
@@ -0,0 +1,121 @@
|
||||
{{--
|
||||
Server-rendered cart contents. Rendered inline on first page load inside
|
||||
checkout/drawer.blade.php, and re-fetched + swapped into the drawer by
|
||||
bbk-cart-controller after every mutation. $cart / $lines come from the view
|
||||
composer in CheckoutModuleServiceProvider.
|
||||
|
||||
The data-bbk-cart-* attributes on the root are the module's read API for the
|
||||
host (e.g. the header bag-icon count) — bbk-cart-controller reads them after
|
||||
each swap and re-emits them on the `bbk-cart:updated` window event.
|
||||
--}}
|
||||
@php($count = $lines->sum('quantity'))
|
||||
|
||||
{{-- @dump($lines) --}}
|
||||
|
||||
<div
|
||||
class="bbk-cart-content"
|
||||
data-bbk-cart-count="{{ $count }}"
|
||||
data-bbk-cart-total="{{ $cart?->total?->value ?? 0 }}"
|
||||
>
|
||||
@if ($lines->isEmpty())
|
||||
<p class="bbk-cart-empty">{{ __('checkout.cart.empty') }}</p>
|
||||
@else
|
||||
<ul class="bbk-cart-items">
|
||||
@each('checkout::partials.cart-line', $lines, 'line')
|
||||
</ul>
|
||||
|
||||
<div class="bbk-cart-summary">
|
||||
<div class="bbk-cart-coupon">
|
||||
@if ($cart?->coupon_code)
|
||||
<div class="bbk-cart-coupon-applied">
|
||||
<span class="bbk-cart-coupon-code">{{ $cart->coupon_code }}</span>
|
||||
|
||||
<form
|
||||
method="POST"
|
||||
action="{{ route('checkout.cart.coupon.remove', app()->getLocale()) }}"
|
||||
data-action="submit->bbk-cart#submit"
|
||||
>
|
||||
@csrf
|
||||
@method('DELETE')
|
||||
<button type="submit" class="bbk-cart-coupon-remove">
|
||||
{{ __('checkout.cart.coupon_remove') }}
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
@else
|
||||
<form
|
||||
class="bbk-cart-coupon-form"
|
||||
method="POST"
|
||||
action="{{ route('checkout.cart.coupon.apply', app()->getLocale()) }}"
|
||||
data-action="submit->bbk-cart#submit"
|
||||
>
|
||||
@csrf
|
||||
<label class="bbk-visually-hidden" for="bbk-coupon-code">
|
||||
{{ __('checkout.cart.coupon_label') }}
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
name="code"
|
||||
id="bbk-coupon-code"
|
||||
class="bbk-cart-coupon-input"
|
||||
placeholder="{{ __('checkout.cart.coupon_placeholder') }}"
|
||||
autocomplete="off"
|
||||
required
|
||||
>
|
||||
<button type="submit" class="bbk-cart-coupon-submit">
|
||||
{{ __('checkout.cart.coupon_apply') }}
|
||||
</button>
|
||||
</form>
|
||||
|
||||
@if ($couponError ?? false)
|
||||
<p class="bbk-cart-coupon-error" role="alert">{{ __('checkout.cart.coupon_invalid') }}</p>
|
||||
@endif
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="bbk-cart-summary-row">
|
||||
<span>{{ __('checkout.cart.subtotal') }}</span>
|
||||
<span>{{ $cart?->subTotal?->formatted() }}</span>
|
||||
</div>
|
||||
|
||||
@if ($cart?->discountTotal?->value > 0)
|
||||
<div class="bbk-cart-summary-row bbk-cart-summary-row--discount">
|
||||
<span>{{ __('checkout.cart.discount') }}</span>
|
||||
<span>−{{ $cart->discountTotal->formatted() }}</span>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
{{-- Shipping + tax appear once the shopper has a shipping address
|
||||
(i.e. they're on the checkout page). In the drawer, where no
|
||||
address is set yet, only subtotal + total show. --}}
|
||||
@if ($cart?->shippingAddress)
|
||||
<div class="bbk-cart-summary-row">
|
||||
<span>{{ __('checkout.cart.shipping') }}</span>
|
||||
@if ($cart->shippingAddress->shipping_option)
|
||||
<span>{{ $cart->shippingTotal?->formatted() }}</span>
|
||||
@else
|
||||
<span class="bbk-cart-summary-pending">{{ __('checkout.cart.shipping_pending') }}</span>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($cart?->taxTotal?->value > 0)
|
||||
<div class="bbk-cart-summary-row">
|
||||
<span>{{ __('checkout.cart.tax') }}</span>
|
||||
<span>{{ $cart->taxTotal->formatted() }}</span>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
{{-- Always shown — equals subtotal with nothing else applied,
|
||||
diverges as discount / shipping / tax come in. --}}
|
||||
<div class="bbk-cart-summary-row bbk-cart-summary-row--total">
|
||||
<span>{{ __('checkout.cart.total') }}</span>
|
||||
<span>{{ $cart?->total?->formatted() }}</span>
|
||||
</div>
|
||||
|
||||
<a class="bbk-cart-checkout" href="{{ route('checkout.show', app()->getLocale()) }}">
|
||||
{{ __('checkout.cart.checkout') }}
|
||||
</a>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@@ -0,0 +1,9 @@
|
||||
{{--
|
||||
Shared error slot for any host wrapping cart-body in a bbk-cart controller
|
||||
instance (the drawer, and the checkout page's own order summary) —
|
||||
bbk-cart-controller.js#showError() writes into whichever one is present.
|
||||
Without this element in a given host, a rejected quantity update (e.g.
|
||||
over stock) still gets rejected server-side, but the shopper never sees
|
||||
why.
|
||||
--}}
|
||||
<p class="bbk-cart-error" data-bbk-cart-target="error" hidden role="alert"></p>
|
||||
@@ -0,0 +1,119 @@
|
||||
{{--
|
||||
One cart line. $line is a Lunar\Models\CartLine (iteration var set by
|
||||
@each in cart-body). The two forms post through bbk-cart-controller
|
||||
(fetch + method spoofing) and the response re-renders cart-body.
|
||||
--}}
|
||||
@php
|
||||
$variant = $line->purchasable;
|
||||
$product = $variant?->product;
|
||||
$name = $product?->translateAttribute('name') ?? $variant?->sku ?? '—';
|
||||
// The variant's own image (falls back to the product's thumbnail
|
||||
// internally — see ProductVariant::getThumbnail()) — the specific option
|
||||
// the shopper picked, not just the product in general.
|
||||
$thumb = $variant?->getThumbnailImage() ?: null;
|
||||
$variantLabel = $variant?->getOption();
|
||||
// Not routed through checkout::'s own locale-explicit convention — this
|
||||
// is a storefront route, so it follows the storefront's own (implicit
|
||||
// locale) call shape, same as App\Catalog\ProductCard. Carries the
|
||||
// variant id along so the product page can restore the same option the
|
||||
// shopper actually has in their cart, not just default to the first one
|
||||
// (see product-form-controller.js reading ?variant= on connect()).
|
||||
$productUrl = $product ? route('product.show', ['id' => $product->id, 'variant' => $variant?->id]) : null;
|
||||
@endphp
|
||||
|
||||
<li class="bbk-cart-item" data-bbk-line-id="{{ $line->id }}">
|
||||
<div class="bbk-cart-item-media">
|
||||
@if ($thumb)
|
||||
{{-- Decorative duplicate of the title link below — hidden from AT
|
||||
and skipped by keyboard so the product isn't announced twice. --}}
|
||||
@if ($productUrl)
|
||||
<a href="{{ $productUrl }}" aria-hidden="true" tabindex="-1">
|
||||
<img src="{{ $thumb }}" alt="" width="72" height="72" loading="lazy">
|
||||
</a>
|
||||
@else
|
||||
<img src="{{ $thumb }}" alt="" width="72" height="72" loading="lazy">
|
||||
@endif
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="bbk-cart-item-detail">
|
||||
<div class="bbk-cart-item-head">
|
||||
@if ($productUrl)
|
||||
<a href="{{ $productUrl }}" class="bbk-cart-item-title" id="bbk-cart-item-title-{{ $line->id }}">{{ $name }}</a>
|
||||
@else
|
||||
<p class="bbk-cart-item-title" id="bbk-cart-item-title-{{ $line->id }}">{{ $name }}</p>
|
||||
@endif
|
||||
|
||||
<form
|
||||
class="bbk-cart-item-remove-form"
|
||||
method="POST"
|
||||
action="{{ route('checkout.cart.remove', ['locale' => app()->getLocale(), 'line' => $line->id]) }}"
|
||||
data-action="submit->bbk-cart#submit"
|
||||
>
|
||||
@csrf
|
||||
@method('DELETE')
|
||||
{{-- Named "Remove", described by the product title, so AT
|
||||
hears which line it removes rather than a bare "Remove". --}}
|
||||
<button
|
||||
type="submit"
|
||||
class="bbk-cart-item-remove"
|
||||
aria-label="{{ __('checkout.cart.remove') }}"
|
||||
aria-describedby="bbk-cart-item-title-{{ $line->id }}"
|
||||
><span aria-hidden="true">×</span></button>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@if ($variantLabel)
|
||||
<p class="bbk-cart-item-variant">{{ $variantLabel }}</p>
|
||||
@endif
|
||||
@include('checkout::partials.line-custom-fields', ['line' => $line])
|
||||
<p class="bbk-cart-item-unit">{{ $line->unitPrice?->formatted() }}</p>
|
||||
|
||||
<div class="bbk-cart-item-foot">
|
||||
{{-- role=group + the title as its name: entering the stepper
|
||||
announces which product's quantity is being changed. --}}
|
||||
<form
|
||||
class="bbk-cart-qty"
|
||||
method="POST"
|
||||
action="{{ route('checkout.cart.update', ['locale' => app()->getLocale(), 'line' => $line->id]) }}"
|
||||
role="group"
|
||||
aria-labelledby="bbk-cart-item-title-{{ $line->id }}"
|
||||
>
|
||||
@csrf
|
||||
@method('PATCH')
|
||||
<button
|
||||
type="button"
|
||||
class="bbk-cart-qty-btn"
|
||||
data-action="bbk-cart#step"
|
||||
data-bbk-cart-dir-param="-1"
|
||||
aria-label="{{ __('checkout.cart.decrease') }}"
|
||||
><span aria-hidden="true">−</span></button>
|
||||
|
||||
<input
|
||||
type="number"
|
||||
name="quantity"
|
||||
value="{{ $line->quantity }}"
|
||||
min="0"
|
||||
inputmode="numeric"
|
||||
class="bbk-cart-qty-input"
|
||||
data-action="change->bbk-cart#submit"
|
||||
data-bbk-cart-confirmed-quantity="{{ $line->quantity }}"
|
||||
aria-label="{{ __('checkout.cart.quantity') }}"
|
||||
>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
class="bbk-cart-qty-btn"
|
||||
data-action="bbk-cart#step"
|
||||
data-bbk-cart-dir-param="1"
|
||||
aria-label="{{ __('checkout.cart.increase') }}"
|
||||
><span aria-hidden="true">+</span></button>
|
||||
</form>
|
||||
|
||||
<p class="bbk-cart-item-total">
|
||||
<span class="bbk-visually-hidden">{{ __('checkout.cart.total') }}:</span>
|
||||
{{ $line->subTotal?->formatted() }}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
@@ -0,0 +1,51 @@
|
||||
{{--
|
||||
@include('checkout::partials.line-custom-fields', ['line' => $line])
|
||||
|
||||
A cart or order line's custom-field answers (meta.custom_fields, written by
|
||||
Cart\Http\Controllers\CartController::customFieldsMeta()). A file answer
|
||||
only carries a File id (Modules\Core\File\Models\File is the source of
|
||||
truth for name/mime/disk/path — never duplicated into meta), resolved
|
||||
here and linked through the signed download route (files.download),
|
||||
minted fresh on every render, with a thumbnail when the browser can
|
||||
display the format (HEIC can't be shown outside Safari, so it gets the
|
||||
name only).
|
||||
--}}
|
||||
@php
|
||||
$fields = $line->meta['custom_fields'] ?? [];
|
||||
$previewable = ['image/jpeg', 'image/png', 'image/webp', 'image/gif'];
|
||||
@endphp
|
||||
|
||||
@if (! empty($fields))
|
||||
<dl class="bbk-line-fields">
|
||||
@foreach ($fields as $field)
|
||||
<div class="bbk-line-field">
|
||||
@if ($field['type'] === 'file')
|
||||
<dt>{{ $field['label'] }}:</dt>
|
||||
<dd>
|
||||
@php
|
||||
$file = \Modules\Core\File\Models\File::find($field['file_id'] ?? null);
|
||||
@endphp
|
||||
@if ($file)
|
||||
@php
|
||||
$fileUrl = \Illuminate\Support\Facades\URL::temporarySignedRoute(
|
||||
'files.download',
|
||||
now()->addHours(2),
|
||||
['file' => $file->id],
|
||||
);
|
||||
@endphp
|
||||
<a href="{{ $fileUrl }}" class="bbk-line-field-file" target="_blank" rel="noopener">
|
||||
@if (in_array($file->mime, $previewable, true))
|
||||
<img src="{{ $fileUrl }}" alt="" width="40" height="40" loading="lazy">
|
||||
@endif
|
||||
<span>{{ $file->original_name }}</span>
|
||||
</a>
|
||||
|
||||
@endif
|
||||
</dd>
|
||||
@else
|
||||
<span>{{ $field['label'] }}: {{ $field['value'] }}</span>
|
||||
@endif
|
||||
</div>
|
||||
@endforeach
|
||||
</dl>
|
||||
@endif
|
||||
@@ -0,0 +1,30 @@
|
||||
{{--
|
||||
Payment method radios. $paymentMethods is Collection<Modules\Core\Payment\
|
||||
Models\PaymentMethod> from CheckoutService::getPaymentMethods() (already
|
||||
filtered to enabled + driver-resolves + isConfigured()). Selecting one
|
||||
autosaves via bbk-payment#selectMethod; `data-payment-driver` tells the
|
||||
controller whether to mount the Stripe Element.
|
||||
|
||||
$paymentMethods, $cart come from the page / controller.
|
||||
--}}
|
||||
@php($selected = $cart?->meta['payment_method'] ?? null)
|
||||
|
||||
@if ($paymentMethods->isEmpty())
|
||||
<p class="bbk-checkout-note">{{ __('checkout.page.payment_method_none') }}</p>
|
||||
@else
|
||||
<div class="bbk-checkout-payment-options">
|
||||
@foreach ($paymentMethods as $method)
|
||||
<label class="bbk-checkout-payment-option">
|
||||
<input
|
||||
type="radio"
|
||||
name="payment_type"
|
||||
value="{{ $method->type }}"
|
||||
data-payment-driver="{{ $method->driver }}"
|
||||
@checked($selected === $method->type)
|
||||
data-action="change->bbk-payment#selectMethod"
|
||||
>
|
||||
<span class="bbk-checkout-payment-option-name">{{ $method->translate('name') }}</span>
|
||||
</label>
|
||||
@endforeach
|
||||
</div>
|
||||
@endif
|
||||
@@ -0,0 +1,109 @@
|
||||
{{--
|
||||
Shipping methods for the checkout page. Rendered inline by page.blade.php on
|
||||
load, and re-rendered as a fragment by CheckoutController after every
|
||||
address save / option change (bbk-checkout-form swaps it in). Radios
|
||||
autosave via bbk-checkout-form#selectShipping — no submit button. A single
|
||||
resolved option is auto-selected server-side and shown as a fixed line.
|
||||
|
||||
$shippingAddress, $shippingOptions come from the controller / page scope.
|
||||
--}}
|
||||
@php($selected = $shippingAddress?->shipping_option)
|
||||
{{-- Box Now by the method's driver, not its (merchant-typed) code --}}
|
||||
@php($boxNowCodes = \Modules\Core\Shipping\Support\BoxNowShipping::codes())
|
||||
|
||||
{{-- Rate resolution needs country (always Greece here) + postcode; until a
|
||||
postcode is saved there's nothing to quote against yet. --}}
|
||||
@if (! $shippingAddress?->postcode)
|
||||
<p class="bbk-checkout-note">{{ __('checkout.page.shipping_method_empty') }}</p>
|
||||
@elseif ($shippingOptions->isEmpty())
|
||||
<p class="bbk-checkout-note">{{ __('checkout.page.shipping_method_none') }}</p>
|
||||
@elseif ($shippingOptions->count() === 1)
|
||||
@php($only = $shippingOptions->first())
|
||||
<div class="bbk-checkout-shipping-confirmed">
|
||||
<span class="bbk-checkout-shipping-option-detail">
|
||||
<span class="bbk-checkout-shipping-option-name">{{ $only->name }}</span>
|
||||
@if ($only->description)
|
||||
<span class="bbk-checkout-shipping-option-description">{{ strip_tags($only->description) }}</span>
|
||||
@endif
|
||||
</span>
|
||||
<span class="bbk-checkout-shipping-option-price">{{ $only->price->formatted() }}</span>
|
||||
</div>
|
||||
@else
|
||||
<div class="bbk-checkout-shipping-options">
|
||||
@foreach ($shippingOptions as $option)
|
||||
<label class="bbk-checkout-shipping-option">
|
||||
<input
|
||||
type="radio"
|
||||
name="shipping_option"
|
||||
value="{{ $option->identifier }}"
|
||||
data-box-now="{{ in_array($option->identifier, $boxNowCodes, true) ? 'true' : 'false' }}"
|
||||
@checked($selected === $option->identifier)
|
||||
data-action="change->bbk-checkout-form#selectShipping"
|
||||
>
|
||||
<span class="bbk-checkout-shipping-option-detail">
|
||||
<span class="bbk-checkout-shipping-option-name">{{ $option->name }}</span>
|
||||
@if ($option->description)
|
||||
<span class="bbk-checkout-shipping-option-description">{{ strip_tags($option->description) }}</span>
|
||||
@endif
|
||||
</span>
|
||||
<span class="bbk-checkout-shipping-option-price">{{ $option->price->formatted() }}</span>
|
||||
</label>
|
||||
@endforeach
|
||||
</div>
|
||||
@endif
|
||||
|
||||
{{--
|
||||
Dummy Box Now locker picker — a Leaflet map standing in for Box Now's own
|
||||
Destination Map JS widget, which only talks to their Production API (not
|
||||
Stage/sandbox — see their Partner API manual §4.1), making it useless
|
||||
for local/staging development. Backed by the same GET /destinations data
|
||||
(including lat/lng) via CheckoutController::boxNowLockers(). Only shown
|
||||
once the "box-now" shipping option is selected (bbk-checkout-form
|
||||
toggles [hidden] on shipping-option change; see bbk-box-now-locker
|
||||
Stimulus controller). Persists the choice via a separate autosave POST
|
||||
(checkout.box-now.locker.select) rather than piggybacking on the
|
||||
shipping-option field, since the two are independent pieces of state
|
||||
(method vs. destination) that CheckoutService models as two calls
|
||||
(selectShippingOption() / selectBoxNowLocker()).
|
||||
--}}
|
||||
<div
|
||||
id="bbk-box-now-locker"
|
||||
class="bbk-checkout-box-now-locker"
|
||||
data-controller="bbk-box-now-locker"
|
||||
data-bbk-box-now-locker-lockers-url-value="{{ route('checkout.box-now.lockers', app()->getLocale()) }}"
|
||||
data-bbk-box-now-locker-select-url-value="{{ route('checkout.box-now.locker.select', app()->getLocale()) }}"
|
||||
data-bbk-box-now-locker-loading-value="{{ __('checkout.page.box_now_locker_loading') }}"
|
||||
data-bbk-box-now-locker-select-label-value="{{ __('checkout.page.box_now_locker_select') }}"
|
||||
data-bbk-box-now-locker-selected-label-value="{{ __('checkout.page.box_now_locker_selected') }}"
|
||||
data-bbk-box-now-locker-no-results-value="{{ __('checkout.page.box_now_locker_no_results') }}"
|
||||
@if (! in_array($selected, $boxNowCodes, true)) hidden @endif
|
||||
>
|
||||
<p class="bbk-checkout-box-now-locker-label">
|
||||
{{ __('checkout.page.box_now_locker_label') }}
|
||||
</p>
|
||||
<input
|
||||
type="search"
|
||||
class="bbk-checkout-box-now-locker-search"
|
||||
placeholder="{{ __('checkout.page.box_now_locker_search') }}"
|
||||
data-bbk-box-now-locker-target="search"
|
||||
data-action="input->bbk-box-now-locker#search"
|
||||
autocomplete="off"
|
||||
>
|
||||
<div
|
||||
id="bbk-box-now-locker-map"
|
||||
class="bbk-checkout-box-now-locker-map"
|
||||
data-bbk-box-now-locker-target="map"
|
||||
></div>
|
||||
<p
|
||||
class="bbk-checkout-box-now-locker-chosen"
|
||||
data-bbk-box-now-locker-target="chosen"
|
||||
hidden
|
||||
></p>
|
||||
<p
|
||||
class="bbk-checkout-status"
|
||||
data-bbk-box-now-locker-target="status"
|
||||
role="status"
|
||||
aria-live="polite"
|
||||
hidden
|
||||
></p>
|
||||
</div>
|
||||
@@ -0,0 +1,113 @@
|
||||
{{--
|
||||
Copy of lunarphp/lunar's resources/views/livewire/components/activity-log-feed.blade.php
|
||||
(the order page's Timeline), overriding it via View::prependNamespace('lunarpanel')
|
||||
in CoreServiceProvider. The only changes: the day heading and each entry's time are
|
||||
shown in core.display_timezone instead of UTC (Lunar formats them by hand, so
|
||||
Filament's display timezone doesn't reach them). Re-copy it if Lunar changes the
|
||||
original. Lunar still groups entries by UTC day, so an entry just after local
|
||||
midnight can sit under the previous day's heading.
|
||||
--}}
|
||||
<div class="px-2 pb-4 scroll-mt-32" id="lunar-panel-timeline">
|
||||
<div class="relative flex items-end gap-4 mt-4">
|
||||
<div class="shrink-0">
|
||||
<div>
|
||||
<img src="{{ $this->userAvatar }}"
|
||||
class="inline-block w-8 h-8 rounded-full" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form class="w-full"
|
||||
wire:submit.prevent="addComment">
|
||||
|
||||
{{ $this->form }}
|
||||
|
||||
<div class="absolute right-0 mt-2">
|
||||
{{ $this->addCommentAction }}
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div class="relative pt-8 -ml-[5px] z-10 pointer-events-none">
|
||||
<span class="absolute inset-y-0 left-5 w-[2px] bg-gray-200 dark:bg-gray-600 rounded-full"></span>
|
||||
|
||||
<div class="flow-root">
|
||||
<ul class="-my-8 divide-y-2 divide-gray-200 dark:divide-gray-600"
|
||||
role="list">
|
||||
@foreach ($this->activityLog as $log)
|
||||
<li class="relative py-8 ml-5">
|
||||
<p class="ml-8 font-bold text-gray-950 dark:text-gray-300">
|
||||
{{ $log['items']->first()['log']->created_at->inDisplayTimezone()->format('F jS, Y') }}
|
||||
</p>
|
||||
|
||||
<ul class="mt-4 space-y-6 pointer-events-auto">
|
||||
@foreach ($log['items'] as $item)
|
||||
@php
|
||||
$logUserName = $item['log']->causer ? ($item['log']->causer->fullName ?: $item['log']->causer->name) : null;
|
||||
@endphp
|
||||
|
||||
<li class="relative pl-8">
|
||||
<div @class([
|
||||
'absolute top-[2px]',
|
||||
'-left-[calc(0.75rem_-_1px)]' => $item['log']->causer,
|
||||
'-left-[calc(0.5rem_-_1px)]' => !$item['log']->causer,
|
||||
])>
|
||||
@if ($email = $item['log']->causer?->email)
|
||||
<img
|
||||
src="{{ $this->getAvatarUrl($email) }}"
|
||||
class="w-6 h-6 rounded-full ring-4 ring-gray-200 dark:ring-gray-600"
|
||||
alt="{{ $logUserName }}"
|
||||
/>
|
||||
@else
|
||||
<span @class([
|
||||
'absolute w-4 h-4 rounded-full ring-4',
|
||||
match($item['log']->description){
|
||||
'created' => 'bg-sky-500 ring-sky-100 dark:ring-sky-800',
|
||||
'updated' => 'bg-teal-500 ring-teal-100 dark:ring-teal-800',
|
||||
'status-update' => 'bg-purple-500 ring-purple-100 dark:ring-purple-800',
|
||||
default => 'bg-gray-300 ring-gray-200 dark:ring-gray-600',
|
||||
},
|
||||
])>
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div @class([
|
||||
'flex justify-between',
|
||||
'pt-[5px]' => $item['log']->causer,
|
||||
'pt-[1px]' => !$item['log']->causer,
|
||||
])>
|
||||
<div>
|
||||
<div class="text-xs font-medium text-gray-500 dark:text-gray-400">
|
||||
@if (!$item['log']->causer)
|
||||
{{ __('lunarpanel::components.activity-log.system') }}
|
||||
@else
|
||||
{{ $logUserName }}
|
||||
@endif
|
||||
</div>
|
||||
|
||||
@if (count($item['renderers']))
|
||||
<div class="mt-2 text-sm font-medium text-gray-700 dark:text-gray-200">
|
||||
@foreach ($item['renderers'] as $class)
|
||||
{{ $class->render($item['log']) }}
|
||||
@endforeach
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<time class="flex-shrink-0 ml-4 text-xs mt-0.5 text-gray-500 dark:text-gray-400 font-medium">
|
||||
{{ $item['log']->created_at->inDisplayTimezone()->format('h:ia') }}
|
||||
</time>
|
||||
</div>
|
||||
</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="pt-4">
|
||||
{{ $this->activityLog->links('lunarpanel::components.activity-log.timeline-paginator.index', data: ['scrollTo' => '#lunar-panel-timeline']) }}
|
||||
</div>
|
||||
</div>
|
||||
@@ -77,7 +77,7 @@
|
||||
class="w-4"
|
||||
/>
|
||||
</div>
|
||||
<span>{{ $transaction->created_at->format('jS F Y h:ia') }}</span>
|
||||
<span>{{ $transaction->created_at->inDisplayTimezone()->format('jS F Y h:ia') }}</span>
|
||||
</div>
|
||||
|
||||
<div class="flex space-x-2">
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
<p>Hi,</p>
|
||||
|
||||
<p>Your order <strong>{{ $reference }}</strong> is on its way.</p>
|
||||
|
||||
@foreach ($shipments ?? [] as $shipment)
|
||||
<p>
|
||||
{{ $shipment->carrierLabel() }}: <strong>{{ $shipment->tracking_reference }}</strong>
|
||||
@if ($url = $shipment->trackingUrl())
|
||||
— <a href="{{ $url }}">Track your parcel</a>
|
||||
@endif
|
||||
</p>
|
||||
@endforeach
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
<div class="flex flex-col gap-1">
|
||||
<div class="flex flex-wrap items-center gap-2">
|
||||
@svg('heroicon-m-truck', ['class' => 'w-4 text-gray-500'])
|
||||
<span>{{ $carrier }} {{ $trackingReference }}@if ($isReturn) (return)@endif</span>
|
||||
<x-filament::badge :color="$statusColor">{{ $statusLabel }}</x-filament::badge>
|
||||
</div>
|
||||
|
||||
@if ($details || $occurredAt)
|
||||
<div class="text-sm text-gray-500">
|
||||
{{ $details }}@if ($details && $occurredAt) · @endif{{ $occurredAt?->format('Y-m-d H:i') }}
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@@ -0,0 +1,120 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="el">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<style>
|
||||
{{--
|
||||
An extra parcel of a multi-parcel send on A4 — ELTA's own client
|
||||
prints these with a separate, smaller report (ELTA_PEL.sydetaE1.rdlc,
|
||||
via epexergasia.cs::print_child()) instead of the full 3-copy
|
||||
voucher: one block with the parcel's own voucher/barcode, its
|
||||
piece ("002/002"), the master voucher and, for cash on delivery,
|
||||
only the warning (the amount is collected on the master). Every
|
||||
position below is that report's own Top/Left in cm, on the page.
|
||||
Classes are ch-* so they don't collide with label-a4's when a
|
||||
batch PDF holds both.
|
||||
--}}
|
||||
@page { margin: 0; size: 21cm 29.7cm; }
|
||||
html, body { margin: 0; padding: 0; }
|
||||
body { font-family: 'DejaVu Sans', sans-serif; font-size: 6.5pt; color: #000; }
|
||||
|
||||
.ch-page { position: relative; width: 21cm; height: 29.7cm; }
|
||||
.ch-page > * { position: absolute; box-sizing: border-box; }
|
||||
.ch-box { border: 1px solid #000; }
|
||||
.ch-box > * { position: absolute; }
|
||||
.ch-label { font-size: 6pt; }
|
||||
.ch-val { font-size: 8pt; font-weight: bold; }
|
||||
.ch-line { font-size: 9pt; white-space: nowrap; overflow: hidden; }
|
||||
.ch-center { text-align: center; left: 0; width: 100%; }
|
||||
.ch-logo img { width: 100%; }
|
||||
.ch-company { font-size: 5pt; line-height: 1.25; white-space: nowrap; }
|
||||
.ch-company-name { font-weight: bold; font-size: 5.5pt; }
|
||||
.ch-barcode img { width: 100%; height: 0.62cm; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="page ch-page">
|
||||
{{-- Image22 (logo) + image4 (ELTA details bitmap, reproduced as text) --}}
|
||||
<div class="ch-logo" style="top:9.07cm;left:0.41cm;width:1.33cm;height:1.28cm;">
|
||||
<img src="{{ $eltaLogo }}" alt="ELTA Courier">
|
||||
</div>
|
||||
<div class="ch-company" style="top:9.07cm;left:1.95cm;width:3.38cm;">
|
||||
<div class="ch-company-name">ΕΛΛΗΝΙΚΑ ΤΑΧΥΔΡΟΜΕΙΑ Α.Ε.</div>
|
||||
<div>Απελλού 1, 105 51, Αθήνα</div>
|
||||
<div>Τ. 210-6073000 | www.eltacourier.gr</div>
|
||||
</div>
|
||||
<div style="top:10.38cm;left:0.41cm;width:4.99cm;font-size:6pt;">ΕΕΤΤ ΑΜ 99-150 Γενική Αδεια Ταχ/κων Υπηρεσιών</div>
|
||||
|
||||
{{-- rectangle17: title, barcode, this parcel's voucher --}}
|
||||
<div class="ch-box" style="top:9.02cm;left:5.44cm;width:8.07cm;height:1.76cm;">
|
||||
<div class="ch-center" style="top:0.13cm;font-size:9pt;font-weight:bold;">ΣΥΝΟΔΕΥΤΙΚΟ ΔΕΛΤΙΟ ΤΑΧΥΜΕΤΑΦΟΡΑΣ</div>
|
||||
<div class="ch-barcode" style="top:0.57cm;left:0.19cm;width:7.65cm;">
|
||||
<img src="{{ $barcode_voucher }}" alt="">
|
||||
</div>
|
||||
<div class="ch-center" style="top:1.30cm;font-size:11pt;font-weight:bold;">{{ $voucher_no }}</div>
|
||||
</div>
|
||||
|
||||
<div style="top:11.02cm;left:5.10cm;width:4.55cm;font-size:8pt;">Ημερομηνία - Ωρα Εκτύπωσης :</div>
|
||||
<div style="top:11.02cm;left:9.70cm;width:3.70cm;font-size:8pt;">{{ $date }} {{ $time }}</div>
|
||||
|
||||
{{-- rectangle18-21: deposit station, weight, volumetric, pieces --}}
|
||||
<div class="ch-box" style="top:11.45cm;left:0.11cm;width:1.51cm;height:0.82cm;">
|
||||
<div class="ch-label" style="top:0.11cm;left:0.05cm;">Γρ.Κατάθεσης</div>
|
||||
<div style="top:0.42cm;left:0.05cm;font-size:9pt;font-weight:bold;">{{ $station_apo }}</div>
|
||||
</div>
|
||||
<div class="ch-box" style="top:11.45cm;left:1.81cm;width:1.35cm;height:0.82cm;">
|
||||
<div class="ch-label" style="top:0.11cm;left:0.05cm;">Βάρος</div>
|
||||
<div class="ch-val" style="top:0.42cm;left:0.05cm;">{{ $weight }}</div>
|
||||
</div>
|
||||
<div class="ch-box" style="top:11.45cm;left:3.29cm;width:2.83cm;height:0.82cm;">
|
||||
<div class="ch-label" style="top:0.11cm;left:0.05cm;">Ογκ/κο Βάρος</div>
|
||||
<div class="ch-val" style="top:0.42cm;left:0.05cm;">{{ $volumetric_weight }}</div>
|
||||
</div>
|
||||
<div class="ch-box" style="top:11.45cm;left:6.28cm;width:1.22cm;height:0.82cm;">
|
||||
<div class="ch-label" style="top:0.11cm;left:0.05cm;">Τεμάχια</div>
|
||||
<div class="ch-val" style="top:0.42cm;left:0.05cm;">{{ $package_label }}</div>
|
||||
</div>
|
||||
|
||||
{{-- rectangle1: service --}}
|
||||
<div class="ch-box" style="top:11.48cm;left:13.49cm;width:6.20cm;height:0.86cm;">
|
||||
<div style="top:0.06cm;left:0.13cm;font-size:8pt;font-weight:bold;">ΥΠΗΡΕΣΙΑ :</div>
|
||||
<div style="top:0.04cm;left:3.19cm;font-size:9pt;font-weight:bold;">{{ $service_code }}</div>
|
||||
<div style="top:0.43cm;left:0.06cm;width:5.82cm;font-size:8pt;font-weight:bold;">{{ $service_name }}</div>
|
||||
</div>
|
||||
|
||||
{{-- rectangle30: destination station --}}
|
||||
<div class="ch-box" style="top:12.38cm;left:0.11cm;width:12.59cm;height:0.61cm;">
|
||||
<div class="ch-label" style="top:0.18cm;left:0.08cm;">Γρ.Προορισμού</div>
|
||||
<div class="ch-val" style="top:0.13cm;left:1.79cm;">{{ $station_pros }}</div>
|
||||
<div class="ch-val" style="top:0.14cm;left:3.65cm;width:8.73cm;">{{ $station_pros_title }}</div>
|
||||
</div>
|
||||
|
||||
{{-- rectangle52: multi-parcel panel — piece, COD warning, master voucher --}}
|
||||
<div class="ch-box" style="top:12.61cm;left:13.50cm;width:6.27cm;height:6.24cm;">
|
||||
<div class="ch-center" style="top:0.26cm;font-size:10pt;font-weight:bold;">** ΠΟΛΛΑΠΛΗ ΑΠΟΣΤΟΛΗ **</div>
|
||||
<div class="ch-center" style="top:1.89cm;font-size:20pt;font-weight:bold;">{{ $piece_label }}</div>
|
||||
@if ($antik_1)
|
||||
<div class="ch-center" style="top:3.66cm;font-size:10pt;font-weight:bold;">{{ $antik_1 }}</div>
|
||||
@endif
|
||||
<div class="ch-center" style="top:4.77cm;font-size:10pt;font-weight:bold;">ΜASTER ΣΥΔΕΤΑ</div>
|
||||
<div class="ch-center" style="top:5.31cm;font-size:11pt;font-weight:bold;">{{ $copy }}</div>
|
||||
</div>
|
||||
|
||||
{{-- rectangle24: sender (sender_1..5) --}}
|
||||
<div class="ch-box" style="top:13.06cm;left:0.11cm;width:12.57cm;height:2.74cm;">
|
||||
<div style="top:0.08cm;left:0.05cm;font-size:9pt;font-weight:bold;">ΑΠΟΣΤΟΛΕΑΣ</div>
|
||||
@foreach ($sender_lines as $i => $line)
|
||||
<div class="ch-line" style="top:{{ 0.53 + $i * 0.43 }}cm;left:0.05cm;width:11.96cm;">{{ $line }}</div>
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
{{-- rectangle27: recipient (rec_1..5) --}}
|
||||
<div class="ch-box" style="top:15.94cm;left:0.11cm;width:12.57cm;height:2.90cm;">
|
||||
<div style="top:0.05cm;left:0.05cm;font-size:9pt;font-weight:bold;">ΠΑΡΑΛΗΠΤΗΣ</div>
|
||||
@foreach ($recipient_lines as $i => $line)
|
||||
<div class="ch-line" style="top:{{ 0.49 + $i * 0.44 }}cm;left:0.05cm;width:12.12cm;font-weight:bold;">{{ $line }}</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,124 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="el">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<style>
|
||||
{{--
|
||||
Geometry is transcribed directly from ELTA_PEL.sydetaE.rdlc
|
||||
(the "delivery copy" RDLC ELTA's own client selects for
|
||||
printer_size==1, i.e. plain A4, per Sydeta.cs::print_vg()) —
|
||||
every .mc-*/.ps-* absolute position below is that report's
|
||||
own Top/Left in cm, walked through its Rectangle/Textbox
|
||||
nesting so each value is already relative to its own
|
||||
containing band. Static label text and font sizes/weights
|
||||
also come from the RDLC's own Textbox/Style elements, not
|
||||
guessed from the screenshot in ELTA's setup manual (that
|
||||
manual image was used only as a sanity check afterwards).
|
||||
--}}
|
||||
@page { margin: 0; size: 21cm 29.7cm; }
|
||||
html, body { margin: 0; padding: 0; }
|
||||
body { font-family: 'DejaVu Sans', sans-serif; font-size: 6.5pt; color: #000; }
|
||||
|
||||
.page { position: relative; width: 21cm; height: 29.7cm; }
|
||||
|
||||
/* Each RDLC "band" (one ΣΥΝΟΔΕΥΤΙΚΟ ΔΕΛΤΙΟ copy) is its own
|
||||
positioning context, so every child offset below is a direct
|
||||
transcription of the RDLC's own relative-to-band Top/Left —
|
||||
no manual offset arithmetic. */
|
||||
.band { position: absolute; left: 0.27cm; }
|
||||
.band > * { position: absolute; }
|
||||
|
||||
.mc-logo, .mc-company, .mc-box, .mc-cell, .mc-partybox { position: absolute; }
|
||||
.mc-logo img { width: 100%; height: 100%; object-fit: contain; }
|
||||
.mc-company { font-size: 4.6pt; line-height: 1.25; }
|
||||
.mc-company-name { font-weight: bold; font-size: 5.2pt; }
|
||||
.mc-text.mc-small { font-size: 4.6pt; }
|
||||
|
||||
.mc-box { border: 1px solid #000; box-sizing: border-box; }
|
||||
.mc-title { position: absolute; font-weight: bold; font-size: 8pt; text-align: center; white-space: nowrap; }
|
||||
.mc-barcode { position: absolute; text-align: center; }
|
||||
.mc-barcode img { height: 26px; }
|
||||
.mc-voucher { position: absolute; text-align: center; font-weight: bold; font-size: 10.5pt; letter-spacing: 0.5px; }
|
||||
.mc-copylabel { position: absolute; text-align: center; font-weight: bold; font-size: 8pt; }
|
||||
|
||||
.mc-cell { border: 1px solid #000; box-sizing: border-box; padding: 1px 2px; }
|
||||
.mc-cell-label { font-size: 5.5pt; }
|
||||
.mc-cell-val { font-weight: bold; font-size: 8pt; margin-top: 3px; }
|
||||
.mc-cell-service { text-align: center; }
|
||||
|
||||
/* 5-cell deposit/destination/weight/pieces/volumetric row: a real
|
||||
table with border-collapse so each internal shared edge is
|
||||
drawn once, not twice (see _main-copy.blade.php comment). */
|
||||
.mc-cell-row { position: absolute; border-collapse: collapse; table-layout: fixed; }
|
||||
.mc-cell-td { border: 1px solid #000; box-sizing: border-box; padding: 1px 2px; vertical-align: top; }
|
||||
|
||||
.mc-partybox { border: 1px solid #000; box-sizing: border-box; }
|
||||
.mc-party-title { position: absolute; font-weight: bold; font-size: 9pt; }
|
||||
.mc-party-line { position: absolute; font-size: 6.3pt; white-space: nowrap; overflow: hidden; }
|
||||
|
||||
.mc-charge { text-align: center; font-weight: bold; font-size: 8pt; box-sizing: border-box; padding-top: 2px; }
|
||||
|
||||
/* Payment stub (copy 3) reuses the .mc-* classes but at smaller
|
||||
scale, matching the RDLC's own narrower band. */
|
||||
.ps-brandbox { border: 1.5px solid #c8102e; box-sizing: border-box; text-align: center; padding-top: 4px; }
|
||||
.ps-brand-logo img { width: 60%; margin: 0 auto 8px; display: block; }
|
||||
.ps-brand-tag { color: #c8102e; font-weight: bold; font-size: 9pt; }
|
||||
.ps-brandbox-small { border: 1px solid #000; box-sizing: border-box; text-align: center; padding: 2px; }
|
||||
.ps-brand-logo-sm img { width: 40%; margin: 2px auto; display: block; }
|
||||
.ps-legal-sm { font-size: 4.6pt; line-height: 1.3; }
|
||||
|
||||
/* Perforated tear-off strip on the right of copy 1 only, with
|
||||
the rotated "3. ΑΡΧΕΙΟ / ΓΡΑΦΕΙΟ ΚΑΤΑΘΕΣΗΣ" label — RDLC's
|
||||
image10 (x=15.42cm) is the dashed perforation line itself;
|
||||
reproduced here as a CSS dashed border since we can't extract
|
||||
that embedded bitmap. transform:rotate() (not
|
||||
writing-mode:vertical-rl, confirmed broken in dompdf) rotates
|
||||
a normal-flow block. */
|
||||
.stub-strip { position: absolute; top: 2.25cm; left: 15.42cm; width: 5.58cm; height: 6.16cm; border-left: 1px dashed #000; }
|
||||
.stub-vtext {
|
||||
position: absolute; top: 2.6cm; left: -1.3cm; width: 6cm;
|
||||
text-align: center; font-size: 6pt; font-weight: bold;
|
||||
white-space: nowrap; transform: rotate(-90deg);
|
||||
}
|
||||
|
||||
.cut-line { position: absolute; left: 0; width: 20.9cm; border-top: 1px dashed #000; text-align: center; font-weight: bold; font-size: 7pt; }
|
||||
.cut-line span { position: relative; top: -5px; background: #fff; padding: 0 6px; }
|
||||
|
||||
.footer-ocr { position: absolute; top: 27.35cm; left: 0; width: 21cm; text-align: center; font-family: monospace; font-size: 8pt; letter-spacing: 1.5px; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="page">
|
||||
|
||||
{{-- Copy 1: delivery copy — RDLC band top=0 --}}
|
||||
<div class="band" style="top:0.05cm; width:15.75cm; height:8.7cm;">
|
||||
@include('core::shipping.carriers.elta.partials._main-copy', ['copyType' => 'delivery'])
|
||||
</div>
|
||||
<div class="stub-strip">
|
||||
<div class="stub-vtext">3. ΑΡΧΕΙΟ / ΓΡΑΦΕΙΟ ΚΑΤΑΘΕΣΗΣ</div>
|
||||
</div>
|
||||
|
||||
<div class="cut-line" style="top:9.0cm;"><span>✂ ΑΠΟΚΟΨΤΕ ΕΔΩ</span></div>
|
||||
|
||||
{{-- Copy 2: sender's copy — RDLC band top≈8.94cm on the full page --}}
|
||||
<div class="band" style="top:9.05cm; width:15.75cm; height:9.9cm;">
|
||||
@include('core::shipping.carriers.elta.partials._main-copy', ['copyType' => 'sender'])
|
||||
</div>
|
||||
|
||||
<div class="cut-line" style="top:18.75cm;"><span>✂ ΑΠΟΚΟΨΤΕ ΕΔΩ</span></div>
|
||||
|
||||
{{-- Copy 3: ΤΑΧΥΠΛΗΡΩΜΗ ΕΙΣΠΡΑΞΗ / ΜΕΤΑΒΙΒΑΣΗ stub — RDLC band top≈19.22cm --}}
|
||||
<div style="position:absolute; top:19.05cm; left:0.27cm; width:20.4cm; font-weight:bold; font-size:7pt; text-align:center;">
|
||||
ΤΑΧΥΠΛΗΡΩΜΗ ΕΙΣΠΡΑΞΗ / ΜΕΤΑΒΙΒΑΣΗ Ο. Αριθμός Λογ/μού Ταχυπληρωμής {{ $siimvasi }}
|
||||
</div>
|
||||
<div class="band" style="top:19.45cm; width:16.75cm; height:7.4cm;">
|
||||
@include('core::shipping.carriers.elta.partials._payment-stub')
|
||||
</div>
|
||||
|
||||
<div class="cut-line" style="top:26.85cm;"><span>ΜΗ ΣΗΜΕΙΩΝΕΤΕ ΚΑΤΩ ΑΠΟ ΑΥΤΗ ΤΗ ΓΡΑΜΜΗ</span></div>
|
||||
|
||||
{{-- antik_ocr: ELTA's OCR line as issued (it already has its own > < markers) --}}
|
||||
<div class="footer-ocr">{{ $ocr_line }}</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,240 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="el">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<style>
|
||||
{{--
|
||||
Geometry transcribed directly from ELTA_PEL.SydetaLabelE.rdlc
|
||||
— the RDLC ELTA's own client selects for printer_size==2
|
||||
(the A6/"thermal label" printer-setup radio button), per
|
||||
Sydeta.cs::print_vg(); RDLCPrinter.cs overrides the actual
|
||||
print DeviceInfo to 10.4cm x 14.8cm for this printer_size
|
||||
regardless of what PageWidth/PageHeight the RDLC itself
|
||||
declares (all ELTA RDLCs declare A4 internally). Every
|
||||
.a6-* absolute position below is that report's own
|
||||
Top/Left in cm.
|
||||
--}}
|
||||
@page { margin: 0; size: 10.4cm 14.8cm; }
|
||||
html, body { margin: 0; padding: 0; }
|
||||
body { font-family: 'DejaVu Sans', sans-serif; font-size: 6.3pt; color: #000; }
|
||||
|
||||
{{--
|
||||
height is deliberately a hair under the true 14.8cm page —
|
||||
dompdf's border-box math isn't quite exact at this scale, and
|
||||
a .page box sized to exactly fill the page (even with
|
||||
box-sizing:border-box) was empirically confirmed to overflow
|
||||
a fraction of a point past the page canvas and silently push
|
||||
a second, blank page (reproduced with an otherwise-empty
|
||||
.page div: only the border's presence, not any content,
|
||||
triggered it — 14.7cm was stable, 14.75cm was not).
|
||||
--}}
|
||||
.page { position: relative; width: 10.4cm; height: 14.65cm; border: 1.5px solid #000; box-sizing: border-box; overflow: hidden; }
|
||||
.page > * { position: absolute; box-sizing: border-box; }
|
||||
|
||||
.a6-logo img { width: 100%; height: 100%; object-fit: contain; }
|
||||
.a6-service-box { border: 1px solid #000; text-align: center; }
|
||||
.a6-service-code { font-weight: bold; font-size: 7pt; }
|
||||
.a6-service-name { font-weight: bold; font-size: 6pt; text-align: center; }
|
||||
|
||||
.a6-title { font-weight: bold; font-size: 7pt; }
|
||||
.a6-datetime { font-size: 6pt; }
|
||||
.a6-copy { font-weight: bold; font-size: 7pt; text-align: right; }
|
||||
|
||||
.a6-station-box { border: 1px solid #000; }
|
||||
.a6-station-label { font-size: 6pt; font-weight: bold; }
|
||||
.a6-station-val { font-weight: bold; font-size: 8pt; }
|
||||
|
||||
.a6-cell { border: 1px solid #000; padding: 1px 3px; }
|
||||
.a6-cell-label { font-size: 6pt; }
|
||||
.a6-cell-val { font-weight: bold; font-size: 8pt; }
|
||||
|
||||
/* ΧΡΕΩΣΗ/REFERENCE/ΣΥΜΒΑΣΗ row and the Γρ.Κατάθεσης/ΒΑΡΟΣ/
|
||||
ΟΓΚΟΜΕΤΡΙΚΟ/Τεμάχια row: real tables with border-collapse so
|
||||
each internal shared edge is drawn once (see label-a6.blade.php
|
||||
comment above their markup). */
|
||||
.a6-cell-row { position: absolute; border-collapse: collapse; border-spacing: 0; table-layout: fixed; }
|
||||
.a6-cell-td { border: 1px solid #000; box-sizing: border-box; padding: 1px 3px; vertical-align: top; overflow: hidden; }
|
||||
|
||||
.a6-box { border: 1px solid #000; padding: 2px 3px; }
|
||||
.a6-party-title { font-weight: bold; font-size: 7pt; }
|
||||
.a6-party-line { font-size: 8pt; white-space: nowrap; overflow: hidden; }
|
||||
|
||||
.a6-return-title { font-weight: bold; font-size: 6pt; }
|
||||
.a6-return-item { font-size: 6pt; }
|
||||
.a6-checkbox { border: 1px solid #000; display: inline-block; width: 6px; height: 6px; margin-right: 3px; vertical-align: middle; }
|
||||
|
||||
.a6-small-title { font-weight: bold; font-size: 5pt; }
|
||||
.a6-small-val { font-size: 6pt; }
|
||||
|
||||
.a6-legal { font-size: 5pt; text-align: center; line-height: 1.15; }
|
||||
|
||||
.a6-barcode { text-align: center; }
|
||||
.a6-barcode img { height: 24px; }
|
||||
.a6-voucher { text-align: center; font-weight: bold; font-size: 12pt; letter-spacing: 1px; }
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="page">
|
||||
{{-- Header: logo (0.10,0.12,1.66x1.26) + service box (6.42,0.10,3.93x0.84) --}}
|
||||
<div class="a6-logo" style="top:0.12cm;left:0.10cm;width:1.66cm;height:1.26cm;">
|
||||
<img src="{{ $eltaLogo }}" alt="ELTA Courier">
|
||||
</div>
|
||||
<div class="a6-service-box" style="top:0.10cm;left:6.42cm;width:3.93cm;height:0.84cm;">
|
||||
<div class="a6-service-code" style="position:absolute;top:0.02cm;left:0.09cm;">ΥΠΗΡΕΣΙΑ: {{ $service_code }}</div>
|
||||
<div class="a6-service-name" style="position:absolute;top:0.40cm;left:0.04cm;width:3.81cm;">{{ $service_name }}</div>
|
||||
</div>
|
||||
<div class="a6-licence-box" style="top:1.05cm;left:6.42cm;width:3.88cm;height:0.62cm;border:1px solid #000;text-align:center;font-size:5.3pt;font-weight:bold;line-height:1.3;padding-top:2px;">
|
||||
ΕΕΤΤ ΑΜ: 99-150 Γενική Άδεια<br>Ταχ/κων Υπηρεσιών
|
||||
</div>
|
||||
|
||||
<div class="a6-datetime" style="top:1.68cm;left:0.13cm;width:1.68cm;">{{ $date }}</div>
|
||||
<div class="a6-title" style="top:1.79cm;left:1.93cm;width:5.89cm;">ΣΥΝΟΔΕΥΤΙΚΟ ΔΕΛΤΙΟ ΤΑΧΥΜΕΤΑΦΟΡΑΣ</div>
|
||||
{{-- textbox15 (copy): "ΠΟΛΛΑΠΛH" on the extra parcels of a multi-parcel send --}}
|
||||
@if ($copy)
|
||||
<div class="a6-title" style="top:1.84cm;left:7.95cm;width:2.21cm;">{{ $copy }}</div>
|
||||
@endif
|
||||
{{-- The RDLC's own barcode textbox here uses the "Free 3 of 9
|
||||
Extended" barcode font — we don't have that font, so this
|
||||
would-be *{voucher}* fallback text is dropped in favor of the
|
||||
real Code 128 barcode image rendered near the bottom instead. --}}
|
||||
<div class="a6-datetime" style="top:2.00cm;left:0.16cm;width:1.60cm;">{{ $time }}</div>
|
||||
|
||||
<div class="a6-station-box" style="top:2.33cm;left:0.10cm;width:10.20cm;height:0.44cm;">
|
||||
<div class="a6-station-label" style="position:absolute;top:0.05cm;left:0.10cm;">Γρ. Επίδοσης :</div>
|
||||
<div class="a6-station-val" style="position:absolute;top:0.03cm;left:2.50cm;">{{ $station_pros }}</div>
|
||||
<div class="a6-station-val" style="position:absolute;top:0.03cm;left:3.90cm;width:6.06cm;">{{ $station_pros_title }}</div>
|
||||
</div>
|
||||
|
||||
{{-- ΧΡΕΩΣΗ / REFERENCE / ΣΥΜΒΑΣΗ 3-cell row, and the Γρ.Κατάθεσης /
|
||||
ΒΑΡΟΣ / ΟΓΚΟΜΕΤΡΙΚΟ ΒΑΡΟΣ / Τεμάχια row right below it: both are
|
||||
genuinely tabular single rows of fixed-width cells, so — like
|
||||
the equivalent A4 rows — they're built as real
|
||||
<table border-collapse:collapse> instead of independently-
|
||||
bordered absolute divs, which was drawing every shared edge
|
||||
(each cell-to-cell seam, and the seam between these two rows)
|
||||
twice, visibly doubling/thickening those lines versus a real
|
||||
printed ELTA label. Each table is positioned at the row's own
|
||||
RDLC top/left; the first table's bottom border is dropped since
|
||||
the second table's top border already draws that shared line. --}}
|
||||
<table class="a6-cell-row" style="top:2.82cm;left:0.10cm;width:10.16cm;">
|
||||
<colgroup>
|
||||
<col style="width:5.41cm;"><col style="width:2.84cm;"><col style="width:1.91cm;">
|
||||
</colgroup>
|
||||
<tr>
|
||||
<td class="a6-cell-td" style="height:0.47cm;border-bottom:none;">
|
||||
<div style="font-size:7pt;">{{ $xreosi }}</div>
|
||||
</td>
|
||||
<td class="a6-cell-td" style="height:0.47cm;text-align:center;border-bottom:none;">
|
||||
<div style="font-size:7pt;">{{ $ocr_reference }}</div>
|
||||
</td>
|
||||
<td class="a6-cell-td" style="height:0.47cm;text-align:center;border-bottom:none;">
|
||||
<div style="font-size:7pt;">{{ $siimvasi }}</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<table class="a6-cell-row" style="top:3.39cm;left:0.10cm;width:9.97cm;">
|
||||
<colgroup>
|
||||
<col style="width:2.00cm;"><col style="width:2.00cm;"><col style="width:4.12cm;"><col style="width:1.85cm;">
|
||||
</colgroup>
|
||||
<tr>
|
||||
<td class="a6-cell-td" style="height:0.97cm;">
|
||||
<div class="a6-cell-label">Γρ.Κατάθεσης:</div>
|
||||
<div class="a6-cell-val">{{ $station_apo }}</div>
|
||||
</td>
|
||||
<td class="a6-cell-td" style="height:0.97cm;">
|
||||
<div class="a6-cell-label">ΒΑΡΟΣ(Kgr)</div>
|
||||
<div class="a6-cell-val">{{ $weight }}</div>
|
||||
</td>
|
||||
<td class="a6-cell-td" style="height:0.97cm;">
|
||||
<div class="a6-cell-label">ΟΓΚΟΜΕΤΡΙΚΟ ΒΑΡΟΣ(Kgr)</div>
|
||||
<div class="a6-cell-val" style="font-size:7pt;">{{ $volumetric_weight }}</div>
|
||||
</td>
|
||||
<td class="a6-cell-td" style="height:0.97cm;">
|
||||
<div class="a6-cell-label">Τεμάχια</div>
|
||||
<div class="a6-cell-val">{{ $package_label }}</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
{{-- ΑΠΟΣΤΟΛΕΑΣ + ΑΙΤΙΑ ΕΠΙΣΤΡΟΦΗΣ --}}
|
||||
<div class="a6-box" style="top:4.43cm;left:0.10cm;width:7.24cm;height:2.44cm;">
|
||||
@include('core::shipping.carriers.elta.partials._party-box', [
|
||||
'title' => 'ΑΠΟΣΤΟΛΕΑΣ',
|
||||
'lines' => $sender_lines,
|
||||
])
|
||||
</div>
|
||||
<div class="a6-box" style="top:4.43cm;left:7.55cm;width:2.80cm;height:2.44cm;">
|
||||
<div class="a6-return-title">ΑΙΤΙΑ ΕΠΙΣΤΡΟΦΗΣ</div>
|
||||
<div style="margin-top:4px;">
|
||||
<div class="a6-return-item"><span class="a6-checkbox"></span>Άγνωστος</div>
|
||||
<div class="a6-return-item" style="margin-top:4px;"><span class="a6-checkbox"></span>Ελλειπή Δ/νση</div>
|
||||
<div class="a6-return-item" style="margin-top:4px;"><span class="a6-checkbox"></span>Απαράδεκτο</div>
|
||||
<div class="a6-return-item" style="margin-top:4px;"><span class="a6-checkbox"></span>Άλλαξε Δ/νση</div>
|
||||
<div class="a6-return-item" style="margin-top:4px;"><span class="a6-checkbox"></span>Αζήτητο</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{-- ΠΑΡΑΛΗΠΤΗΣ + ΑΝΤΙΚΑΤΑΒΟΛΗ column --}}
|
||||
<div class="a6-box" style="top:6.97cm;left:0.10cm;width:7.26cm;height:2.78cm;">
|
||||
@include('core::shipping.carriers.elta.partials._party-box', [
|
||||
'title' => 'ΠΑΡΑΛΗΠΤΗΣ',
|
||||
'lines' => $recipient_lines,
|
||||
])
|
||||
</div>
|
||||
{{-- antik_1..7 (textbox51/21/22/24/56/59/61): "ΑΝΤΙΚΑΤΑΒΟΛΗ 17.00",
|
||||
"* ΑΝΑΛΥΣΗ *", "17.00 MΕΤΡΗΤΑ", one line every 0.37cm. --}}
|
||||
<div class="a6-box" style="top:6.97cm;left:7.48cm;width:2.85cm;height:2.79cm;">
|
||||
@foreach ($antik_lines as $i => $line)
|
||||
<div style="position:absolute;top:{{ 0.16 + $i * 0.37 }}cm;left:0.10cm;width:2.62cm;font-size:6pt;">{{ $line }}</div>
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
{{-- REFERENCE / ΕΠΙΒΑΡΥΝΣΕΙΣ --}}
|
||||
<div class="a6-box" style="top:9.84cm;left:0.10cm;width:5.81cm;height:0.69cm;">
|
||||
<div class="a6-small-title">REFERENCE</div>
|
||||
<div class="a6-small-val" style="margin-top:3px; font-weight:bold;">{{ $order_reference }}</div>
|
||||
</div>
|
||||
<div class="a6-box" style="top:9.84cm;left:6.00cm;width:4.37cm;height:1.56cm;">
|
||||
<div class="a6-small-title">* ΕΠΙΒΑΡΥΝΣΕΙΣ *</div>
|
||||
@foreach ([$sur_1 ?? null, $sur_2 ?? null, $sur_3 ?? null, $sur_4 ?? null] as $sur)
|
||||
@if (!empty($sur))
|
||||
<div style="font-size:6pt; margin-top:2px;">{{ $sur }}</div>
|
||||
@endif
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
{{-- ΠΑΡΑΤΗΡΗΣΕΙΣ --}}
|
||||
<div class="a6-box" style="top:10.60cm;left:0.10cm;width:5.82cm;height:0.80cm;">
|
||||
<div class="a6-small-title">* ΠΑΡΑΤΗΡΗΣΕΙΣ *</div>
|
||||
{{-- sxolia_1/2 (textbox49/50) --}}
|
||||
@foreach (array_slice($sxolia, 0, 2) as $i => $line)
|
||||
<div style="position:absolute;top:{{ 0.24 + $i * 0.26 }}cm;left:0.10cm;width:5.62cm;font-size:6pt;line-height:1;white-space:nowrap;overflow:hidden;">{{ $line }}</div>
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
@if ($multiPiece)
|
||||
<div class="a6-box" style="top:11.58cm;left:0.10cm;width:10.23cm;height:0.30cm;text-align:center;">
|
||||
<div style="font-weight:bold; font-size:8pt; line-height:1;">{{ $polaplo }}</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="a6-box" style="top:11.98cm;left:0.10cm;width:10.23cm;height:0.52cm;">
|
||||
<div class="a6-legal">
|
||||
Ισχύουν οι Γενικοί Οροι Παραχής Υπηρεσιών οι οποίοι βρίσκονται αναρτημένοι στο www.elta-courier.gr<br>
|
||||
και είναι διαθέσιμοι σε ολα τα καταστήματα της εταιρίας.
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if ($antik_1 ?? null)
|
||||
<div class="a6-box" style="top:12.60cm;left:0.10cm;width:10.23cm;height:0.40cm;text-align:center;">
|
||||
<div style="font-weight:bold; font-size:9pt; line-height:1;">{{ $antik_1 }}</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="a6-barcode" style="top:13.18cm;left:0.10cm;width:10.27cm;">
|
||||
<img src="{{ $barcode_voucher }}" alt="">
|
||||
</div>
|
||||
<div class="a6-voucher" style="top:14.02cm;left:0.10cm;width:10.30cm;">{{ $voucher_no }}</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,175 @@
|
||||
{{--
|
||||
One "ΣΥΝΟΔΕΥΤΙΚΟ ΔΕΛΤΙΟ ΤΑΧΥΜΕΤΑΦΟΡΑΣ" copy (delivery or sender's),
|
||||
geometry transcribed directly from ELTA_PEL.sydetaE.rdlc's delivery-
|
||||
copy band (Top/Left values there are relative to that band; here
|
||||
they're absolute cm offsets from THIS partial's own 0,0, since the
|
||||
caller wraps it in a `position:relative` container sized 15.75cm x
|
||||
8.75cm — the same width/height as the RDLC band, read off its own
|
||||
rectangle8/rectangle9/rectangle11/rectangle12 extents).
|
||||
|
||||
Expects: $copyType ('delivery'|'sender') and all of
|
||||
EltaLabelRenderer's $data.
|
||||
--}}
|
||||
<div class="mc-logo" style="top:0.09cm;left:0.32cm;width:2.65cm;height:1.93cm;">
|
||||
<img src="{{ $eltaLogo }}" alt="ELTA Courier">
|
||||
</div>
|
||||
<div class="mc-company" style="top:0.12cm;left:3.15cm;width:5.19cm;">
|
||||
<div class="mc-company-name">ΕΛΛΗΝΙΚΑ ΤΑΧΥΔΡΟΜΕΙΑ Α.Ε.</div>
|
||||
<div>Έδρα: Απελλού 1, 105 51, Αθήνα</div>
|
||||
<div>Υποκ/μα: Λ. Μεσογείων 395, 153 43, Αγ. Παρασκευή</div>
|
||||
<div>Α.Φ.Μ.: 094026421 | Δ.Ο.Υ.: ΚΕΦΟ.Δ.Ε. ΑΤΤΙΚΗΣ</div>
|
||||
<div>Τ. 210-6073000 | Ε. info@elta-courier.gr</div>
|
||||
<div>www.eltacourier.gr</div>
|
||||
</div>
|
||||
<div class="mc-text mc-small" style="top:1.80cm;left:3.15cm;width:5.03cm;">ΕΕΤΤ ΑΜ 99-150 Γενική Αδεια Ταχ/κων Υπηρεσιών</div>
|
||||
|
||||
{{-- Title / barcode / voucher, centered column at x=8.52..15.58 --}}
|
||||
<div class="mc-box" style="top:0.05cm;left:8.52cm;width:7.06cm;height:1.75cm;">
|
||||
<div class="mc-title" style="top:0.19cm;left:0.05cm;width:6.85cm;">ΣΥΝΟΔΕΥΤΙΚΟ ΔΕΛΤΙΟ ΤΑΧΥΜΕΤΑΦΟΡΑΣ</div>
|
||||
<div class="mc-barcode" style="top:0.57cm;left:0.24cm;width:6.67cm;">
|
||||
<img src="{{ $barcode_voucher }}" alt="">
|
||||
</div>
|
||||
{{-- The RDLC's own barcode textbox uses the "Free 3 of 9 Extended"
|
||||
barcode font (literal *{voucher}* text rendered as bars by that
|
||||
font) — we don't have that font, so we render a real Code 128
|
||||
barcode image above instead (visually equivalent, actually
|
||||
scannable), making this second plain-text *{voucher}* line
|
||||
redundant with it rather than a distinct field. --}}
|
||||
<div class="mc-voucher" style="top:1.29cm;left:0.24cm;width:6.64cm;">{{ $voucher_no }}</div>
|
||||
</div>
|
||||
|
||||
{{-- The sender's copy carries the COD warning under the voucher
|
||||
(sydetaE.rdlc textbox205: antik_minima), only for cash on delivery.
|
||||
Its "Απόδειξη Είσπαξης" note (textbox211) sits at the top-left in the
|
||||
RDLC, where our header block is — it goes in this copy's COD box
|
||||
instead, under the breakdown. --}}
|
||||
@if ($copyType === 'sender' && $antik_minima)
|
||||
<div style="position:absolute;top:1.84cm;left:8.52cm;width:7.06cm;text-align:center;font-size:8pt;font-weight:bold;line-height:1;">{{ $antik_minima }}</div>
|
||||
@endif
|
||||
|
||||
{{-- 5-cell deposit/destination/weight/pieces/volumetric row — a genuinely
|
||||
tabular single row of fixed-width cells, so it's built as a real
|
||||
<table border-collapse:collapse> rather than independently-bordered
|
||||
absolute divs: that was drawing every shared internal edge twice
|
||||
(once per adjacent cell), producing a visibly doubled/thickened line
|
||||
that real printed ELTA labels don't show. The table is positioned via
|
||||
the same absolute top/left/width the RDLC geometry gives the row as a
|
||||
whole; each <td> keeps its own RDLC-derived width via <col>. --}}
|
||||
<table class="mc-cell-row" style="top:2.20cm;left:0.27cm;width:8.44cm;height:0.82cm;">
|
||||
<colgroup>
|
||||
<col style="width:1.51cm;"><col style="width:1.67cm;"><col style="width:1.35cm;"><col style="width:1.08cm;"><col style="width:2.83cm;">
|
||||
</colgroup>
|
||||
<tr>
|
||||
<td class="mc-cell-td">
|
||||
<div class="mc-cell-label">Γρ.Κατάθεσης</div>
|
||||
<div class="mc-cell-val">{{ $station_apo }}</div>
|
||||
</td>
|
||||
<td class="mc-cell-td">
|
||||
<div class="mc-cell-label">Γρ.Προορισμού</div>
|
||||
<div class="mc-cell-val">{{ $station_pros }}</div>
|
||||
</td>
|
||||
<td class="mc-cell-td">
|
||||
<div class="mc-cell-label">Βάρος</div>
|
||||
<div class="mc-cell-val">{{ $weight }}</div>
|
||||
</td>
|
||||
<td class="mc-cell-td">
|
||||
<div class="mc-cell-label">Τεμάχια</div>
|
||||
<div class="mc-cell-val">{{ $package_label }}</div>
|
||||
</td>
|
||||
<td class="mc-cell-td">
|
||||
<div class="mc-cell-label">Ογκ/κο Βάρος</div>
|
||||
<div class="mc-cell-val" style="font-size:7pt;">{{ $volumetric_weight }}</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div class="mc-cell mc-cell-service" style="top:2.20cm;left:9.19cm;width:6.19cm;height:0.82cm;">
|
||||
<div style="position:absolute;top:0.05cm;left:0.32cm;font-size:6.5pt;">ΥΠΗΡΕΣΙΑ :</div>
|
||||
<div style="position:absolute;top:0.03cm;left:3.21cm;font-size:7.5pt;">{{ $service_code }}</div>
|
||||
<div style="position:absolute;top:0.42cm;left:0.05cm;width:6.08cm;text-align:center;font-size:7.5pt;">{{ $service_name }}</div>
|
||||
</div>
|
||||
|
||||
{{-- Sender box --}}
|
||||
<div class="mc-box mc-partybox" style="top:3.12cm;left:0.27cm;width:6.24cm;height:2.53cm;">
|
||||
<div class="mc-party-title" style="top:0.05cm;left:0.10cm;">ΑΠΟΣΤΟΛΕΑΣ</div>
|
||||
@foreach ($sender_lines as $i => $line)
|
||||
@if (trim((string) $line) !== '')
|
||||
<div class="mc-party-line" style="top:{{ 0.53 + $i * 0.395 }}cm;left:0.05cm;width:6.11cm;">{{ $line }}</div>
|
||||
@endif
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
{{-- Recipient box --}}
|
||||
<div class="mc-box mc-partybox" style="top:5.76cm;left:0.29cm;width:6.20cm;height:2.68cm;">
|
||||
<div class="mc-party-title" style="top:0.05cm;left:0.05cm;">ΠΑΡΑΛΗΠΤΗΣ</div>
|
||||
@foreach ($recipient_lines as $i => $line)
|
||||
@if (trim((string) $line) !== '')
|
||||
<div class="mc-party-line" style="top:{{ 0.54 + $i * 0.445 }}cm;left:0.05cm;width:6.11cm;">{{ $line }}</div>
|
||||
@endif
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
{{-- Charge banner + right-column panel stack (ΧΡΕΩΣΗ / Συν.Χρέωσης /
|
||||
REFERENCE / ΠΑΡΑΤΗΡΗΣΕΙΣ, and the Πρόσθετες Υπηρεσίες column beside
|
||||
them): these panels sit only a hair apart (~0.09-0.10cm, the RDLC's
|
||||
own geometry, left untouched), close enough that each pair's two
|
||||
independent borders read as one thick/doubled line at print
|
||||
resolution. Each panel below keeps only the border sides it "owns"
|
||||
on a shared seam (border-top/border-left removed where the
|
||||
neighbouring panel above/left already draws that same line), so
|
||||
every seam is drawn exactly once while every panel's outward-facing
|
||||
sides keep their border. --}}
|
||||
<div class="mc-box mc-charge" style="top:3.09cm;left:6.60cm;width:8.78cm;height:0.48cm;">{{ str_replace(' ΠΙΣΤΩΣΗ', ' ΤΡ.ΠΛΗΡ: ΠΙΣΤΩΣΗ', $xreosi) }}</div>
|
||||
|
||||
<div class="mc-box" style="top:3.66cm;left:6.60cm;width:4.37cm;height:0.44cm;border-top:none;">
|
||||
<div style="position:absolute;top:0.05cm;left:0.05cm;font-size:7pt;font-weight:bold;">Συν.Χρέωσης (€):</div>
|
||||
</div>
|
||||
<div class="mc-box" style="top:3.66cm;left:11.07cm;width:4.31cm;height:2.65cm;border-top:none;">
|
||||
<div style="position:absolute;top:0.04cm;left:0.05cm;font-size:6pt;">Πρόσθετες Υπηρεσίες</div>
|
||||
@foreach ([$sur_1 ?? null, $sur_2 ?? null, $sur_3 ?? null, $sur_4 ?? null] as $i => $sur)
|
||||
@if (!empty($sur))
|
||||
<div style="position:absolute;top:{{ 0.35 + $i * 0.365 }}cm;left:0.08cm;width:4.18cm;font-size:6pt;">{{ $sur }}</div>
|
||||
@endif
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
<div class="mc-box" style="top:4.20cm;left:6.59cm;width:4.37cm;height:0.67cm;border-top:none;border-right:none;">
|
||||
<div style="position:absolute;top:0.03cm;left:0.05cm;font-size:6pt;">* REFERENCE No*</div>
|
||||
<div style="position:absolute;top:0.31cm;left:0.05cm;font-size:6.5pt;">{{ $order_reference }}</div>
|
||||
</div>
|
||||
|
||||
<div class="mc-box" style="top:4.97cm;left:6.60cm;width:4.37cm;height:1.31cm;border-top:none;">
|
||||
<div style="position:absolute;top:0.03cm;left:0.08cm;font-size:6pt;">* ΠΑΡΑΤΗΡΗΣΕΙΣ *</div>
|
||||
{{-- sxolia_1..3 (textbox92/95/94) --}}
|
||||
@foreach ($sxolia as $i => $line)
|
||||
<div style="position:absolute;top:{{ 0.30 + $i * 0.31 }}cm;left:0.10cm;width:4.18cm;font-size:7pt;line-height:1;white-space:nowrap;overflow:hidden;">{{ $line }}</div>
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
{{-- Right-hand signature / print-timestamp column, differs by copy type --}}
|
||||
@if ($copyType === 'delivery')
|
||||
<div class="mc-box" style="top:6.37cm;left:6.61cm;width:4.71cm;height:2.07cm;">
|
||||
{{-- antik_1..6 (textbox102/108/107/106/105/104), first line bold --}}
|
||||
@foreach ($antik_lines as $i => $line)
|
||||
<div style="position:absolute;top:{{ 0.12 + $i * 0.31 }}cm;left:0.08cm;width:4.55cm;font-size:7pt;{{ $i === 0 ? 'font-weight:bold;' : '' }}">{{ $line }}</div>
|
||||
@endforeach
|
||||
</div>
|
||||
<div class="mc-box" style="top:6.37cm;left:11.48cm;width:3.89cm;height:2.03cm;">
|
||||
<div style="position:absolute;top:0.08cm;left:0.08cm;font-size:6pt;">ΓΙΑ ΤΗΝ ΠΑΡΑΛΑΒΗ</div>
|
||||
<div style="position:absolute;top:0.38cm;left:0.08cm;font-size:6pt;">ΟΝΟΜΑ/ΥΠΟΓΡΑΦΗ</div>
|
||||
<div style="position:absolute;top:1.73cm;left:0.11cm;font-size:6pt;">{{ $date }} {{ $time }}</div>
|
||||
</div>
|
||||
@else
|
||||
<div class="mc-box" style="top:6.37cm;left:6.61cm;width:4.71cm;height:2.07cm;">
|
||||
{{-- antik_1..6 (textbox102/108/107/106/105/104), first line bold --}}
|
||||
@foreach ($antik_lines as $i => $line)
|
||||
<div style="position:absolute;top:{{ 0.12 + $i * 0.31 }}cm;left:0.08cm;width:4.55cm;font-size:7pt;{{ $i === 0 ? 'font-weight:bold;' : '' }}">{{ $line }}</div>
|
||||
@endforeach
|
||||
@if ($apodiksi)
|
||||
<div style="position:absolute;top:1.62cm;left:0.08cm;width:4.55cm;font-size:7pt;">{{ $apodiksi }}</div>
|
||||
@endif
|
||||
</div>
|
||||
<div class="mc-box" style="top:6.37cm;left:11.48cm;width:3.89cm;height:2.03cm;">
|
||||
<div style="position:absolute;top:0.08cm;left:0.08cm;font-size:6pt;font-weight:bold;">ΥΠΟΓΡΑΦΗ ΑΠΟΣΤΟΛΕΑ</div>
|
||||
<div style="position:absolute;top:1.73cm;left:0.11cm;font-size:6pt;">Ημερομηνία - Ωρα Εκτύπωσης: {{ $date }} {{ $time }}</div>
|
||||
</div>
|
||||
@endif
|
||||
@@ -0,0 +1,17 @@
|
||||
{{--
|
||||
Sender/recipient box, matching SydetaLabelE.rdlc's rectangle10/
|
||||
rectangle11 (ΑΠΟΣΤΟΛΕΑΣ/ΠΑΡΑΛΗΠΤΗΣ) layout: a bold title line, then
|
||||
the RDLC's sender_1..5 / rec_1..5 fields as separate plain text
|
||||
lines (ELTA's own client pre-wraps the address into these fixed-
|
||||
width lines server-side, so we render each line separately rather
|
||||
than reflowing the address ourselves, to match the real line
|
||||
breaks).
|
||||
|
||||
Expects: $title, $lines (array of up to 5 strings).
|
||||
--}}
|
||||
<div class="pb-title">{{ $title }}</div>
|
||||
@foreach ($lines as $line)
|
||||
@if (trim((string) $line) !== '')
|
||||
<div class="pb-line">{{ $line }}</div>
|
||||
@endif
|
||||
@endforeach
|
||||
@@ -0,0 +1,137 @@
|
||||
{{--
|
||||
Copy 3: the ΤΑΧΥΠΛΗΡΩΜΗ ΕΙΣΠΡΑΞΗ/ΜΕΤΑΒΙΒΑΣΗ payment-receipt stub,
|
||||
geometry transcribed from sydetaE.rdlc's third band (source Top
|
||||
values there run ~19.22cm-27.0cm on the full A4 page; offsets below
|
||||
are relative to this partial's own container, i.e. the RDLC's Top
|
||||
minus 19.22cm). This band is narrower than copies 1/2 (starts at
|
||||
x=3.01cm instead of x=0.27cm) — the RDLC leaves its left margin for
|
||||
the perforated tear line + rotated "3. ΑΡΧΕΙΟ / ΓΡΑΦΕΙΟ ΚΑΤΑΘΕΣΗΣ"
|
||||
text, reproduced by the caller outside this partial.
|
||||
|
||||
Expects all of EltaLabelRenderer's $data.
|
||||
--}}
|
||||
<div class="mc-box" style="top:0.00cm;left:6.44cm;width:6.64cm;height:1.15cm;">
|
||||
<div class="mc-barcode" style="top:0.10cm;left:0.22cm;width:6.27cm;">
|
||||
<img src="{{ $barcode_voucher }}" alt="">
|
||||
</div>
|
||||
<div class="mc-voucher" style="top:0.75cm;left:0.24cm;width:6.14cm;">{{ $voucher_no }}</div>
|
||||
</div>
|
||||
<div class="mc-copylabel" style="position:absolute;top:0.10cm;left:0.00cm;width:3.92cm;font-size:8pt;font-weight:bold;">{{ $voucher_no }}</div>
|
||||
|
||||
{{-- 4-cell deposit/destination/weight/pieces row: same doubled-border
|
||||
issue and same fix as _main-copy.blade.php's 5-cell row — a real
|
||||
<table border-collapse:collapse> in place of 4 independently-bordered
|
||||
absolute divs, positioned at the row's own RDLC top/left/width. --}}
|
||||
<table class="mc-cell-row" style="top:1.60cm;left:0.02cm;width:5.61cm;height:0.82cm;">
|
||||
<colgroup>
|
||||
<col style="width:1.51cm;"><col style="width:1.67cm;"><col style="width:1.35cm;"><col style="width:1.08cm;">
|
||||
</colgroup>
|
||||
{{-- border-bottom:none on every cell: the ΑΠΟΣΤΟΛΕΑΣ party box
|
||||
immediately below (top:2.44cm, this row ends at 2.42cm) already
|
||||
draws that shared line with its own border-top. --}}
|
||||
<tr>
|
||||
<td class="mc-cell-td" style="border-bottom:none;">
|
||||
<div class="mc-cell-label">Γρ.Κατάθεσης</div>
|
||||
<div class="mc-cell-val">{{ $station_apo }}</div>
|
||||
</td>
|
||||
<td class="mc-cell-td" style="border-bottom:none;">
|
||||
<div class="mc-cell-label">Γρ.Προορισμού</div>
|
||||
<div class="mc-cell-val">{{ $station_pros }}</div>
|
||||
</td>
|
||||
<td class="mc-cell-td" style="border-bottom:none;">
|
||||
<div class="mc-cell-label">Βάρος</div>
|
||||
<div class="mc-cell-val">{{ $weight }}</div>
|
||||
</td>
|
||||
<td class="mc-cell-td" style="border-bottom:none;">
|
||||
<div class="mc-cell-label">Τεμάχια</div>
|
||||
<div class="mc-cell-val">{{ $package_label }}</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div class="mc-box" style="top:1.60cm;left:5.90cm;width:4.87cm;height:0.40cm;">
|
||||
<div style="position:absolute;top:0.05cm;left:0.13cm;font-size:6pt;">{{ $service_code }}</div>
|
||||
<div style="position:absolute;top:0.03cm;left:0.85cm;width:3.89cm;font-size:6pt;">{{ $service_name }}</div>
|
||||
</div>
|
||||
|
||||
{{-- Below: several panel pairs sit a hair apart (or, for the
|
||||
Συν.Χρέωσης/ΕΠΙΒΑΡΥΝΣΕΙΣ pair, even overlap slightly) per the RDLC's
|
||||
own geometry — left untouched — close enough that two independent
|
||||
borders read as one doubled/thick line. border-top/border-bottom is
|
||||
removed from one side of each pair so only the remaining box's
|
||||
border draws that shared line. --}}
|
||||
<div class="mc-box mc-charge" style="top:2.02cm;left:5.90cm;width:4.87cm;height:0.37cm;font-size:5.4pt;padding-top:4px;white-space:nowrap;overflow:hidden;border-top:none;">{{ str_replace(' ΠΙΣΤΩΣΗ', ' ΤΡ.ΠΛΗΡ: ΠΙΣΤΩΣΗ', $xreosi) }}</div>
|
||||
|
||||
<div class="mc-box mc-partybox" style="top:2.44cm;left:0.00cm;width:5.98cm;height:0.91cm;overflow:hidden;">
|
||||
<div class="mc-party-title" style="top:0.03cm;left:0.10cm;font-size:6.5pt;">ΑΠΟΣΤΟΛΕΑΣ</div>
|
||||
{{-- The stub prints sender_1/sender_2 only (code + name) --}}
|
||||
@foreach (array_slice($sender_lines, 0, 2) as $i => $line)
|
||||
@if (trim((string) $line) !== '')
|
||||
<div class="mc-party-line" style="top:{{ 0.30 + $i * 0.19 }}cm;left:0.06cm;width:5.85cm;font-size:5.6pt;">{{ $line }}</div>
|
||||
@endif
|
||||
@endforeach
|
||||
</div>
|
||||
<div class="mc-box" style="top:2.45cm;left:6.06cm;width:4.71cm;height:1.17cm;border-bottom:none;">
|
||||
<div style="position:absolute;top:0.02cm;left:0.16cm;font-size:6pt;">Συν.Χρέωσης (€):</div>
|
||||
<div style="position:absolute;top:0.30cm;left:0.16cm;font-size:6pt;">Πρόσθετες Υπηρεσίες</div>
|
||||
{{-- sxolia_1..3 (textbox91/132/133) sit under this heading in the RDLC;
|
||||
this stub's boxes are shorter than the RDLC's, so only 2 lines fit. --}}
|
||||
@foreach (array_slice($sxolia, 0, 2) as $i => $line)
|
||||
<div style="position:absolute;top:{{ 0.50 + $i * 0.16 }}cm;left:0.16cm;width:4.47cm;font-size:5pt;line-height:1;white-space:nowrap;overflow:hidden;">{{ $line }}</div>
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
<div class="mc-box mc-partybox" style="top:3.35cm;left:0.00cm;width:5.97cm;height:1.63cm;overflow:hidden;border-top:none;">
|
||||
<div class="mc-party-title" style="top:0.06cm;left:0.10cm;font-size:6.5pt;">ΠΑΡΑΛΗΠΤΗΣ</div>
|
||||
{{-- ...and rec_1..4: name, address, postcode — no phone --}}
|
||||
@foreach (array_slice($recipient_lines, 0, 3) as $i => $line)
|
||||
@if (trim((string) $line) !== '')
|
||||
<div class="mc-party-line" style="top:{{ 0.34 + $i * 0.26 }}cm;left:0.10cm;width:5.79cm;font-size:5.6pt;">{{ $line }}</div>
|
||||
@endif
|
||||
@endforeach
|
||||
</div>
|
||||
<div class="mc-box" style="top:3.28cm;left:6.06cm;width:4.71cm;height:1.41cm;">
|
||||
<div style="position:absolute;top:0.05cm;left:0.14cm;font-size:6pt;">* ΕΠΙΒΑΡΥΝΣΕΙΣ *</div>
|
||||
{{-- sur_1..4 (textbox139-142) --}}
|
||||
@foreach ([$sur_1, $sur_2, $sur_3, $sur_4] as $i => $sur)
|
||||
@if (filled($sur))
|
||||
<div style="position:absolute;top:{{ 0.33 + $i * 0.265 }}cm;left:0.13cm;width:4.52cm;font-size:6pt;">{{ $sur }}</div>
|
||||
@endif
|
||||
@endforeach
|
||||
</div>
|
||||
|
||||
<div style="position:absolute;top:4.95cm;left:0.05cm;width:8.75cm;font-size:4.6pt;line-height:1.25;white-space:nowrap;">
|
||||
Έλαβα γνώση των όρων που αναγράφονται στο αντίγραφο 1 και 6 και τους αποδέχομαι ανεπιφύλακτα
|
||||
</div>
|
||||
|
||||
{{-- rectangle29 --}}
|
||||
<div class="mc-box" style="top:5.46cm;left:0.03cm;width:2.75cm;height:1.66cm;">
|
||||
<div style="position:absolute;top:0.08cm;left:0.08cm;font-size:6pt;font-weight:bold;">ΥΠΟΓΡΑΦΗ ΑΠΟΣΤΟΛΕΑ</div>
|
||||
<div style="position:absolute;top:1.35cm;left:0.08cm;font-size:6pt;">{{ $date }}</div>
|
||||
</div>
|
||||
{{-- rectangle43 --}}
|
||||
<div class="mc-box" style="top:5.47cm;left:2.89cm;width:3.76cm;height:1.66cm;">
|
||||
<div style="position:absolute;top:0.09cm;left:0.08cm;font-size:6pt;font-weight:bold;">ΟΝΟΜΑ/ΥΠΟΓΡΑΦΗ ΠΑΡΑΛΗΠΤΗ</div>
|
||||
<div style="position:absolute;top:1.35cm;left:0.08cm;font-size:6pt;">Ημ/νία: Ώρα:</div>
|
||||
</div>
|
||||
{{-- Image18: the ELTA "ΠΟΡΤΑ-ΠΟΡΤΑ" details bitmap, above ΠΟΣΟ —
|
||||
approximated with our logo + the same text, since the bitmap can't
|
||||
be extracted. --}}
|
||||
<div class="ps-brandbox-small" style="position:absolute;top:3.12cm;left:10.87cm;width:4.79cm;height:2.17cm;border:none;">
|
||||
<div class="ps-brand-logo-sm"><img src="{{ $eltaLogo }}" alt=""></div>
|
||||
<div class="ps-legal-sm">
|
||||
<strong>ΠΟΡΤΑ-ΠΟΡΤΑ</strong><br>
|
||||
ΕΛΛΗΝΙΚΑ ΤΑΧΥΔΡΟΜΕΙΑ Α.Ε.<br>
|
||||
ΕΕΤΤ ΑΜ: 99-150
|
||||
</div>
|
||||
</div>
|
||||
{{-- rectangle44: the COD breakdown, antik_1..6 (textbox149-151,167-169) --}}
|
||||
<div class="mc-box" style="top:5.48cm;left:6.76cm;width:3.99cm;height:1.68cm;">
|
||||
@foreach ($antik_lines as $i => $line)
|
||||
<div style="position:absolute;top:{{ 0.04 + $i * 0.265 }}cm;left:0.11cm;width:3.78cm;font-size:7pt;{{ $i === 0 ? 'font-weight:bold;' : '' }}">{{ $line }}</div>
|
||||
@endforeach
|
||||
</div>
|
||||
{{-- rectangle45: Π Ο Σ Ο + antik_poso (textbox148/152) --}}
|
||||
<div class="mc-box" style="top:5.55cm;left:10.84cm;width:2.72cm;height:1.61cm;text-align:center;">
|
||||
<div style="position:absolute;top:0.15cm;left:0;width:100%;font-size:7pt;">Π Ο Σ Ο</div>
|
||||
<div style="position:absolute;top:0.70cm;left:0;width:100%;font-size:13pt;font-weight:bold;">{{ $antik_poso }}</div>
|
||||
</div>
|
||||
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Auth\Events;
|
||||
|
||||
use Illuminate\Contracts\Auth\Authenticatable;
|
||||
|
||||
/**
|
||||
* Dispatched by Customer\Services\CustomerEmailChangeService::confirm()
|
||||
* once a login-email change actually takes effect — $oldEmail is what the
|
||||
* account's login used to be, already overwritten on $user by the time
|
||||
* this fires.
|
||||
*/
|
||||
class UserEmailChanged
|
||||
{
|
||||
public function __construct(
|
||||
public readonly Authenticatable $user,
|
||||
public readonly string $oldEmail,
|
||||
) {}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Auth\Listeners;
|
||||
|
||||
use Modules\Core\Auth\Events\UserCreated;
|
||||
|
||||
/**
|
||||
* The storefront login page shows a terms/privacy notice ("By continuing,
|
||||
* you accept the Terms of Use and have read the Privacy Policy") that
|
||||
* requesting an OTP code implicitly accepts — recorded once, right here,
|
||||
* for a genuinely new signup only (UserCreated fires exactly once per
|
||||
* user, from Auth\Services\UserOtpService::generateAndSend()'s own
|
||||
* wasRecentlyCreated check). An existing user's original acceptance
|
||||
* (whatever version was live when THEY signed up) must never be
|
||||
* overwritten by whatever config('legal.*') says today, which is exactly
|
||||
* why this only ever runs from UserCreated and nowhere else.
|
||||
*/
|
||||
class RecordLegalAcceptanceForNewUser
|
||||
{
|
||||
public function handle(UserCreated $event): void
|
||||
{
|
||||
$event->user->forceFill([
|
||||
'terms_accepted_at' => now(),
|
||||
'terms_version' => config('legal.terms_version'),
|
||||
'privacy_policy_version' => config('legal.privacy_policy_version'),
|
||||
])->save();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Auth\Mail;
|
||||
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Mail\Mailables\Content;
|
||||
use Illuminate\Mail\Mailables\Envelope;
|
||||
|
||||
/**
|
||||
* Sent to the NEW address a shopper is trying to switch their login email
|
||||
* to (Customer\Services\CustomerEmailChangeService::request()) — proves
|
||||
* they can actually receive mail there before the switch takes effect.
|
||||
* View overridable per-app the same way UserOtpMail's is (resources/
|
||||
* views/vendor/core/auth/mail/email-change-code.blade.php).
|
||||
*/
|
||||
class EmailChangeCodeMail extends Mailable
|
||||
{
|
||||
public function __construct(
|
||||
public readonly string $code,
|
||||
) {}
|
||||
|
||||
public function envelope(): Envelope
|
||||
{
|
||||
return new Envelope(subject: 'Confirm your new email address');
|
||||
}
|
||||
|
||||
public function content(): Content
|
||||
{
|
||||
return new Content(view: 'core::auth.mail.email-change-code');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Auth\Mail;
|
||||
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Mail\Mailables\Content;
|
||||
use Illuminate\Mail\Mailables\Envelope;
|
||||
|
||||
/**
|
||||
* Sent to the OLD address once a login-email change actually takes
|
||||
* effect (Customer\Services\CustomerEmailChangeService::confirm()) — lets
|
||||
* the previous owner notice if someone else changed it from a hijacked
|
||||
* session. Shows the new address masked (first character + domain only),
|
||||
* never the full new address — this notice's whole point is alerting the
|
||||
* OLD owner, not handing them the new address outright. View overridable
|
||||
* per-app the same way UserOtpMail's is (resources/views/vendor/core/
|
||||
* auth/mail/email-changed-notice.blade.php).
|
||||
*/
|
||||
class EmailChangedNoticeMail extends Mailable
|
||||
{
|
||||
public readonly string $maskedEmail;
|
||||
|
||||
public function __construct(string $newEmail)
|
||||
{
|
||||
[$local, $domain] = explode('@', $newEmail, 2);
|
||||
|
||||
$this->maskedEmail = mb_substr($local, 0, 1).'•••@'.$domain;
|
||||
}
|
||||
|
||||
public function envelope(): Envelope
|
||||
{
|
||||
return new Envelope(subject: 'Your account email was changed');
|
||||
}
|
||||
|
||||
public function content(): Content
|
||||
{
|
||||
return new Content(view: 'core::auth.mail.email-changed-notice');
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@ class Staff extends ModelsStaff
|
||||
'last_name',
|
||||
'admin',
|
||||
'email',
|
||||
'otp_code',
|
||||
'otp_code_hash',
|
||||
'otp_expires_at',
|
||||
];
|
||||
|
||||
@@ -19,6 +19,18 @@ class Staff extends ModelsStaff
|
||||
'admin' => 'bool',
|
||||
'email_verified_at' => 'datetime',
|
||||
'password' => 'hashed',
|
||||
'otp_code_hash' => 'hashed',
|
||||
'otp_expires_at' => 'datetime',
|
||||
];
|
||||
|
||||
// Overrides (doesn't merge with) Lunar\Admin\Models\Staff's own
|
||||
// $hidden — repeats its password/remember_token here so this class
|
||||
// doesn't silently drop that protection while adding otp_code_hash/
|
||||
// otp_expires_at, which the base model has no reason to know about.
|
||||
protected $hidden = [
|
||||
'password',
|
||||
'remember_token',
|
||||
'otp_code_hash',
|
||||
'otp_expires_at',
|
||||
];
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace Modules\Core\Auth\Services;
|
||||
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Modules\Core\Auth\Mail\OtpMail;
|
||||
use Modules\Core\Auth\Models\Staff;
|
||||
@@ -27,7 +28,10 @@ class OtpService
|
||||
|
||||
$code = str_pad((string) random_int(0, 999999), self::CODE_LENGTH, '0', STR_PAD_LEFT);
|
||||
|
||||
$staff->otp_code = $code;
|
||||
// otp_code_hash's 'hashed' cast (see Staff's own $casts) hashes
|
||||
// this automatically on assignment, same as password — never
|
||||
// stored or compared in plaintext.
|
||||
$staff->otp_code_hash = $code;
|
||||
$staff->otp_expires_at = now()->addMinutes(self::EXPIRY_MINUTES);
|
||||
$staff->save();
|
||||
|
||||
@@ -44,11 +48,15 @@ class OtpService
|
||||
return null;
|
||||
}
|
||||
|
||||
if (! $staff->otp_expires_at || $staff->otp_code != $code || now()->isAfter($staff->otp_expires_at)) {
|
||||
if (! $staff->otp_code_hash || ! $staff->otp_expires_at || now()->isAfter($staff->otp_expires_at)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$staff->otp_code = null;
|
||||
if (! Hash::check($code, $staff->otp_code_hash)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
$staff->otp_code_hash = null;
|
||||
$staff->otp_expires_at = null;
|
||||
$staff->save();
|
||||
|
||||
|
||||
@@ -5,8 +5,10 @@ namespace Modules\Core\Auth\Services;
|
||||
use Illuminate\Contracts\Auth\Authenticatable;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Facades\RateLimiter;
|
||||
use Modules\Core\Auth\Events\UserAuthenticated;
|
||||
@@ -29,17 +31,28 @@ use Modules\Core\Auth\Mail\UserOtpMail;
|
||||
* here: doing our own on top would run a SECOND merge attempt with a
|
||||
* hardcoded policy that ignores whatever the consumer configured.
|
||||
*
|
||||
* generateAndSend()'s find-or-create already triggers the full
|
||||
* Customer/User pairing cascade for a genuinely new email — see
|
||||
* Modules\Core\Auth\Events\UserCreated's own docblock and
|
||||
* Modules\Core\Customer\Listeners\CreateCustomerForUser.
|
||||
* generateAndSend() does NOT create a User row for an email it hasn't
|
||||
* seen before — it used to (firstOrCreate() ran unconditionally), which
|
||||
* meant this login FORM was effectively a registration form: anyone could
|
||||
* create a real User (and, via UserCreated's own cascade, a paired
|
||||
* Customer) for any email address they liked, whether or not a single
|
||||
* correct code was ever entered. A genuinely new email's pending code now
|
||||
* lives in the cache (see pendingKey()), keyed by email, with no DB row
|
||||
* at all — firstOrCreate() and UserCreated only fire from validate(), and
|
||||
* only once the code has actually been proven correct. An email that
|
||||
* already has a User row is unaffected: its OTP state still lives on that
|
||||
* row's own otp_code_hash/otp_expires_at/otp_attempts columns exactly as
|
||||
* before, so a returning shopper's login is unchanged. otp_code_hash
|
||||
* holds a bcrypt hash of the code (the 'otp_code_hash' => 'hashed' cast
|
||||
* on App\Models\User hashes it automatically on assignment, same as
|
||||
* password), not the code itself — compared via Hash::check().
|
||||
*
|
||||
* Two independent throttles, both configured under core.auth.otp — see
|
||||
* config/core.php's own comment for why they're separate: max_attempts
|
||||
* caps wrong guesses against ONE code; generation_limit caps how often a
|
||||
* NEW code can be requested for the same email at all (closes both the
|
||||
* "regenerate to reset my guess count" loophole and mail-bombing one
|
||||
* inbox).
|
||||
* inbox). Both apply identically whether or not a User row exists yet.
|
||||
*
|
||||
* validate() also records a UserSessionService entry for the new login —
|
||||
* see that class's own docblock for the "logout everywhere" registry
|
||||
@@ -74,28 +87,31 @@ class UserOtpService
|
||||
RateLimiter::hit($limiterKey, (int) config('core.auth.otp.generation_decay_minutes', 10) * 60);
|
||||
|
||||
$model = config('auth.providers.users.model');
|
||||
$user = $model::firstOrCreate(['email' => $email]);
|
||||
|
||||
// wasRecentlyCreated is Eloquent's own "did firstOrCreate() just
|
||||
// INSERT, or did it find an existing row" flag — the only reliable
|
||||
// way to tell them apart from firstOrCreate()'s return value alone.
|
||||
// Without this check, a genuinely new signup never fired
|
||||
// UserCreated at all (this class's own docblock claimed the
|
||||
// Customer/User pairing cascade "already triggers" here, which was
|
||||
// false as written — see Modules\Core\Customer\Listeners\
|
||||
// CreateCustomerForUser, which depends entirely on this event).
|
||||
if ($user->wasRecentlyCreated) {
|
||||
Event::dispatch(new UserCreated($user));
|
||||
}
|
||||
|
||||
$user = $model::where('email', $email)->first();
|
||||
$code = str_pad((string) random_int(0, 999999), self::CODE_LENGTH, '0', STR_PAD_LEFT);
|
||||
|
||||
$user->otp_code = $code;
|
||||
$user->otp_expires_at = now()->addMinutes(self::EXPIRY_MINUTES);
|
||||
$user->otp_attempts = 0;
|
||||
$user->save();
|
||||
if ($user) {
|
||||
$user->otp_code_hash = $code;
|
||||
$user->otp_expires_at = now()->addMinutes(self::EXPIRY_MINUTES);
|
||||
$user->otp_attempts = 0;
|
||||
$user->save();
|
||||
} else {
|
||||
// No row yet — deliberately not created here. See this
|
||||
// class's own docblock for why: creating one on every
|
||||
// generateAndSend() call let anyone mint real User/Customer
|
||||
// rows for an email nobody proved they owned.
|
||||
//
|
||||
// Hashed even in the cache (not just on the DB-backed path)
|
||||
// — a code sitting in Cache::get()-able storage is the same
|
||||
// exposure as a plaintext DB column if anything can read it.
|
||||
Cache::put($this->pendingKey($email), [
|
||||
'code_hash' => Hash::make($code),
|
||||
'expires_at' => now()->addMinutes(self::EXPIRY_MINUTES)->timestamp,
|
||||
'attempts' => 0,
|
||||
], now()->addMinutes(self::EXPIRY_MINUTES));
|
||||
}
|
||||
|
||||
Mail::to($user->email)->send(new UserOtpMail($user->name ?? $user->email, $code));
|
||||
Mail::to($email)->send(new UserOtpMail($user->name ?? $email, $code));
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -106,46 +122,17 @@ class UserOtpService
|
||||
* a fresh one via generateAndSend() (itself throttled independently
|
||||
* — see this class's own docblock) rather than being able to keep
|
||||
* guessing against a still-live code for the rest of its 10-minute
|
||||
* expiry window.
|
||||
* expiry window. Applies identically to the cache-backed (no User row
|
||||
* yet) and DB-backed (existing User row) paths.
|
||||
*/
|
||||
public function validate(string $email, string $code, ?Request $request = null): ?Authenticatable
|
||||
{
|
||||
$model = config('auth.providers.users.model');
|
||||
$existing = $model::where('email', $email)->exists();
|
||||
|
||||
// lockForUpdate() + a transaction make the read-check-increment-save
|
||||
// below atomic across concurrent requests for the same user — without
|
||||
// it, two guesses fired in parallel can each read the same
|
||||
// pre-increment otp_attempts value and both save past
|
||||
// max_attempts, letting an attacker exceed the lockout by
|
||||
// parallelizing requests instead of sending them serially.
|
||||
$result = DB::transaction(function () use ($model, $email, $code) {
|
||||
$user = $model::where('email', $email)->lockForUpdate()->first();
|
||||
|
||||
if (! $user || ! $user->otp_expires_at || now()->isAfter($user->otp_expires_at)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (! hash_equals((string) $user->otp_code, $code)) {
|
||||
$user->otp_attempts++;
|
||||
|
||||
if ($user->otp_attempts >= (int) config('core.auth.otp.max_attempts', 5)) {
|
||||
$user->otp_code = null;
|
||||
$user->otp_expires_at = null;
|
||||
$user->otp_attempts = 0;
|
||||
}
|
||||
|
||||
$user->save();
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
$user->otp_code = null;
|
||||
$user->otp_expires_at = null;
|
||||
$user->otp_attempts = 0;
|
||||
$user->save();
|
||||
|
||||
return $user;
|
||||
});
|
||||
$result = $existing
|
||||
? $this->validateExisting($model, $email, $code)
|
||||
: $this->validatePending($model, $email, $code);
|
||||
|
||||
if (! $result) {
|
||||
return null;
|
||||
@@ -162,8 +149,102 @@ class UserOtpService
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* lockForUpdate() + a transaction make the read-check-increment-save
|
||||
* atomic across concurrent requests for the same user — without it,
|
||||
* two guesses fired in parallel can each read the same pre-increment
|
||||
* otp_attempts value and both save past max_attempts, letting an
|
||||
* attacker exceed the lockout by parallelizing requests instead of
|
||||
* sending them serially.
|
||||
*/
|
||||
private function validateExisting(string $model, string $email, string $code): ?Authenticatable
|
||||
{
|
||||
return DB::transaction(function () use ($model, $email, $code) {
|
||||
$user = $model::where('email', $email)->lockForUpdate()->first();
|
||||
|
||||
if (! $user || ! $user->otp_code_hash || ! $user->otp_expires_at || now()->isAfter($user->otp_expires_at)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (! Hash::check($code, $user->otp_code_hash)) {
|
||||
$user->otp_attempts++;
|
||||
|
||||
if ($user->otp_attempts >= (int) config('core.auth.otp.max_attempts', 5)) {
|
||||
$user->otp_code_hash = null;
|
||||
$user->otp_expires_at = null;
|
||||
$user->otp_attempts = 0;
|
||||
}
|
||||
|
||||
$user->save();
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
$user->otp_code_hash = null;
|
||||
$user->otp_expires_at = null;
|
||||
$user->otp_attempts = 0;
|
||||
$user->save();
|
||||
|
||||
return $user;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* No User row exists yet, so there's nothing to lockForUpdate() —
|
||||
* Cache::lock() is the equivalent guard against two parallel guesses
|
||||
* against the same pending signup both reading the same pre-increment
|
||||
* attempts count. The User (and, via UserCreated, its paired Customer)
|
||||
* is only ever created here, once the code has actually been proven
|
||||
* correct — never from generateAndSend().
|
||||
*/
|
||||
private function validatePending(string $model, string $email, string $code): ?Authenticatable
|
||||
{
|
||||
$key = $this->pendingKey($email);
|
||||
|
||||
return Cache::lock("{$key}:lock", 10)->block(5, function () use ($model, $email, $code, $key) {
|
||||
$pending = Cache::get($key);
|
||||
|
||||
if (! $pending || now()->timestamp > $pending['expires_at']) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (! Hash::check($code, $pending['code_hash'])) {
|
||||
$pending['attempts']++;
|
||||
|
||||
if ($pending['attempts'] >= (int) config('core.auth.otp.max_attempts', 5)) {
|
||||
Cache::forget($key);
|
||||
} else {
|
||||
Cache::put($key, $pending, now()->addMinutes(self::EXPIRY_MINUTES));
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
Cache::forget($key);
|
||||
|
||||
$user = $model::firstOrCreate(['email' => $email]);
|
||||
|
||||
// wasRecentlyCreated is Eloquent's own "did firstOrCreate()
|
||||
// just INSERT, or did it find an existing row" flag. Always
|
||||
// true here in practice (validatePending() only runs when no
|
||||
// row existed moments ago), but checked anyway rather than
|
||||
// assumed, in case of an extremely unlikely race with a
|
||||
// signup completed through some other path in between.
|
||||
if ($user->wasRecentlyCreated) {
|
||||
Event::dispatch(new UserCreated($user));
|
||||
}
|
||||
|
||||
return $user;
|
||||
});
|
||||
}
|
||||
|
||||
private function generationLimiterKey(string $email): string
|
||||
{
|
||||
return 'otp-generate:'.strtolower($email);
|
||||
}
|
||||
|
||||
private function pendingKey(string $email): string
|
||||
{
|
||||
return 'otp-pending:'.strtolower($email);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,253 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Cart\Http\Controllers;
|
||||
|
||||
use Closure;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Routing\Controller;
|
||||
use Illuminate\Support\Facades\App;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
use Illuminate\View\View;
|
||||
use Lunar\Exceptions\Carts\CartException;
|
||||
use Lunar\Models\CartLine;
|
||||
use Lunar\Models\ProductVariant;
|
||||
use Modules\Core\Cart\Exceptions\InvalidCouponException;
|
||||
use Modules\Core\Cart\Services\CartService;
|
||||
use Modules\Core\File\Models\File;
|
||||
use Modules\Core\File\Services\FileService;
|
||||
use Modules\Core\Localization\Services\LanguageCache;
|
||||
|
||||
/**
|
||||
* Thin storefront cart endpoints for the checkout module. Every action mutates
|
||||
* the session cart via CartService and returns the same server-rendered
|
||||
* `cart-body` partial — the drawer's Stimulus controller swaps that fragment
|
||||
* in place (no JSON, no client-side templating). $cart / $lines for the
|
||||
* partial come from the view composer in Providers\CheckoutModuleServiceProvider.
|
||||
*/
|
||||
class CartController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private readonly CartService $cart,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* CartException here is Lunar's own add_to_cart validation pipeline
|
||||
* (CartLineQuantity/CartLineStock) rejecting the line — most commonly
|
||||
* "not enough stock at this quantity" for a tracked (purchasable =
|
||||
* in_stock) variant. Its own message is an untranslated, hardcoded
|
||||
* English string not meant for storefront display, so this returns our
|
||||
* own translated one instead rather than passing it through — a
|
||||
* storefront.* key rather than checkout.*, since this is a catalog/stock
|
||||
* concern the storefront owns, not something specific to the portable
|
||||
* checkout module.
|
||||
*/
|
||||
public function add(string $locale, Request $request): View|JsonResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'purchasable_id' => ['required', 'integer'],
|
||||
'quantity' => ['nullable', 'integer', 'min:1'],
|
||||
'custom_fields' => ['nullable', 'array'],
|
||||
]);
|
||||
|
||||
$variant = ProductVariant::findOrFail($data['purchasable_id']);
|
||||
|
||||
try {
|
||||
$meta = $this->customFieldsMeta($variant, $data['custom_fields'] ?? []);
|
||||
} catch (ValidationException $e) {
|
||||
return response()->json(['error' => collect($e->errors())->flatten()->first()], 422);
|
||||
}
|
||||
|
||||
try {
|
||||
$this->cart->addLine($variant, $data['quantity'] ?? 1, $meta);
|
||||
} catch (CartException) {
|
||||
return $this->stockError($variant);
|
||||
}
|
||||
|
||||
return view('checkout::partials.cart-body');
|
||||
}
|
||||
|
||||
/**
|
||||
* The shopper's answers to the product's custom fields (Catalog\Models\
|
||||
* Product::$custom_fields — {key, type: text|textarea|file, label,
|
||||
* required}), as cart line meta. Lunar copies CartLine.meta onto the
|
||||
* OrderLine at order creation, so this is also what the order keeps.
|
||||
*
|
||||
* Only keys the product actually defines are kept, nested under
|
||||
* `custom_fields` — line meta also carries behavior flags (core's
|
||||
* `saved_for_later` zeroes the line's price), so shopper input must never
|
||||
* be merged into it directly. Label and type are snapshotted alongside
|
||||
* each value so the cart/order still reads correctly if the product's
|
||||
* fields are edited later.
|
||||
*
|
||||
* A `file` answer is the id of a File row the host's own upload endpoint
|
||||
* already created via FileService — never the file's bytes, disk, or
|
||||
* path, all of which FileService alone is the source of truth for. A
|
||||
* shopper can't point this at someone else's file: the id must resolve
|
||||
* to a File that is BOTH unowned (isFileAnswerValid()) and tagged with
|
||||
* config('checkout.custom_field_upload_purpose') — the host's own
|
||||
* upload endpoint sets its File rows to this same purpose string, so
|
||||
* this stays a single source of truth without this module reaching
|
||||
* into a host controller class directly (an inverted dependency this
|
||||
* module can't have — a host app's upload endpoint is deliberately its
|
||||
* own concern, see config/checkout.php's own comment). Attaching the
|
||||
* File to the real CartLine it belongs to happens afterward, in File\
|
||||
* Listeners\AttachCustomFieldFileToCartLine (listening for Cart\Events\
|
||||
* CartLineAdded) — not here, since this method only builds the meta
|
||||
* $this->cart->addLine() is about to receive, before any CartLine
|
||||
* actually exists to own anything.
|
||||
*
|
||||
* Two adds with identical answers merge into one line (Lunar matches
|
||||
* existing lines on meta); different answers stay separate lines.
|
||||
*/
|
||||
private function customFieldsMeta(ProductVariant $variant, array $input): array
|
||||
{
|
||||
$fields = collect($variant->product?->custom_fields ?? [])
|
||||
->keyBy('key')
|
||||
->map(fn (array $field) => [...$field, 'label' => $this->resolveLabel($field['label'])]);
|
||||
|
||||
if ($fields->isEmpty()) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$validated = Validator::make(
|
||||
$input,
|
||||
$fields->map(fn (array $field) => [
|
||||
($field['required'] ?? false) ? 'required' : 'nullable',
|
||||
...match ($field['type']) {
|
||||
'textarea' => ['string', 'max:2000'],
|
||||
'file' => [function (string $attribute, mixed $value, Closure $fail) {
|
||||
if (! $this->isFileAnswerValid($value)) {
|
||||
$fail('validation.uploaded')->translate();
|
||||
}
|
||||
}],
|
||||
default => ['string', 'max:255'],
|
||||
},
|
||||
])->all(),
|
||||
[],
|
||||
$fields->map(fn (array $field) => $field['label'])->all(),
|
||||
)->validate();
|
||||
|
||||
$answers = $fields
|
||||
->filter(fn (array $field) => filled($validated[$field['key']] ?? null))
|
||||
->map(fn (array $field) => [
|
||||
'key' => $field['key'],
|
||||
'label' => $field['label'],
|
||||
'type' => $field['type'],
|
||||
...($field['type'] === 'file'
|
||||
? ['file_id' => (int) $validated[$field['key']]]
|
||||
: ['value' => $validated[$field['key']]]),
|
||||
])
|
||||
->values()
|
||||
->all();
|
||||
|
||||
return $answers === [] ? [] : ['custom_fields' => $answers];
|
||||
}
|
||||
|
||||
/**
|
||||
* Product::$custom_fields stores `label` as {locale: string} (see
|
||||
* Catalog\Filament\Pages\ManageProductCustomFields) — this resolves it
|
||||
* to the single current-locale string cart/order line meta actually
|
||||
* needs, the same filled()-over-?? fallback ProductDocumentLocalizer
|
||||
* uses for every other translated field (an empty string for the
|
||||
* current locale still falls through to the store's default language,
|
||||
* rather than showing blank). A product saved before labels became
|
||||
* translatable still has a plain string here, returned as-is.
|
||||
*/
|
||||
private function resolveLabel(mixed $label): string
|
||||
{
|
||||
if (! is_array($label)) {
|
||||
return (string) $label;
|
||||
}
|
||||
|
||||
$locale = App::getLocale();
|
||||
$fallbackLocale = app(LanguageCache::class)->defaultLocale();
|
||||
|
||||
return filled($label[$locale] ?? null)
|
||||
? $label[$locale]
|
||||
: ($label[$fallbackLocale] ?? '');
|
||||
}
|
||||
|
||||
private function isFileAnswerValid(mixed $fileId): bool
|
||||
{
|
||||
$file = File::find($fileId);
|
||||
|
||||
return $file !== null
|
||||
&& $file->purpose === config('checkout.custom_field_upload_purpose')
|
||||
&& $file->owner_id === null
|
||||
&& app(FileService::class)->exists($file);
|
||||
}
|
||||
|
||||
public function updateLine(string $locale, Request $request, int $line): View|JsonResponse
|
||||
{
|
||||
$quantity = (int) $request->validate([
|
||||
'quantity' => ['required', 'integer', 'min:0'],
|
||||
])['quantity'];
|
||||
|
||||
try {
|
||||
$quantity === 0
|
||||
? $this->cart->removeLine($line)
|
||||
: $this->cart->updateLine($line, $quantity);
|
||||
} catch (CartException) {
|
||||
$variant = CartLine::find($line)?->purchasable;
|
||||
|
||||
return $this->stockError($variant instanceof ProductVariant ? $variant : null);
|
||||
}
|
||||
|
||||
return view('checkout::partials.cart-body');
|
||||
}
|
||||
|
||||
/**
|
||||
* getTotalInventory() is the same number canBeFulfilledAtQuantity()
|
||||
* checked against (stock, for a tracked in_stock variant) — telling the
|
||||
* shopper how many are actually left beats a generic "not enough stock"
|
||||
* they'd otherwise have to guess around by trial and error.
|
||||
*/
|
||||
private function stockError(?ProductVariant $variant): JsonResponse
|
||||
{
|
||||
$available = $variant?->getTotalInventory() ?? 0;
|
||||
|
||||
return response()->json([
|
||||
'error' => trans_choice('storefront.product.add_to_cart_failed', $available, ['count' => $available]),
|
||||
], 422);
|
||||
}
|
||||
|
||||
public function remove(string $locale, int $line): View
|
||||
{
|
||||
$this->cart->removeLine($line);
|
||||
|
||||
return view('checkout::partials.cart-body');
|
||||
}
|
||||
|
||||
/**
|
||||
* A bad code is a normal, expected outcome here (typo, expired code), not
|
||||
* an error state for the request — it re-renders the same cart-body
|
||||
* partial with $couponError set, rather than a 4xx/redirect, so the fetch
|
||||
* + swap in bbk-cart-controller stays the one code path for every cart
|
||||
* mutation.
|
||||
*/
|
||||
public function applyCoupon(string $locale, Request $request): View
|
||||
{
|
||||
$code = $request->validate([
|
||||
'code' => ['required', 'string'],
|
||||
])['code'];
|
||||
|
||||
$couponError = false;
|
||||
|
||||
try {
|
||||
$this->cart->applyCoupon($code);
|
||||
} catch (InvalidCouponException) {
|
||||
$couponError = true;
|
||||
}
|
||||
|
||||
return view('checkout::partials.cart-body', ['couponError' => $couponError]);
|
||||
}
|
||||
|
||||
public function removeCoupon(string $locale): View
|
||||
{
|
||||
$this->cart->removeCoupon();
|
||||
|
||||
return view('checkout::partials.cart-body');
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,8 @@
|
||||
namespace Modules\Core\Catalog\Recommendations;
|
||||
|
||||
use Illuminate\Support\Collection;
|
||||
use Lunar\Facades\ModelManifest;
|
||||
use Lunar\Models\Contracts\Product as ProductContract;
|
||||
use Lunar\Models\Product;
|
||||
use Modules\Core\Catalog\Contracts\RecommendationRule;
|
||||
|
||||
@@ -18,7 +20,14 @@ class RandomRule implements RecommendationRule
|
||||
{
|
||||
public function recommend(Product $product, int $limit, array $exclude): Collection
|
||||
{
|
||||
return Product::query()
|
||||
// ModelManifest::get(), not Product::query() directly — the base
|
||||
// Lunar\Models\Product has no custom_fields cast/fillable entry
|
||||
// (see Catalog\Models\Product's own docblock), so a recommendation
|
||||
// resolved as the base class silently lost that field once
|
||||
// ProductIndexer started reading it for recommendations.has_custom_fields.
|
||||
$model = ModelManifest::get(ProductContract::class);
|
||||
|
||||
return $model::query()
|
||||
->whereKeyNot($exclude)
|
||||
->inRandomOrder()
|
||||
->limit($limit)
|
||||
|
||||
@@ -189,6 +189,23 @@ class ProductIndexer extends BaseProductIndexer
|
||||
'name' => $recommendation->translateAttribute('name'),
|
||||
'price' => $this->cheapestPrice($recommendation, $currency),
|
||||
'image' => $recommendation->media->first() ? $this->mapMedia($recommendation->media->first())['thumb'] : null,
|
||||
// Same fields ProductCard::fromIndexed() (3dealer) reads off
|
||||
// a normal listing document to decide which button a card
|
||||
// shows at all — a recommendation with neither used to
|
||||
// render no button whatsoever, since it's built from this
|
||||
// embedded shape rather than a full ProductService document.
|
||||
// variant_id: same "first variant, no picker at card scope"
|
||||
// default every other listing card uses. custom_fields is
|
||||
// only readable at all because every RecommendationRule now
|
||||
// resolves products through ModelManifest (see Recommendations\
|
||||
// RandomRule) rather than the base Lunar\Models\Product
|
||||
// directly — that class has no custom_fields cast/fillable
|
||||
// entry (see Catalog\Models\Product's own docblock), so a
|
||||
// recommendation resolved as the base class would have
|
||||
// silently read null here regardless of the product's real
|
||||
// custom fields.
|
||||
'variant_id' => $recommendation->variants->first()?->id,
|
||||
'has_custom_fields' => ! empty($recommendation->custom_fields),
|
||||
])
|
||||
->all();
|
||||
|
||||
|
||||
@@ -0,0 +1,229 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Checkout\Database\Seeders;
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use Modules\Core\Localization\Services\TranslationService;
|
||||
use Spatie\TranslationLoader\LanguageLine;
|
||||
|
||||
/**
|
||||
* Default `checkout` translation lines for the cart drawer and the checkout
|
||||
* page (see the checkout module under resources/views/checkout).
|
||||
*
|
||||
* Additive and idempotent: a group/key that already exists is left untouched,
|
||||
* so anything edited in the Filament Language Lines UI wins on a re-run. Runs
|
||||
* explicitly — `php artisan db:seed --class="Modules\Core\Checkout\Database\
|
||||
* Seeders\CheckoutTranslationsSeeder"` — it is not wired into any app's own
|
||||
* DatabaseSeeder.
|
||||
*
|
||||
* Greek copy uses an informal register (εσύ/σου) — a consuming app with a
|
||||
* different house style overrides individual lines from the Filament
|
||||
* Language Lines UI same as any other translation, rather than forking
|
||||
* this class.
|
||||
*/
|
||||
class CheckoutTranslationsSeeder extends Seeder
|
||||
{
|
||||
public function run(): void
|
||||
{
|
||||
$translations = app(TranslationService::class);
|
||||
|
||||
foreach ($this->lines() as $key => [$en, $el]) {
|
||||
$exists = LanguageLine::query()
|
||||
->where('group', 'checkout')
|
||||
->where('key', $key)
|
||||
->exists();
|
||||
|
||||
if ($exists) {
|
||||
$this->command?->warn("checkout.{$key} already exists — skipped");
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$translations->create('checkout', $key, ['en' => $en, 'el' => $el]);
|
||||
$this->command?->info("checkout.{$key} added");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* key => [English, Greek].
|
||||
*
|
||||
* @return array<string, array{0: string, 1: string}>
|
||||
*/
|
||||
private function lines(): array
|
||||
{
|
||||
return [
|
||||
// ── Cart drawer + order summary ──────────────────────────────
|
||||
'cart.title' => ['Your cart', 'Το καλάθι σου'],
|
||||
'cart.close' => ['Close', 'Κλείσιμο'],
|
||||
'cart.empty' => ['Your cart is empty', 'Το καλάθι σου είναι άδειο'],
|
||||
'cart.quantity' => ['Quantity', 'Ποσότητα'],
|
||||
'cart.increase' => ['Increase quantity', 'Αύξηση ποσότητας'],
|
||||
'cart.decrease' => ['Decrease quantity', 'Μείωση ποσότητας'],
|
||||
'cart.remove' => ['Remove', 'Αφαίρεση'],
|
||||
'cart.updated' => ['Cart updated', 'Το καλάθι ενημερώθηκε'],
|
||||
'cart.subtotal' => ['Subtotal', 'Υποσύνολο'],
|
||||
'cart.discount' => ['Discount', 'Έκπτωση'],
|
||||
'cart.shipping' => ['Shipping', 'Μεταφορικά'],
|
||||
'cart.shipping_pending' => ['Not selected yet', 'Δεν έχει επιλεγεί ακόμη'],
|
||||
'cart.tax' => ['VAT', 'ΦΠΑ'],
|
||||
'cart.total' => ['Total', 'Σύνολο'],
|
||||
'cart.checkout' => ['Checkout', 'Ολοκλήρωση παραγγελίας'],
|
||||
'cart.coupon_label' => ['Coupon code', 'Κωδικός κουπονιού'],
|
||||
'cart.coupon_placeholder' => ['Coupon code', 'Κωδικός κουπονιού'],
|
||||
'cart.coupon_apply' => ['Apply', 'Εφαρμογή'],
|
||||
'cart.coupon_remove' => ['Remove', 'Αφαίρεση'],
|
||||
'cart.coupon_invalid' => ["That coupon code isn't valid", 'Ο κωδικός κουπονιού δεν είναι έγκυρος'],
|
||||
|
||||
// ── Checkout page ────────────────────────────────────────────
|
||||
'page.title' => ['Checkout', 'Ολοκλήρωση παραγγελίας'],
|
||||
'page.contact_heading' => ['Contact', 'Στοιχεία επικοινωνίας'],
|
||||
'page.guest_tab' => ['Guest', 'Ως επισκέπτης'],
|
||||
'page.login_tab' => ['Log in', 'Σύνδεση'],
|
||||
'page.email_label' => ['Email', 'Email'],
|
||||
'page.recovery_consent' => [
|
||||
"Email me a reminder if I don't finish my order",
|
||||
'Στείλε μου μια υπενθύμιση αν δεν ολοκληρώσω την παραγγελία μου',
|
||||
],
|
||||
'page.logged_in_as' => ['Logged in as', 'Συνδεδεμένος/η ως'],
|
||||
'page.login_prompt' => [
|
||||
'Already have an account?',
|
||||
'Έχεις ήδη λογαριασμό;',
|
||||
],
|
||||
'page.login_link' => ['Log in', 'Σύνδεση'],
|
||||
'page.login_email_label' => ['Email', 'Email'],
|
||||
'page.send_code' => ['Send code', 'Αποστολή κωδικού'],
|
||||
'page.login_coming_soon' => [
|
||||
'Login is coming soon — continue as a guest for now.',
|
||||
'Η σύνδεση θα είναι διαθέσιμη σύντομα — προς το παρόν συνέχισε ως επισκέπτης.',
|
||||
],
|
||||
'page.billing_heading' => ['Billing information', 'Στοιχεία τιμολόγησης'],
|
||||
'page.shipping_heading' => ['Shipping information', 'Στοιχεία αποστολής'],
|
||||
'page.same_as_billing' => ['Same as billing address', 'Ίδια με τη διεύθυνση τιμολόγησης'],
|
||||
'page.first_name' => ['First name', 'Όνομα'],
|
||||
'page.last_name' => ['Last name', 'Επώνυμο'],
|
||||
'page.company_name' => ['Company name', 'Επωνυμία εταιρείας'],
|
||||
'page.wants_invoice' => ['I need an invoice', 'Θέλω τιμολόγιο'],
|
||||
'page.tax_identifier' => ['Tax ID', 'ΑΦΜ'],
|
||||
'page.address_line_one' => ['Address', 'Διεύθυνση'],
|
||||
'page.address_line_two' => ['Address line 2', 'Διεύθυνση (γραμμή 2)'],
|
||||
'page.city' => ['City', 'Πόλη'],
|
||||
'page.state' => ['Region / Prefecture', 'Νομός / Περιοχή'],
|
||||
'page.state_placeholder' => ['Select a region', 'Επίλεξε νομό'],
|
||||
'page.postcode' => ['Postcode', 'Ταχυδρομικός κώδικας'],
|
||||
'page.country' => ['Country', 'Χώρα'],
|
||||
'page.country_placeholder' => ['Select a country', 'Επίλεξε χώρα'],
|
||||
'page.phone' => ['Phone', 'Τηλέφωνο'],
|
||||
'page.delivery_instructions' => ['Delivery notes', 'Σχόλια για την παράδοση'],
|
||||
'page.save_address' => ['Save and continue', 'Αποθήκευση και συνέχεια'],
|
||||
'page.saving' => ['Saving…', 'Αποθήκευση…'],
|
||||
'page.saved' => ['Saved', 'Αποθηκεύτηκε'],
|
||||
'page.save_error' => ["Couldn't save — check your connection", 'Δεν αποθηκεύτηκε — έλεγξε τη σύνδεσή σου'],
|
||||
'page.shipping_method_heading' => ['Shipping method', 'Τρόπος αποστολής'],
|
||||
'page.shipping_method_empty' => [
|
||||
'Add your shipping address to see delivery options.',
|
||||
'Συμπλήρωσε τη διεύθυνση αποστολής για να δεις τις διαθέσιμες επιλογές.',
|
||||
],
|
||||
'page.shipping_method_none' => [
|
||||
'No delivery options are available for this address.',
|
||||
'Δεν υπάρχουν διαθέσιμες επιλογές αποστολής για αυτή τη διεύθυνση.',
|
||||
],
|
||||
'page.select_shipping_method' => ['Continue', 'Συνέχεια'],
|
||||
'page.shipping_option_invalid' => [
|
||||
'That shipping option is no longer available.',
|
||||
'Αυτός ο τρόπος αποστολής δεν είναι πλέον διαθέσιμος.',
|
||||
],
|
||||
'page.continue_to_payment' => ['Continue to payment', 'Συνέχεια στην πληρωμή'],
|
||||
'page.order_summary_heading' => ['Order summary', 'Σύνοψη παραγγελίας'],
|
||||
|
||||
// ── Payment step ────────────────────────────────────────────
|
||||
'page.payment_heading' => ['Payment', 'Πληρωμή'],
|
||||
'page.payment_method_none' => [
|
||||
'No payment methods are available right now.',
|
||||
'Δεν υπάρχουν διαθέσιμοι τρόποι πληρωμής αυτή τη στιγμή.',
|
||||
],
|
||||
'page.terms_accept' => [
|
||||
"I accept the <a href=':terms' target='_blank'>Terms of Sale</a> and the <a href=':privacy' target='_blank'>Privacy Policy</a>",
|
||||
"Αποδέχομαι τους <a href=':terms' target='_blank'>Όρους Πώλησης</a> και την <a href=':privacy' target='_blank'>Πολιτική Απορρήτου</a>",
|
||||
],
|
||||
'page.terms_required' => [
|
||||
'You must accept the terms to place your order.',
|
||||
'Πρέπει να αποδεχτείς τους όρους για να ολοκληρώσεις την παραγγελία.',
|
||||
],
|
||||
'page.withdrawal_notice' => [
|
||||
"You have a 14-day right of withdrawal. <a href=':link' target='_blank'>See details</a>.",
|
||||
"Έχεις δικαίωμα υπαναχώρησης εντός 14 ημερών. <a href=':link' target='_blank'>Δες λεπτομέρειες</a>.",
|
||||
],
|
||||
'page.place_order' => ['Place order — payment obligation', 'Παραγγελία με υποχρέωση πληρωμής'],
|
||||
'page.choose_payment_method' => ['Choose a payment method.', 'Επίλεξε τρόπο πληρωμής.'],
|
||||
'page.shipping_method_required' => [
|
||||
'Choose a shipping method below to continue.',
|
||||
'Επίλεξε τρόπο αποστολής παρακάτω για να συνεχίσεις.',
|
||||
],
|
||||
'page.payment_failed' => ['Payment failed. Please try again.', 'Η πληρωμή απέτυχε. Δοκίμασε ξανά.'],
|
||||
'page.payment_incomplete_details' => [
|
||||
'Complete your billing and shipping details above.',
|
||||
'Συμπλήρωσε τα στοιχεία χρέωσης και αποστολής παραπάνω.',
|
||||
],
|
||||
'page.payment_cart_changed' => [
|
||||
'Your cart changed. Refresh the page and place your order again.',
|
||||
'Το καλάθι σου άλλαξε. Ανανέωσε τη σελίδα και ολοκλήρωσε ξανά.',
|
||||
],
|
||||
'page.payment_processing' => ['Confirming your payment…', 'Επιβεβαίωση πληρωμής…'],
|
||||
'page.payment_processing_slow' => [
|
||||
"Your payment is still processing. You'll get an email once it's confirmed.",
|
||||
'Η πληρωμή σου επεξεργάζεται ακόμη. Θα λάβεις email μόλις επιβεβαιωθεί.',
|
||||
],
|
||||
|
||||
// ── Confirmation page ──────────────────────────────────────
|
||||
'page.confirmation_title' => ['Your order', 'Η παραγγελία σου'],
|
||||
'page.confirmation_heading' => [
|
||||
'Thank you! Your order is confirmed.',
|
||||
'Ευχαριστούμε! Η παραγγελία σου καταχωρήθηκε.',
|
||||
],
|
||||
'page.confirmation_order_number' => ['Order number', 'Αριθμός παραγγελίας'],
|
||||
'page.confirmation_email_note' => [
|
||||
'A confirmation email will follow shortly.',
|
||||
'Θα λάβεις email επιβεβαίωσης σύντομα.',
|
||||
],
|
||||
'page.confirmation_shipping_to' => ['Shipping to', 'Αποστολή σε'],
|
||||
'page.confirmation_login_hint' => [
|
||||
'Want to track this order? Create an account or',
|
||||
'Θέλεις να παρακολουθείς την παραγγελία σου; Δημιούργησε λογαριασμό ή',
|
||||
],
|
||||
'page.confirmation_billing' => ['Billing', 'Χρέωση'],
|
||||
'page.confirmation_bank_transfer_heading' => [
|
||||
'Bank transfer details',
|
||||
'Στοιχεία τραπεζικής μεταφοράς',
|
||||
],
|
||||
'page.confirmation_continue' => ['Continue shopping', 'Συνέχεια αγορών'],
|
||||
'page.box_now_locker_label' => [
|
||||
'Choose a Box Now locker',
|
||||
'Επίλεξε Box Now locker',
|
||||
],
|
||||
'page.box_now_locker_loading' => [
|
||||
'Loading lockers…',
|
||||
'Φόρτωση lockers…',
|
||||
],
|
||||
'page.box_now_locker_required' => [
|
||||
'Choose a Box Now locker to continue.',
|
||||
'Επίλεξε ένα Box Now locker για να συνεχίσεις.',
|
||||
],
|
||||
'page.box_now_locker_select' => [
|
||||
'Select this locker',
|
||||
'Επιλογή αυτού του locker',
|
||||
],
|
||||
'page.box_now_locker_selected' => [
|
||||
'Selected',
|
||||
'Επιλέχθηκε',
|
||||
],
|
||||
'page.box_now_locker_search' => [
|
||||
'Search by area or address…',
|
||||
'Αναζήτηση με περιοχή ή διεύθυνση…',
|
||||
],
|
||||
'page.box_now_locker_no_results' => [
|
||||
'No lockers match your search.',
|
||||
'Δεν βρέθηκαν lockers για αυτή την αναζήτηση.',
|
||||
]
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,764 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Checkout\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Routing\Controller;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\View\View;
|
||||
use Lunar\Exceptions\Carts\CartException;
|
||||
use Lunar\Exceptions\FingerprintMismatchException;
|
||||
use Lunar\Facades\CartSession;
|
||||
use Lunar\Models\Cart;
|
||||
use Lunar\Models\Country;
|
||||
use Lunar\Models\Order;
|
||||
use Lunar\Models\State;
|
||||
use Modules\Core\Cart\Services\CartService;
|
||||
use Modules\Core\Checkout\Exceptions\InvalidShippingOptionException;
|
||||
use Modules\Core\Checkout\Exceptions\NoShippingAddressException;
|
||||
use Modules\Core\Checkout\Exceptions\TermsNotAcceptedException;
|
||||
use Modules\Core\Checkout\Exceptions\UnknownPaymentTypeException;
|
||||
use Modules\Core\Checkout\Services\CheckoutService;
|
||||
use Modules\Core\Customer\Services\CustomerAccountService;
|
||||
use Modules\Core\Payment\Enums\PaymentResultStatus;
|
||||
use Modules\Core\Payment\Models\PaymentMethod;
|
||||
use Modules\Core\Shipping\Carriers\BoxNow\BoxNowClient;
|
||||
use Modules\Core\Store\Services\StoreDetailsService;
|
||||
|
||||
/**
|
||||
* The checkout page — one page, sections (contact / billing / shipping /
|
||||
* shipping method / payment), built on CheckoutService.
|
||||
*
|
||||
* The address form and the shipping-method radios **autosave** — no submit
|
||||
* buttons. `saveAddress()` / `selectShippingOption()` are called by
|
||||
* bbk-checkout-form (debounced fetch) and return a JSON envelope of
|
||||
* server-rendered fragments (shipping options + order summary) plus any
|
||||
* field errors, rather than redirecting. Address validation is deliberately
|
||||
* lenient — nothing is rejected mid-typing; required-field enforcement is
|
||||
* placeOrder()'s own gate.
|
||||
*
|
||||
* Guests type their email; the login tab links to config('checkout.login_route')
|
||||
* and back. Logged in: the email is the account's (forced in saveAddress()),
|
||||
* the first visit prefills addresses from the account (prefillFromAccount()),
|
||||
* and Lunar's Login listener has already attached the cart, so the placed
|
||||
* order lands in the account's history.
|
||||
*
|
||||
* config('checkout.store_country_iso3') fixes the country (hidden field,
|
||||
* forced server-side) for a single-country store — null (the default) gives
|
||||
* the full country picker, for a multi-country store.
|
||||
*/
|
||||
class CheckoutController extends Controller
|
||||
{
|
||||
public function __construct(
|
||||
private readonly CartService $cart,
|
||||
private readonly CheckoutService $checkout,
|
||||
private readonly CustomerAccountService $account,
|
||||
) {}
|
||||
|
||||
public function show(string $locale): View
|
||||
{
|
||||
$cart = $this->cart->current();
|
||||
$lines = $cart ? $this->cart->activeLines($cart) : collect();
|
||||
$storeCountry = $this->storeCountry();
|
||||
|
||||
$shippingOptions = collect();
|
||||
|
||||
// Captured before prefillFromAccount(), which may recreate the address
|
||||
// row (dropping its shipping_option) — same reason as in saveAddress().
|
||||
$previousOption = $cart?->shippingAddress?->shipping_option;
|
||||
|
||||
if ($cart && Auth::check()) {
|
||||
$cart = $this->prefillFromAccount($cart);
|
||||
|
||||
// Nothing chosen on this cart yet: carry over the account's standing
|
||||
// opt-in (an explicit earlier choice, recorded with its own
|
||||
// timestamp/policy version). Never opts anyone in by default.
|
||||
if (! array_key_exists('recovery_consent', $cart->meta?->toArray() ?? [])
|
||||
&& data_get($this->account->customer(Auth::user()), 'meta.recovery_consent')) {
|
||||
$cart = $this->checkout->setRecoveryConsent(true);
|
||||
}
|
||||
}
|
||||
|
||||
if ($cart?->shippingAddress) {
|
||||
$shippingOptions = $this->syncShipping($cart, $previousOption);
|
||||
|
||||
// Cart's CachesProperties::refresh() explicitly nulls total/
|
||||
// subTotal/shippingTotal/etc. back to their defaults — every
|
||||
// Lunar call site pairs it with recalculate() for exactly that
|
||||
// reason. Bare refresh() here was leaving $cart->total null on
|
||||
// reload, which fed a 0 amount straight into the Stripe Element.
|
||||
$cart->refresh()->recalculate();
|
||||
}
|
||||
|
||||
$paymentMethods = $this->checkout->getPaymentMethods();
|
||||
|
||||
// Nothing checked yet (fresh cart), or the shopper's earlier pick is
|
||||
// no longer offered (method disabled/removed since) — auto-select
|
||||
// the first one, same as a manual click would, so the payment
|
||||
// section (and the Stripe Element mounting under it) isn't sitting
|
||||
// inert behind an unchecked radio. A still-valid previous choice is
|
||||
// left alone.
|
||||
$firstMethod = $paymentMethods->first();
|
||||
|
||||
if ($cart && $firstMethod && ! $paymentMethods->contains('type', data_get($cart, 'meta.payment_method'))) {
|
||||
$cart = $this->checkout->selectPaymentMethod($firstMethod->type);
|
||||
}
|
||||
|
||||
return view('checkout::page', [
|
||||
'cart' => $cart,
|
||||
'lines' => $lines,
|
||||
'billingAddress' => $cart?->billingAddress,
|
||||
'shippingAddress' => $cart?->shippingAddress,
|
||||
'shippingOptions' => $shippingOptions,
|
||||
'paymentMethods' => $paymentMethods,
|
||||
'shipToBilling' => (bool) data_get($cart, 'meta.ship_to_billing', true),
|
||||
'wantsInvoice' => (bool) data_get($cart, 'meta.wants_invoice', false),
|
||||
'storeCountry' => $storeCountry,
|
||||
'countries' => $storeCountry
|
||||
? collect()
|
||||
: Country::orderBy('name')->get(['id', 'name']),
|
||||
'regions' => $storeCountry
|
||||
? State::where('country_id', $storeCountry->id)->orderBy('name')->get(['id', 'name'])
|
||||
: collect(),
|
||||
]);
|
||||
}
|
||||
|
||||
public function saveAddress(string $locale, Request $request): JsonResponse
|
||||
{
|
||||
$storeCountry = $this->storeCountry();
|
||||
$sameAsBilling = $request->boolean('same_as_billing');
|
||||
|
||||
// Only the fields shipping rates resolve against — if none of these
|
||||
// changed (shopper edited their name, phone, email, …) there's no point
|
||||
// re-quoting shipping or re-rendering the summary.
|
||||
$addressBefore = $this->cart->current()?->shippingAddress;
|
||||
$rateKeyBefore = $addressBefore?->only(['postcode', 'state', 'country_id']);
|
||||
|
||||
// setShippingAddress() below always deletes + recreates this row (see
|
||||
// syncShipping()'s docblock) — capture what was selected NOW, before
|
||||
// it's gone, so it can be carried forward onto the fresh row.
|
||||
$previousOption = $addressBefore?->shipping_option;
|
||||
|
||||
$stateRule = $storeCountry
|
||||
? ['nullable', 'string', Rule::exists((new State)->getTable(), 'name')->where('country_id', $storeCountry->id)]
|
||||
: ['nullable', 'string', 'max:255'];
|
||||
$countryRule = $storeCountry
|
||||
? ['nullable']
|
||||
: ['nullable', 'integer', 'exists:'.(new Country)->getTable().',id'];
|
||||
|
||||
// Lenient — only format checks. Anything that fails is simply left out
|
||||
// of what gets persisted, and reported back for inline display.
|
||||
$validator = Validator::make($request->all(), [
|
||||
'contact_email' => ['nullable', 'email'],
|
||||
|
||||
'billing_first_name' => ['nullable', 'string', 'max:255'],
|
||||
'billing_last_name' => ['nullable', 'string', 'max:255'],
|
||||
'billing_company_name' => ['nullable', 'string', 'max:255'],
|
||||
'billing_tax_identifier' => ['nullable', 'string', 'max:255'],
|
||||
'billing_line_one' => ['nullable', 'string', 'max:255'],
|
||||
'billing_city' => ['nullable', 'string', 'max:255'],
|
||||
'billing_state' => $stateRule,
|
||||
'billing_postcode' => ['nullable', 'string', 'max:20'],
|
||||
'billing_country_id' => $countryRule,
|
||||
'billing_contact_phone' => ['nullable', 'string', 'max:50'],
|
||||
|
||||
'shipping_first_name' => ['nullable', 'string', 'max:255'],
|
||||
'shipping_last_name' => ['nullable', 'string', 'max:255'],
|
||||
'shipping_line_one' => ['nullable', 'string', 'max:255'],
|
||||
'shipping_city' => ['nullable', 'string', 'max:255'],
|
||||
'shipping_state' => $stateRule,
|
||||
'shipping_postcode' => ['nullable', 'string', 'max:20'],
|
||||
'shipping_country_id' => $countryRule,
|
||||
'shipping_contact_phone' => ['nullable', 'string', 'max:50'],
|
||||
'shipping_delivery_instructions' => ['nullable', 'string', 'max:1000'],
|
||||
]);
|
||||
|
||||
$errors = $validator->errors()->toArray();
|
||||
$data = $validator->valid();
|
||||
|
||||
// Logged in: the order email is always the account's. It isn't a field
|
||||
// on the page then, and a submitted value isn't trusted.
|
||||
if ($user = Auth::user()) {
|
||||
$data['contact_email'] = $user->email;
|
||||
}
|
||||
|
||||
$billingCountryId = $storeCountry?->id ?? ($data['billing_country_id'] ?? null);
|
||||
$shippingCountryId = $storeCountry?->id ?? ($data['shipping_country_id'] ?? $billingCountryId);
|
||||
|
||||
// Company/tax id only count when "I want an invoice" is ticked; the
|
||||
// fields stay in the DOM (just hidden) when it isn't, so ignore what
|
||||
// they send.
|
||||
$wantsInvoice = $request->boolean('wants_invoice');
|
||||
|
||||
$billing = [
|
||||
'first_name' => $data['billing_first_name'] ?? null,
|
||||
'last_name' => $data['billing_last_name'] ?? null,
|
||||
'company_name' => $wantsInvoice ? ($data['billing_company_name'] ?? null) : null,
|
||||
'tax_identifier' => $wantsInvoice ? ($data['billing_tax_identifier'] ?? null) : null,
|
||||
'line_one' => $data['billing_line_one'] ?? null,
|
||||
'city' => $data['billing_city'] ?? null,
|
||||
'state' => $data['billing_state'] ?? null,
|
||||
'postcode' => $data['billing_postcode'] ?? null,
|
||||
'country_id' => $billingCountryId,
|
||||
'contact_email' => $data['contact_email'] ?? null,
|
||||
'contact_phone' => $data['billing_contact_phone'] ?? null,
|
||||
];
|
||||
|
||||
$shipping = $sameAsBilling
|
||||
? [
|
||||
...array_diff_key($billing, ['company_name' => 1, 'tax_identifier' => 1]),
|
||||
'delivery_instructions' => $data['shipping_delivery_instructions'] ?? null,
|
||||
]
|
||||
: [
|
||||
'first_name' => $data['shipping_first_name'] ?? null,
|
||||
'last_name' => $data['shipping_last_name'] ?? null,
|
||||
'line_one' => $data['shipping_line_one'] ?? null,
|
||||
'city' => $data['shipping_city'] ?? null,
|
||||
'state' => $data['shipping_state'] ?? null,
|
||||
'postcode' => $data['shipping_postcode'] ?? null,
|
||||
'country_id' => $shippingCountryId,
|
||||
'contact_email' => $data['contact_email'] ?? null,
|
||||
'contact_phone' => $data['shipping_contact_phone'] ?? null,
|
||||
'delivery_instructions' => $data['shipping_delivery_instructions'] ?? null,
|
||||
];
|
||||
|
||||
$this->checkout->setBillingAddress($billing);
|
||||
$cart = $this->checkout->setShippingAddress($shipping);
|
||||
|
||||
$cart->meta = [
|
||||
...($cart->meta?->toArray() ?? []),
|
||||
'ship_to_billing' => $sameAsBilling,
|
||||
'wants_invoice' => $wantsInvoice,
|
||||
];
|
||||
$cart->save();
|
||||
|
||||
// Abandoned-cart-recovery opt-in — boboko-core owns the record (bool +
|
||||
// timestamp + policy version on Cart::meta, RecoveryConsentSet event).
|
||||
// Deliberately its own scope, not merged with any future newsletter opt-in.
|
||||
$this->checkout->setRecoveryConsent($request->boolean('recovery_consent'));
|
||||
|
||||
if (Auth::check()) {
|
||||
$this->account->setRecoveryConsent(Auth::user(), $request->boolean('recovery_consent'));
|
||||
}
|
||||
|
||||
$rateKeyAfter = $cart->shippingAddress?->only(['postcode', 'state', 'country_id']);
|
||||
$rateChanged = $rateKeyAfter != $rateKeyBefore;
|
||||
|
||||
// setShippingAddress() above always deletes and recreates the
|
||||
// CartAddress row (Lunar's AddAddress action), which drops whatever
|
||||
// shipping_option was previously selected — regardless of whether the
|
||||
// rate-determining fields actually changed. So this always has to run
|
||||
// to restore/re-validate it, even on a save that only touched e.g. the
|
||||
// phone number. Only the fragment RE-RENDER is skippable when nothing
|
||||
// rate-relevant moved — the re-select itself is not optional.
|
||||
$options = $this->syncShipping($cart, $previousOption);
|
||||
|
||||
if (! $rateChanged) {
|
||||
return $this->fragments($cart, null, $errors);
|
||||
}
|
||||
|
||||
return $this->fragments($cart, $options, $errors);
|
||||
}
|
||||
|
||||
public function selectShippingOption(string $locale, Request $request): JsonResponse
|
||||
{
|
||||
$identifier = (string) $request->input('shipping_option');
|
||||
|
||||
try {
|
||||
$this->checkout->selectShippingOption($identifier);
|
||||
} catch (InvalidShippingOptionException) {
|
||||
// Re-render with whatever is currently valid; no hard error surfaced.
|
||||
}
|
||||
|
||||
$cart = $this->cart->current();
|
||||
$options = $cart?->shippingAddress
|
||||
? $this->checkout->getShippingOptions()
|
||||
: collect();
|
||||
|
||||
return $this->fragments($cart, $options);
|
||||
}
|
||||
|
||||
/**
|
||||
* A plain, own-hosted stand-in for Box Now's Destination Map widget —
|
||||
* that widget only talks to their Production environment (see their
|
||||
* Partner API manual §4.1), which is useless while developing against
|
||||
* Stage credentials. Same underlying data (GET /destinations), no map.
|
||||
*/
|
||||
public function boxNowLockers(string $locale, BoxNowClient $boxNow): JsonResponse
|
||||
{
|
||||
$lockers = collect($boxNow->destinations())
|
||||
// Drops entries with a blank `name` (e.g. id 8288, "Virtual
|
||||
// Locker" in Sudan at lat 12.3/lng 25.3) — a real, in-range
|
||||
// coordinate, but sandbox test fixture noise rather than an
|
||||
// actual pickup point, and it alone was enough to make
|
||||
// fitBounds() below zoom the map out to the whole Balkans/
|
||||
// Middle East to fit every marker's cluster in Greece.
|
||||
->filter(fn (array $destination) => filled($destination['name'] ?? null))
|
||||
->map(fn (array $destination) => [
|
||||
'id' => $destination['id'],
|
||||
'name' => $destination['name'] ?? $destination['title'] ?? $destination['id'],
|
||||
'addressLine1' => $destination['addressLine1'] ?? null,
|
||||
'addressLine2' => $destination['addressLine2'] ?? null,
|
||||
'postalCode' => $destination['postalCode'] ?? null,
|
||||
'country' => $destination['country'] ?? null,
|
||||
'note' => $destination['note'] ?? null,
|
||||
'image' => $destination['image'] ?? null,
|
||||
'lat' => isset($destination['lat']) ? (float) $destination['lat'] : null,
|
||||
'lng' => isset($destination['lng']) ? (float) $destination['lng'] : null,
|
||||
])
|
||||
// Box Now's own Stage/sandbox data has at least one malformed
|
||||
// entry observed in practice (locker id 47: lat/lng as huge
|
||||
// integers with the decimal point apparently dropped, e.g.
|
||||
// 96065874308606 instead of ~37.96) — a single such point blows
|
||||
// out L.featureGroup().getBounds() on the frontend, zooming the
|
||||
// map out to near-nothing with every real marker imperceptible
|
||||
// at that scale. Valid latitude/longitude ranges are absolute,
|
||||
// not guesswork, so filtering on them is safe regardless of
|
||||
// what BoxNow's API does or doesn't fix upstream.
|
||||
->filter(fn (array $locker) => $locker['lat'] !== null && $locker['lng'] !== null
|
||||
&& abs($locker['lat']) <= 90 && abs($locker['lng']) <= 180)
|
||||
->values();
|
||||
|
||||
return response()->json(['lockers' => $lockers]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Persists the shopper's chosen locker (radio/select change, same
|
||||
* autosave shape as selectShippingOption()) via
|
||||
* CheckoutService::selectBoxNowLocker() onto the cart's shipping
|
||||
* address meta.
|
||||
*/
|
||||
public function selectBoxNowLocker(string $locale, Request $request): JsonResponse
|
||||
{
|
||||
$locationId = (string) $request->input('locker_id');
|
||||
|
||||
if ($locationId === '') {
|
||||
return response()->json(['errors' => ['locker_id' => __('checkout.page.box_now_locker_required')]], 422);
|
||||
}
|
||||
|
||||
try {
|
||||
$this->checkout->selectBoxNowLocker([
|
||||
'locationId' => $locationId,
|
||||
'name' => (string) $request->input('locker_name'),
|
||||
'addressLine1' => (string) $request->input('locker_address'),
|
||||
]);
|
||||
} catch (NoShippingAddressException) {
|
||||
return response()->json(['errors' => ['locker_id' => __('checkout.page.box_now_locker_required')]], 422);
|
||||
}
|
||||
|
||||
return response()->json(['ok' => true]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Autosave-select a payment method (radio change). Persists it via
|
||||
* CheckoutService (which also records it on Cart::meta and re-snapshots
|
||||
* the fingerprint) so ApplyCashOnDeliveryFee etc. show in the summary.
|
||||
*/
|
||||
public function selectPaymentMethod(string $locale, Request $request): JsonResponse
|
||||
{
|
||||
$type = (string) $request->input('payment_type');
|
||||
|
||||
try {
|
||||
$this->checkout->selectPaymentMethod($type);
|
||||
} catch (UnknownPaymentTypeException) {
|
||||
// Radio value out of sync with what's offered — ignore, the summary
|
||||
// just won't reflect a method fee. place-order re-checks properly.
|
||||
}
|
||||
|
||||
return response()->json([
|
||||
'summaryHtml' => view('checkout::partials.cart-body')->render(),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* The real submit — the hard gate. Re-selects the payment method (fresh
|
||||
* fingerprint), then hands off to CheckoutService::initiatePayment(), which
|
||||
* creates the draft order, records terms acceptance, and charges the driver.
|
||||
* Returns JSON the bbk-payment controller routes on:
|
||||
* { redirect } — placed, go to confirmation
|
||||
* { status: 'pending', clientSecret }— 3-D Secure; client does handleNextAction then polls
|
||||
* { status: 'failed', message } — declined
|
||||
* { status: 'invalid'|'stale', ... } — cart incomplete / changed since selection
|
||||
*/
|
||||
public function placeOrder(string $locale, Request $request): JsonResponse
|
||||
{
|
||||
if (! $request->boolean('terms_accepted')) {
|
||||
return response()->json(['error' => __('checkout.page.terms_required')], 422);
|
||||
}
|
||||
|
||||
try {
|
||||
$this->checkout->selectPaymentMethod((string) $request->input('payment_type'));
|
||||
} catch (UnknownPaymentTypeException) {
|
||||
return response()->json(['error' => __('checkout.page.choose_payment_method')], 422);
|
||||
}
|
||||
|
||||
$cart = $this->cart->current();
|
||||
|
||||
// Captured now, before initiatePayment() can place the order — Lunar's
|
||||
// CartSessionManager::fetchOrCreate() silently swaps the session onto a
|
||||
// BRAND NEW empty cart the moment the current one hasCompletedOrders()
|
||||
// (i.e. has an order with placed_at set), which happens synchronously
|
||||
// for an immediately-captured payment. Any later $this->cart->current()
|
||||
// call in this same flow (here, or in a subsequent orderStatus() poll
|
||||
// once the 3-D Secure webhook sets placed_at) would then resolve to
|
||||
// that fresh, order-less cart instead of the one that was just placed.
|
||||
// Storing the real cart id ourselves, under our own session key,
|
||||
// sidesteps CartSession entirely for the rest of the placement flow.
|
||||
session(['checkout.cart_id' => $cart?->id]);
|
||||
|
||||
// Lunar's own ValidateCartForOrderCreation (order_create validator)
|
||||
// never checks for this — an empty cart with a valid billing address
|
||||
// sails straight through it and would place a real, zero-line order.
|
||||
// The disabled "place order" button is only the client-side half of
|
||||
// this fix; this is the half that actually matters.
|
||||
if ($cart === null || $this->cart->activeLines($cart)->isEmpty()) {
|
||||
return response()->json([
|
||||
'status' => 'invalid',
|
||||
'message' => __('checkout.page.cart_empty'),
|
||||
], 422);
|
||||
}
|
||||
|
||||
// Lenient autosave never requires these; this is the gate.
|
||||
if (data_get($cart, 'meta.wants_invoice')
|
||||
&& (blank($cart->billingAddress?->company_name) || blank($cart->billingAddress?->tax_identifier))) {
|
||||
return response()->json([
|
||||
'status' => 'invalid',
|
||||
'message' => __('checkout.page.invoice_required'),
|
||||
], 422);
|
||||
}
|
||||
|
||||
// Same check Lunar's own ValidateCartForOrderCreation runs inside
|
||||
// initiatePayment() (a product unpublished/deleted after it was
|
||||
// added to the cart) — checked here first so the shopper is told
|
||||
// which product is the problem, rather than falling into the
|
||||
// catch-all "complete your billing/shipping details" message below,
|
||||
// which is what actually happened and is generic to every
|
||||
// CartException reason, misleading when the real cause is a line,
|
||||
// not an address.
|
||||
$unavailableLines = $this->cart->activeLines($cart)->filter(
|
||||
fn ($line) => ! $line->purchasable || ! $line->purchasable->isPurchasable(),
|
||||
);
|
||||
|
||||
if ($unavailableLines->isNotEmpty()) {
|
||||
$names = $unavailableLines
|
||||
->map(fn ($line) => $line->purchasable?->product?->translateAttribute('name') ?? $line->purchasable?->getIdentifier())
|
||||
->filter()
|
||||
->implode(', ');
|
||||
|
||||
return response()->json([
|
||||
'status' => 'invalid',
|
||||
'message' => __('checkout.page.cart_line_unavailable', ['name' => $names]),
|
||||
], 422);
|
||||
}
|
||||
|
||||
// The one incomplete-cart case worth a specific message + pointing the
|
||||
// shopper at the right section: a region resolving 2+ methods needs an
|
||||
// explicit pick (no auto-select), easy to miss since nothing else on
|
||||
// the page demands it. Everything else CartException catches below.
|
||||
if ($cart?->shippingAddress && ! $cart->shippingAddress->shipping_option) {
|
||||
return response()->json([
|
||||
'status' => 'invalid',
|
||||
'message' => __('checkout.page.shipping_method_required'),
|
||||
'field' => 'shipping_option',
|
||||
], 422);
|
||||
}
|
||||
|
||||
$fingerprint = (string) ($cart?->meta['checkout_fingerprint'] ?? '');
|
||||
|
||||
$data = $request->filled('payment_method')
|
||||
? ['payment_method' => (string) $request->input('payment_method')]
|
||||
: [];
|
||||
|
||||
try {
|
||||
$result = $this->checkout->initiatePayment(
|
||||
$fingerprint,
|
||||
termsAccepted: true,
|
||||
policyVersion: (string) config('legal.terms_version'),
|
||||
data: $data,
|
||||
);
|
||||
} catch (FingerprintMismatchException) {
|
||||
return response()->json(['status' => 'stale', 'message' => __('checkout.page.payment_cart_changed')], 409);
|
||||
} catch (CartException $e) {
|
||||
return response()->json([
|
||||
'status' => 'invalid',
|
||||
'message' => __('checkout.page.payment_incomplete_details'),
|
||||
'errors' => collect($e->errors()->toArray())->map(fn ($m) => is_array($m) ? ($m[0] ?? null) : $m)->all(),
|
||||
], 422);
|
||||
} catch (TermsNotAcceptedException) {
|
||||
return response()->json(['error' => __('checkout.page.terms_required')], 422);
|
||||
}
|
||||
|
||||
// Pending with no continuation (cash-on-delivery, or any other
|
||||
// deferred/offline method) means CheckoutService::initiatePayment()
|
||||
// already created the placed order — money just hasn't changed
|
||||
// hands yet. Only a Pending WITH a continuation (Stripe's client
|
||||
// secret) means the shopper still has something to do before the
|
||||
// order exists as far as the storefront is concerned.
|
||||
return match (true) {
|
||||
$result->status === PaymentResultStatus::Succeeded => $this->orderPlacedResponse($locale),
|
||||
$result->status === PaymentResultStatus::Pending && $result->continuation === null => $this->orderPlacedResponse($locale),
|
||||
$result->status === PaymentResultStatus::Pending => response()->json([
|
||||
'status' => 'pending',
|
||||
'clientSecret' => $result->continuation?->value,
|
||||
]),
|
||||
default => response()->json([
|
||||
'status' => 'failed',
|
||||
'message' => $result->failureReason ?: __('checkout.page.payment_failed'),
|
||||
'retriable' => $result->retriable,
|
||||
], 422),
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Poll target for the 3-D Secure path: has the webhook placed the order yet?
|
||||
* StripeWebhookController -> handleCallback -> PaymentCaptured ->
|
||||
* ApplyResolvedPaymentStatus sets placed_at.
|
||||
*/
|
||||
public function orderStatus(string $locale): JsonResponse
|
||||
{
|
||||
$order = $this->placedOrder();
|
||||
|
||||
if (! $order) {
|
||||
return response()->json(['placed' => false]);
|
||||
}
|
||||
|
||||
session(['checkout.order_id' => $order->id]);
|
||||
CartSession::forget();
|
||||
|
||||
return response()->json(['placed' => true, 'redirect' => route('checkout.confirmation', $locale)]);
|
||||
}
|
||||
|
||||
public function confirmation(string $locale): View|RedirectResponse
|
||||
{
|
||||
$orderId = session('checkout.order_id');
|
||||
|
||||
$order = $orderId
|
||||
? Order::with(['lines.purchasable.product', 'shippingAddress', 'billingAddress'])->find($orderId)
|
||||
: null;
|
||||
|
||||
if (! $order) {
|
||||
return redirect()->to(route((string) config('checkout.products_route', 'products'), $locale));
|
||||
}
|
||||
|
||||
// Looked up by type rather than a stored relation — the method may since
|
||||
// have been disabled/deleted, but the order still needs to show what was
|
||||
// actually used at the time.
|
||||
$paymentMethodName = PaymentMethod::where('type', $order->meta['payment_method'] ?? null)
|
||||
->first()
|
||||
?->translate('name');
|
||||
|
||||
return view('checkout::confirmation', [
|
||||
'order' => $order,
|
||||
'paymentMethodName' => $paymentMethodName,
|
||||
'bankTransferInstructions' => app(StoreDetailsService::class)
|
||||
->bankTransferInstructionsFor($order, $locale),
|
||||
]);
|
||||
}
|
||||
|
||||
private function orderPlacedResponse(string $locale): JsonResponse
|
||||
{
|
||||
if ($order = $this->placedOrder()) {
|
||||
session(['checkout.order_id' => $order->id]);
|
||||
}
|
||||
|
||||
CartSession::forget();
|
||||
|
||||
return response()->json(['redirect' => route('checkout.confirmation', $locale)]);
|
||||
}
|
||||
|
||||
private function placedOrder(): ?Order
|
||||
{
|
||||
$cartId = session('checkout.cart_id');
|
||||
|
||||
if ($cartId === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Order::where('cart_id', $cartId)
|
||||
->whereNotNull('placed_at')
|
||||
->latest('placed_at')
|
||||
->first();
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-resolve shipping options for the cart's current address and keep the
|
||||
* selection sane: auto-select when exactly one resolves, or carry a
|
||||
* previous pick forward when it's still among the resolved options.
|
||||
*
|
||||
* $previousOption must be captured by the CALLER before setShippingAddress()
|
||||
* runs — Lunar's AddAddress action always deletes and recreates the
|
||||
* CartAddress row on every save (see saveAddress()), so by the time this
|
||||
* runs, $address->shipping_option is unconditionally null regardless of
|
||||
* what was selected a moment ago. There is nothing meaningful left to read
|
||||
* off $address itself; $previousOption is the only source of truth for
|
||||
* "what was chosen before this save wiped the row." show() passes the
|
||||
* address's own (not-just-wiped) current value, since nothing recreated
|
||||
* anything in that path.
|
||||
*
|
||||
* Always (re-)applies the resolved target via selectShippingOption() rather
|
||||
* than comparing against the (always-blank, post-recreation) current value
|
||||
* — the fresh row needs the write regardless of whether the decision
|
||||
* "which option" actually changed.
|
||||
*
|
||||
* @return Collection<int, \Lunar\DataTypes\ShippingOption>
|
||||
*/
|
||||
private function syncShipping(Cart $cart, ?string $previousOption): Collection
|
||||
{
|
||||
if (! $cart->shippingAddress) {
|
||||
return collect();
|
||||
}
|
||||
|
||||
$options = $this->checkout->getShippingOptions();
|
||||
|
||||
$target = match (true) {
|
||||
$options->count() === 1 => $options->first()->identifier,
|
||||
$previousOption !== null && $options->contains(fn ($option) => $option->identifier === $previousOption) => $previousOption,
|
||||
default => null,
|
||||
};
|
||||
|
||||
if ($target !== null) {
|
||||
try {
|
||||
$this->checkout->selectShippingOption($target);
|
||||
} catch (InvalidShippingOptionException) {
|
||||
// $target came from $options itself — shouldn't happen, stay defensive
|
||||
}
|
||||
}
|
||||
|
||||
return $options;
|
||||
}
|
||||
|
||||
/**
|
||||
* $options === null means "nothing money-relevant changed" — acknowledge the
|
||||
* save (and any field errors) without re-rendering the shipping options or
|
||||
* the order summary, so a plain name/phone edit is a cheap round-trip.
|
||||
*/
|
||||
private function fragments(?Cart $cart, ?Collection $options, array $errors = []): JsonResponse
|
||||
{
|
||||
return response()->json([
|
||||
'errors' => collect($errors)
|
||||
->map(fn ($messages) => is_array($messages) ? ($messages[0] ?? null) : $messages)
|
||||
->all(),
|
||||
'shippingOptionsHtml' => $options === null ? null : view('checkout::partials.shipping-options', [
|
||||
'shippingAddress' => $cart?->shippingAddress,
|
||||
'shippingOptions' => $options,
|
||||
])->render(),
|
||||
// Composer (Providers\CheckoutModuleServiceProvider) fills $cart / $lines.
|
||||
'summaryHtml' => $options === null ? null : view('checkout::partials.cart-body')->render(),
|
||||
// getPaymentMethods() filters by the cart's CURRENT fulfillment
|
||||
// type (Modules\Core\Checkout\Services\CheckoutService's own
|
||||
// docblock) — a shipping-option change can change that filter's
|
||||
// result (e.g. switching to store pickup should drop
|
||||
// cash-on-delivery and offer "pay in store" instead), so this
|
||||
// needs to be re-rendered every time shipping options are,
|
||||
// otherwise the payment section silently goes stale until a
|
||||
// full page reload.
|
||||
'paymentMethodsHtml' => $options === null ? null : view('checkout::partials.payment-methods', [
|
||||
'paymentMethods' => $this->checkout->getPaymentMethods(),
|
||||
'cart' => $cart,
|
||||
])->render(),
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Logged-in shopper: fills any BLANK cart address field from the account
|
||||
* (name, saved default address, phone, email), on every checkout load, so
|
||||
* an account filled in after checkout started still shows up. Never
|
||||
* overwrites anything already in the cart.
|
||||
*
|
||||
* Company/tax id (and ticking "I want an invoice") only on the first pass
|
||||
* (meta.account_prefilled): someone who then clears them or unticks the
|
||||
* box for this order shouldn't get them back on the next reload.
|
||||
*
|
||||
* Writes only when something actually changes, so a normal reload costs
|
||||
* nothing extra.
|
||||
*/
|
||||
private function prefillFromAccount(Cart $cart): Cart
|
||||
{
|
||||
$user = Auth::user();
|
||||
$customer = $this->account->customer($user);
|
||||
$addresses = collect($this->account->addresses($user));
|
||||
$saved = $addresses->firstWhere('shipping_default', true) ?? $addresses->first();
|
||||
$firstPass = ! data_get($cart, 'meta.account_prefilled');
|
||||
|
||||
$fromAccount = array_filter([
|
||||
'first_name' => $customer?->first_name ?: $saved?->first_name,
|
||||
'last_name' => $customer?->last_name ?: $saved?->last_name,
|
||||
'line_one' => $saved?->line_one,
|
||||
'city' => $saved?->city,
|
||||
'state' => $saved?->state,
|
||||
'postcode' => $saved?->postcode,
|
||||
'country_id' => $this->storeCountry()?->id ?? $saved?->country_id,
|
||||
'contact_email' => $user->email,
|
||||
'contact_phone' => $saved?->contact_phone,
|
||||
], 'filled');
|
||||
|
||||
$invoice = $firstPass
|
||||
? array_filter([
|
||||
'company_name' => $customer?->company_name,
|
||||
'tax_identifier' => $customer?->tax_identifier,
|
||||
], 'filled')
|
||||
: [];
|
||||
|
||||
$fields = ['first_name', 'last_name', 'company_name', 'tax_identifier', 'line_one', 'city',
|
||||
'state', 'postcode', 'country_id', 'contact_email', 'contact_phone'];
|
||||
|
||||
$fillBlanks = function (?array $current, array $values) {
|
||||
$current ??= [];
|
||||
|
||||
foreach ($values as $key => $value) {
|
||||
if (blank($current[$key] ?? null)) {
|
||||
$current[$key] = $value;
|
||||
}
|
||||
}
|
||||
|
||||
return $current;
|
||||
};
|
||||
|
||||
$billingBefore = $cart->billingAddress?->only($fields);
|
||||
$billing = $fillBlanks($billingBefore, [...$fromAccount, ...$invoice]);
|
||||
|
||||
// Shipping has no company/tax id (same shape saveAddress() writes).
|
||||
$shipToBilling = (bool) data_get($cart, 'meta.ship_to_billing', true);
|
||||
$shippingFields = [...array_diff($fields, ['company_name', 'tax_identifier']), 'delivery_instructions'];
|
||||
|
||||
$shippingBefore = $cart->shippingAddress?->only($shippingFields);
|
||||
$shipping = $shipToBilling
|
||||
? [
|
||||
...array_diff_key($billing, ['company_name' => 1, 'tax_identifier' => 1]),
|
||||
'delivery_instructions' => $shippingBefore['delivery_instructions'] ?? null,
|
||||
]
|
||||
: $fillBlanks($shippingBefore, $fromAccount);
|
||||
|
||||
if ($billing != ($billingBefore ?? []) || $shipping != ($shippingBefore ?? [])) {
|
||||
$this->checkout->setBillingAddress($billing);
|
||||
$cart = $this->checkout->setShippingAddress($shipping);
|
||||
}
|
||||
|
||||
if ($firstPass) {
|
||||
$cart->meta = [
|
||||
...($cart->meta?->toArray() ?? []),
|
||||
'account_prefilled' => true,
|
||||
'wants_invoice' => (bool) data_get($cart, 'meta.wants_invoice') || $invoice !== [],
|
||||
];
|
||||
$cart->save();
|
||||
}
|
||||
|
||||
return $cart;
|
||||
}
|
||||
|
||||
private function storeCountry(): ?Country
|
||||
{
|
||||
$iso3 = config('checkout.store_country_iso3');
|
||||
|
||||
if ($iso3 === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return Country::where('iso3', $iso3)->first();
|
||||
}
|
||||
}
|
||||
@@ -5,6 +5,7 @@ namespace Modules\Core\Checkout\Services;
|
||||
use Lunar\Exceptions\FingerprintMismatchException;
|
||||
use Lunar\Exceptions\Carts\CartException;
|
||||
use Illuminate\Support\Collection;
|
||||
use Illuminate\Support\Facades\App;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
use Lunar\Base\Addressable;
|
||||
use Lunar\DataTypes\ShippingOption;
|
||||
@@ -21,11 +22,14 @@ use Modules\Core\Checkout\Exceptions\InvalidShippingOptionException;
|
||||
use Modules\Core\Checkout\Exceptions\NoShippingAddressException;
|
||||
use Modules\Core\Checkout\Exceptions\TermsNotAcceptedException;
|
||||
use Modules\Core\Checkout\Exceptions\UnknownPaymentTypeException;
|
||||
use Lunar\Shipping\Facades\Shipping;
|
||||
use Modules\Core\Payment\Contracts\RequiresFulfillmentType;
|
||||
use Modules\Core\Payment\DTOs\PaymentResult;
|
||||
use Modules\Core\Payment\Models\PaymentMethod;
|
||||
use Modules\Core\Payment\Services\PaymentDriverRegistry;
|
||||
use Modules\Core\Payment\Services\PaymentMethodCache;
|
||||
use Modules\Core\Shipping\Contracts\SupportsCashCollection;
|
||||
use Modules\Core\Shipping\Support\BoxNowShipping;
|
||||
use Modules\Core\Shipping\Support\FulfillmentType;
|
||||
|
||||
/**
|
||||
@@ -178,7 +182,7 @@ class CheckoutService
|
||||
// switches BACK to Box Now and it resurfaces as if still chosen,
|
||||
// possibly for a locker that no longer exists/fits. Cleared here,
|
||||
// the one place that knows the method just changed.
|
||||
if ($identifier !== 'box-now') {
|
||||
if (! BoxNowShipping::isOption($identifier)) {
|
||||
$address = $cart->shippingAddress;
|
||||
|
||||
if ($address && isset($address->meta['box_now_locker'])) {
|
||||
@@ -253,42 +257,59 @@ class CheckoutService
|
||||
* a courier delivery makes no sense (no staff member present at
|
||||
* handoff to take cash), and cash-on-delivery alongside store
|
||||
* pickup is equally meaningless (OfflinePaymentDriver already
|
||||
* covers that in-person moment). A cart with no shipping option
|
||||
* selected yet imposes no constraint here — every method is
|
||||
* offered until a fulfillment type is actually known, the same
|
||||
* leniency setShippingAddress()'s own docblock describes for
|
||||
* required-field enforcement happening at the payment gate, not
|
||||
* mid-checkout.
|
||||
* covers that in-person moment).
|
||||
* 5. for cash-on-delivery specifically, the cart's currently selected
|
||||
* shipping method's own driver implements Modules\Core\Shipping\
|
||||
* Contracts\SupportsCashCollection — "carrier" alone
|
||||
* (RequiresFulfillmentType) isn't precise enough, since an
|
||||
* unattended parcel locker network (Modules\Core\Shipping\
|
||||
* Carriers\BoxNow\BoxNowRateDriver) is a carrier delivery with
|
||||
* nobody there to collect cash, unlike an actual courier
|
||||
* (Modules\Core\Shipping\Carriers\Acs\AcsRateDriver).
|
||||
* Checks 4 and 5 both impose no constraint when the cart has no
|
||||
* shipping option selected yet — every method is offered until a
|
||||
* shipping method is actually known, the same leniency
|
||||
* setShippingAddress()'s own docblock describes for required-field
|
||||
* enforcement happening at the payment gate, not mid-checkout.
|
||||
*
|
||||
* @return Collection<int, PaymentMethod>
|
||||
*/
|
||||
public function getPaymentMethods(): Collection
|
||||
{
|
||||
$fulfillmentType = $this->currentFulfillmentType();
|
||||
$shippingMethod = $this->currentShippingMethod();
|
||||
$fulfillmentType = $shippingMethod ? FulfillmentType::resolve($shippingMethod) : null;
|
||||
|
||||
return $this->paymentMethods->all()
|
||||
->filter(fn (PaymentMethod $method) => $method->enabled && $method->driver_missing_at === null)
|
||||
->filter(function (PaymentMethod $method) use ($fulfillmentType) {
|
||||
->filter(function (PaymentMethod $method) use ($fulfillmentType, $shippingMethod) {
|
||||
$driver = $this->paymentDrivers->resolve($method->driver);
|
||||
|
||||
if (! $driver?->isConfigured()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($fulfillmentType === null || ! $driver instanceof RequiresFulfillmentType) {
|
||||
return true;
|
||||
if ($fulfillmentType !== null && $driver instanceof RequiresFulfillmentType
|
||||
&& $driver->requiredFulfillmentType() !== $fulfillmentType) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return $driver->requiredFulfillmentType() === $fulfillmentType;
|
||||
// collect(...)->get() rather than Shipping::driver(), which
|
||||
// throws for an unregistered key — a stale ShippingMethod
|
||||
// row (e.g. still pointing at a removed generic driver)
|
||||
// must fail this check quietly, the same as any other
|
||||
// driver this module doesn't recognize.
|
||||
if ($shippingMethod !== null && $method->driver === 'cash-on-delivery') {
|
||||
$shippingDriver = collect(Shipping::getSupportedDrivers())->get($shippingMethod->driver);
|
||||
|
||||
return $shippingDriver instanceof SupportsCashCollection && $shippingDriver->collectsCash($shippingMethod);
|
||||
}
|
||||
|
||||
return true;
|
||||
})
|
||||
->values();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return 'carrier'|'store_pickup'|null null when the cart has no
|
||||
* shipping option selected yet
|
||||
*/
|
||||
private function currentFulfillmentType(): ?string
|
||||
private function currentShippingMethod(): ?ShippingMethod
|
||||
{
|
||||
$identifier = $this->cart->currentOrCreate()->shippingAddress?->shipping_option;
|
||||
|
||||
@@ -296,9 +317,7 @@ class CheckoutService
|
||||
return null;
|
||||
}
|
||||
|
||||
$method = ShippingMethod::where('code', $identifier)->first();
|
||||
|
||||
return $method ? FulfillmentType::resolve($method) : null;
|
||||
return ShippingMethod::where('code', $identifier)->first();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -431,6 +450,22 @@ class CheckoutService
|
||||
'terms_accepted' => true,
|
||||
'terms_accepted_at' => now()->toIso8601String(),
|
||||
'terms_accepted_policy_version' => $policyVersion,
|
||||
// Order.locale doesn't exist as a column — saved here so every
|
||||
// order notification (OrderPaymentResolutionService/
|
||||
// MarkOrderPlacedOnDeferredPayment fire OrderPlaced synchronously
|
||||
// in THIS request, but a later one — e.g. a Stripe 3-D Secure
|
||||
// webhook, or a staff status change from Filament — has no
|
||||
// request-scoped locale of its own) can render in the locale the
|
||||
// shopper actually checked out in, not whatever locale (or none)
|
||||
// happens to be active when the notification is sent. See
|
||||
// NotificationRegistry::register(), which reads this back.
|
||||
'locale' => App::getLocale(),
|
||||
// Lunar copies the discount onto Order.discount_breakdown but not
|
||||
// the coupon CODE itself — that stays on the cart row, which may
|
||||
// since have been cleared/reused for a new cart. Copied here so
|
||||
// the confirmation email always shows what code THIS order was
|
||||
// actually placed with.
|
||||
'coupon_code' => $cart->coupon_code,
|
||||
];
|
||||
$order->save();
|
||||
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use Modules\Core\Cart\Http\Controllers\CartController;
|
||||
use Modules\Core\Checkout\Http\Controllers\CheckoutController;
|
||||
|
||||
/*
|
||||
* Cart + checkout module routes. The {locale} prefix and `locale`
|
||||
* middleware (registered by Providers\LocalizationServiceProvider) are
|
||||
* this module's own convention, not a host one — every action already
|
||||
* declares $locale as its literal first parameter, per Laravel's
|
||||
* ControllerDispatcher positional-args behavior.
|
||||
*
|
||||
* Loaded from Providers\CheckoutModuleServiceProvider inside the `web`
|
||||
* middleware group.
|
||||
*/
|
||||
|
||||
Route::prefix('{locale}')
|
||||
->middleware('locale')
|
||||
->group(function () {
|
||||
// No standalone cart page — the drawer (checkout::drawer) is the cart.
|
||||
Route::get('checkout', [CheckoutController::class, 'show'])
|
||||
->name('checkout.show');
|
||||
|
||||
Route::post('checkout/address', [CheckoutController::class, 'saveAddress'])
|
||||
->name('checkout.address.save');
|
||||
|
||||
Route::post('checkout/shipping-option', [CheckoutController::class, 'selectShippingOption'])
|
||||
->name('checkout.shipping-option.select');
|
||||
|
||||
Route::get('checkout/box-now/lockers', [CheckoutController::class, 'boxNowLockers'])
|
||||
->name('checkout.box-now.lockers');
|
||||
|
||||
Route::post('checkout/box-now/locker', [CheckoutController::class, 'selectBoxNowLocker'])
|
||||
->name('checkout.box-now.locker.select');
|
||||
|
||||
|
||||
Route::post('checkout/payment-method', [CheckoutController::class, 'selectPaymentMethod'])
|
||||
->name('checkout.payment-method.select');
|
||||
|
||||
Route::post('checkout/place-order', [CheckoutController::class, 'placeOrder'])
|
||||
->name('checkout.place-order');
|
||||
|
||||
Route::get('checkout/order-status', [CheckoutController::class, 'orderStatus'])
|
||||
->name('checkout.order-status');
|
||||
|
||||
Route::get('checkout/confirmation', [CheckoutController::class, 'confirmation'])
|
||||
->name('checkout.confirmation');
|
||||
|
||||
Route::post('cart/lines', [CartController::class, 'add'])
|
||||
->name('checkout.cart.add');
|
||||
|
||||
Route::patch('cart/lines/{line}', [CartController::class, 'updateLine'])
|
||||
->whereNumber('line')
|
||||
->name('checkout.cart.update');
|
||||
|
||||
Route::delete('cart/lines/{line}', [CartController::class, 'remove'])
|
||||
->whereNumber('line')
|
||||
->name('checkout.cart.remove');
|
||||
|
||||
Route::post('cart/coupon', [CartController::class, 'applyCoupon'])
|
||||
->name('checkout.cart.coupon.apply');
|
||||
|
||||
Route::delete('cart/coupon', [CartController::class, 'removeCoupon'])
|
||||
->name('checkout.cart.coupon.remove');
|
||||
});
|
||||
@@ -18,9 +18,6 @@ use Lunar\Models\Product;
|
||||
use Lunar\Models\ProductType;
|
||||
use Lunar\Models\TaxClass;
|
||||
use Lunar\Models\TaxZone;
|
||||
use Modules\Core\Localization\Models\LanguageLine;
|
||||
use Modules\Core\Localization\Services\StorefrontLabels;
|
||||
use Modules\Core\Localization\Services\TranslationService;
|
||||
use Modules\Core\Payment\Models\PaymentMethod;
|
||||
|
||||
/**
|
||||
@@ -35,7 +32,7 @@ class InstallLunarCommand extends Command
|
||||
|
||||
protected $description = 'Seed the default Lunar store data (countries, channel, currency, tax zone, attributes, product type)';
|
||||
|
||||
public function handle(TranslationService $translations): void
|
||||
public function handle(): void
|
||||
{
|
||||
$this->components->info('Seeding default Lunar store data...');
|
||||
|
||||
@@ -255,9 +252,6 @@ class InstallLunarCommand extends Command
|
||||
}
|
||||
});
|
||||
|
||||
$this->components->info('Seeding storefront label translations');
|
||||
$this->seedStorefrontLabels($translations);
|
||||
|
||||
$this->components->info('Seeding payment method settings');
|
||||
$this->seedPaymentMethods();
|
||||
|
||||
@@ -267,32 +261,6 @@ class InstallLunarCommand extends Command
|
||||
$this->components->info('Lunar default data seeded.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Per-key upsert, not an all-or-nothing "only seed if the group is empty" guard —
|
||||
* a key already present in the database (including one an admin has since edited
|
||||
* via the Filament Languages resource) is left untouched; only keys missing
|
||||
* entirely are created. This is what makes it safe to add new keys to
|
||||
* StorefrontLabels later and re-run this on an already-installed store without
|
||||
* either skipping the new keys (the old all-or-nothing guard) or reverting an
|
||||
* admin's edits back to the hardcoded default (a naive updateOrCreate would).
|
||||
*/
|
||||
private function seedStorefrontLabels(TranslationService $translations): void
|
||||
{
|
||||
$labels = StorefrontLabels::all();
|
||||
|
||||
$existingKeys = LanguageLine::where('group', 'storefront')
|
||||
->whereIn('key', array_keys($labels))
|
||||
->pluck('key');
|
||||
|
||||
foreach ($labels as $key => $text) {
|
||||
if ($existingKeys->contains($key)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$translations->create('storefront', $key, $text);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* A single, deliberately opinionated starter row on fresh install —
|
||||
* `PaymentMethod` is now fully admin-creatable/deletable (see
|
||||
@@ -304,7 +272,7 @@ class InstallLunarCommand extends Command
|
||||
* order status should be called; that's a merchant decision.
|
||||
*
|
||||
* Skip-if-exists on `type`, same idempotent convention as
|
||||
* seedStorefrontLabels() — an admin who has since edited or deleted
|
||||
* StorefrontTranslationsSeeder — an admin who has since edited or deleted
|
||||
* this row (via the Filament Payment Methods resource) is left alone;
|
||||
* re-running lunar:install never recreates a deleted starter row.
|
||||
*
|
||||
|
||||
@@ -0,0 +1,159 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Command;
|
||||
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Database\Seeder;
|
||||
use Modules\Core\Checkout\Database\Seeders\CheckoutTranslationsSeeder;
|
||||
use Modules\Core\Localization\Database\Seeders\StorefrontTranslationsSeeder;
|
||||
use Modules\Core\Localization\Database\Seeders\ValidationTranslationsSeeder;
|
||||
use Modules\Core\Localization\Models\LanguageLine;
|
||||
use ReflectionClass;
|
||||
use ReflectionMethod;
|
||||
|
||||
/**
|
||||
* The reverse of the translation seeders: copies lines added in the Filament
|
||||
* Language Lines UI (e.g. while building the storefront) into the matching
|
||||
* seeder's lines(), so they ship with core and every app gets them.
|
||||
*
|
||||
* Only adds keys the seeder doesn't have yet — a key that already exists in
|
||||
* the seeder is left alone even if its text was edited in the database.
|
||||
* New lines are appended at the end of lines() under a marker comment, to be
|
||||
* moved into the right section by hand.
|
||||
*
|
||||
* Writes into the seeder files the app actually loaded, so it only makes
|
||||
* sense in local mode, where vendor/boboko/core is a symlink to the
|
||||
* ../boboko-core checkout. Against an installed copy it refuses to write;
|
||||
* --dry-run works anywhere.
|
||||
*/
|
||||
class PullTranslationsCommand extends Command
|
||||
{
|
||||
protected $signature = 'boboko:translations:pull {--dry-run : Show what would be added without writing}';
|
||||
|
||||
protected $description = 'Add translation lines that exist in the database but not in the core translation seeders';
|
||||
|
||||
/** @var array<string, class-string<Seeder>> */
|
||||
private const SEEDERS = [
|
||||
'storefront' => StorefrontTranslationsSeeder::class,
|
||||
'checkout' => CheckoutTranslationsSeeder::class,
|
||||
'validation' => ValidationTranslationsSeeder::class,
|
||||
];
|
||||
|
||||
public function handle(): int
|
||||
{
|
||||
$dryRun = (bool) $this->option('dry-run');
|
||||
$total = 0;
|
||||
|
||||
foreach (self::SEEDERS as $group => $seederClass) {
|
||||
$file = realpath((new ReflectionClass($seederClass))->getFileName());
|
||||
|
||||
if (! $dryRun && str_contains($file, '/vendor/')) {
|
||||
$this->error("{$file} is an installed copy, not your ../boboko-core checkout.");
|
||||
$this->line('Switch to local mode first (bin/core-mode local), or use --dry-run.');
|
||||
|
||||
return self::FAILURE;
|
||||
}
|
||||
|
||||
$known = (new ReflectionMethod($seederClass, 'lines'))->invoke(new $seederClass);
|
||||
|
||||
$missing = LanguageLine::query()
|
||||
->where('group', $group)
|
||||
->whereNotIn('key', array_keys($known))
|
||||
->orderBy('key')
|
||||
->get();
|
||||
|
||||
if ($missing->isEmpty()) {
|
||||
$this->line("{$group}: nothing missing");
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$entries = '';
|
||||
|
||||
foreach ($missing as $line) {
|
||||
$en = $line->text['en'] ?? '';
|
||||
$el = $line->text['el'] ?? '';
|
||||
|
||||
if ($en === '' || $el === '') {
|
||||
$this->warn(" {$group}.{$line->key} has no ".($en === '' ? 'English' : 'Greek').' text — added empty, fill it in');
|
||||
}
|
||||
|
||||
$entries .= $this->entry($line->key, $en, $el);
|
||||
$this->info(" + {$group}.{$line->key}");
|
||||
}
|
||||
|
||||
$total += $missing->count();
|
||||
|
||||
if (! $dryRun && ! $this->append($file, $entries)) {
|
||||
return self::FAILURE;
|
||||
}
|
||||
}
|
||||
|
||||
$this->newLine();
|
||||
$this->line($dryRun
|
||||
? "{$total} line(s) would be added."
|
||||
: "{$total} line(s) added — move them into the right section and commit core.");
|
||||
|
||||
return self::SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* One lines() entry in the seeders' own style: single line when short,
|
||||
* split over several lines when long.
|
||||
*/
|
||||
private function entry(string $key, string $en, string $el): string
|
||||
{
|
||||
[$key, $en, $el] = array_map(fn (string $value) => var_export($value, true), [$key, $en, $el]);
|
||||
|
||||
$single = " {$key} => [{$en}, {$el}],\n";
|
||||
|
||||
if (mb_strlen($single) <= 120) {
|
||||
return $single;
|
||||
}
|
||||
|
||||
return " {$key} => [\n {$en},\n {$el},\n ],\n";
|
||||
}
|
||||
|
||||
/**
|
||||
* Inserts the entries right before the closing `];` of lines(), then
|
||||
* lints the file and restores the original if the result doesn't parse.
|
||||
*/
|
||||
private function append(string $file, string $entries): bool
|
||||
{
|
||||
$original = file_get_contents($file);
|
||||
$method = strpos($original, 'function lines(): array');
|
||||
$close = $method === false ? false : strpos($original, "\n ];\n }", $method);
|
||||
|
||||
if ($close === false) {
|
||||
$this->error("Couldn't find the end of lines() in {$file} — add these by hand.");
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
$before = rtrim(substr($original, 0, $close));
|
||||
|
||||
// The last existing entry doesn't always have a trailing comma.
|
||||
if (! str_ends_with($before, ',') && ! str_ends_with($before, '[')) {
|
||||
$before .= ',';
|
||||
}
|
||||
|
||||
$updated = $before
|
||||
."\n\n // ── Pulled from the database (boboko:translations:pull) — move into the right section ──\n"
|
||||
.$entries
|
||||
.substr($original, $close + 1);
|
||||
|
||||
file_put_contents($file, $updated);
|
||||
|
||||
exec(PHP_BINARY.' -l '.escapeshellarg($file).' 2>&1', $output, $exitCode);
|
||||
|
||||
if ($exitCode !== 0) {
|
||||
file_put_contents($file, $original);
|
||||
$this->error("Writing {$file} produced invalid PHP — restored the original:");
|
||||
$this->line(implode("\n", $output));
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+8
-1
@@ -49,7 +49,9 @@ use Modules\Core\Shipping\Extensions\OrderViewExtension;
|
||||
use Modules\Core\Shipping\Extensions\ShippingMethodListExtension;
|
||||
use Modules\Core\Shipping\Extensions\ShippingMethodResourceExtension;
|
||||
use Modules\Core\Shipping\Filament\Resources\ManifestResource;
|
||||
use Modules\Core\Shipping\Filament\Resources\CarrierVoucherResource;
|
||||
use Modules\Core\Shipping\Filament\Resources\ShipmentResource;
|
||||
use Modules\Core\Store\Filament\Pages\ManageStoreDetails;
|
||||
|
||||
class CorePlugin implements Plugin
|
||||
{
|
||||
@@ -64,6 +66,7 @@ class CorePlugin implements Plugin
|
||||
->brandName('Boboko')
|
||||
->brandLogo(asset('static/logos/core/boboko-logo.svg'))
|
||||
->darkModeBrandLogo(asset('static/logos/core/boboko-logo-white.svg'))
|
||||
->favicon(asset('static/logos/core/favicon.svg'))
|
||||
->login(Login::class)
|
||||
->resources([
|
||||
LanguageLineResource::class,
|
||||
@@ -72,8 +75,12 @@ class CorePlugin implements Plugin
|
||||
CartResource::class,
|
||||
PaymentMethodResource::class,
|
||||
ShipmentResource::class,
|
||||
CarrierVoucherResource::class,
|
||||
ManifestResource::class,
|
||||
])
|
||||
->pages([
|
||||
ManageStoreDetails::class,
|
||||
])
|
||||
->plugin(ShippingPlugin::make());
|
||||
|
||||
LunarPanel::extensions([
|
||||
@@ -146,7 +153,7 @@ class CorePlugin implements Plugin
|
||||
});
|
||||
|
||||
LunarStaff::addActivitylogExcept([
|
||||
'otp_code',
|
||||
'otp_code_hash',
|
||||
'otp_expires_at',
|
||||
'password',
|
||||
'remember_token',
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Customer\Events;
|
||||
|
||||
use Illuminate\Contracts\Auth\Authenticatable;
|
||||
use Modules\Core\Customer\Models\Customer;
|
||||
|
||||
/**
|
||||
* Customer-side sibling of Checkout\Events\RecoveryConsentSet — dispatched
|
||||
* by CustomerAccountService::setRecoveryConsent() every time the account's
|
||||
* standing promotional/abandoned-cart-recovery opt-in changes, including
|
||||
* an explicit opt-OUT, not just an opt-in. $consent is the new value,
|
||||
* already written to Customer::meta by the time this fires. Distinct from
|
||||
* RecoveryConsentSet, which fires for the current CART's own opt-in
|
||||
* (CheckoutService::setRecoveryConsent()) — the two write the same meta
|
||||
* shape onto different models and can fire independently of each other.
|
||||
*/
|
||||
class CustomerRecoveryConsentSet
|
||||
{
|
||||
public function __construct(
|
||||
public readonly Customer $customer,
|
||||
public readonly bool $consent,
|
||||
public readonly Authenticatable $causer,
|
||||
) {}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Customer\Exceptions;
|
||||
|
||||
use RuntimeException;
|
||||
|
||||
/**
|
||||
* Thrown by Modules\Core\Customer\Services\CustomerEmailChangeService when
|
||||
* the requested new email already belongs to a different user — checked
|
||||
* both up front (request()) and again at confirm() time, since someone
|
||||
* else could sign up with that address in the window between the two.
|
||||
*/
|
||||
class EmailAlreadyTakenException extends RuntimeException
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct('That email address is already in use.');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Customer\Exceptions;
|
||||
|
||||
use RuntimeException;
|
||||
|
||||
/**
|
||||
* Thrown by Modules\Core\Customer\Services\CustomerEmailChangeService::
|
||||
* confirm() for a wrong, expired, or already-burned (too many wrong
|
||||
* guesses) code — deliberately one exception for all three, the same way
|
||||
* Auth\Services\UserOtpService::validate() collapses them into a single
|
||||
* null return, so a caller can't distinguish "wrong code" from "no
|
||||
* pending change at all" and use that to probe for one.
|
||||
*/
|
||||
class InvalidEmailChangeCodeException extends RuntimeException
|
||||
{
|
||||
public function __construct()
|
||||
{
|
||||
parent::__construct('That code is invalid or has expired.');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Customer\Listeners;
|
||||
|
||||
use Modules\Core\Auth\Events\UserAuthenticated;
|
||||
use Modules\Core\Customer\Services\GuestOrderClaimer;
|
||||
|
||||
/**
|
||||
* Registered from Providers\CustomerServiceProvider — UserAuthenticated
|
||||
* only fires after a valid login code, which is what makes matching
|
||||
* placed guest orders by email safe (see GuestOrderClaimer's own
|
||||
* docblock).
|
||||
*/
|
||||
class ClaimGuestOrdersOnLogin
|
||||
{
|
||||
public function __construct(
|
||||
private readonly GuestOrderClaimer $claimer,
|
||||
) {}
|
||||
|
||||
public function handle(UserAuthenticated $event): void
|
||||
{
|
||||
$this->claimer->claim($event->user);
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ use Modules\Core\Customer\Events\CustomerAddressCreated;
|
||||
use Modules\Core\Customer\Events\CustomerAddressDeleted;
|
||||
use Modules\Core\Customer\Events\CustomerAddressUpdated;
|
||||
use Modules\Core\Customer\Events\CustomerProfileUpdated;
|
||||
use Modules\Core\Customer\Events\CustomerRecoveryConsentSet;
|
||||
use Modules\Core\Logging\ActivityLogService;
|
||||
|
||||
/**
|
||||
@@ -62,4 +63,21 @@ class LogCustomerAccountActivity implements ShouldQueue
|
||||
$event->causer,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* CustomerRecoveryConsentSet carries only the new value, not a
|
||||
* before/after snapshot the way CustomerProfileUpdated does — but
|
||||
* CustomerAccountService::setRecoveryConsent() only ever dispatches it
|
||||
* once the value has actually changed, so "old" is trivially the
|
||||
* opposite of $event->consent.
|
||||
*/
|
||||
public function handleRecoveryConsentSet(CustomerRecoveryConsentSet $event): void
|
||||
{
|
||||
$this->activityLog->updated(
|
||||
$event->customer,
|
||||
['recovery_consent' => ! $event->consent],
|
||||
['recovery_consent' => $event->consent],
|
||||
$event->causer,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,6 +66,9 @@ class CustomerDataProvider implements PersonalDataProvider
|
||||
'id' => $user->id,
|
||||
'name' => $user->name,
|
||||
'email' => $user->email,
|
||||
'terms_accepted_at' => $user->terms_accepted_at,
|
||||
'terms_version' => $user->terms_version,
|
||||
'privacy_policy_version' => $user->privacy_policy_version,
|
||||
'customers' => $user->customers->map(fn (Customer $customer) => [
|
||||
'id' => $customer->id,
|
||||
'company_name' => $customer->company_name,
|
||||
@@ -112,7 +115,7 @@ class CustomerDataProvider implements PersonalDataProvider
|
||||
// secret tied to an identity that no longer exists here — clear
|
||||
// it alongside name/email rather than leaving it to expire on
|
||||
// its own 10-minute window.
|
||||
'otp_code' => null,
|
||||
'otp_code_hash' => null,
|
||||
'otp_expires_at' => null,
|
||||
'otp_attempts' => 0,
|
||||
]);
|
||||
|
||||
@@ -13,6 +13,7 @@ use Modules\Core\Customer\Events\CustomerAddressCreated;
|
||||
use Modules\Core\Customer\Events\CustomerAddressDeleted;
|
||||
use Modules\Core\Customer\Events\CustomerAddressUpdated;
|
||||
use Modules\Core\Customer\Events\CustomerProfileUpdated;
|
||||
use Modules\Core\Customer\Events\CustomerRecoveryConsentSet;
|
||||
use Modules\Core\Customer\Exceptions\AddressNotFoundException;
|
||||
use Modules\Core\Customer\Exceptions\OrderNotFoundException;
|
||||
use Modules\Core\Customer\Models\Customer;
|
||||
@@ -72,7 +73,7 @@ class CustomerAccountService
|
||||
];
|
||||
|
||||
private const WRITABLE_PROFILE_FIELDS = [
|
||||
'title', 'first_name', 'last_name', 'company_name', 'vat_no',
|
||||
'title', 'first_name', 'last_name', 'company_name', 'tax_identifier',
|
||||
];
|
||||
|
||||
public function customer(Authenticatable $user): ?Customer
|
||||
@@ -111,7 +112,7 @@ class CustomerAccountService
|
||||
$order = $customer
|
||||
?->orders()
|
||||
->whereNotNull('placed_at')
|
||||
->with(['lines', 'shippingAddress', 'billingAddress', 'transactions', 'shipments'])
|
||||
->with(['lines', 'shippingAddress', 'billingAddress', 'transactions', 'shipments.shipmentInfo'])
|
||||
->find($orderId);
|
||||
|
||||
if (! $order) {
|
||||
@@ -235,6 +236,43 @@ class CustomerAccountService
|
||||
return $customer;
|
||||
}
|
||||
|
||||
/**
|
||||
* The account's standing "email me a reminder if I don't finish my
|
||||
* order" opt-in — same meta shape Checkout\Services\CheckoutService::
|
||||
* setRecoveryConsent() writes on the current CART (recovery_consent,
|
||||
* recovery_consent_at, recovery_consent_policy_version), written here
|
||||
* onto the CUSTOMER instead, so it survives across carts/sessions as a
|
||||
* standing account preference. The two are independent: opting out on
|
||||
* the customer doesn't retroactively change a cart already opted in,
|
||||
* and vice versa — a caller that wants both kept in sync (e.g. 3dealer
|
||||
* applying a customer's standing preference to the current cart too)
|
||||
* calls both services itself.
|
||||
*
|
||||
* A no-op (no write, no event) when $consent already matches what's
|
||||
* stored — unlike updateProfile()'s address/profile writes, which
|
||||
* always write and dispatch even when nothing actually changed.
|
||||
*/
|
||||
public function setRecoveryConsent(Authenticatable $user, bool $consent): Customer
|
||||
{
|
||||
$customer = $this->customerOrFail($user);
|
||||
|
||||
if ((bool) data_get($customer->meta, 'recovery_consent') === $consent) {
|
||||
return $customer;
|
||||
}
|
||||
|
||||
$customer->meta = [
|
||||
...($customer->meta?->toArray() ?? []),
|
||||
'recovery_consent' => $consent,
|
||||
'recovery_consent_at' => $consent ? now()->toIso8601String() : null,
|
||||
'recovery_consent_policy_version' => $consent ? config('legal.privacy_policy_version') : null,
|
||||
];
|
||||
$customer->save();
|
||||
|
||||
Event::dispatch(new CustomerRecoveryConsentSet($customer, $consent, $user));
|
||||
|
||||
return $customer;
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws LogicException if $user has no paired Customer at all —
|
||||
* distinct from AddressNotFoundException/OrderNotFoundException
|
||||
|
||||
@@ -0,0 +1,163 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Customer\Services;
|
||||
|
||||
use Illuminate\Contracts\Auth\Authenticatable;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Facades\RateLimiter;
|
||||
use Modules\Core\Auth\Events\UserEmailChanged;
|
||||
use Modules\Core\Auth\Exceptions\OtpThrottledException;
|
||||
use Modules\Core\Auth\Mail\EmailChangeCodeMail;
|
||||
use Modules\Core\Auth\Mail\EmailChangedNoticeMail;
|
||||
use Modules\Core\Customer\Exceptions\EmailAlreadyTakenException;
|
||||
use Modules\Core\Customer\Exceptions\InvalidEmailChangeCodeException;
|
||||
|
||||
/**
|
||||
* Changing an account's login email — core's login is passwordless, so
|
||||
* the email IS the login, and it only ever changes once the shopper has
|
||||
* proved they can receive mail at the new address (a typo can never lock
|
||||
* them out of their own account). The pending change (new address, a
|
||||
* hash of the code, expiry, wrong-guess count) lives on the user's own
|
||||
* row (see the migration adding pending_email/pending_email_code_hash/
|
||||
* pending_email_expires_at/pending_email_attempts) — the same convention
|
||||
* Auth\Services\UserOtpService's otp_code_hash/otp_expires_at/otp_attempts
|
||||
* already use — rather than the session, since a code arrives by email
|
||||
* and is often opened on a different device/session than the one that
|
||||
* requested it; a session-scoped pending change couldn't be confirmed
|
||||
* from there at all.
|
||||
*
|
||||
* Two independent throttles, both configured under core.auth.email_change
|
||||
* (same shape/reasoning as core.auth.otp): max_attempts caps wrong
|
||||
* guesses against ONE code; generation_limit/generation_decay_minutes cap
|
||||
* how often a NEW code can be requested at all.
|
||||
*/
|
||||
class CustomerEmailChangeService
|
||||
{
|
||||
/**
|
||||
* @throws OtpThrottledException if this account has requested too
|
||||
* many codes within core.auth.email_change.generation_decay_minutes
|
||||
* @throws EmailAlreadyTakenException if $newEmail already belongs to
|
||||
* a different user
|
||||
*/
|
||||
public function request(Authenticatable $user, string $newEmail): void
|
||||
{
|
||||
$newEmail = strtolower(trim($newEmail));
|
||||
|
||||
if ($user->newQuery()->where('email', $newEmail)->whereKeyNot($user->getKey())->exists()) {
|
||||
throw new EmailAlreadyTakenException;
|
||||
}
|
||||
|
||||
$limiterKey = $this->generationLimiterKey($user);
|
||||
$maxGenerations = (int) config('core.auth.email_change.generation_limit', 3);
|
||||
|
||||
if (RateLimiter::tooManyAttempts($limiterKey, $maxGenerations)) {
|
||||
throw new OtpThrottledException(RateLimiter::availableIn($limiterKey));
|
||||
}
|
||||
|
||||
RateLimiter::hit($limiterKey, (int) config('core.auth.email_change.generation_decay_minutes', 10) * 60);
|
||||
|
||||
$code = str_pad((string) random_int(0, 999999), 6, '0', STR_PAD_LEFT);
|
||||
|
||||
$user->forceFill([
|
||||
'pending_email' => $newEmail,
|
||||
'pending_email_code_hash' => Hash::make($code),
|
||||
'pending_email_expires_at' => now()->addMinutes((int) config('core.auth.email_change.expiry_minutes', 10)),
|
||||
'pending_email_attempts' => 0,
|
||||
])->save();
|
||||
|
||||
Mail::to($newEmail)->send(new EmailChangeCodeMail($code));
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws InvalidEmailChangeCodeException for a wrong, expired, or
|
||||
* already-burned (too many wrong guesses) code, or when there is no
|
||||
* pending change at all
|
||||
* @throws EmailAlreadyTakenException if someone else has since signed
|
||||
* up with the pending address, in the window between request() and
|
||||
* confirm()
|
||||
*/
|
||||
public function confirm(Authenticatable $user, string $code): void
|
||||
{
|
||||
$model = $user::class;
|
||||
|
||||
// lockForUpdate() + a transaction make the read-check-increment-save
|
||||
// below atomic across concurrent requests — same reasoning as
|
||||
// Auth\Services\UserOtpService::validate(), which this mirrors.
|
||||
$valid = DB::transaction(function () use ($model, $user, $code) {
|
||||
/** @var Authenticatable $locked */
|
||||
$locked = $model::whereKey($user->getKey())->lockForUpdate()->first();
|
||||
|
||||
if (! $locked->pending_email
|
||||
|| ! $locked->pending_email_code_hash
|
||||
|| ! $locked->pending_email_expires_at
|
||||
|| now()->isAfter($locked->pending_email_expires_at)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (! Hash::check($code, $locked->pending_email_code_hash)) {
|
||||
$locked->pending_email_attempts++;
|
||||
|
||||
if ($locked->pending_email_attempts >= (int) config('core.auth.email_change.max_attempts', 5)) {
|
||||
$locked->pending_email_code_hash = null;
|
||||
$locked->pending_email_expires_at = null;
|
||||
$locked->pending_email_attempts = 0;
|
||||
}
|
||||
|
||||
$locked->save();
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
});
|
||||
|
||||
if (! $valid) {
|
||||
throw new InvalidEmailChangeCodeException;
|
||||
}
|
||||
|
||||
$user->refresh();
|
||||
$newEmail = $user->pending_email;
|
||||
|
||||
// Someone may have signed up with this address since request() ran.
|
||||
if ($user->newQuery()->where('email', $newEmail)->whereKeyNot($user->getKey())->exists()) {
|
||||
$user->forceFill([
|
||||
'pending_email' => null,
|
||||
'pending_email_code_hash' => null,
|
||||
'pending_email_expires_at' => null,
|
||||
'pending_email_attempts' => 0,
|
||||
])->save();
|
||||
|
||||
throw new EmailAlreadyTakenException;
|
||||
}
|
||||
|
||||
$oldEmail = $user->email;
|
||||
|
||||
$user->forceFill([
|
||||
'email' => $newEmail,
|
||||
'email_verified_at' => now(),
|
||||
'pending_email' => null,
|
||||
'pending_email_code_hash' => null,
|
||||
'pending_email_expires_at' => null,
|
||||
'pending_email_attempts' => 0,
|
||||
])->save();
|
||||
|
||||
RateLimiter::clear($this->generationLimiterKey($user));
|
||||
|
||||
// Lets the previous owner notice if someone else changed it from a
|
||||
// hijacked session.
|
||||
Mail::to($oldEmail)->send(new EmailChangedNoticeMail($newEmail));
|
||||
|
||||
// The code just proved they own the new address too.
|
||||
app(GuestOrderClaimer::class)->claim($user);
|
||||
|
||||
Event::dispatch(new UserEmailChanged($user, $oldEmail));
|
||||
}
|
||||
|
||||
private function generationLimiterKey(Authenticatable $user): string
|
||||
{
|
||||
return 'email-change:'.$user->getKey();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Customer\Services;
|
||||
|
||||
use Illuminate\Contracts\Auth\Authenticatable;
|
||||
use Lunar\Base\LunarUser;
|
||||
use Lunar\Models\Order;
|
||||
|
||||
/**
|
||||
* Attaches placed guest orders to an account when their billing email
|
||||
* matches the account's email, case-insensitively. Only ever called right
|
||||
* after the shopper has proved they own that email — a login code
|
||||
* (Auth\Events\UserAuthenticated), or the code confirming an email change
|
||||
* (a consuming app's own email-change flow, e.g. 3dealer's Account\
|
||||
* EmailController::verify()) — which is what makes matching on email safe.
|
||||
*
|
||||
* Only orders with no customer_id AND no user_id are touched: an order
|
||||
* already attached to any account (guest or otherwise) is left alone.
|
||||
*/
|
||||
class GuestOrderClaimer
|
||||
{
|
||||
public function claim(Authenticatable&LunarUser $user): int
|
||||
{
|
||||
$customer = $user->latestCustomer();
|
||||
|
||||
if (! $customer || ! $user->email) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return Order::query()
|
||||
->whereNotNull('placed_at')
|
||||
->whereNull('customer_id')
|
||||
->whereNull('user_id')
|
||||
->whereHas('billingAddress', fn ($query) => $query
|
||||
->whereRaw('lower(contact_email) = ?', [strtolower($user->email)]))
|
||||
->update([
|
||||
'customer_id' => $customer->id,
|
||||
'user_id' => $user->id,
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\File\Adapters;
|
||||
|
||||
use Illuminate\Contracts\Filesystem\Filesystem;
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Modules\Core\File\Contracts\FileAdapterInterface;
|
||||
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||
|
||||
/**
|
||||
* Wraps Laravel's own 'local' Storage disk — see FileAdapterInterface's
|
||||
* own docblock for why this exists as a named adapter rather than every
|
||||
* caller reaching for Storage::disk('local') directly: swapping to a
|
||||
* different backend later (S3FileAdapter, say) means adding one class and
|
||||
* one contextual-binding entry, touching nothing that already uses
|
||||
* FileService.
|
||||
*/
|
||||
class LocalFileAdapter implements FileAdapterInterface
|
||||
{
|
||||
public function __construct(
|
||||
private readonly Filesystem $disk,
|
||||
) {}
|
||||
|
||||
public function store(UploadedFile $file, string $directory): string
|
||||
{
|
||||
return $this->disk->putFile($directory, $file);
|
||||
}
|
||||
|
||||
public function exists(string $path): bool
|
||||
{
|
||||
return $this->disk->exists($path);
|
||||
}
|
||||
|
||||
public function delete(string $path): void
|
||||
{
|
||||
$this->disk->delete($path);
|
||||
}
|
||||
|
||||
public function retrieve(string $path, ?string $name = null): StreamedResponse
|
||||
{
|
||||
return $this->disk->response($path, $name);
|
||||
}
|
||||
|
||||
public function download(string $path, ?string $name = null): StreamedResponse
|
||||
{
|
||||
return $this->disk->download($path, $name);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\File\Commands;
|
||||
|
||||
use Illuminate\Console\Command;
|
||||
use Modules\Core\File\Services\FileService;
|
||||
|
||||
/**
|
||||
* Generic wrapper around FileService::pruneUnowned() — see that method's
|
||||
* own docblock for what "unowned" means and why the grace period exists.
|
||||
* Any caller (3dealer's product custom-field photo uploads today, some
|
||||
* other future upload feature tomorrow, in this app or another consuming
|
||||
* app) schedules this once per purpose string it stores files under; this
|
||||
* command itself has no opinion about what any given purpose means.
|
||||
*/
|
||||
class PruneUnownedFilesCommand extends Command
|
||||
{
|
||||
protected $signature = 'boboko:file:prune-unowned {purpose} {--hours=24 : Only delete unowned files older than this}';
|
||||
|
||||
protected $description = 'Delete unowned files of a given purpose past their grace period';
|
||||
|
||||
public function handle(FileService $files): int
|
||||
{
|
||||
$purpose = $this->argument('purpose');
|
||||
|
||||
$deleted = $files->pruneUnowned($purpose, now()->subHours((int) $this->option('hours')));
|
||||
|
||||
$this->info("Deleted {$deleted} unowned file(s) of purpose \"{$purpose}\".");
|
||||
|
||||
return self::SUCCESS;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\File\Contracts;
|
||||
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||
|
||||
/**
|
||||
* One storage backend's actual byte-level operations — a disk name (see
|
||||
* Modules\Core\File\Models\File::$disk) resolves to exactly one
|
||||
* implementation of this via Modules\Core\File\Services\FileService's own
|
||||
* contextual binding (see Providers\FileServiceProvider), the same
|
||||
* pattern Shipping\Contracts\CarrierFulfillmentInterface uses to pick an
|
||||
* AcsFulfillmentService/BoxNowFulfillmentService per carrier. FileService
|
||||
* itself never touches a disk directly — every backend-specific detail
|
||||
* (a local path, an S3 bucket/region, ...) lives entirely inside one
|
||||
* adapter, so adding a new backend never touches FileService or any of
|
||||
* its callers.
|
||||
*/
|
||||
interface FileAdapterInterface
|
||||
{
|
||||
/**
|
||||
* Stores the file under $directory, returning the path to record on
|
||||
* the File row (Models\File::$path) — backend-specific (a relative
|
||||
* local path, an S3 object key, ...), meaningful only to this same
|
||||
* adapter.
|
||||
*/
|
||||
public function store(UploadedFile $file, string $directory): string;
|
||||
|
||||
public function exists(string $path): bool;
|
||||
|
||||
public function delete(string $path): void;
|
||||
|
||||
/**
|
||||
* Streams the file at $path straight to the browser, inline (the
|
||||
* browser renders/previews it directly rather than prompting to save).
|
||||
*/
|
||||
public function retrieve(string $path, ?string $name = null): StreamedResponse;
|
||||
|
||||
/**
|
||||
* Same bytes as retrieve(), but as a forced attachment — the browser
|
||||
* always prompts to save, even for a type it could otherwise preview
|
||||
* (an image inline in a new tab).
|
||||
*/
|
||||
public function download(string $path, ?string $name = null): StreamedResponse;
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\File\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Routing\Controller;
|
||||
use Modules\Core\File\Models\File;
|
||||
use Modules\Core\File\Services\FileService;
|
||||
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||
|
||||
/**
|
||||
* Streams a File's bytes straight to the browser — inline by default (a
|
||||
* browser-previewable type like an image opens/displays directly), or as
|
||||
* a forced download with ?download=1 (e.g. an explicit "Download" button
|
||||
* distinct from a thumbnail/preview link pointing at the same file). Only
|
||||
* reachable via a short-lived signed URL — same auth model as
|
||||
* Modules\Core\Shipping\Http\Controllers\DownloadShipmentLabelController
|
||||
* (a valid signature IS the auth check, no separate staff/customer
|
||||
* session check here) — so any caller that can mint a signed URL to this
|
||||
* route (the storefront's own custom-field upload flow, or the admin
|
||||
* order-line display) can hand a viewer a working link without this
|
||||
* controller knowing anything about who they are or why they're allowed
|
||||
* to see this particular file.
|
||||
*
|
||||
* Looks the File up manually from a plain {file} id rather than relying
|
||||
* on implicit route-model-binding — registered via loadRoutesFrom() with
|
||||
* no middleware group (see Providers\FileServiceProvider::boot()), so
|
||||
* SubstituteBindings never runs and a type-hinted File parameter would
|
||||
* silently resolve to an empty, non-existent model instead of 404ing.
|
||||
*/
|
||||
class DownloadFileController extends Controller
|
||||
{
|
||||
public function __invoke(Request $request, int $file, FileService $files): StreamedResponse
|
||||
{
|
||||
if (! $request->hasValidSignature()) {
|
||||
abort(401);
|
||||
}
|
||||
|
||||
$file = File::findOrFail($file);
|
||||
|
||||
abort_unless($files->exists($file), 404);
|
||||
|
||||
return $request->boolean('download') ? $files->download($file) : $files->retrieve($file);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\File\Http\Controllers;
|
||||
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Routing\Controller;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
use Modules\Core\File\Services\FileService;
|
||||
|
||||
/**
|
||||
* The generic "accept an upload, validate it, store it via FileService,
|
||||
* return its id" flow — what varies per use case (which extensions/sizes
|
||||
* are acceptable) is deliberately NOT configurable here, and NEVER trusts
|
||||
* anything the request itself claims about its own limits: a client could
|
||||
* simply lie about them. purpose()/validationRules() are protected hooks
|
||||
* a concrete subclass overrides instead — an ordinary PHP method a caller
|
||||
* writes once per upload policy, not request input, so the actual limit
|
||||
* enforced is always whatever server-side code says it is. Different
|
||||
* products can even need different limits (a 3D-print reference photo
|
||||
* vs. a video upload, say) — that's still a subclass's own store()
|
||||
* override deciding which rule set applies to a given request, not
|
||||
* something this base class or a shared config file could express.
|
||||
*/
|
||||
abstract class UploadFileController extends Controller
|
||||
{
|
||||
/**
|
||||
* The File row's `purpose` tag (see Models\File) — also the storage
|
||||
* directory it lands under (FileService::store()'s single $purpose
|
||||
* param doubles as both).
|
||||
*/
|
||||
abstract protected function purpose(): string;
|
||||
|
||||
/**
|
||||
* Laravel validation rules for the incoming request, keyed exactly as
|
||||
* $request->all() would be. Must include a 'file' rule accepting an
|
||||
* uploaded file — this class always reads the file from that key.
|
||||
*
|
||||
* @return array<string, array<int, mixed>>
|
||||
*/
|
||||
abstract protected function validationRules(Request $request): array;
|
||||
|
||||
public function store(Request $request, FileService $files): JsonResponse
|
||||
{
|
||||
$validator = Validator::make(
|
||||
$request->all(),
|
||||
$this->validationRules($request),
|
||||
$this->validationMessages($request),
|
||||
$this->validationAttributes($request),
|
||||
);
|
||||
|
||||
if ($validator->fails()) {
|
||||
return response()->json(['error' => $validator->errors()->first('file')], 422);
|
||||
}
|
||||
|
||||
$file = $files->store($request->file('file'), $this->purpose());
|
||||
|
||||
return response()->json(['file_id' => $file->id]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, string>
|
||||
*/
|
||||
protected function validationMessages(Request $request): array
|
||||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array<string, string>
|
||||
*/
|
||||
protected function validationAttributes(Request $request): array
|
||||
{
|
||||
return [];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\File\Listeners;
|
||||
|
||||
use Modules\Core\Cart\Events\CartLineAdded;
|
||||
use Modules\Core\File\Models\File;
|
||||
use Modules\Core\File\Services\FileService;
|
||||
|
||||
/**
|
||||
* A custom-field photo is uploaded (and gets its own File row, unowned)
|
||||
* the moment a shopper picks it on the product page — before add-to-cart
|
||||
* even runs (see 3dealer's CustomFieldUploadController). The storefront's
|
||||
* add-to-cart request only carries that File's `id` in its custom_fields
|
||||
* answer (see CartController::customFieldsMeta()); this is what actually
|
||||
* gives the File an owner, once the real CartLine it belongs to exists.
|
||||
*
|
||||
* Listens for Cart\Events\CartLineAdded rather than reaching back into
|
||||
* the cart after CartService::addLine() returns — that event already
|
||||
* carries the exact CartLine Lunar resolved/created, with no need to
|
||||
* re-match it by meta (ambiguous whenever two lines share a purchasable +
|
||||
* similar meta).
|
||||
*/
|
||||
class AttachCustomFieldFileToCartLine
|
||||
{
|
||||
public function __construct(
|
||||
private readonly FileService $files,
|
||||
) {}
|
||||
|
||||
public function handle(CartLineAdded $event): void
|
||||
{
|
||||
$fileIds = collect($event->line->meta['custom_fields'] ?? [])
|
||||
->pluck('file_id')
|
||||
->filter()
|
||||
->all();
|
||||
|
||||
if ($fileIds === []) {
|
||||
return;
|
||||
}
|
||||
|
||||
File::query()
|
||||
->whereIn('id', $fileIds)
|
||||
->each(fn (File $file) => $this->files->attachOwner($file, $event->line));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\File\Listeners;
|
||||
|
||||
use Lunar\Models\OrderLine;
|
||||
use Modules\Core\Checkout\Events\OrderPlaced;
|
||||
use Modules\Core\File\Models\File;
|
||||
use Modules\Core\File\Services\FileService;
|
||||
|
||||
/**
|
||||
* Lunar\Pipelines\Order\Creation\CreateOrderLines copies a CartLine's
|
||||
* meta (custom_fields included) onto its new OrderLine verbatim — so an
|
||||
* order's custom-field file answer keeps the exact same `file_id` its
|
||||
* originating cart line's meta already had (see 3dealer's CartController::
|
||||
* customFieldsMeta(), which stores only that id — File is the single
|
||||
* source of truth for disk/path/name/mime, never duplicated into meta).
|
||||
* That id is enough to find the File row directly, with no need to match
|
||||
* an OrderLine back to "the" CartLine it came from.
|
||||
*
|
||||
* Re-points ownership (not a copy — the same File row) from whatever
|
||||
* CartLine owned it to this OrderLine, so a customer's placed order keeps
|
||||
* its file even after the cart it came from is later cleared (see
|
||||
* Modules\Core\Cart\Services\CartService, or a checkout-complete cart
|
||||
* reset) — FileService::pruneUnowned() only ever removes UNOWNED files,
|
||||
* but a File left pointing at a since-deleted CartLine would be just as
|
||||
* orphaned in practice; this listener is what keeps that from ever
|
||||
* happening for a real, placed order.
|
||||
*
|
||||
* Listens for Checkout\Events\OrderPlaced, not an OrderLine model event —
|
||||
* that's the one place in this codebase an order is reliably known to be
|
||||
* placed exactly once (see that event's own docblock), and it hands over
|
||||
* the whole Order with every line already loaded.
|
||||
*/
|
||||
class TransferCustomFieldFileOwnership
|
||||
{
|
||||
public function __construct(
|
||||
private readonly FileService $files,
|
||||
) {}
|
||||
|
||||
public function handle(OrderPlaced $event): void
|
||||
{
|
||||
foreach ($event->order->lines as $line) {
|
||||
$this->transferLine($line);
|
||||
}
|
||||
}
|
||||
|
||||
private function transferLine(OrderLine $line): void
|
||||
{
|
||||
$fileIds = collect($line->meta['custom_fields'] ?? [])
|
||||
->pluck('file_id')
|
||||
->filter()
|
||||
->all();
|
||||
|
||||
if ($fileIds === []) {
|
||||
return;
|
||||
}
|
||||
|
||||
File::query()
|
||||
->whereIn('id', $fileIds)
|
||||
->each(fn (File $file) => $this->files->attachOwner($file, $line));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\File\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Database\Eloquent\Relations\MorphTo;
|
||||
|
||||
/**
|
||||
* A row per physical file Modules\Core\File\Services\FileService has
|
||||
* stored — see that migration's own docblock for why `owner_type`/
|
||||
* `owner_id` are nullable and what `purpose` is for.
|
||||
*/
|
||||
class File extends Model
|
||||
{
|
||||
protected $guarded = [];
|
||||
|
||||
protected function casts(): array
|
||||
{
|
||||
return [
|
||||
'size' => 'integer',
|
||||
];
|
||||
}
|
||||
|
||||
public function owner(): MorphTo
|
||||
{
|
||||
return $this->morphTo();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,135 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\File\Services;
|
||||
|
||||
use Illuminate\Contracts\Container\Container;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Http\UploadedFile;
|
||||
use Illuminate\Support\Carbon;
|
||||
use Illuminate\Support\Collection;
|
||||
use Modules\Core\File\Contracts\FileAdapterInterface;
|
||||
use Modules\Core\File\Models\File;
|
||||
use Symfony\Component\HttpFoundation\StreamedResponse;
|
||||
|
||||
/**
|
||||
* Orchestrates the `files` table (ownership, purpose, cleanup — see that
|
||||
* migration's own docblock) on top of whichever FileAdapterInterface a
|
||||
* disk resolves to (see Providers\FileServiceProvider's contextual
|
||||
* binding) — never touches a disk or a raw path itself. Knows nothing
|
||||
* about custom fields, carts, or orders specifically; every caller
|
||||
* (3dealer's custom-field upload flow today, some other future
|
||||
* file-upload need tomorrow) supplies its own `purpose` string and owner
|
||||
* model, and scopes its own queries by them.
|
||||
*
|
||||
* `purpose` also doubles as the storage directory a file lands under
|
||||
* (store() passes it straight through as the adapter's own $directory) —
|
||||
* one string to name both, rather than every caller supplying two
|
||||
* near-identical values for what's really the same distinction ("which
|
||||
* kind of upload is this").
|
||||
*/
|
||||
class FileService
|
||||
{
|
||||
public function __construct(
|
||||
private readonly Container $container,
|
||||
) {}
|
||||
|
||||
public function store(UploadedFile $file, string $purpose, string $disk = 'local'): File
|
||||
{
|
||||
$path = $this->adapter($disk)->store($file, $purpose);
|
||||
|
||||
return File::create([
|
||||
'disk' => $disk,
|
||||
'path' => $path,
|
||||
'original_name' => $file->getClientOriginalName(),
|
||||
'mime' => $file->getMimeType(),
|
||||
'size' => $file->getSize(),
|
||||
'purpose' => $purpose,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-points an existing File at its owner — called once an owner
|
||||
* actually exists (e.g. a shopper's picked-but-not-yet-added photo
|
||||
* gets a CartLine the moment it's added to the cart). Never creates a
|
||||
* second row for the same physical file.
|
||||
*/
|
||||
public function attachOwner(File $file, Model $owner): File
|
||||
{
|
||||
$file->update([
|
||||
'owner_type' => $owner->getMorphClass(),
|
||||
'owner_id' => $owner->getKey(),
|
||||
]);
|
||||
|
||||
return $file;
|
||||
}
|
||||
|
||||
public function retrieve(File $file): StreamedResponse
|
||||
{
|
||||
return $this->adapter($file->disk)->retrieve($file->path, $file->original_name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Same file as retrieve(), forced as a download (Content-Disposition:
|
||||
* attachment) rather than served inline — for a button distinct from
|
||||
* a preview link/thumbnail pointing at the same File.
|
||||
*/
|
||||
public function download(File $file): StreamedResponse
|
||||
{
|
||||
return $this->adapter($file->disk)->download($file->path, $file->original_name);
|
||||
}
|
||||
|
||||
public function exists(File $file): bool
|
||||
{
|
||||
return $this->adapter($file->disk)->exists($file->path);
|
||||
}
|
||||
|
||||
public function delete(File $file): void
|
||||
{
|
||||
$this->adapter($file->disk)->delete($file->path);
|
||||
|
||||
$file->delete();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Collection<int, File>
|
||||
*/
|
||||
public function list(string $purpose, ?Model $owner = null): Collection
|
||||
{
|
||||
return File::query()
|
||||
->where('purpose', $purpose)
|
||||
->when($owner, fn ($query) => $query
|
||||
->where('owner_type', $owner->getMorphClass())
|
||||
->where('owner_id', $owner->getKey()))
|
||||
->get();
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes every File of the given purpose that has no owner yet and
|
||||
* is older than $olderThan — the grace period covers a shopper still
|
||||
* on the page with a picked-but-not-yet-added file. An owned File
|
||||
* (whatever the owner type) is never touched here; callers that want
|
||||
* owned files gone too should delete() them explicitly wherever that
|
||||
* ownership itself ends (e.g. a CartLine being removed).
|
||||
*
|
||||
* @return int number of files deleted
|
||||
*/
|
||||
public function pruneUnowned(string $purpose, Carbon $olderThan): int
|
||||
{
|
||||
$files = File::query()
|
||||
->where('purpose', $purpose)
|
||||
->whereNull('owner_type')
|
||||
->where('created_at', '<', $olderThan)
|
||||
->get();
|
||||
|
||||
foreach ($files as $file) {
|
||||
$this->delete($file);
|
||||
}
|
||||
|
||||
return $files->count();
|
||||
}
|
||||
|
||||
private function adapter(string $disk): FileAdapterInterface
|
||||
{
|
||||
return $this->container->make(FileAdapterInterface::class, ['disk' => $disk]);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
<?php
|
||||
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use Modules\Core\File\Http\Controllers\DownloadFileController;
|
||||
|
||||
Route::get('files/{file}/download', DownloadFileController::class)
|
||||
->name('files.download');
|
||||
@@ -0,0 +1,342 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Localization\Database\Seeders;
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use Modules\Core\Localization\Services\TranslationService;
|
||||
use Spatie\TranslationLoader\LanguageLine;
|
||||
|
||||
/**
|
||||
* Default `storefront` translation lines — nav, cart, product, shop, auth,
|
||||
* account, orders, contact, reviews, wishlist (see the storefront views
|
||||
* under resources/views for where each is used).
|
||||
*
|
||||
* Additive and idempotent: a group/key that already exists is left untouched,
|
||||
* so anything edited in the Filament Language Lines UI wins on a re-run. Runs
|
||||
* explicitly — `php artisan db:seed --class="Modules\Core\Localization\
|
||||
* Database\Seeders\StorefrontTranslationsSeeder"` — it is not wired into any
|
||||
* app's own DatabaseSeeder.
|
||||
*
|
||||
* Greek copy uses an informal register (εσύ/σου) — a consuming app with a
|
||||
* different house style overrides individual lines from the Filament
|
||||
* Language Lines UI same as any other translation, rather than forking
|
||||
* this class.
|
||||
*/
|
||||
class StorefrontTranslationsSeeder extends Seeder
|
||||
{
|
||||
public function run(): void
|
||||
{
|
||||
$translations = app(TranslationService::class);
|
||||
|
||||
foreach ($this->lines() as $key => [$en, $el]) {
|
||||
$exists = LanguageLine::query()
|
||||
->where('group', 'storefront')
|
||||
->where('key', $key)
|
||||
->exists();
|
||||
|
||||
if ($exists) {
|
||||
$this->command?->warn("storefront.{$key} already exists — skipped");
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$translations->create('storefront', $key, ['en' => $en, 'el' => $el]);
|
||||
$this->command?->info("storefront.{$key} added");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* key => [English, Greek].
|
||||
*
|
||||
* @return array<string, array{0: string, 1: string}>
|
||||
*/
|
||||
private function lines(): array
|
||||
{
|
||||
return [
|
||||
// ── Navigation ──────────────────────────────────────────────
|
||||
'nav.home' => ['Home', 'Αρχική'],
|
||||
'nav.products' => ['Products', 'Προϊόντα'],
|
||||
'nav.cart' => ['Cart', 'Καλάθι'],
|
||||
'nav.account' => ['Account', 'Λογαριασμός'],
|
||||
'nav.back' => ['Back', 'Πίσω'],
|
||||
'nav.contact' => ['Contact', 'Επικοινωνία'],
|
||||
'nav.close' => ['Close', 'Κλείσιμο'],
|
||||
|
||||
// ── Cart ────────────────────────────────────────────────────
|
||||
'cart.empty' => ['Your cart is empty', 'Το καλάθι σας είναι άδειο'],
|
||||
'cart.checkout' => ['Checkout', 'Ολοκλήρωση Παραγγελίας'],
|
||||
'cart.total' => ['Total', 'Σύνολο'],
|
||||
'cart.remove' => ['Remove', 'Αφαίρεση'],
|
||||
|
||||
// ── Product ─────────────────────────────────────────────────
|
||||
'product.add_to_cart' => ['Add to Cart', 'Προσθήκη στο Καλάθι'],
|
||||
'product.out_of_stock' => ['Out of Stock', 'Εξαντλήθηκε'],
|
||||
'product.sold' => ['Sold', 'Εξαντλήθηκε'],
|
||||
'product.price' => ['Price', 'Τιμή'],
|
||||
'product.description' => ['Description', 'Περιγραφή'],
|
||||
'product.no_image' => ['No image', 'Χωρίς εικόνα'],
|
||||
'product.read_more' => ['Read more', 'Περισσότερα'],
|
||||
'product.reviews' => ['Reviews', 'Αξιολογήσεις'],
|
||||
'product.related' => ['You may also like', 'Μπορεί επίσης να σου αρέσει'],
|
||||
|
||||
// ── Auth (login link) ───────────────────────────────────────
|
||||
'auth.login' => ['Log In', 'Σύνδεση'],
|
||||
'auth.logout' => ['Log Out', 'Αποσύνδεση'],
|
||||
|
||||
// ── Search ──────────────────────────────────────────────────
|
||||
'search.placeholder' => ['Search products…', 'Αναζήτηση προϊόντων…'],
|
||||
'search.results_for' => ['Search results for ', 'Αποτελέσματα αναζήτησης για '],
|
||||
|
||||
'customer_reviews' => [
|
||||
'{0} No customer reviews|{1} :count customer review|[2,*] :count customer reviews',
|
||||
'{0} Καμία αξιολόγηση πελάτη|{1} :count αξιολόγηση πελάτη|[2,*] :count αξιολογήσεις πελατών',
|
||||
],
|
||||
|
||||
// ── Pagination ──────────────────────────────────────────────
|
||||
'pagination.nav_label' => ['Pagination', 'Σελιδοποίηση'],
|
||||
'pagination.next' => ['Next page', 'Επόμενη σελίδα'],
|
||||
'pagination.previous' => ['Previous page', 'Προηγούμενη σελίδα'],
|
||||
'pagination.page' => ['Page :page', 'Σελίδα :page'],
|
||||
|
||||
// ── Error pages ─────────────────────────────────────────────
|
||||
'errors.404_title' => ['Page not found', 'Η σελίδα δεν βρέθηκε'],
|
||||
'errors.404_text' => [
|
||||
'The page you are looking for does not exist or has been moved.',
|
||||
'Η σελίδα που αναζητάς δεν υπάρχει ή έχει μετακινηθεί.',
|
||||
],
|
||||
'errors.back_home' => ['Back to home', 'Επιστροφή στην αρχική'],
|
||||
|
||||
// ── Reviews ─────────────────────────────────────────────────
|
||||
'review.rating' => ['Rating', 'Βαθμολογία'],
|
||||
'review.write_label' => ['Write a review', 'Γράψε μια αξιολόγηση'],
|
||||
'review.name' => ['Name', 'Όνομα'],
|
||||
'review.name_optional' => ['Optional', 'Προαιρετικό'],
|
||||
'review.email' => ['Email', 'Email'],
|
||||
'review.email_not_published' => ['Will not be published', 'Δεν θα δημοσιευτεί'],
|
||||
'review.save_info' => [
|
||||
'Save my name and email for the next time I comment.',
|
||||
'Αποθήκευσε το όνομα και το email μου για την επόμενη φορά που θα σχολιάσω.',
|
||||
],
|
||||
'review.submit' => ['Submit', 'Υποβολή'],
|
||||
'review.stars_count' => ['{1} :count star|[2,*] :count stars', '{1} :count αστέρι|[2,*] :count αστέρια'],
|
||||
'review.no_reviews_yet' => ['No reviews yet.', 'Δεν υπάρχουν αξιολογήσεις ακόμα.'],
|
||||
'review.write_first' => ['Write the first review', 'Γράψε την πρώτη'],
|
||||
'review.write_new' => ['Add a review', 'Πρόσθεσε μια'],
|
||||
'review.for_product' => ['review for ":name"', 'αξιολόγηση για το «:name»'],
|
||||
'review.rating_required' => ['Please select a rating.', 'Παρακαλούμε επίλεξε βαθμολογία.'],
|
||||
'review.reply' => ['Reply', 'Απάντηση'],
|
||||
'review.thank_you' => ['Thanks for your review!', 'Ευχαριστούμε για την αξιολόγησή σου!'],
|
||||
|
||||
// ── Shop / listing page ─────────────────────────────────────
|
||||
'shop.showing_results' => [
|
||||
'{0} No products found|{1} Showing :first–:last of :total result|[2,*] Showing :first–:last of :total results',
|
||||
'{0} Δεν βρέθηκαν προϊόντα|{1} Εμφάνιση :first–:last από :total αποτέλεσμα|[2,*] Εμφάνιση :first–:last από :total αποτελέσματα',
|
||||
],
|
||||
'shop.all_products' => ['All Products', 'Όλα τα Προϊόντα'],
|
||||
'shop.sort_label' => ['Sort products', 'Ταξινόμηση προϊόντων'],
|
||||
'shop.sort_default' => ['Default sorting', 'Προεπιλεγμένη ταξινόμηση'],
|
||||
'shop.sort_popularity' => ['Popularity', 'Δημοφιλή'],
|
||||
'shop.sort_price_asc' => ['Price: Low to High', 'Τιμή: Αύξουσα'],
|
||||
'shop.sort_price_desc' => ['Price: High to Low', 'Τιμή: Φθίνουσα'],
|
||||
'shop.sort_newest' => ['Newest', 'Νεότερα'],
|
||||
'shop.no_products' => ['No products found in this category.', 'Δεν βρέθηκαν προϊόντα σε αυτή την κατηγορία.'],
|
||||
'shop.search_label' => ['Search products', 'Αναζήτηση προϊόντων'],
|
||||
'shop.search_placeholder' => ['Search products…', 'Αναζήτησε προϊόντα…'],
|
||||
'shop.filter_price' => ['Filter by price', 'Φίλτρο τιμής'],
|
||||
'shop.price_min' => ['Min price', 'Ελάχιστη τιμή'],
|
||||
'shop.price_max' => ['Max price', 'Μέγιστη τιμή'],
|
||||
'shop.reset' => ['Reset', 'Επαναφορά'],
|
||||
'shop.apply' => ['Apply', 'Εφαρμογή'],
|
||||
'shop.availability' => ['Availability', 'Διαθεσιμότητα'],
|
||||
'shop.in_stock_only' => ['In-stock products only', 'Μόνο διαθέσιμα προϊόντα'],
|
||||
|
||||
// ── Passwordless login (Auth\Services\UserOtpService) ───────
|
||||
'auth.login_intro' => [
|
||||
'Enter your email and we\'ll send you a code to sign in — no password needed.',
|
||||
'Γράψε το email σου και θα σου στείλουμε έναν κωδικό σύνδεσης — δεν χρειάζεται κωδικός πρόσβασης.',
|
||||
],
|
||||
'auth.email' => ['Email', 'Email'],
|
||||
'auth.terms_notice' => [
|
||||
'By continuing, you accept the <a href=":terms">Terms of Use</a> and have read the <a href=":privacy">Privacy Policy</a>.',
|
||||
'Συνεχίζοντας, αποδέχεσαι τους <a href=":terms">Όρους Χρήσης</a> και έχεις διαβάσει την <a href=":privacy">Πολιτική Απορρήτου</a>.',
|
||||
],
|
||||
'auth.send_code' => ['Send code', 'Αποστολή κωδικού'],
|
||||
'auth.enter_code' => ['Enter the code', 'Εισάγετε τον κωδικό'],
|
||||
'auth.code_sent_to' => ['We sent a code to', 'Στείλαμε έναν κωδικό στο'],
|
||||
'auth.code' => ['Code', 'Κωδικός'],
|
||||
'auth.resend_code' => ['Resend code', 'Επαναποστολή κωδικού'],
|
||||
'auth.code_resent' => ['A new code was sent.', 'Στάλθηκε νέος κωδικός.'],
|
||||
'auth.change_email' => ['Use a different email', 'Χρήση διαφορετικού email'],
|
||||
'auth.invalid_code' => ['That code is invalid or has expired.', 'Ο κωδικός δεν είναι έγκυρος ή έχει λήξει.'],
|
||||
'auth.too_many_codes' => [
|
||||
'Too many attempts. Please wait a few minutes and try again.',
|
||||
'Πολλές προσπάθειες. Περίμενε λίγα λεπτά και ξαναδοκίμασε.',
|
||||
],
|
||||
'auth.captcha_failed' => [
|
||||
'Please complete the captcha and try again.',
|
||||
'Παρακαλούμε ολοκλήρωσε το captcha και ξαναδοκίμασε.',
|
||||
],
|
||||
|
||||
// ── Account profile page (account/show.blade.php) ───────────
|
||||
'account.nav_profile' => ['Profile', 'Προφίλ'],
|
||||
'account.nav_orders' => ['Orders', 'Παραγγελίες'],
|
||||
'account.nav_wishlist' => ['Wishlist', 'Λίστα επιθυμιών'],
|
||||
'account.email_heading' => ['Login email', 'Email σύνδεσης'],
|
||||
'account.email_change' => ['Change email', 'Αλλαγή email'],
|
||||
'account.details_heading' => ['Your details', 'Τα στοιχεία σου'],
|
||||
'account.first_name' => ['First name', 'Όνομα'],
|
||||
'account.last_name' => ['Last name', 'Επώνυμο'],
|
||||
'account.invoice' => ['I need an invoice', 'Χρειάζομαι τιμολόγιο'],
|
||||
'account.company_name' => ['Company name', 'Επωνυμία εταιρείας'],
|
||||
'account.tax_identifier' => ['Tax ID (VAT)', 'ΑΦΜ'],
|
||||
'account.address_heading' => ['Address', 'Διεύθυνση'],
|
||||
'account.line_one' => ['Address', 'Διεύθυνση'],
|
||||
'account.city' => ['City', 'Πόλη'],
|
||||
'account.postcode' => ['Postcode', 'Ταχυδρομικός κώδικας'],
|
||||
'account.state' => ['Region', 'Περιοχή'],
|
||||
'account.state_placeholder' => ['Select a region', 'Επίλεξε περιοχή'],
|
||||
'account.phone' => ['Phone', 'Τηλέφωνο'],
|
||||
'account.emails_heading' => ['Emails', 'Ειδοποιήσεις email'],
|
||||
'account.recovery_consent' => [
|
||||
'Email me a reminder if I don\'t finish my order',
|
||||
'Στείλε μου υπενθύμιση αν δεν ολοκληρώσω την παραγγελία μου',
|
||||
],
|
||||
'account.save' => ['Save changes', 'Αποθήκευση'],
|
||||
'account.saved' => ['Your details were saved.', 'Τα στοιχεία σου αποθηκεύτηκαν.'],
|
||||
'account.delete_heading' => ['Delete account', 'Διαγραφή λογαριασμού'],
|
||||
'account.delete_text' => [
|
||||
'This permanently deletes your account and personal data. This cannot be undone.',
|
||||
'Αυτό διαγράφει οριστικά τον λογαριασμό και τα προσωπικά σου δεδομένα. Δεν μπορεί να αναιρεθεί.',
|
||||
],
|
||||
'account.delete' => ['Delete my account', 'Διαγραφή λογαριασμού'],
|
||||
'account.delete_confirm_heading' => ['Are you sure?', 'Είσαι σίγουρος/η;'],
|
||||
'account.delete_confirm_text' => [
|
||||
'This cannot be undone. Your account and personal data will be permanently deleted.',
|
||||
'Αυτό δεν μπορεί να αναιρεθεί. Ο λογαριασμός και τα προσωπικά σου δεδομένα θα διαγραφούν οριστικά.',
|
||||
],
|
||||
'account.delete_confirm' => ['Yes, delete my account', 'Ναι, διαγραφή λογαριασμού'],
|
||||
'account.delete_cancel' => ['Cancel', 'Ακύρωση'],
|
||||
'account.deletion_requested' => [
|
||||
'Your account deletion has been requested.',
|
||||
'Ζητήθηκε η διαγραφή του λογαριασμού σου.',
|
||||
],
|
||||
|
||||
// ── Account email-change flow (account/email.blade.php, account/email-code.blade.php) ──
|
||||
'account.email_change_heading' => ['Change your email', 'Αλλαγή email'],
|
||||
'account.email_current' => ['Your current email is', 'Το τρέχον email σου είναι'],
|
||||
'account.email_new' => ['New email', 'Νέο email'],
|
||||
'account.email_new_hint' => [
|
||||
'We\'ll send a code to this address to confirm it\'s yours.',
|
||||
'Θα στείλουμε έναν κωδικό σε αυτή τη διεύθυνση για να επιβεβαιώσουμε ότι είναι δική σου.',
|
||||
],
|
||||
'account.email_confirm' => ['Confirm', 'Επιβεβαίωση'],
|
||||
'account.email_same' => ['That\'s already your current email.', 'Αυτό είναι ήδη το τρέχον email σου.'],
|
||||
'account.email_taken' => [
|
||||
'That email address is already in use.',
|
||||
'Αυτή η διεύθυνση email χρησιμοποιείται ήδη.',
|
||||
],
|
||||
'account.email_changed' => ['Your email was changed.', 'Το email σου άλλαξε.'],
|
||||
|
||||
// ── Order history (account/orders/index.blade.php, account/orders/show.blade.php) ──
|
||||
'orders.empty' => ['You have no orders yet.', 'Δεν έχεις παραγγελίες ακόμα.'],
|
||||
'orders.shop_now' => ['Shop now', 'Αγόρασε τώρα'],
|
||||
'orders.date' => ['Date', 'Ημερομηνία'],
|
||||
'orders.number' => ['Order', 'Παραγγελία'],
|
||||
'orders.status' => ['Status', 'Κατάσταση'],
|
||||
'orders.total' => ['Total', 'Σύνολο'],
|
||||
'orders.view' => ['View', 'Προβολή'],
|
||||
'orders.view_order' => ['View order :number', 'Προβολή παραγγελίας :number'],
|
||||
'orders.order_title' => ['Order :number', 'Παραγγελία :number'],
|
||||
'orders.back' => ['Back to orders', 'Πίσω στις παραγγελίες'],
|
||||
'orders.payment' => ['Payment method', 'Τρόπος πληρωμής'],
|
||||
'orders.shipping_method' => ['Shipping method', 'Τρόπος αποστολής'],
|
||||
'orders.tracking' => ['Tracking', 'Παρακολούθηση αποστολής'],
|
||||
'orders.shipment' => ['Shipment', 'Αποστολή'],
|
||||
'orders.voucher_number' => ['Tracking number', 'Αριθμός αποστολής'],
|
||||
'orders.shipment_status' => ['Shipment status', 'Κατάσταση αποστολής'],
|
||||
'orders.tracking_history' => ['Tracking history', 'Ιστορικό αποστολής'],
|
||||
'orders.tracking_empty' => [
|
||||
'No updates from the courier yet.',
|
||||
'Δεν υπάρχουν ακόμα ενημερώσεις από την εταιρεία courier.',
|
||||
],
|
||||
'orders.track_on_carrier' => ['Track on the courier\'s website', 'Παρακολούθηση στη σελίδα του courier'],
|
||||
|
||||
// ── Tracking statuses (Modules\Core\Shipping\Enums\TrackingStatus) ──
|
||||
'tracking_status.pending' => ['Awaiting pickup', 'Αναμονή παραλαβής'],
|
||||
'tracking_status.collected_from_sender' => ['Picked up by the courier', 'Παραλήφθηκε από το courier'],
|
||||
'tracking_status.in_transit' => ['In transit', 'Σε μεταφορά'],
|
||||
'tracking_status.out_for_delivery' => ['Out for delivery', 'Προς παράδοση'],
|
||||
'tracking_status.delivered' => ['Delivered', 'Παραδόθηκε'],
|
||||
'tracking_status.failed' => ['Delivery attempt failed', 'Αποτυχία παράδοσης'],
|
||||
'tracking_status.returned' => ['Returned to sender', 'Επιστράφηκε στον αποστολέα'],
|
||||
'tracking_status.cancelled' => ['Cancelled', 'Ακυρώθηκε'],
|
||||
'tracking_status.unknown' => ['Update', 'Ενημέρωση'],
|
||||
'orders.items' => ['Items', 'Προϊόντα'],
|
||||
'orders.subtotal' => ['Subtotal', 'Μερικό σύνολο'],
|
||||
'orders.discount' => ['Discount', 'Έκπτωση'],
|
||||
'orders.shipping' => ['Shipping', 'Μεταφορικά'],
|
||||
'orders.tax' => ['Tax', 'ΦΠΑ'],
|
||||
'orders.shipping_to' => ['Shipping to', 'Αποστολή σε'],
|
||||
'orders.billing' => ['Billing details', 'Στοιχεία τιμολόγησης'],
|
||||
|
||||
// ── Contact details (components/contact-details.blade.php) ──
|
||||
'contact.address' => ['Address', 'Διεύθυνση'],
|
||||
'contact.phone' => ['Phone', 'Τηλέφωνο'],
|
||||
|
||||
// ── Contact form (contact.blade.php, ContactController, emails.contact-confirmation) ──
|
||||
'contact.sent' => [
|
||||
'Your message was sent — we\'ll get back to you soon.',
|
||||
'Το μήνυμά σου στάλθηκε — θα σου απαντήσουμε σύντομα.',
|
||||
],
|
||||
'contact.send_failed' => [
|
||||
'Something went wrong sending your message. Please try again.',
|
||||
'Κάτι πήγε στραβά κατά την αποστολή. Παρακαλούμε δοκίμασε ξανά.',
|
||||
],
|
||||
'contact.too_many' => [
|
||||
'Too many messages sent. Please wait a while before trying again.',
|
||||
'Στάλθηκαν πολλά μηνύματα. Περίμενε λίγο πριν ξαναδοκιμάσεις.',
|
||||
],
|
||||
'contact.confirmation_subject' => ['We received your message', 'Λάβαμε το μήνυμά σου'],
|
||||
'contact.confirmation_preheader' => [
|
||||
'Thanks for reaching out — here\'s a copy of your message.',
|
||||
'Ευχαριστούμε για την επικοινωνία — εδώ είναι ένα αντίγραφο του μηνύματός σου.',
|
||||
],
|
||||
'contact.confirmation_heading' => ['We received your message', 'Λάβαμε το μήνυμά σου'],
|
||||
'contact.confirmation_body' => [
|
||||
'Thanks for getting in touch. We\'ll reply as soon as we can.',
|
||||
'Ευχαριστούμε που επικοινώνησες μαζί μας. Θα απαντήσουμε το συντομότερο δυνατό.',
|
||||
],
|
||||
'contact.confirmation_footer' => [
|
||||
'This is a copy of the message you sent us.',
|
||||
'Αυτό είναι ένα αντίγραφο του μηνύματος που μας έστειλες.',
|
||||
],
|
||||
|
||||
// ── Product page — custom fields, add-to-cart failure (product/show.blade.php,
|
||||
// components/product-custom-fields.blade.php) ─────────────
|
||||
'product.personalize' => ['Personalize', 'Εξατομίκευση'],
|
||||
'product.custom_field_photo_hint' => ['Max file size: :size MB.', 'Μέγιστο μέγεθος αρχείου: :size MB.'],
|
||||
'product.custom_field_uploading' => ['Uploading…', 'Μεταφόρτωση…'],
|
||||
'product.custom_field_upload_failed' => [
|
||||
'Upload failed. Please try again.',
|
||||
'Η μεταφόρτωση απέτυχε. Παρακαλούμε δοκίμασε ξανά.',
|
||||
],
|
||||
'product.add_to_cart_failed' => [
|
||||
'{0} Sorry, that\'s out of stock|{1} Only :count left in stock|[2,*] Only :count left in stock',
|
||||
'{0} Λυπούμαστε, εξαντλήθηκε|{1} Απομένει μόνο :count κομμάτι|[2,*] Απομένουν μόνο :count κομμάτια',
|
||||
],
|
||||
|
||||
// ── Wishlist (components/wishlist-button.blade.php, wishlist/guest.blade.php, wishlist/list.blade.php) ──
|
||||
'wishlist.add' => ['Add to wishlist', 'Προσθήκη στη λίστα επιθυμιών'],
|
||||
'wishlist.remove' => ['Remove from wishlist', 'Αφαίρεση από τη λίστα επιθυμιών'],
|
||||
'wishlist.added' => ['Added to wishlist', 'Προστέθηκε στη λίστα επιθυμιών'],
|
||||
'wishlist.removed' => ['Removed from wishlist', 'Αφαιρέθηκε από τη λίστα επιθυμιών'],
|
||||
'wishlist.empty' => ['Your wishlist is empty.', 'Η λίστα επιθυμιών σου είναι άδεια.'],
|
||||
'wishlist.guest_hint' => [
|
||||
'Log in to keep your wishlist across devices.',
|
||||
'Συνδέσου για να κρατήσεις τη λίστα επιθυμιών σου σε όλες τις συσκευές.',
|
||||
],
|
||||
'wishlist.remove_named' => ['Remove :name from wishlist', 'Αφαίρεση :name από τη λίστα επιθυμιών'],
|
||||
'wishlist.remove_short' => ['Remove', 'Αφαίρεση'],
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,114 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Localization\Database\Seeders;
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
use Modules\Core\Localization\Services\TranslationService;
|
||||
use Spatie\TranslationLoader\LanguageLine;
|
||||
|
||||
/**
|
||||
* Default `validation` translation lines — Laravel's own error-message group
|
||||
* (`validation.required`, `validation.email`, `validation.attributes.*`, …),
|
||||
* resolved by every `Validator::make()`/`$request->validate()` call in a
|
||||
* consuming app (checkout addresses, cart, product reviews, stock checks).
|
||||
*
|
||||
* Spatie's DB loader (spatie/laravel-translation-loader, wired in
|
||||
* LocalizationServiceProvider) merges this group over Laravel's file-based
|
||||
* validation.php — without this, Greek requests fall back to Laravel's
|
||||
* untranslated English defaults. Only the rule keys and field attributes
|
||||
* actually in use are seeded; add more as new rules/fields show up.
|
||||
*
|
||||
* Additive and idempotent: a key that already exists is left untouched, so
|
||||
* anything edited in the Filament Language Lines UI wins on a re-run. Runs
|
||||
* explicitly — `php artisan db:seed --class="Modules\Core\Localization\
|
||||
* Database\Seeders\ValidationTranslationsSeeder"` — it is not wired into any
|
||||
* app's own DatabaseSeeder.
|
||||
*
|
||||
* Greek copy uses the project's informal register (εσύ/σου).
|
||||
*/
|
||||
class ValidationTranslationsSeeder extends Seeder
|
||||
{
|
||||
public function run(): void
|
||||
{
|
||||
$translations = app(TranslationService::class);
|
||||
|
||||
foreach ($this->lines() as $key => [$en, $el]) {
|
||||
$exists = LanguageLine::query()
|
||||
->where('group', 'validation')
|
||||
->where('key', $key)
|
||||
->exists();
|
||||
|
||||
if ($exists) {
|
||||
$this->command?->warn("validation.{$key} already exists — skipped");
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
$translations->create('validation', $key, ['en' => $en, 'el' => $el]);
|
||||
$this->command?->info("validation.{$key} added");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* key => [English, Greek].
|
||||
*
|
||||
* @return array<string, array{0: string, 1: string}>
|
||||
*/
|
||||
private function lines(): array
|
||||
{
|
||||
return [
|
||||
// ── Rule messages ─────────────────────────────────────────────
|
||||
'required' => ['The :attribute field is required.', 'Το πεδίο :attribute είναι υποχρεωτικό.'],
|
||||
'email' => ['The :attribute field must be a valid email address.', 'Το πεδίο :attribute πρέπει να είναι έγκυρη διεύθυνση email.'],
|
||||
'string' => ['The :attribute field must be a string.', 'Το πεδίο :attribute πρέπει να είναι κείμενο.'],
|
||||
'integer' => ['The :attribute field must be an integer.', 'Το πεδίο :attribute πρέπει να είναι ακέραιος αριθμός.'],
|
||||
'boolean' => ['The :attribute field must be true or false.', 'Το πεδίο :attribute πρέπει να είναι true ή false.'],
|
||||
'min.numeric' => ['The :attribute field must be at least :min.', 'Το πεδίο :attribute πρέπει να είναι τουλάχιστον :min.'],
|
||||
'max.string' => ['The :attribute field must not be greater than :max characters.', 'Το πεδίο :attribute δεν πρέπει να ξεπερνά τους :max χαρακτήρες.'],
|
||||
'between.numeric' => ['The :attribute field must be between :min and :max.', 'Το πεδίο :attribute πρέπει να είναι μεταξύ :min και :max.'],
|
||||
'exists' => ['The selected :attribute is invalid.', 'Η επιλεγμένη τιμή για το πεδίο :attribute δεν είναι έγκυρη.'],
|
||||
// Product custom-field photo uploads (CustomFieldUploadController, CartController).
|
||||
'file' => ['The :attribute field must be a file.', 'Το πεδίο :attribute πρέπει να είναι αρχείο.'],
|
||||
'mimes' => ['The :attribute field must be a file of type: :values.', 'Το πεδίο :attribute πρέπει να είναι αρχείο τύπου: :values.'],
|
||||
'max.file' => ['The :attribute field must not be greater than :max kilobytes.', 'Το αρχείο στο πεδίο :attribute δεν πρέπει να ξεπερνά τα :max kilobytes.'],
|
||||
'uploaded' => ['The :attribute failed to upload.', 'Η μεταφόρτωση στο πεδίο :attribute απέτυχε.'],
|
||||
|
||||
// ── Field names (checkout: billing/shipping address) ──────────
|
||||
'attributes.contact_email' => ['email', 'email'],
|
||||
'attributes.billing_first_name' => ['first name', 'όνομα'],
|
||||
'attributes.billing_last_name' => ['last name', 'επώνυμο'],
|
||||
'attributes.billing_company_name' => ['company name', 'επωνυμία εταιρείας'],
|
||||
'attributes.billing_tax_identifier' => ['tax ID', 'ΑΦΜ'],
|
||||
'attributes.billing_line_one' => ['address', 'διεύθυνση'],
|
||||
'attributes.billing_line_two' => ['address line 2', 'διεύθυνση (γραμμή 2)'],
|
||||
'attributes.billing_city' => ['city', 'πόλη'],
|
||||
'attributes.billing_state' => ['region', 'νομό / περιοχή'],
|
||||
'attributes.billing_postcode' => ['postcode', 'ταχυδρομικό κώδικα'],
|
||||
'attributes.billing_country_id' => ['country', 'χώρα'],
|
||||
'attributes.billing_contact_phone' => ['phone', 'τηλέφωνο'],
|
||||
'attributes.shipping_first_name' => ['first name', 'όνομα'],
|
||||
'attributes.shipping_last_name' => ['last name', 'επώνυμο'],
|
||||
'attributes.shipping_company_name' => ['company name', 'επωνυμία εταιρείας'],
|
||||
'attributes.shipping_line_one' => ['address', 'διεύθυνση'],
|
||||
'attributes.shipping_line_two' => ['address line 2', 'διεύθυνση (γραμμή 2)'],
|
||||
'attributes.shipping_city' => ['city', 'πόλη'],
|
||||
'attributes.shipping_state' => ['region', 'νομό / περιοχή'],
|
||||
'attributes.shipping_postcode' => ['postcode', 'ταχυδρομικό κώδικα'],
|
||||
'attributes.shipping_country_id' => ['country', 'χώρα'],
|
||||
'attributes.shipping_contact_phone' => ['phone', 'τηλέφωνο'],
|
||||
'attributes.shipping_delivery_instructions' => ['delivery notes', 'σχόλια για την παράδοση'],
|
||||
|
||||
// ── Field names (cart) ─────────────────────────────────────────
|
||||
'attributes.purchasable_id' => ['product', 'προϊόν'],
|
||||
'attributes.quantity' => ['quantity', 'ποσότητα'],
|
||||
'attributes.code' => ['coupon code', 'κωδικό κουπονιού'],
|
||||
|
||||
// ── Field names (product reviews / stock check) ────────────────
|
||||
'attributes.variant' => ['variant', 'παραλλαγή'],
|
||||
'attributes.rating' => ['rating', 'βαθμολογία'],
|
||||
'attributes.content' => ['review text', 'κείμενο κριτικής'],
|
||||
'attributes.name' => ['name', 'όνομα'],
|
||||
'attributes.email' => ['email', 'email'],
|
||||
];
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user