Skip to content

Commit

Permalink
feat(order): 优化订单资源页面展示
Browse files Browse the repository at this point in the history 
- 新增买家、卖家和订单状态的自定义视图组件
- 重构订单产品展示列的视图结构
- 添加订单退款资源页面相关功能
- 调整订单资源页面的展示逻辑，支持自定义视图
  • Loading branch information
@liushoukun
liushoukun committed Oct 28, 2024
1 parent 9c093a1 commit 044fa1f
Show file tree
Hide file tree
Showing 11 changed files with 451 additions and 32 deletions.
9 changes: 9 additions & 0 deletions packages/filament-order/resources/views/resources/order-resource/columns/buyer.blade.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@php use RedJasmine\Order\Domain\Models\Enums\OrderStatusEnum; @endphp

<div class="flex flex-col items-center">
<p class="text-xs font-normal text-gray-700 dark:text-gray-400">{{$getRecord()->buyer_type}}</p>
<p class="text-xs font-normal text-gray-700 dark:text-gray-400">{{$getRecord()->buyer_id}}</p>
<p class="text-xs font-normal text-gray-800 dark:text-gray-400">{{$getRecord()->buyer_nickname}}</p>

</div>

7 changes: 4 additions & 3 deletions ...lumns/order-product-show-column.blade.php → ...lumns/order-product-show-column.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<tbody class="w-full">
@foreach($getRecord()->products as $orderProduct)
<tr class="w-full ">
<td name="product" >
<td name="product" >
<div class="flex items-center gap-x-2 ">
<img class="object-cover w-8 h-8" src="{{$orderProduct->image}}" alt="">
<div>
<h2 class="text-sm font-medium text-gray-800 dark:text-white ">{{$orderProduct->title}}</h2>
<p class="text-xs font-medium text-gray-800 dark:text-white whitespace-normal break-words ">{{$orderProduct->title}}</p>
<p class="text-xs font-normal text-gray-700 dark:text-gray-400">{{$orderProduct->sku_name}}</p>
<p class="text-xs font-normal text-gray-700 dark:text-gray-400">
<span>{{__('red-jasmine-order::order.fields.product.product_id')}}:</span><span>{{$orderProduct->product_id}}</span>
Expand All @@ -29,7 +29,8 @@
</div>
</td>
<td name="alter_sale_service" >
<span> {{$orderProduct->refund_status?->getLable()}} </span>

<span></span>
</td>

</tr>
Expand Down
18 changes: 18 additions & 0 deletions ...es/filament-order/resources/views/resources/order-resource/columns/order-status.blade.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
@php use RedJasmine\Order\Domain\Models\Enums\OrderStatusEnum; @endphp

<div class="flex flex-col items-center">
<x-filament::badge color="{{$getState()?->getColor()}}" icon="{{$getState()?->getIcon()}}">
{{$getState()?->getLabel()}}
</x-filament::badge>

@if($getState() === OrderStatusEnum::WAIT_SELLER_ACCEPT)

<x-filament::badge color="{{$getRecord()->accept_status?->getColor()}}"
icon="{{$getRecord()->accept_status?->getIcon()}}">
{{$getRecord()->accept_status?->getLabel()}}
</x-filament::badge>


@endif
</div>

9 changes: 9 additions & 0 deletions packages/filament-order/resources/views/resources/order-resource/columns/seller.blade.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@php use RedJasmine\Order\Domain\Models\Enums\OrderStatusEnum; @endphp

<div class="flex flex-col items-center">
<p class="text-xs font-normal text-gray-700 dark:text-gray-400">{{$getRecord()->seller_type}}</p>
<p class="text-xs font-normal text-gray-700 dark:text-gray-400">{{$getRecord()->seller_id}}</p>
<p class="text-xs font-normal text-gray-800 dark:text-gray-400">{{$getRecord()->seller_nickname}}</p>

</div>

292 changes: 292 additions & 0 deletions packages/filament-order/src/Clusters/Order/Resources/OrderRefundResource.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,292 @@
<?php

namespace RedJasmine\FilamentOrder\Clusters\Order\Resources;

use RedJasmine\FilamentCore\Helpers\ResourcePageHelper;
use RedJasmine\FilamentOrder\Clusters\Order;
use RedJasmine\FilamentOrder\Clusters\Order\Resources\OrderRefundResource\Pages;
use RedJasmine\FilamentOrder\Clusters\Order\Resources\OrderRefundResource\RelationManagers;
use RedJasmine\Order\Application\Services\OrderCommandService;
use RedJasmine\Order\Application\Services\OrderQueryService;
use RedJasmine\Order\Application\Services\RefundCommandService;
use RedJasmine\Order\Application\Services\RefundQueryService;
use RedJasmine\Order\Application\UserCases\Commands\OrderCreateCommand;
use RedJasmine\Order\Application\UserCases\Commands\Refund\RefundCreateCommand;
use RedJasmine\Order\Domain\Models\OrderRefund;
use Filament\Forms;
use Filament\Forms\Form;
use Filament\Resources\Resource;
use Filament\Tables;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope;

