Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5f0dbbb734 | ||
|
|
839335ed3f | ||
|
|
0a6958eb9e | ||
|
|
d189a7559a |
@@ -4,6 +4,42 @@ 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/).
|
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
|
## [0.26.3] - 2026-09-28
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
"name": "boboko/core",
|
"name": "boboko/core",
|
||||||
"description": "Core module — authentication and shared panel behaviour",
|
"description": "Core module — authentication and shared panel behaviour",
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"version": "0.26.3",
|
"version": "0.26.5",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Modules\\Core\\": "src/"
|
"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",
|
"name": "@boboko/core",
|
||||||
"version": "0.26.3",
|
"version": "0.26.5",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"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.",
|
"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.",
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ use Illuminate\Support\Facades\Event;
|
|||||||
use Lunar\Models\Order;
|
use Lunar\Models\Order;
|
||||||
use Modules\Core\Checkout\Events\OrderPlaced;
|
use Modules\Core\Checkout\Events\OrderPlaced;
|
||||||
use Modules\Core\Order\Services\OrderPaymentResolutionService;
|
use Modules\Core\Order\Services\OrderPaymentResolutionService;
|
||||||
|
use Modules\Core\Order\Services\OrderStatusFlow;
|
||||||
use Modules\Core\Payment\Events\PaymentDeferred;
|
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
|
* visibility and stock decrement, but nothing ever moved `status` off its
|
||||||
* initial value, since resolveCaptureOrAuthorization() only does that for
|
* initial value, since resolveCaptureOrAuthorization() only does that for
|
||||||
* an actual capture. Caught and fixed after the fact.
|
* 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
|
class MarkOrderPlacedOnDeferredPayment
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
private readonly OrderPaymentResolutionService $resolution,
|
private readonly OrderPaymentResolutionService $resolution,
|
||||||
|
private readonly OrderStatusFlow $flow,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
public function handle(PaymentDeferred $event): void
|
public function handle(PaymentDeferred $event): void
|
||||||
@@ -53,7 +61,9 @@ class MarkOrderPlacedOnDeferredPayment
|
|||||||
|
|
||||||
$order = Order::findOrFail($orderId);
|
$order = Order::findOrFail($orderId);
|
||||||
|
|
||||||
$this->resolution->resolveDeferredPayment($order, self::class);
|
if (! $this->flow->isBankTransfer($order)) {
|
||||||
|
$this->resolution->resolveDeferredPayment($order, self::class);
|
||||||
|
}
|
||||||
|
|
||||||
if (! blank($order->placed_at)) {
|
if (! blank($order->placed_at)) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ use Modules\Core\Payment\Contracts\SupportsPay;
|
|||||||
use Modules\Core\Payment\Contracts\SupportsRefunds;
|
use Modules\Core\Payment\Contracts\SupportsRefunds;
|
||||||
use Modules\Core\Payment\DTOs\PaymentResult;
|
use Modules\Core\Payment\DTOs\PaymentResult;
|
||||||
use Modules\Core\Payment\Enums\PaymentResultStatus;
|
use Modules\Core\Payment\Enums\PaymentResultStatus;
|
||||||
|
use Modules\Core\Payment\Events\PaymentDeferred;
|
||||||
use Modules\Core\Payment\Events\PaymentRefunded;
|
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
|
* payment requires the money to arrive BEFORE the order can be
|
||||||
* considered paid (unlike cash-on-delivery, where payment happens on
|
* considered paid (unlike cash-on-delivery, where payment happens on
|
||||||
* delivery — see CashOnDeliveryPaymentDriver's own docblock for that
|
* delivery — see CashOnDeliveryPaymentDriver's own docblock for that
|
||||||
* driver's mirror-image reasoning). So pay() returns Pending, dispatching
|
* driver's mirror-image reasoning). So pay() returns Pending and DOES
|
||||||
* no event at all — no PaymentCaptured (nothing has been paid yet), and
|
* dispatch PaymentDeferred, same as COD — without it, nothing ever sets
|
||||||
* deliberately NOT PaymentDeferred either (unlike COD, whose
|
* Order::placed_at or fires OrderPlaced, leaving the order invisible in
|
||||||
* MarkOrderPlacedOnDeferredPayment listener immediately advances the
|
* customer order history, un-decremented in stock, and the checkout
|
||||||
* order past 'awaiting_payment' since a COD order has nothing to await at
|
* confirmation page unable to find it (see PaymentDeferred's and
|
||||||
* checkout). A bank transfer order genuinely DOES have something to
|
* CashOnDeliveryPaymentDriver's own docblocks for that failure mode).
|
||||||
* await: it stays at 'awaiting_payment' with Order::paid false until
|
* Unlike COD, though, a bank transfer order genuinely DOES have something
|
||||||
* staff confirm the wire arrived via OrderFulfillmentService::markPaid(),
|
* to await: MarkOrderPlacedOnDeferredPayment skips
|
||||||
* which — unlike its COD path — also advances the order's status, since
|
* OrderPaymentResolutionService::resolveDeferredPayment() for a bank
|
||||||
* nothing else ever will (see that method's own docblock).
|
* transfer order (via OrderStatusFlow::isBankTransfer()), so it stays at
|
||||||
* CheckoutController::placeOrder() already treats a Pending result with
|
* 'awaiting_payment' with Order::paid false until staff confirm the wire
|
||||||
* no continuation as a fully placed order (see its own docblock), so the
|
* arrived via OrderFulfillmentService::markPaid(), which — unlike its COD
|
||||||
* order is still created and visible to the shopper immediately; only its
|
* path — also advances the order's status, since nothing else ever will
|
||||||
* payment/status is what's left outstanding.
|
* (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
|
* $reference is generated here for the same reason as OfflinePaymentDriver's
|
||||||
* pay(): there is no gateway to hand one back. refund()'s 'notes' (in
|
* 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
|
public function pay(string $type, Price $amount, array $data = [], array $context = []): PaymentResult
|
||||||
{
|
{
|
||||||
return new PaymentResult(
|
$result = new PaymentResult(
|
||||||
status: PaymentResultStatus::Pending,
|
status: PaymentResultStatus::Pending,
|
||||||
reference: 'bank-transfer-'.Str::uuid(),
|
reference: 'bank-transfer-'.Str::uuid(),
|
||||||
amount: $amount,
|
amount: $amount,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
PaymentDeferred::dispatch($type, $result, $context);
|
||||||
|
|
||||||
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function refund(string $reference, Price $amount, array $context = []): PaymentResult
|
public function refund(string $reference, Price $amount, array $context = []): PaymentResult
|
||||||
|
|||||||
@@ -80,10 +80,19 @@ class ManageStoreDetails extends Page implements HasForms
|
|||||||
TextInput::make('phone')
|
TextInput::make('phone')
|
||||||
->label('Phone')
|
->label('Phone')
|
||||||
->tel(),
|
->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')
|
Section::make('Legal')
|
||||||
->description('Shown on invoices and terms pages.')
|
->description('Shown on invoices and terms pages.')
|
||||||
->schema([
|
->schema([
|
||||||
|
TranslatedText::make('legal_name')
|
||||||
|
->label('Legal name'),
|
||||||
TextInput::make('tax_identifier')
|
TextInput::make('tax_identifier')
|
||||||
->label('Tax ID (ΑΦΜ)'),
|
->label('Tax ID (ΑΦΜ)'),
|
||||||
TextInput::make('registration_number')
|
TextInput::make('registration_number')
|
||||||
|
|||||||
@@ -21,5 +21,6 @@ class StoreDetails extends Model
|
|||||||
'name' => 'array',
|
'name' => 'array',
|
||||||
'address' => 'array',
|
'address' => 'array',
|
||||||
'bank_transfer_instructions' => 'array',
|
'bank_transfer_instructions' => 'array',
|
||||||
|
'legal_name' => 'array',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,6 +67,7 @@ class StoreDetailsService
|
|||||||
'name' => $this->emptyPerLocale(),
|
'name' => $this->emptyPerLocale(),
|
||||||
'address' => $this->emptyPerLocale(),
|
'address' => $this->emptyPerLocale(),
|
||||||
'bank_transfer_instructions' => $this->emptyPerLocale(),
|
'bank_transfer_instructions' => $this->emptyPerLocale(),
|
||||||
|
'legal_name' => $this->emptyPerLocale(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user