boboko/core
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat: Upgrading Lunar to 1.5

Browse Source
This commit is contained in:
arvanitakis
2026-08-31 13:16:13 +03:00
parent 661e8b9a96
commit d873cb4931
42 changed files with 229 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Shipping/Carriers/Acs/AcsFulfillmentService.php
+2 -1
View File
@@ -2,6 +2,7 @@
namespace Modules\Core\Shipping\Carriers\Acs;
use RuntimeException;
use Illuminate\Support\Carbon;
use Illuminate\Support\Collection;
use Lunar\Models\Order;
@@ -88,7 +89,7 @@ class AcsFulfillmentService implements CarrierFulfillmentInterface, SupportsMani
public function cancelShipment(Shipment $shipment): void
{
if ($shipment->manifest_reference) {
throw new \RuntimeException('Cannot cancel a shipment already included in an issued manifest.');
throw new RuntimeException('Cannot cancel a shipment already included in an issued manifest.');
}
$this->client->call('ACS_Delete_Voucher', [
src/Shipping/Concerns/CachesLivePricing.php
+2 -1
View File
@@ -2,6 +2,7 @@
namespace Modules\Core\Shipping\Concerns;
use Closure;
use Illuminate\Support\Facades\Cache;
use Lunar\DataTypes\ShippingOption;
use Lunar\Models\Cart;
@@ -27,7 +28,7 @@ use Lunar\Shipping\Models\ShippingRate;
*/
trait CachesLivePricing
{
private function cached(ShippingRate $shippingRate, Cart $cart, \Closure $resolve): ?ShippingOption
private function cached(ShippingRate $shippingRate, Cart $cart, Closure $resolve): ?ShippingOption
{
return Cache::remember(
"shipping.live_price.{$shippingRate->id}.{$cart->id}",
src/Shipping/Extensions/OrderViewExtension.php
+14 -9
View File
@@ -2,6 +2,11 @@
namespace Modules\Core\Shipping\Extensions;
use Filament\Actions\Action;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Toggle;
use Closure;
use Throwable;
use Filament\Actions;
use Filament\Forms;
use Filament\Notifications\Notification;
@@ -20,28 +25,28 @@ class OrderViewExtension extends ViewPageExtension
return $actions;
}
private function createShipmentAction(): Actions\Action
private function createShipmentAction(): Action
{
return Actions\Action::make('create_shipment')
return Action::make('create_shipment')
->label('Create Shipment')
->icon('heroicon-o-truck')
->modalSubmitActionLabel('Create Shipment')
->form([
Forms\Components\TextInput::make('weight')
->schema([
TextInput::make('weight')
->label('Package weight (kg)')
->numeric()
->minValue(0)
->helperText('Leave blank to use the carrier\'s default.'),
Forms\Components\TextInput::make('destination_location_id')
TextInput::make('destination_location_id')
->label('Box Now locker ID')
->helperText('Only required for Box Now shipments.')
->default(fn (Order $record) => $record->shippingAddress?->meta['box_now_locker']['locationId'] ?? null),
Forms\Components\Toggle::make('confirm')
Toggle::make('confirm')
->label('Confirm')
->helperText('This will create a real shipment with the carrier.')
->rules([
function () {
return function (string $attribute, $value, \Closure $fail) {
return function (string $attribute, $value, Closure $fail) {
if ($value !== true) {
$fail('Please confirm before creating the shipment.');
}
@@ -49,7 +54,7 @@ class OrderViewExtension extends ViewPageExtension
},
]),
])
->action(function (Order $record, array $data, Actions\Action $action) {
->action(function (Order $record, array $data, Action $action) {
$service = $this->resolveFulfillmentService($record);
if (! $service) {
@@ -70,7 +75,7 @@ class OrderViewExtension extends ViewPageExtension
try {
$service->createShipment($record, $request);
} catch (\Throwable $e) {
} catch (Throwable $e) {
report($e);
Notification::make()
src/Shipping/Extensions/ShippingMethodListExtension.php
+4 -3
View File
@@ -2,8 +2,9 @@
namespace Modules\Core\Shipping\Extensions;
use Filament\Actions\CreateAction;
use Filament\Schemas\Components\Group;
use Filament\Actions;
use Filament\Forms\Components\Group;
use Filament\Forms\Components\Select;
use Lunar\Admin\Support\Extending\BaseExtension;
use Lunar\Shipping\Facades\Shipping;
@@ -22,8 +23,8 @@ class ShippingMethodListExtension extends BaseExtension
public function headerActions(array $actions): array
{
foreach ($actions as $action) {
if ($action instanceof Actions\CreateAction) {
$action->form([
if ($action instanceof CreateAction) {
$action->schema([
ShippingMethodResource::getNameFormComponent(),
Group::make([
ShippingMethodResource::getCodeFormComponent(),
src/Shipping/Extensions/ShippingMethodResourceExtension.php
+10 -9
View File
@@ -2,11 +2,12 @@
namespace Modules\Core\Shipping\Extensions;
use Filament\Forms\Components\Component;
use Filament\Forms\Components\Concerns\HasChildComponents;
use Filament\Schemas\Schema;
use Filament\Schemas\Components\Component;
use Filament\Schemas\Components\Concerns\HasChildComponents;
use Filament\Schemas\Components\Utilities\Get;
use InvalidArgumentException;
use Filament\Forms\Components\Select;
use Filament\Forms\Form;
use Filament\Forms\Get;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Table;
use Lunar\Admin\Support\Extending\ResourceExtension;
@@ -15,11 +16,11 @@ use Modules\Core\Shipping\Contracts\SupportsLivePricing;
class ShippingMethodResourceExtension extends ResourceExtension
{
public function extendForm(Form $form): Form
public function extendForm(Schema $schema): Schema
{
return $form->schema(
return $schema->components(
$this->replaceChargeByField(
$this->replaceDriverField($form->getComponents())
$this->replaceDriverField($schema->getComponents())
)
);
}
@@ -83,7 +84,7 @@ class ShippingMethodResourceExtension extends ResourceExtension
try {
return Shipping::driver($driver) instanceof SupportsLivePricing;
} catch (\InvalidArgumentException) {
} catch (InvalidArgumentException) {
return false;
}
}
@@ -120,7 +121,7 @@ class ShippingMethodResourceExtension extends ResourceExtension
* Select (nested inside Section > Group) with one listing every
* registered driver, built-in or custom.
*
* @param array<Component> $components
* @param array<Component> $components
* @return array<Component>
*/
private function replaceDriverField(array $components): array
src/Shipping/Filament/Pages/ManagePickupManifests.php
+7 -7
View File
@@ -2,10 +2,10 @@
namespace Modules\Core\Shipping\Filament\Pages;
use Filament\Actions\Action;
use Filament\Actions\BulkAction;
use Filament\Notifications\Notification;
use Filament\Pages\Page;
use Filament\Tables\Actions\Action;
use Filament\Tables\Actions\BulkAction;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Concerns\InteractsWithTable;
use Filament\Tables\Contracts\HasTable;
@@ -21,7 +21,7 @@ class ManagePickupManifests extends Page implements HasTable
{
use InteractsWithTable;
protected static ?string $navigationIcon = 'heroicon-o-truck';
protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-truck';
protected static ?string $navigationLabel = 'Pickup Manifests';
@@ -38,11 +38,11 @@ class ManagePickupManifests extends Page implements HasTable
* OrderResource uses 1) so this page never competes to be first even as
* more Sales-group items are added later.
*/
protected static ?string $navigationGroup = 'Sales';
protected static string | \UnitEnum | null $navigationGroup = 'Sales';
protected static ?int $navigationSort = 100;
protected static string $view = 'core::shipping.filament.pages.manage-pickup-manifests';
protected string $view = 'core::shipping.filament.pages.manage-pickup-manifests';
public function table(Table $table): Table
{
@@ -54,13 +54,13 @@ class ManagePickupManifests extends Page implements HasTable
TextColumn::make('order.reference')->label('Order'),
TextColumn::make('label_printed_at')->label('Printed')->dateTime()->placeholder('Not printed'),
])
->actions([
->recordActions([
Action::make('print')
->label('Print')
->icon('heroicon-o-printer')
->action(fn (Shipment $record) => $this->printShipment($record)),
])
->bulkActions([
->toolbarActions([
BulkAction::make('print_selected')
->label('Print selected')
->icon('heroicon-o-printer')
src/Shipping/Filament/Pages/ManageShippingRates.php
+6 -6
View File
@@ -2,9 +2,9 @@
namespace Modules\Core\Shipping\Filament\Pages;
use Filament\Schemas\Schema;
use Filament\Schemas\Components\Utilities\Get;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Form;
use Filament\Forms\Get;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Model;
@@ -36,12 +36,12 @@ use Lunar\Shipping\Models\ShippingRate;
*/
class ManageShippingRates extends BaseManageShippingRates
{
public function form(Form $form): Form
public function form(Schema $schema): Schema
{
$form = parent::form($form);
$schema = parent::form($schema);
return $form->schema(
$this->labelPriceFieldsAsFallbackWhenLive($form->getComponents())
return $schema->components(
$this->labelPriceFieldsAsFallbackWhenLive($schema->getComponents())
);
}