class OrderRefundResource extends Resource
{

use ResourcePageHelper;

protected static bool $onlyOwner = false;
protected static ?string $commandService = RefundCommandService::class;
protected static ?string $queryService = RefundQueryService::class;
protected static ?string $createCommand = RefundCreateCommand::class;

protected static ?string $model = OrderRefund::class;

protected static ?string $navigationIcon = 'heroicon-o-rectangle-stack';

protected static ?string $cluster = Order::class;

public static function form(Form $form): Form
{
return $form
->schema([
Forms\Components\Select::make('order_id')
->relationship('order', 'title')
->required(),
Forms\Components\TextInput::make('order_product_id')
->required()
->numeric(),
Forms\Components\TextInput::make('seller_type')
->required()
->maxLength(32),
Forms\Components\TextInput::make('seller_id')
->required()
->numeric(),
Forms\Components\TextInput::make('buyer_type')
->required()
->maxLength(32),
Forms\Components\TextInput::make('buyer_id')
->required()
->numeric(),
Forms\Components\TextInput::make('order_product_type')
->required()
->maxLength(32),
Forms\Components\TextInput::make('shipping_type')
->required()
->maxLength(32),
Forms\Components\TextInput::make('title')
->required()
->maxLength(255),
Forms\Components\TextInput::make('sku_name')
->maxLength(255),
Forms\Components\FileUpload::make('image')
->image(),
Forms\Components\TextInput::make('product_type')
->required()
->maxLength(32),
Forms\Components\Select::make('product_id')
->relationship('product', 'title')
->required(),
Forms\Components\TextInput::make('sku_id')
->required()
->numeric()
->default(0),
Forms\Components\TextInput::make('category_id')
->required()
->numeric()
->default(0),
Forms\Components\TextInput::make('product_group_id')
->required()
->numeric()
->default(0),
Forms\Components\TextInput::make('outer_id')
->maxLength(64),
Forms\Components\TextInput::make('outer_sku_id')
->maxLength(64),
Forms\Components\TextInput::make('barcode')
->maxLength(64),
Forms\Components\TextInput::make('unit_quantity')
->required()
->numeric()
->default(1),
Forms\Components\TextInput::make('unit')
->maxLength(255),
Forms\Components\TextInput::make('num')
->required()
->numeric()
->default(0),
Forms\Components\TextInput::make('price')
->required()
->numeric()
->default(0.00)
->prefix('$'),
Forms\Components\TextInput::make('cost_price')
->required()
->numeric()
->default(0.00),
Forms\Components\TextInput::make('product_amount')
->required()
->numeric()
->default(0.00),
Forms\Components\TextInput::make('tax_amount')
->required()
->numeric()
->default(0.00),
Forms\Components\TextInput::make('discount_amount')
->required()
->numeric()
->default(0.00),
Forms\Components\TextInput::make('payable_amount')
->required()
->numeric()
->default(0.00),
Forms\Components\TextInput::make('payment_amount')
->required()
->numeric()
->default(0.00),
Forms\Components\TextInput::make('divided_payment_amount')
->required()
->numeric()
->default(0.00),
Forms\Components\TextInput::make('shipping_status')
->maxLength(32),
Forms\Components\TextInput::make('refund_type')
->required()
->maxLength(32),
Forms\Components\TextInput::make('phase')
->required()
->maxLength(32),
Forms\Components\TextInput::make('has_good_return')
->required()
->numeric()
->default(0),
Forms\Components\TextInput::make('good_status')
->maxLength(32),
Forms\Components\TextInput::make('reason')
->maxLength(255),
Forms\Components\TextInput::make('outer_refund_id')
->maxLength(64),
Forms\Components\TextInput::make('refund_status')
->required()
->maxLength(32),
Forms\Components\TextInput::make('freight_amount')
->required()
->numeric()
->default(0.00),
Forms\Components\TextInput::make('refund_amount')
->required()
->numeric()
->default(0.00),
Forms\Components\TextInput::make('total_refund_amount')
->required()
->numeric()
->default(0.00),
Forms\Components\DateTimePicker::make('created_time'),
Forms\Components\DateTimePicker::make('end_time'),
Forms\Components\TextInput::make('seller_custom_status')
->maxLength(30),
Forms\Components\TextInput::make('version')
->required()
->numeric()
->default(0),
Forms\Components\TextInput::make('creator_type')
->maxLength(255),
Forms\Components\TextInput::make('creator_id')
->numeric(),
Forms\Components\TextInput::make('updater_type')
->maxLength(255),
Forms\Components\TextInput::make('updater_id')
->numeric(),
]);
}

public static function table(Table $table): Table
{
return $table
->columns([
Tables\Columns\TextColumn::make('id')
->label('ID')
->sortable(),

Tables\Columns\TextColumn::make('order_id'),
Tables\Columns\TextColumn::make('order_product_id'),
Tables\Columns\TextColumn::make('seller_type')
->searchable(),
Tables\Columns\TextColumn::make('seller_id'),
Tables\Columns\TextColumn::make('buyer_type'),
Tables\Columns\TextColumn::make('buyer_id'),
Tables\Columns\TextColumn::make('order_product_type')->useEnum(),
Tables\Columns\TextColumn::make('shipping_type')->useEnum(),
Tables\Columns\TextColumn::make('title'),
Tables\Columns\TextColumn::make('sku_name'),
Tables\Columns\ImageColumn::make('image'),
Tables\Columns\TextColumn::make('product_type'),

Tables\Columns\TextColumn::make('sku_id'),
Tables\Columns\TextColumn::make('category_id'),
Tables\Columns\TextColumn::make('product_group_id'),
Tables\Columns\TextColumn::make('outer_id'),
Tables\Columns\TextColumn::make('outer_sku_id'),
Tables\Columns\TextColumn::make('barcode')
->searchable(),
Tables\Columns\TextColumn::make('unit_quantity')
->numeric()
->sortable(),
Tables\Columns\TextColumn::make('unit'),
Tables\Columns\TextColumn::make('num'),
Tables\Columns\TextColumn::make('price')->money(),
Tables\Columns\TextColumn::make('cost_price')->money(),
Tables\Columns\TextColumn::make('product_amount')->money(),
Tables\Columns\TextColumn::make('tax_amount')->money(),
Tables\Columns\TextColumn::make('discount_amount')->money(),
Tables\Columns\TextColumn::make('payable_amount')->money(),
Tables\Columns\TextColumn::make('payment_amount')->money(),
Tables\Columns\TextColumn::make('divided_payment_amount')->money(),
Tables\Columns\TextColumn::make('shipping_status'),
Tables\Columns\TextColumn::make('refund_type')->useEnum(),
Tables\Columns\TextColumn::make('phase')->useEnum(),
Tables\Columns\TextColumn::make('has_good_return'),
Tables\Columns\TextColumn::make('good_status'),
Tables\Columns\TextColumn::make('reason')
->searchable(),
Tables\Columns\TextColumn::make('outer_refund_id')
->searchable(),
Tables\Columns\TextColumn::make('refund_status')->useEnum(),
Tables\Columns\TextColumn::make('freight_amount')->money(),
Tables\Columns\TextColumn::make('refund_amount')->money(),
Tables\Columns\TextColumn::make('total_refund_amount')->money(),

...static::operateTableColumns()
])
->filters([
Tables\Filters\TrashedFilter::make(),
])
->actions([
Tables\Actions\ViewAction::make(),
Tables\Actions\EditAction::make(),
])
->bulkActions([
Tables\Actions\BulkActionGroup::make([
Tables\Actions\DeleteBulkAction::make(),
Tables\Actions\ForceDeleteBulkAction::make(),
Tables\Actions\RestoreBulkAction::make(),
]),
]);
}

public static function getRelations(): array
{
return [
//
];
}

public static function getPages(): array
{
return [
'index' => Pages\ListOrderRefunds::route('/'),
'create' => Pages\CreateOrderRefund::route('/create'),
'view' => Pages\ViewOrderRefund::route('/{record}'),
'edit' => Pages\EditOrderRefund::route('/{record}/edit'),
];
}

public static function getEloquentQuery(): Builder
{
return parent::getEloquentQuery()
->withoutGlobalScopes([
SoftDeletingScope::class,
]);
}
}
14 changes: 14 additions & 0 deletions ...lament-order/src/Clusters/Order/Resources/OrderRefundResource/Pages/CreateOrderRefund.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

