Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5f0dbbb734 | ||
|
|
839335ed3f | ||
|
|
0a6958eb9e | ||
|
|
d189a7559a | ||
|
|
7f2ddea240 | ||
|
|
45df93692a | ||
|
|
b806db611f | ||
|
|
c1874c277e | ||
|
|
05f00ed1fd | ||
|
|
569eb310e9 | ||
|
|
0387b38ab3 | ||
|
|
0a51d912a0 | ||
|
|
1214f9b748 |
@@ -4,6 +4,83 @@ 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.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
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "boboko/core",
|
||||
"description": "Core module — authentication and shared panel behaviour",
|
||||
"type": "library",
|
||||
"version": "0.26.0",
|
||||
"version": "0.26.5",
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"Modules\\Core\\": "src/"
|
||||
|
||||
+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']);
|
||||
});
|
||||
}
|
||||
};
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@boboko/core",
|
||||
"version": "0.26.0",
|
||||
"version": "0.26.5",
|
||||
"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.",
|
||||
|
||||
@@ -223,13 +223,13 @@ a.bbk-cart-item-title:hover { text-decoration: underline; }
|
||||
font-size: 0.8125rem;
|
||||
}
|
||||
|
||||
.bbk-line-field span,
|
||||
.bbk-line-field dt {
|
||||
color: var(--bbk-color-muted);
|
||||
}
|
||||
|
||||
.bbk-line-field dd {
|
||||
margin: 0;
|
||||
white-space: pre-line;
|
||||
margin: 3px 0 0 0;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<dl class="bbk-confirmation-meta">
|
||||
<div class="bbk-confirmation-meta-row">
|
||||
<dt>{{ __('checkout.page.confirmation_order_number') }}</dt>
|
||||
<dd>{{ $order->reference }}</dd>
|
||||
<dd>{{ \Modules\Core\Order\Support\OrderReferenceDisplay::resolve($order) }}</dd>
|
||||
</div>
|
||||
|
||||
@if ($order->billingAddress?->contact_email)
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
<dl class="bbk-line-fields">
|
||||
@foreach ($fields as $field)
|
||||
<div class="bbk-line-field">
|
||||
<dt>{{ $field['label'] }}</dt>
|
||||
<dd>
|
||||
@if ($field['type'] === 'file')
|
||||
<dt>{{ $field['label'] }}:</dt>
|
||||
<dd>
|
||||
@php
|
||||
$file = \Modules\Core\File\Models\File::find($field['file_id'] ?? null);
|
||||
@endphp
|
||||
@@ -39,11 +39,12 @@
|
||||
@endif
|
||||
<span>{{ $file->original_name }}</span>
|
||||
</a>
|
||||
@endif
|
||||
@else
|
||||
{{ $field['value'] }}
|
||||
|
||||
@endif
|
||||
</dd>
|
||||
@else
|
||||
<span>{{ $field['label'] }}: {{ $field['value'] }}</span>
|
||||
@endif
|
||||
</div>
|
||||
@endforeach
|
||||
</dl>
|
||||
|
||||
@@ -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'],
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -108,6 +108,10 @@ class StorefrontLabels
|
||||
'en' => 'Too many attempts. Please wait a few minutes and try again.',
|
||||
'el' => 'Πολλές προσπάθειες. Περίμενε λίγα λεπτά και ξαναδοκίμασε.',
|
||||
],
|
||||
'auth.captcha_failed' => [
|
||||
'en' => 'Please complete the captcha and try again.',
|
||||
'el' => 'Παρακαλούμε ολοκλήρωσε το captcha και ξαναδοκίμασε.',
|
||||
],
|
||||
|
||||
// Account profile page (account/show.blade.php)
|
||||
'account.nav_profile' => ['en' => 'Profile', 'el' => 'Προφίλ'],
|
||||
|
||||
@@ -6,6 +6,7 @@ use Illuminate\Support\Facades\Event;
|
||||
use Lunar\Models\Order;
|
||||
use Modules\Core\Checkout\Events\OrderPlaced;
|
||||
use Modules\Core\Order\Services\OrderPaymentResolutionService;
|
||||
use Modules\Core\Order\Services\OrderStatusFlow;
|
||||
use Modules\Core\Payment\Events\PaymentDeferred;
|
||||
|
||||
/**
|
||||
@@ -36,11 +37,18 @@ use Modules\Core\Payment\Events\PaymentDeferred;
|
||||
* visibility and stock decrement, but nothing ever moved `status` off its
|
||||
* initial value, since resolveCaptureOrAuthorization() only does that for
|
||||
* an actual capture. Caught and fixed after the fact.
|
||||
*
|
||||
* The status advance is skipped for a bank transfer order
|
||||
* (OrderStatusFlow::isBankTransfer()) — unlike COD, it genuinely has
|
||||
* something to await at 'awaiting_payment': the wire itself. Only
|
||||
* OrderFulfillmentService::markPaid() ever advances it past that point
|
||||
* (see BankTransferPaymentDriver's own docblock).
|
||||
*/
|
||||
class MarkOrderPlacedOnDeferredPayment
|
||||
{
|
||||
public function __construct(
|
||||
private readonly OrderPaymentResolutionService $resolution,
|
||||
private readonly OrderStatusFlow $flow,
|
||||
) {}
|
||||
|
||||
public function handle(PaymentDeferred $event): void
|
||||
@@ -53,7 +61,9 @@ class MarkOrderPlacedOnDeferredPayment
|
||||
|
||||
$order = Order::findOrFail($orderId);
|
||||
|
||||
if (! $this->flow->isBankTransfer($order)) {
|
||||
$this->resolution->resolveDeferredPayment($order, self::class);
|
||||
}
|
||||
|
||||
if (! blank($order->placed_at)) {
|
||||
return;
|
||||
|
||||
@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
|
||||
use Illuminate\Support\Facades\Notification as NotificationFacade;
|
||||
use Modules\Core\Notification\BaseNotification;
|
||||
use Modules\Core\Order\Events\OrderCaptured;
|
||||
use Modules\Core\Order\Support\OrderReferenceDisplay;
|
||||
|
||||
class OrderCapturedNotification extends BaseNotification
|
||||
{
|
||||
@@ -40,10 +41,12 @@ class OrderCapturedNotification extends BaseNotification
|
||||
{
|
||||
$order = $this->event->order;
|
||||
|
||||
$reference = OrderReferenceDisplay::resolve($order);
|
||||
|
||||
return (new MailMessage)
|
||||
->subject(__('Payment captured for your order :reference', ['reference' => $order->reference]))
|
||||
->subject(__('Payment captured for your order :reference', ['reference' => $reference]))
|
||||
->view('core::order.notifications.captured', [
|
||||
'reference' => $order->reference,
|
||||
'reference' => $reference,
|
||||
'amount' => $this->event->transaction->amount->formatted,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
|
||||
use Illuminate\Support\Facades\Notification as NotificationFacade;
|
||||
use Modules\Core\Notification\BaseNotification;
|
||||
use Modules\Core\Order\Events\OrderCompleted;
|
||||
use Modules\Core\Order\Support\OrderReferenceDisplay;
|
||||
|
||||
class OrderCompletedNotification extends BaseNotification
|
||||
{
|
||||
@@ -40,10 +41,12 @@ class OrderCompletedNotification extends BaseNotification
|
||||
{
|
||||
$order = $this->event->order;
|
||||
|
||||
$reference = OrderReferenceDisplay::resolve($order);
|
||||
|
||||
return (new MailMessage)
|
||||
->subject(__('Your order :reference is complete', ['reference' => $order->reference]))
|
||||
->subject(__('Your order :reference is complete', ['reference' => $reference]))
|
||||
->view('core::order.notifications.completed', [
|
||||
'reference' => $order->reference,
|
||||
'reference' => $reference,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
|
||||
use Illuminate\Support\Facades\Notification as NotificationFacade;
|
||||
use Modules\Core\Notification\BaseNotification;
|
||||
use Modules\Core\Order\Events\OrderDelivered;
|
||||
use Modules\Core\Order\Support\OrderReferenceDisplay;
|
||||
|
||||
class OrderDeliveredNotification extends BaseNotification
|
||||
{
|
||||
@@ -40,10 +41,12 @@ class OrderDeliveredNotification extends BaseNotification
|
||||
{
|
||||
$order = $this->event->order;
|
||||
|
||||
$reference = OrderReferenceDisplay::resolve($order);
|
||||
|
||||
return (new MailMessage)
|
||||
->subject(__('Your order :reference has been delivered', ['reference' => $order->reference]))
|
||||
->subject(__('Your order :reference has been delivered', ['reference' => $reference]))
|
||||
->view('core::order.notifications.delivered', [
|
||||
'reference' => $order->reference,
|
||||
'reference' => $reference,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
|
||||
use Illuminate\Support\Facades\Notification as NotificationFacade;
|
||||
use Modules\Core\Notification\BaseNotification;
|
||||
use Modules\Core\Order\Events\OrderDispatched;
|
||||
use Modules\Core\Order\Support\OrderReferenceDisplay;
|
||||
|
||||
/**
|
||||
* Fills a real, previously-unfilled customer-communication gap — before
|
||||
@@ -45,10 +46,12 @@ class OrderDispatchedNotification extends BaseNotification
|
||||
{
|
||||
$order = $this->event->order;
|
||||
|
||||
$reference = OrderReferenceDisplay::resolve($order);
|
||||
|
||||
return (new MailMessage)
|
||||
->subject(__('Your order :reference is on its way', ['reference' => $order->reference]))
|
||||
->subject(__('Your order :reference is on its way', ['reference' => $reference]))
|
||||
->view('core::order.notifications.dispatched', [
|
||||
'reference' => $order->reference,
|
||||
'reference' => $reference,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
|
||||
use Illuminate\Support\Facades\Notification as NotificationFacade;
|
||||
use Modules\Core\Notification\BaseNotification;
|
||||
use Modules\Core\Order\Events\OrderReadyForPickup;
|
||||
use Modules\Core\Order\Support\OrderReferenceDisplay;
|
||||
|
||||
/**
|
||||
* "Your order is ready to collect" — listens to the specific
|
||||
@@ -50,10 +51,12 @@ class OrderPickupReadyNotification extends BaseNotification
|
||||
{
|
||||
$order = $this->event->order;
|
||||
|
||||
$reference = OrderReferenceDisplay::resolve($order);
|
||||
|
||||
return (new MailMessage)
|
||||
->subject(__('Your order :reference is ready for pickup', ['reference' => $order->reference]))
|
||||
->subject(__('Your order :reference is ready for pickup', ['reference' => $reference]))
|
||||
->view('core::order.notifications.pickup-ready', [
|
||||
'reference' => $order->reference,
|
||||
'reference' => $reference,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
|
||||
use Illuminate\Support\Facades\Notification as NotificationFacade;
|
||||
use Modules\Core\Checkout\Events\OrderPlaced;
|
||||
use Modules\Core\Notification\BaseNotification;
|
||||
use Modules\Core\Order\Support\OrderReferenceDisplay;
|
||||
|
||||
/**
|
||||
* The order confirmation email — fires once, for every capture_mode and
|
||||
@@ -51,10 +52,12 @@ class OrderPlacedNotification extends BaseNotification
|
||||
{
|
||||
$order = $this->event->order;
|
||||
|
||||
$reference = OrderReferenceDisplay::resolve($order);
|
||||
|
||||
return (new MailMessage)
|
||||
->subject(__('Your order :reference is confirmed', ['reference' => $order->reference]))
|
||||
->subject(__('Your order :reference is confirmed', ['reference' => $reference]))
|
||||
->view('core::order.notifications.placed', [
|
||||
'reference' => $order->reference,
|
||||
'reference' => $reference,
|
||||
'total' => $order->total->formatted,
|
||||
'lines' => $order->lines,
|
||||
]);
|
||||
|
||||
@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
|
||||
use Illuminate\Support\Facades\Notification as NotificationFacade;
|
||||
use Modules\Core\Notification\BaseNotification;
|
||||
use Modules\Core\Order\Events\OrderRefunded;
|
||||
use Modules\Core\Order\Support\OrderReferenceDisplay;
|
||||
|
||||
class OrderRefundedNotification extends BaseNotification
|
||||
{
|
||||
@@ -40,10 +41,12 @@ class OrderRefundedNotification extends BaseNotification
|
||||
{
|
||||
$order = $this->event->order;
|
||||
|
||||
$reference = OrderReferenceDisplay::resolve($order);
|
||||
|
||||
return (new MailMessage)
|
||||
->subject(__('A refund has been issued for your order :reference', ['reference' => $order->reference]))
|
||||
->subject(__('A refund has been issued for your order :reference', ['reference' => $reference]))
|
||||
->view('core::order.notifications.refunded', [
|
||||
'reference' => $order->reference,
|
||||
'reference' => $reference,
|
||||
'amount' => $this->event->transaction->amount->formatted,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ use Illuminate\Notifications\Messages\MailMessage;
|
||||
use Illuminate\Support\Facades\Notification as NotificationFacade;
|
||||
use Modules\Core\Notification\BaseNotification;
|
||||
use Modules\Core\Order\Events\OrderStatusUpdated;
|
||||
use Modules\Core\Order\Support\OrderReferenceDisplay;
|
||||
|
||||
class OrderStatusUpdatedNotification extends BaseNotification
|
||||
{
|
||||
@@ -52,10 +53,12 @@ class OrderStatusUpdatedNotification extends BaseNotification
|
||||
{
|
||||
$order = $this->event->order;
|
||||
|
||||
$reference = OrderReferenceDisplay::resolve($order);
|
||||
|
||||
return (new MailMessage)
|
||||
->subject(__('Your order :reference has been updated', ['reference' => $order->reference]))
|
||||
->subject(__('Your order :reference has been updated', ['reference' => $reference]))
|
||||
->view('core::order.notifications.status-updated', [
|
||||
'reference' => $order->reference,
|
||||
'reference' => $reference,
|
||||
'statusLabel' => config("lunar.orders.statuses.{$order->status}.label", $order->status),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
<?php
|
||||
|
||||
namespace Modules\Core\Order\Support;
|
||||
|
||||
use Lunar\Models\Order;
|
||||
|
||||
/**
|
||||
* A shorter, human-facing form of Order::reference for emails/views —
|
||||
* Lunar\Base\OrderReferenceGenerator pads the order's own id out to a fixed
|
||||
* length (config('lunar.orders.reference_format'), 8 characters/'0'-padded
|
||||
* by default), so a shop's first real orders read as "#00000001" rather
|
||||
* than "#1". Strips leading zeros until the first non-zero digit; if
|
||||
* nothing but zeros remain (or the reference is empty), shows "0".
|
||||
*
|
||||
* $order->reference itself is untouched anywhere else (DB lookups, the
|
||||
* order-status API, staff search) — this is purely a display helper.
|
||||
*/
|
||||
class OrderReferenceDisplay
|
||||
{
|
||||
public static function resolve(Order $order): string
|
||||
{
|
||||
$reference = ltrim((string) $order->reference, '0');
|
||||
|
||||
return $reference !== '' ? $reference : '0';
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,7 @@ use Modules\Core\Payment\Contracts\SupportsPay;
|
||||
use Modules\Core\Payment\Contracts\SupportsRefunds;
|
||||
use Modules\Core\Payment\DTOs\PaymentResult;
|
||||
use Modules\Core\Payment\Enums\PaymentResultStatus;
|
||||
use Modules\Core\Payment\Events\PaymentDeferred;
|
||||
use Modules\Core\Payment\Events\PaymentRefunded;
|
||||
|
||||
/**
|
||||
@@ -27,20 +28,24 @@ use Modules\Core\Payment\Events\PaymentRefunded;
|
||||
* payment requires the money to arrive BEFORE the order can be
|
||||
* considered paid (unlike cash-on-delivery, where payment happens on
|
||||
* delivery — see CashOnDeliveryPaymentDriver's own docblock for that
|
||||
* driver's mirror-image reasoning). So pay() returns Pending, dispatching
|
||||
* no event at all — no PaymentCaptured (nothing has been paid yet), and
|
||||
* deliberately NOT PaymentDeferred either (unlike COD, whose
|
||||
* MarkOrderPlacedOnDeferredPayment listener immediately advances the
|
||||
* order past 'awaiting_payment' since a COD order has nothing to await at
|
||||
* checkout). A bank transfer order genuinely DOES have something to
|
||||
* await: it stays at 'awaiting_payment' with Order::paid false until
|
||||
* staff confirm the wire arrived via OrderFulfillmentService::markPaid(),
|
||||
* which — unlike its COD path — also advances the order's status, since
|
||||
* nothing else ever will (see that method's own docblock).
|
||||
* CheckoutController::placeOrder() already treats a Pending result with
|
||||
* no continuation as a fully placed order (see its own docblock), so the
|
||||
* order is still created and visible to the shopper immediately; only its
|
||||
* payment/status is what's left outstanding.
|
||||
* driver's mirror-image reasoning). So pay() returns Pending and DOES
|
||||
* dispatch PaymentDeferred, same as COD — without it, nothing ever sets
|
||||
* Order::placed_at or fires OrderPlaced, leaving the order invisible in
|
||||
* customer order history, un-decremented in stock, and the checkout
|
||||
* confirmation page unable to find it (see PaymentDeferred's and
|
||||
* CashOnDeliveryPaymentDriver's own docblocks for that failure mode).
|
||||
* Unlike COD, though, a bank transfer order genuinely DOES have something
|
||||
* to await: MarkOrderPlacedOnDeferredPayment skips
|
||||
* OrderPaymentResolutionService::resolveDeferredPayment() for a bank
|
||||
* transfer order (via OrderStatusFlow::isBankTransfer()), so it stays at
|
||||
* 'awaiting_payment' with Order::paid false until staff confirm the wire
|
||||
* arrived via OrderFulfillmentService::markPaid(), which — unlike its COD
|
||||
* path — also advances the order's status, since nothing else ever will
|
||||
* (see that method's own docblock). CheckoutController::placeOrder()
|
||||
* already treats a Pending result with no continuation as a fully placed
|
||||
* order (see its own docblock), so the order is still created and visible
|
||||
* to the shopper immediately; only its payment/status is what's left
|
||||
* outstanding.
|
||||
*
|
||||
* $reference is generated here for the same reason as OfflinePaymentDriver's
|
||||
* pay(): there is no gateway to hand one back. refund()'s 'notes' (in
|
||||
@@ -63,11 +68,15 @@ class BankTransferPaymentDriver implements Configurable, SupportsPay, SupportsRe
|
||||
|
||||
public function pay(string $type, Price $amount, array $data = [], array $context = []): PaymentResult
|
||||
{
|
||||
return new PaymentResult(
|
||||
$result = new PaymentResult(
|
||||
status: PaymentResultStatus::Pending,
|
||||
reference: 'bank-transfer-'.Str::uuid(),
|
||||
amount: $amount,
|
||||
);
|
||||
|
||||
PaymentDeferred::dispatch($type, $result, $context);
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function refund(string $reference, Price $amount, array $context = []): PaymentResult
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace Modules\Core\Providers;
|
||||
|
||||
use Illuminate\Support\Facades\Event;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use Modules\Core\Auth\Events\UserAuthenticated;
|
||||
use Modules\Core\Wishlist\Listeners\MergeGuestWishlistOnLogin;
|
||||
@@ -19,7 +20,7 @@ class WishlistServiceProvider extends ServiceProvider
|
||||
|
||||
public function boot(): void
|
||||
{
|
||||
$this->loadRoutesFrom(__DIR__.'/../Wishlist/routes/web.php');
|
||||
Route::middleware('web')->group(__DIR__.'/../Wishlist/routes/web.php');
|
||||
|
||||
Event::listen(UserAuthenticated::class, MergeGuestWishlistOnLogin::class);
|
||||
}
|
||||
|
||||
@@ -80,10 +80,19 @@ class ManageStoreDetails extends Page implements HasForms
|
||||
TextInput::make('phone')
|
||||
->label('Phone')
|
||||
->tel(),
|
||||
TextInput::make('contact_email')
|
||||
->label('Contact email')
|
||||
->email()
|
||||
->helperText('Receives the contact form, and is shown to customers as the store\'s contact email.'),
|
||||
TextInput::make('mail_from_name')
|
||||
->label('Mail from name')
|
||||
->helperText('The sender name on outgoing emails (MAIL_FROM_NAME).'),
|
||||
]),
|
||||
Section::make('Legal')
|
||||
->description('Shown on invoices and terms pages.')
|
||||
->schema([
|
||||
TranslatedText::make('legal_name')
|
||||
->label('Legal name'),
|
||||
TextInput::make('tax_identifier')
|
||||
->label('Tax ID (ΑΦΜ)'),
|
||||
TextInput::make('registration_number')
|
||||
|
||||
@@ -21,5 +21,6 @@ class StoreDetails extends Model
|
||||
'name' => 'array',
|
||||
'address' => 'array',
|
||||
'bank_transfer_instructions' => 'array',
|
||||
'legal_name' => 'array',
|
||||
];
|
||||
}
|
||||
|
||||
@@ -67,6 +67,7 @@ class StoreDetailsService
|
||||
'name' => $this->emptyPerLocale(),
|
||||
'address' => $this->emptyPerLocale(),
|
||||
'bank_transfer_instructions' => $this->emptyPerLocale(),
|
||||
'legal_name' => $this->emptyPerLocale(),
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user