Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.x' into 3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
daurensky committed Mar 12, 2024
2 parents 307fdf6 + 1452201 commit 07aae59
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 17 deletions.
10 changes: 5 additions & 5 deletions src/Models/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

namespace AdminKit\Products\Models;

use Spatie\MediaLibrary\HasMedia;
use Illuminate\Support\Collection;
use Spatie\Translatable\HasTranslations;
use Spatie\MediaLibrary\InteractsWithMedia;
use AdminKit\Core\Abstracts\Models\AbstractModel;
use AdminKit\Products\Database\Factories\ProductFactory;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Support\Collection;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;
use Spatie\MediaLibrary\MediaCollections\Models\Media;
use AdminKit\Products\Database\Factories\ProductFactory;
use Spatie\Translatable\HasTranslations;

/**
* @property-read string $title
Expand Down
13 changes: 6 additions & 7 deletions src/UI/API/DTO/ProductDTO.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,18 @@

namespace AdminKit\Products\UI\API\DTO;

use Spatie\LaravelData\Data;
use Illuminate\Support\Collection;
use AdminKit\Products\Models\Product;
use Illuminate\Support\Collection;
use Spatie\LaravelData\Data;

class ProductDTO extends Data
{
public function __construct(
public string $title,
public string $text,
public string $photo,
public string $title,
public string $text,
public string $photo,
public Collection $attachments,
)
{
) {
}

public static function fromModel(Product $product): ProductDTO
Expand Down
10 changes: 5 additions & 5 deletions src/UI/Filament/Resources/ProductResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

namespace AdminKit\Products\UI\Filament\Resources;

use Filament\Forms;
use Filament\Tables;
use Filament\Resources\Resource;
use AdminKit\Products\Models\Product;
use Filament\Forms\Components\Tabs\Tab;
use AdminKit\Core\Forms\Components\TranslatableTabs;
use AdminKit\Products\Models\Product;
use AdminKit\Products\UI\Filament\Resources\ProductResource\Pages;
use Filament\Forms;
use Filament\Forms\Components\Tabs\Tab;
use Filament\Resources\Resource;
use Filament\Tables;

class ProductResource extends Resource
{
Expand Down

0 comments on commit 07aae59

Please sign in to comment.