namespace RedJasmine\FilamentOrder\Clusters\Order\Resources\OrderRefundResource\Pages;

use RedJasmine\FilamentCore\Helpers\ResourcePageHelper;
use RedJasmine\FilamentOrder\Clusters\Order\Resources\OrderRefundResource;
use Filament\Actions;
use Filament\Resources\Pages\CreateRecord;

class CreateOrderRefund extends CreateRecord
{
protected static string $resource = OrderRefundResource::class;
use ResourcePageHelper;
}
23 changes: 23 additions & 0 deletions ...filament-order/src/Clusters/Order/Resources/OrderRefundResource/Pages/EditOrderRefund.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?php

namespace RedJasmine\FilamentOrder\Clusters\Order\Resources\OrderRefundResource\Pages;

use RedJasmine\FilamentCore\Helpers\ResourcePageHelper;
use RedJasmine\FilamentOrder\Clusters\Order\Resources\OrderRefundResource;
use Filament\Actions;
use Filament\Resources\Pages\EditRecord;

class EditOrderRefund extends EditRecord
{
protected static string $resource = OrderRefundResource::class;
use ResourcePageHelper;
protected function getHeaderActions(): array
{
return [
Actions\ViewAction::make(),
Actions\DeleteAction::make(),
Actions\ForceDeleteAction::make(),
Actions\RestoreAction::make(),
];
}
}
Loading

0 comments on commit 044fa1f

Please sign in to comment.