Skip to content

Commit 7974d74

Browse files
Merge pull request #122 from khalidmaquilang/dev
v.2.6.0 - SI-131 | Feature | rename category+SI-122 | Feature | added new stock movement filters+SI-133 | Feature | export stock movement+SI-127 | Feature | added summarize+SI-130 | Feature | Branding icon+SI-126 | Feature | added new widgets+SI-137 | Feature | modify logo+SI-138 | Feature | added widgetshield+SI-101 | Feature | menu groupings+SI-139 | Feature | Rearrange Widget
2 parents c8523bc + 807053b commit 7974d74

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1056
-211
lines changed

.vemto_settings

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
SCHEMA_READER_MODE=db
2+
SCHEMA_READER_DB_DRIVER=mysql
3+
SCHEMA_READER_DB_HOST=mysql
4+
SCHEMA_READER_DB_PORT=3306
5+
SCHEMA_READER_DB_USERNAME=sail
6+
SCHEMA_READER_DB_PASSWORD=password
7+
SCHEMA_READER_DB_DATABASE=vemto_schema_reader
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?php
2+
3+
namespace App\Filament\Exports;
4+
5+
use App\Models\StockMovement;
6+
use Filament\Actions\Exports\ExportColumn;
7+
use Filament\Actions\Exports\Exporter;
8+
use Filament\Actions\Exports\Models\Export;
9+
10+
class StockMovementExporter extends Exporter
11+
{
12+
use ReportExporterTrait;
13+
14+
protected string $filename = 'stock-movement-report';
15+
16+
protected static ?string $model = StockMovement::class;
17+
18+
public static function getColumns(): array
19+
{
20+
return [
21+
ExportColumn::make('created_at'),
22+
ExportColumn::make('reference_number'),
23+
ExportColumn::make('quantity_before_adjustment'),
24+
ExportColumn::make('quantity'),
25+
ExportColumn::make('type')
26+
->formatStateUsing(fn ($state) => $state->getLabel() ?? ''),
27+
ExportColumn::make('note'),
28+
ExportColumn::make('supplier.company_name'),
29+
ExportColumn::make('customer.name'),
30+
ExportColumn::make('user.name'),
31+
];
32+
}
33+
34+
public static function getCompletedNotificationBody(Export $export): string
35+
{
36+
$body = 'Your stock movement export has completed and '.number_format($export->successful_rows).' '.str('row')
37+
->plural($export->successful_rows).' exported.';
38+
39+
if ($failedRowsCount = $export->getFailedRowsCount()) {
40+
$body .= ' '.number_format($failedRowsCount).' '.str('row')->plural($failedRowsCount).' failed to export.';
41+
}
42+
43+
return $body;
44+
}
45+
}

app/Filament/Pages/Subscriptions.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ class Subscriptions extends Page implements HasInfolists, HasTable
2222

2323
protected static ?string $navigationIcon = 'heroicon-o-arrow-path';
2424

25-
protected static ?int $navigationSort = 10;
25+
protected static ?string $navigationGroup = 'Finance';
26+
27+
protected static ?int $navigationSort = 2;
2628

2729
protected static string $view = 'filament.pages.subscriptions';
2830

app/Filament/Resources/CategoryResource.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ class CategoryResource extends Resource
1616

1717
protected static ?string $navigationIcon = 'heroicon-o-squares-2x2';
1818

19-
protected static ?int $navigationSort = 3;
19+
protected static ?string $navigationGroup = 'Inventory';
20+
21+
protected static ?int $navigationSort = 1;
2022

2123
public static function form(Form $form): Form
2224
{
2325
return $form
2426
->schema([
2527
Forms\Components\Select::make('category_id')
28+
->label('Parent Category')
2629
->relationship('category', 'name', ignoreRecord: true)
2730
->nullable(),
2831
Forms\Components\TextInput::make('name')

app/Filament/Resources/CustomerResource.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ class CustomerResource extends Resource
1818

1919
protected static ?string $navigationIcon = 'heroicon-o-users';
2020

21+
protected static ?string $navigationGroup = 'Sale';
22+
2123
protected static ?int $navigationSort = 1;
2224

2325
public static function form(Form $form): Form

app/Filament/Resources/GoodsIssueResource.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ class GoodsIssueResource extends Resource
1919

2020
protected static ?string $navigationIcon = 'heroicon-o-archive-box-arrow-down';
2121

22-
protected static ?int $navigationSort = 7;
22+
protected static ?string $navigationGroup = 'Inventory';
23+
24+
protected static ?int $navigationSort = 4;
2325

2426
public static function form(Form $form): Form
2527
{

app/Filament/Resources/InventoryResource.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ class InventoryResource extends Resource
2121

2222
protected static ?string $navigationIcon = 'heroicon-o-clipboard-document-list';
2323

24-
protected static ?int $navigationSort = 9;
24+
protected static ?string $navigationGroup = 'Inventory';
25+
26+
protected static ?int $navigationSort = 3;
2527

2628
public static function form(Form $form): Form
2729
{

app/Filament/Resources/InventoryResource/RelationManagers/StockMovementsRelationManager.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use App\Enums\GoodsIssueTypeEnum;
66
use App\Enums\PurchaseOrderEnum;
77
use App\Enums\StockMovementEnum;
8+
use App\Filament\Exports\StockMovementExporter;
89
use App\Models\Customer;
910
use App\Models\StockMovement;
1011
use Filament\Forms;
@@ -90,6 +91,8 @@ public function table(Table $table): Table
9091
$livewire
9192
)
9293
),
94+
Tables\Actions\ExportAction::make()
95+
->exporter(StockMovementExporter::class),
9396
])
9497
->actions([
9598
Tables\Actions\ViewAction::make(),
@@ -107,8 +110,14 @@ public function getTabs(): array
107110
->modifyQueryUsing(fn ($query) => $query->where('type', StockMovementEnum::SALE)),
108111
'adjustment' => Tab::make('Adjustment')
109112
->modifyQueryUsing(fn ($query) => $query->where('type', StockMovementEnum::ADJUSTMENT)),
110-
'return' => Tab::make('Return')
113+
'return' => Tab::make('Customer Return')
111114
->modifyQueryUsing(fn ($query) => $query->where('type', StockMovementEnum::RETURN)),
115+
'transfer' => Tab::make('Transfer')
116+
->modifyQueryUsing(fn ($query) => $query->where('type', StockMovementEnum::TRANSFER)),
117+
'write_off' => Tab::make('Write Off')
118+
->modifyQueryUsing(fn ($query) => $query->where('type', StockMovementEnum::WRITE_OFF)),
119+
'return_supplier' => Tab::make('Return To Supplier')
120+
->modifyQueryUsing(fn ($query) => $query->where('type', StockMovementEnum::RTO)),
112121
];
113122
}
114123

app/Filament/Resources/InviteResource.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ class InviteResource extends Resource
2323

2424
protected static ?string $navigationIcon = 'heroicon-o-user-plus';
2525

26-
protected static ?int $navigationSort = 9;
26+
protected static ?string $navigationGroup = 'Settings';
27+
28+
protected static ?int $navigationSort = 1;
2729

2830
public static function form(Form $form): Form
2931
{

app/Filament/Resources/PaymentTypeResource.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ class PaymentTypeResource extends Resource
1616

1717
protected static ?string $navigationIcon = 'heroicon-o-banknotes';
1818

19-
protected static ?int $navigationSort = 4;
19+
protected static ?string $navigationGroup = 'Finance';
20+
21+
protected static ?int $navigationSort = 1;
2022

2123
public static function form(Form $form): Form
2224
{

0 commit comments

Comments
 (0)