Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ebf8fd7571 | ||
|
|
536fe32e0d | ||
|
|
8293195395 | ||
|
|
d19fe1b6ea | ||
|
|
44a2ddda4a | ||
|
|
52f3036960 | ||
|
|
004f2382cb | ||
|
|
6cf142e35b | ||
|
|
47851d36ec | ||
|
|
c43682ef0c |
@@ -4,6 +4,82 @@ 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.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
|
||||
|
||||
+105
-42
@@ -1,85 +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
|
||||
bin/dc-core.sh exec app composer update boboko/core --with-all-dependencies
|
||||
```
|
||||
|
||||
Skipping this step is the most common cause of "my change isn't showing up."
|
||||
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: no separate npm package
|
||||
## JS/CSS: a real npm package
|
||||
|
||||
This package's JS (Stimulus controllers) and CSS ship as plain source files under `resources/js/` and `resources/css/`, read directly by a consumer app's own Vite build — there is no separate `@boboko/core` npm package, and no `npm install`/`file:` dependency step of any kind.
|
||||
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.
|
||||
|
||||
The reason: Composer already gives every environment one single, unconditional path — `vendor/boboko/core` — whether that resolves to a real symlink into `../boboko-core` (local path repo) or a real installed copy (tagged VCS release). A consumer's `vite.config.js` and JS entry point just read straight from that path, so there is nothing to toggle on the JS side — whatever Composer resolved is exactly what Vite sees, automatically, in both dev and prod.
|
||||
Public entry points (`package.json` `exports`):
|
||||
|
||||
**Stable entry point.** A consumer imports from [resources/js/index.js](resources/js/index.js) only — never from a path reaching into a specific module's internals (e.g. `resources/js/checkout/index.js` directly). That barrel file re-exports whatever a consumer needs (currently just `registerCheckout`), so this package's internal file layout can change without breaking every consumer's own entry point:
|
||||
| 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 } from "../../vendor/boboko/core/resources/js/index.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(['vendor/boboko/core/resources/css/checkout.css', 'resources/css/app.css', 'resources/js/app.js'])
|
||||
@vite(['node_modules/@boboko/core/resources/css/checkout.css', 'resources/css/app.css', 'resources/js/app.js'])
|
||||
```
|
||||
|
||||
**What a consumer's `vite.config.js` needs**, because `vendor/boboko/core` is a symlink in local path-repo dev (not a real directory):
|
||||
`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.
|
||||
|
||||
```js
|
||||
export default defineConfig({
|
||||
server: {
|
||||
watch: {
|
||||
// vendor/boboko/core is a symlink into ../boboko-core in local
|
||||
// path-repo dev. Vite/chokidar don't follow symlinks for watched
|
||||
// files by default, so edits to core's source wouldn't otherwise
|
||||
// trigger HMR. No-op against a real installed copy (tagged VCS
|
||||
// release) in production — there's no symlink to follow, and
|
||||
// production only ever runs a one-shot `npm run build`, which
|
||||
// doesn't watch anything regardless.
|
||||
followSymlinks: true,
|
||||
},
|
||||
},
|
||||
});
|
||||
## 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
|
||||
```
|
||||
|
||||
Bare imports inside this package's own JS (`leaflet`, `@hotwired/stimulus`) resolve against the *consumer's* `node_modules` — Node's normal upward `node_modules` resolution walks from `vendor/boboko/core/resources/js/...` up through `vendor/boboko/`, `vendor/`, to the consumer app's root, where `node_modules` lives. This works with zero extra config as long as `vendor/boboko/core` sits inside the consumer's own directory tree (true for both the symlink and the real-copy case) — a consuming app's `vite`-equivalent Docker service just needs the same bind mount PHP containers already get, landing at the same path:
|
||||
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.
|
||||
|
||||
```yaml
|
||||
# consumer app's docker-compose.core-dev.yml
|
||||
services:
|
||||
vite:
|
||||
volumes:
|
||||
- ../boboko-core:/app/vendor/boboko/core
|
||||
## 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
|
||||
git tag v0.27.5
|
||||
git push origin master v0.27.5
|
||||
```
|
||||
|
||||
(Match whatever the consumer's Vite container's working directory actually is — `/app` above, `/var/www/html` for the PHP containers in `boboko-test`'s convention.)
|
||||
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
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "boboko/core",
|
||||
"description": "Core module — authentication and shared panel behaviour",
|
||||
"type": "library",
|
||||
"version": "0.27.2",
|
||||
"version": "0.28.0",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Modules\\Core\\": "src/"
|
||||
|
||||
@@ -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');
|
||||
});
|
||||
}
|
||||
};
|
||||
+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']);
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
+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
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@boboko/core",
|
||||
"version": "0.27.2",
|
||||
"version": "0.28.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.",
|
||||
|
||||
+110
-26
@@ -53,6 +53,7 @@
|
||||
--bbk-color-accent: #18181b;
|
||||
--bbk-color-accent-text: #ffffff;
|
||||
--bbk-color-danger: #dc2626;
|
||||
--bbk-color-info: #2563eb;
|
||||
|
||||
--bbk-radius: 8px;
|
||||
--bbk-radius-sm: 4px;
|
||||
@@ -153,6 +154,11 @@
|
||||
outline-offset: 2px;
|
||||
}
|
||||
|
||||
/* Programmatic focus targets only (tabindex=-1) — never reached by Tab, so
|
||||
no ring needed. */
|
||||
.bbk-cart-heading:focus,
|
||||
.bbk-checkout-summary-heading:focus { outline: none; }
|
||||
|
||||
.bbk-visually-hidden {
|
||||
position: absolute;
|
||||
width: 1px;
|
||||
@@ -183,7 +189,7 @@
|
||||
|
||||
.bbk-cart-item {
|
||||
display: grid;
|
||||
grid-template-columns: 72px 1fr auto;
|
||||
grid-template-columns: 72px 1fr;
|
||||
gap: 0.875rem;
|
||||
align-items: start;
|
||||
}
|
||||
@@ -199,8 +205,23 @@
|
||||
|
||||
.bbk-cart-item-detail { min-width: 0; }
|
||||
|
||||
/* Title + remove button share the first row; quantity stepper + line total
|
||||
share the last one. */
|
||||
.bbk-cart-item-head,
|
||||
.bbk-cart-item-foot {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
gap: 0.75rem;
|
||||
}
|
||||
|
||||
.bbk-cart-item-head { align-items: flex-start; }
|
||||
.bbk-cart-item-foot { align-items: center; }
|
||||
|
||||
.bbk-cart-item-remove-form { flex: 0 0 auto; }
|
||||
|
||||
.bbk-cart-item-title {
|
||||
display: block;
|
||||
min-width: 0;
|
||||
margin: 0 0 0.25rem;
|
||||
font-weight: 600;
|
||||
color: inherit;
|
||||
@@ -252,24 +273,24 @@ a.bbk-cart-item-title:hover { text-decoration: underline; }
|
||||
color: var(--bbk-color-muted);
|
||||
}
|
||||
|
||||
.bbk-cart-item-aside {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: flex-end;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.bbk-cart-item-total { margin: 0; font-weight: 600; }
|
||||
.bbk-cart-item-total { margin: 0; font-weight: 600; white-space: nowrap; }
|
||||
|
||||
/* 2.5rem hit area (same as the drawer's own close button), pulled up/right by
|
||||
negative margins so the glyph lines up with the title's first line instead
|
||||
of pushing the row taller. */
|
||||
.bbk-cart-item-remove {
|
||||
font-size: 1.125rem;
|
||||
width: 1.5rem;
|
||||
height: 1.5rem;
|
||||
font-size: 1.75rem;
|
||||
width: 2.5rem;
|
||||
height: 2.5rem;
|
||||
margin: -0.5rem -0.5rem 0 0;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: var(--bbk-radius-sm);
|
||||
}
|
||||
|
||||
.bbk-cart-item-remove:hover { background: var(--bbk-color-bg-muted); }
|
||||
|
||||
.bbk-cart-qty {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
@@ -905,10 +926,39 @@ textarea.bbk-field-input { resize: vertical; }
|
||||
to { transform: rotate(360deg); }
|
||||
}
|
||||
|
||||
/* ── Notice ────────────────────────────────────────────────────────────
|
||||
Inline, static message box: `.bbk-notice` + a tone modifier. Static
|
||||
content, so no live-region role — for messages injected after load, add
|
||||
role="status" (or role="alert" for errors) on the element itself. */
|
||||
|
||||
.bbk-notice {
|
||||
--bbk-notice-color: var(--bbk-color-text);
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 0.625rem;
|
||||
padding: 0.875rem 1rem;
|
||||
border: 1px solid color-mix(in srgb, var(--bbk-notice-color) 25%, transparent);
|
||||
border-radius: var(--bbk-radius-sm);
|
||||
background: color-mix(in srgb, var(--bbk-notice-color) 6%, var(--bbk-color-bg));
|
||||
color: var(--bbk-color-text);
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
|
||||
.bbk-notice--info { --bbk-notice-color: var(--bbk-color-info); }
|
||||
|
||||
.bbk-notice-icon {
|
||||
flex: 0 0 auto;
|
||||
width: 1.25rem;
|
||||
height: 1.25rem;
|
||||
color: var(--bbk-notice-color);
|
||||
}
|
||||
|
||||
.bbk-notice-text { margin: 0; align-self: center; }
|
||||
|
||||
/* ── Confirmation page ─────────────────────────────────────────────── */
|
||||
|
||||
.bbk-confirmation {
|
||||
max-width: 720px;
|
||||
max-width: 560px;
|
||||
margin: 0 auto;
|
||||
padding: 3rem 1.5rem 5rem;
|
||||
font-family: var(--bbk-font);
|
||||
@@ -916,7 +966,7 @@ textarea.bbk-field-input { resize: vertical; }
|
||||
}
|
||||
|
||||
.bbk-confirmation-heading {
|
||||
margin: 0 0 1rem;
|
||||
margin: 0 0 1.25rem;
|
||||
font-size: 1.75rem;
|
||||
font-weight: 700;
|
||||
}
|
||||
@@ -924,7 +974,7 @@ textarea.bbk-field-input { resize: vertical; }
|
||||
.bbk-confirmation-ref { margin: 0 0 0.25rem; }
|
||||
|
||||
.bbk-confirmation-meta {
|
||||
margin: 0 0 1rem;
|
||||
margin: 1.5rem 0 1rem;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.25rem;
|
||||
@@ -940,17 +990,22 @@ textarea.bbk-field-input { resize: vertical; }
|
||||
.bbk-confirmation-meta-row dt { color: var(--bbk-color-muted); }
|
||||
.bbk-confirmation-meta-row dd { margin: 0; font-weight: 600; }
|
||||
|
||||
.bbk-confirmation-body {
|
||||
margin: 2rem 0;
|
||||
display: grid;
|
||||
gap: 2.5rem;
|
||||
.bbk-confirmation-section {
|
||||
margin-top: 2rem;
|
||||
padding-top: 1.5rem;
|
||||
border-top: 1px solid var(--bbk-color-border);
|
||||
}
|
||||
|
||||
@media (min-width: 640px) {
|
||||
.bbk-confirmation-body { grid-template-columns: 1fr 1fr; }
|
||||
.bbk-confirmation-section-heading {
|
||||
margin: 0 0 1rem;
|
||||
font-size: 1.125rem;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.bbk-confirmation-lines {
|
||||
list-style: none;
|
||||
margin: 0 0 1.25rem;
|
||||
padding: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.75rem;
|
||||
@@ -965,22 +1020,51 @@ textarea.bbk-field-input { resize: vertical; }
|
||||
|
||||
.bbk-confirmation-line-detail { min-width: 0; }
|
||||
|
||||
.bbk-confirmation-line-name { margin: 0 0 0.25rem; }
|
||||
|
||||
.bbk-confirmation-line-total { margin: 0; white-space: nowrap; }
|
||||
|
||||
.bbk-confirmation-line-qty { color: var(--bbk-color-muted); }
|
||||
|
||||
.bbk-confirmation-lines .bbk-cart-summary { margin-top: 0.75rem; }
|
||||
|
||||
.bbk-confirmation-addresses {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
display: grid;
|
||||
gap: 1.5rem;
|
||||
}
|
||||
|
||||
.bbk-confirmation-address-heading {
|
||||
@media (min-width: 480px) {
|
||||
.bbk-confirmation-addresses { grid-template-columns: 1fr 1fr; }
|
||||
}
|
||||
|
||||
.bbk-confirmation-address-heading,
|
||||
.bbk-confirmation-bank-transfer-heading {
|
||||
margin: 0 0 0.5rem;
|
||||
font-size: 0.9375rem;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
/* Store-authored rich text (ManageStoreDetails' RichEditor) — may be
|
||||
paragraphs, bold text or a bank/IBAN/BIC table. */
|
||||
.bbk-confirmation-bank-transfer-body {
|
||||
font-size: 0.875rem;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.bbk-confirmation-bank-transfer-body > :first-child { margin-top: 0; }
|
||||
.bbk-confirmation-bank-transfer-body > :last-child { margin-bottom: 0; }
|
||||
|
||||
.bbk-confirmation-bank-transfer-body table {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
|
||||
.bbk-confirmation-bank-transfer-body th,
|
||||
.bbk-confirmation-bank-transfer-body td {
|
||||
padding: 0.375rem 0.5rem;
|
||||
border: 1px solid var(--bbk-color-border);
|
||||
text-align: left;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
.bbk-address-lines {
|
||||
font-style: normal;
|
||||
display: flex;
|
||||
|
||||
@@ -9,11 +9,13 @@ import { csrfToken } from './csrf'
|
||||
// - 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']
|
||||
static targets = ['panel', 'body', 'error', 'heading', 'status']
|
||||
|
||||
connect() {
|
||||
this.onChanged = this.onChanged.bind(this)
|
||||
@@ -40,19 +42,31 @@ export default class extends Controller {
|
||||
}
|
||||
|
||||
onKeydown(event) {
|
||||
if (event.key === 'Escape' && !this.element.hidden) this.close()
|
||||
// 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'))
|
||||
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
|
||||
@@ -132,6 +146,28 @@ export default class extends Controller {
|
||||
}
|
||||
}
|
||||
|
||||
// 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
|
||||
@@ -144,10 +180,53 @@ export default class extends Controller {
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// Single stable JS entry point for this package. A consuming app imports
|
||||
// from here (vendor/boboko/core/resources/js/index.js), never from a path
|
||||
// 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.
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
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')
|
||||
|
||||
@@ -11,10 +14,19 @@
|
||||
<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>
|
||||
<dd>#{{ \Modules\Core\Order\Support\OrderReferenceDisplay::resolve($order) }}</dd>
|
||||
</div>
|
||||
|
||||
@if ($order->billingAddress?->contact_email)
|
||||
@@ -39,8 +51,6 @@
|
||||
@endif
|
||||
</dl>
|
||||
|
||||
<p class="bbk-checkout-note">{{ __('checkout.page.confirmation_email_note') }}</p>
|
||||
|
||||
{{-- 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. --}}
|
||||
@@ -53,21 +63,29 @@
|
||||
@endif
|
||||
@endguest
|
||||
|
||||
<div class="bbk-confirmation-body">
|
||||
<div class="bbk-confirmation-lines">
|
||||
<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)
|
||||
<div class="bbk-confirmation-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="{{ $line->description }}" width="72" height="72" loading="lazy">
|
||||
<img src="{{ $thumb }}" alt="" width="72" height="72" loading="lazy">
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="bbk-confirmation-line-detail">
|
||||
<span class="bbk-confirmation-line-name">
|
||||
<p class="bbk-confirmation-line-name">
|
||||
{{ $line->description }}
|
||||
<span class="bbk-confirmation-line-qty">× {{ $line->quantity }}</span>
|
||||
<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>
|
||||
@@ -76,9 +94,13 @@
|
||||
@include('checkout::partials.line-custom-fields', ['line' => $line])
|
||||
</div>
|
||||
|
||||
<span class="bbk-confirmation-line-total">{{ $line->sub_total?->formatted() }}</span>
|
||||
</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">
|
||||
@@ -110,23 +132,31 @@
|
||||
<span>{{ $order->total?->formatted() }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div class="bbk-confirmation-addresses">
|
||||
@if ($order->shippingAddress || $order->billingAddress)
|
||||
<div class="bbk-confirmation-section bbk-confirmation-addresses">
|
||||
@if ($order->shippingAddress)
|
||||
<div class="bbk-confirmation-address">
|
||||
<h2 class="bbk-confirmation-address-heading">{{ __('checkout.page.confirmation_shipping_to') }}</h2>
|
||||
<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" />
|
||||
</div>
|
||||
</section>
|
||||
@endif
|
||||
|
||||
@if ($order->billingAddress)
|
||||
<div class="bbk-confirmation-address">
|
||||
<h2 class="bbk-confirmation-address-heading">{{ __('checkout.page.confirmation_billing') }}</h2>
|
||||
<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" />
|
||||
</div>
|
||||
</section>
|
||||
@endif
|
||||
</div>
|
||||
</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
|
||||
|
||||
@@ -15,7 +15,9 @@
|
||||
data-bbk-cart-target="panel"
|
||||
>
|
||||
<header class="bbk-cart-panel-header">
|
||||
<h2 class="bbk-cart-heading" id="bbk-cart-heading">{{ __('checkout.cart.title') }}</h2>
|
||||
{{-- 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"
|
||||
@@ -26,7 +28,16 @@
|
||||
|
||||
@include('checkout::partials.cart-error')
|
||||
|
||||
<div class="bbk-cart-panel-body" data-bbk-cart-target="body" aria-live="polite">
|
||||
{{-- 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>
|
||||
|
||||
@@ -267,9 +267,15 @@
|
||||
|
||||
<aside class="bbk-checkout-aside">
|
||||
<div class="bbk-checkout-summary" data-controller="bbk-cart">
|
||||
<h2 class="bbk-checkout-summary-heading">{{ __('checkout.page.order_summary_heading') }}</h2>
|
||||
<h2 class="bbk-checkout-summary-heading" tabindex="-1" data-bbk-cart-target="heading">{{ __('checkout.page.order_summary_heading') }}</h2>
|
||||
@include('checkout::partials.cart-error')
|
||||
<div data-bbk-cart-target="body" aria-live="polite">
|
||||
<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>
|
||||
|
||||
@@ -24,32 +24,60 @@
|
||||
<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="{{ $name }}" width="72" height="72" loading="lazy">
|
||||
<img src="{{ $thumb }}" alt="" width="72" height="72" loading="lazy">
|
||||
</a>
|
||||
@else
|
||||
<img src="{{ $thumb }}" alt="{{ $name }}" width="72" height="72" loading="lazy">
|
||||
<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">{{ $name }}</a>
|
||||
<a href="{{ $productUrl }}" class="bbk-cart-item-title" id="bbk-cart-item-title-{{ $line->id }}">{{ $name }}</a>
|
||||
@else
|
||||
<p class="bbk-cart-item-title">{{ $name }}</p>
|
||||
<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')
|
||||
@@ -59,7 +87,7 @@
|
||||
data-action="bbk-cart#step"
|
||||
data-bbk-cart-dir-param="-1"
|
||||
aria-label="{{ __('checkout.cart.decrease') }}"
|
||||
>−</button>
|
||||
><span aria-hidden="true">−</span></button>
|
||||
|
||||
<input
|
||||
type="number"
|
||||
@@ -79,25 +107,13 @@
|
||||
data-action="bbk-cart#step"
|
||||
data-bbk-cart-dir-param="1"
|
||||
aria-label="{{ __('checkout.cart.increase') }}"
|
||||
>+</button>
|
||||
><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 class="bbk-cart-item-aside">
|
||||
<p class="bbk-cart-item-total">{{ $line->subTotal?->formatted() }}</p>
|
||||
|
||||
<form
|
||||
method="POST"
|
||||
action="{{ route('checkout.cart.remove', ['locale' => app()->getLocale(), 'line' => $line->id]) }}"
|
||||
data-action="submit->bbk-cart#submit"
|
||||
>
|
||||
@csrf
|
||||
@method('DELETE')
|
||||
<button
|
||||
type="submit"
|
||||
class="bbk-cart-item-remove"
|
||||
aria-label="{{ __('checkout.cart.remove') }}"
|
||||
>×</button>
|
||||
</form>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ 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;
|
||||
@@ -40,8 +41,11 @@ use Modules\Core\Auth\Mail\UserOtpMail;
|
||||
* 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/otp_expires_at/otp_attempts columns exactly as
|
||||
* before, so a returning shopper's login is unchanged.
|
||||
* 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
|
||||
@@ -87,7 +91,7 @@ class UserOtpService
|
||||
$code = str_pad((string) random_int(0, 999999), self::CODE_LENGTH, '0', STR_PAD_LEFT);
|
||||
|
||||
if ($user) {
|
||||
$user->otp_code = $code;
|
||||
$user->otp_code_hash = $code;
|
||||
$user->otp_expires_at = now()->addMinutes(self::EXPIRY_MINUTES);
|
||||
$user->otp_attempts = 0;
|
||||
$user->save();
|
||||
@@ -96,8 +100,12 @@ class UserOtpService
|
||||
// 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' => $code,
|
||||
'code_hash' => Hash::make($code),
|
||||
'expires_at' => now()->addMinutes(self::EXPIRY_MINUTES)->timestamp,
|
||||
'attempts' => 0,
|
||||
], now()->addMinutes(self::EXPIRY_MINUTES));
|
||||
@@ -154,15 +162,15 @@ class UserOtpService
|
||||
return 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)) {
|
||||
if (! $user || ! $user->otp_code_hash || ! $user->otp_expires_at || now()->isAfter($user->otp_expires_at)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (! hash_equals((string) $user->otp_code, $code)) {
|
||||
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 = null;
|
||||
$user->otp_code_hash = null;
|
||||
$user->otp_expires_at = null;
|
||||
$user->otp_attempts = 0;
|
||||
}
|
||||
@@ -172,7 +180,7 @@ class UserOtpService
|
||||
return null;
|
||||
}
|
||||
|
||||
$user->otp_code = null;
|
||||
$user->otp_code_hash = null;
|
||||
$user->otp_expires_at = null;
|
||||
$user->otp_attempts = 0;
|
||||
$user->save();
|
||||
@@ -200,7 +208,7 @@ class UserOtpService
|
||||
return null;
|
||||
}
|
||||
|
||||
if (! hash_equals((string) $pending['code'], $code)) {
|
||||
if (! Hash::check($code, $pending['code_hash'])) {
|
||||
$pending['attempts']++;
|
||||
|
||||
if ($pending['attempts'] >= (int) config('core.auth.otp.max_attempts', 5)) {
|
||||
|
||||
@@ -60,6 +60,7 @@ class CheckoutTranslationsSeeder extends Seeder
|
||||
'cart.increase' => ['Increase quantity', 'Αύξηση ποσότητας'],
|
||||
'cart.decrease' => ['Decrease quantity', 'Μείωση ποσότητας'],
|
||||
'cart.remove' => ['Remove', 'Αφαίρεση'],
|
||||
'cart.updated' => ['Cart updated', 'Το καλάθι ενημερώθηκε'],
|
||||
'cart.subtotal' => ['Subtotal', 'Υποσύνολο'],
|
||||
'cart.discount' => ['Discount', 'Έκπτωση'],
|
||||
'cart.shipping' => ['Shipping', 'Μεταφορικά'],
|
||||
@@ -190,6 +191,10 @@ class CheckoutTranslationsSeeder extends Seeder
|
||||
'Θέλεις να παρακολουθείς την παραγγελία σου; Δημιούργησε λογαριασμό ή',
|
||||
],
|
||||
'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',
|
||||
|
||||
@@ -28,6 +28,7 @@ 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 /
|
||||
@@ -554,6 +555,8 @@ class CheckoutController extends Controller
|
||||
return view('checkout::confirmation', [
|
||||
'order' => $order,
|
||||
'paymentMethodName' => $paymentMethodName,
|
||||
'bankTransferInstructions' => app(StoreDetailsService::class)
|
||||
->bankTransferInstructionsFor($order, $locale),
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -150,7 +150,7 @@ class CorePlugin implements Plugin
|
||||
});
|
||||
|
||||
LunarStaff::addActivitylogExcept([
|
||||
'otp_code',
|
||||
'otp_code_hash',
|
||||
'otp_expires_at',
|
||||
'password',
|
||||
'remember_token',
|
||||
|
||||
@@ -115,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,
|
||||
]);
|
||||
|
||||
@@ -23,7 +23,7 @@ use Modules\Core\Customer\Exceptions\InvalidEmailChangeCodeException;
|
||||
* 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/otp_expires_at/otp_attempts
|
||||
* 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
|
||||
|
||||
@@ -98,6 +98,14 @@ class StorefrontTranslationsSeeder extends Seeder
|
||||
'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', 'Γράψε μια αξιολόγηση'],
|
||||
|
||||
@@ -5,6 +5,7 @@ namespace Modules\Core\Providers;
|
||||
use Illuminate\Support\Facades\Event;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use Lunar\Models\Language;
|
||||
use Modules\Core\Command\PullTranslationsCommand;
|
||||
use Modules\Core\Localization\Events\LanguageCreated;
|
||||
use Modules\Core\Localization\Events\LanguageDeleted;
|
||||
use Modules\Core\Localization\Events\LanguageUpdated;
|
||||
@@ -46,5 +47,9 @@ class LocalizationServiceProvider extends ServiceProvider
|
||||
}
|
||||
|
||||
Event::listen(LanguageUpdated::class, MigrateTranslationsForRenamedLanguage::class);
|
||||
|
||||
if ($this->app->runningInConsole()) {
|
||||
$this->commands([PullTranslationsCommand::class]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ use Illuminate\Support\Facades\Event;
|
||||
use Lunar\Models\Language;
|
||||
use Lunar\Models\Order;
|
||||
use Modules\Core\Order\Services\OrderStatusFlow;
|
||||
use Modules\Core\Order\Support\OrderReferenceDisplay;
|
||||
use Modules\Core\Store\Events\StoreDetailsUpdated;
|
||||
use Modules\Core\Store\Models\StoreDetails;
|
||||
|
||||
@@ -39,8 +40,8 @@ class StoreDetailsService
|
||||
}
|
||||
|
||||
/**
|
||||
* Null for any non-bank-transfer order — the confirmation email only
|
||||
* shows this block when there's actually a wire to send (see
|
||||
* Null for any non-bank-transfer order — the confirmation email and page
|
||||
* only show this block when there's actually a wire to send (see
|
||||
* BankTransferPaymentDriver's own docblock for why a bank transfer
|
||||
* order stays at 'awaiting_payment' until staff confirm the wire
|
||||
* arrived). Null also when the store hasn't filled the field in for
|
||||
@@ -66,7 +67,30 @@ class StoreDetailsService
|
||||
return null;
|
||||
}
|
||||
|
||||
return RichContentRenderer::make($content)->toHtml();
|
||||
return $this->fillOrderReference(
|
||||
RichContentRenderer::make($content)->toHtml(),
|
||||
$order,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Replaces a `{order_reference}` (or `{{ order_reference }}`) the shop
|
||||
* owner typed into the instructions with the order's display reference
|
||||
* (OrderReferenceDisplay — same form as the email subject).
|
||||
*
|
||||
* A plain text replace rather than RichContentRenderer::mergeTags():
|
||||
* that only fills genuine Tiptap mergeTag nodes, which this editor never
|
||||
* creates — Lunar's TranslatedText can't pass mergeTags() through to its
|
||||
* per-locale RichEditors, so the placeholder is always stored as
|
||||
* ordinary typed text.
|
||||
*/
|
||||
private function fillOrderReference(string $html, Order $order): string
|
||||
{
|
||||
return preg_replace(
|
||||
'/\{\{?\s*order_reference\s*\}\}?/',
|
||||
e(OrderReferenceDisplay::resolve($order)),
|
||||
$html,
|
||||
);
|
||||
}
|
||||
|
||||
public function update(array $attributes): StoreDetails
|
||||
|
||||
Reference in New Issue
Block a user