Add some changes
This commit is contained in:
@@ -5,6 +5,7 @@ namespace App\Models\Order\Loan;
|
|||||||
use App\Models\Branch\Branch;
|
use App\Models\Branch\Branch;
|
||||||
use App\Models\System\Location\Province;
|
use App\Models\System\Location\Province;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
|
use App\Repos\Order\Loan\LoanOrderRepo;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
@@ -103,4 +104,15 @@ class LoanOrder extends Model
|
|||||||
{
|
{
|
||||||
return $this->belongsTo(User::class, 'user_id');
|
return $this->belongsTo(User::class, 'user_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* "boot" method for model
|
||||||
|
*/
|
||||||
|
protected static function boot()
|
||||||
|
{
|
||||||
|
parent::boot();
|
||||||
|
|
||||||
|
static::creating(LoanOrderRepo::creating());
|
||||||
|
static::created(LoanOrderRepo::created());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ use App\Nova\Resource;
|
|||||||
use App\Nova\Resources\Order\Card\Concerns\CardOrderNovaRepo;
|
use App\Nova\Resources\Order\Card\Concerns\CardOrderNovaRepo;
|
||||||
use App\Nova\User;
|
use App\Nova\User;
|
||||||
use App\Repos\Order\Card\CardStateRepo;
|
use App\Repos\Order\Card\CardStateRepo;
|
||||||
|
use App\Repos\Order\Card\CardTypeRepo;
|
||||||
use App\Repos\Order\OrderRepo;
|
use App\Repos\Order\OrderRepo;
|
||||||
use App\Repos\System\Nova\NovaRepo;
|
use App\Repos\System\Nova\NovaRepo;
|
||||||
use App\Repos\System\Settings\Legal\PassportRepo;
|
use App\Repos\System\Settings\Legal\PassportRepo;
|
||||||
@@ -18,10 +19,13 @@ use Illuminate\Http\Request;
|
|||||||
use Laravel\Nova\Fields\BelongsTo;
|
use Laravel\Nova\Fields\BelongsTo;
|
||||||
use Laravel\Nova\Fields\Date;
|
use Laravel\Nova\Fields\Date;
|
||||||
use Laravel\Nova\Fields\ID;
|
use Laravel\Nova\Fields\ID;
|
||||||
|
use Laravel\Nova\Fields\Image;
|
||||||
use Laravel\Nova\Fields\Number;
|
use Laravel\Nova\Fields\Number;
|
||||||
use Laravel\Nova\Fields\Select;
|
use Laravel\Nova\Fields\Select;
|
||||||
use Laravel\Nova\Fields\Text;
|
use Laravel\Nova\Fields\Text;
|
||||||
use Laravel\Nova\Http\Requests\NovaRequest;
|
use Laravel\Nova\Http\Requests\NovaRequest;
|
||||||
|
use Laravel\Nova\Panel;
|
||||||
|
use Nurmuhammet\NovaInputmask\NovaInputmask;
|
||||||
|
|
||||||
class CardOrder extends Resource
|
class CardOrder extends Resource
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ class LoanOrderFieldsForDetail
|
|||||||
->withIcons()
|
->withIcons()
|
||||||
->icons(OrderRepo::statusIcons()),
|
->icons(OrderRepo::statusIcons()),
|
||||||
|
|
||||||
Text::make(__('Note'), 'status_reason'),
|
Text::make(__('Note'), 'notes'),
|
||||||
|
|
||||||
BelongsTo::make(__('Created by').': ', 'user', User::class),
|
BelongsTo::make(__('Created by').': ', 'user', User::class),
|
||||||
|
|
||||||
|
|||||||
@@ -2,31 +2,6 @@
|
|||||||
|
|
||||||
namespace App\Nova\Resources\Order\Loan\Concerns;
|
namespace App\Nova\Resources\Order\Loan\Concerns;
|
||||||
|
|
||||||
use App\Models\Branch\Branch;
|
|
||||||
use App\Repos\Order\OrderRepo;
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use Laravel\Nova\Http\Requests\NovaRequest;
|
|
||||||
|
|
||||||
class LoanOrderNovaRepo
|
class LoanOrderNovaRepo
|
||||||
{
|
{
|
||||||
public static function fillUniqueId($request, $model): string
|
|
||||||
{
|
|
||||||
return mb_strtoupper(sprintf(
|
|
||||||
'TB%s-%s',
|
|
||||||
Branch::find($request->branch_id)->unique_code ?? 'TB',
|
|
||||||
$model->id
|
|
||||||
)) ?? uniqid();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* After model has been created
|
|
||||||
*/
|
|
||||||
public static function afterCreate(NovaRequest $request, Model $model): void
|
|
||||||
{
|
|
||||||
$model->update([
|
|
||||||
'unique_id' => static::fillUniqueId($request, $model),
|
|
||||||
'user_id' => auth()->id(),
|
|
||||||
'status' => OrderRepo::defaultStatus(),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,8 +10,6 @@ use App\Nova\Filters\StatusFilter;
|
|||||||
use App\Nova\Resource;
|
use App\Nova\Resource;
|
||||||
use App\Nova\Resources\Order\Loan\Concerns\LoanOrderFieldsForDetail;
|
use App\Nova\Resources\Order\Loan\Concerns\LoanOrderFieldsForDetail;
|
||||||
use App\Nova\Resources\Order\Loan\Concerns\LoanOrderFieldsForIndex;
|
use App\Nova\Resources\Order\Loan\Concerns\LoanOrderFieldsForIndex;
|
||||||
use App\Nova\Resources\Order\Loan\Concerns\LoanOrderNovaRepo;
|
|
||||||
use App\Nova\User;
|
|
||||||
use App\Repos\Order\Loan\LoanTypeRepo;
|
use App\Repos\Order\Loan\LoanTypeRepo;
|
||||||
use App\Repos\Order\OrderRepo;
|
use App\Repos\Order\OrderRepo;
|
||||||
use App\Repos\System\Nova\NovaRepo;
|
use App\Repos\System\Nova\NovaRepo;
|
||||||
@@ -24,9 +22,9 @@ use App\Rules\OnlyLetters;
|
|||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Gate;
|
use Illuminate\Support\Facades\Gate;
|
||||||
use Laravel\Nova\Fields\BelongsTo;
|
|
||||||
use Laravel\Nova\Fields\Date;
|
use Laravel\Nova\Fields\Date;
|
||||||
use Laravel\Nova\Fields\Email;
|
use Laravel\Nova\Fields\Email;
|
||||||
|
use Laravel\Nova\Fields\Hidden;
|
||||||
use Laravel\Nova\Fields\ID;
|
use Laravel\Nova\Fields\ID;
|
||||||
use Laravel\Nova\Fields\Image;
|
use Laravel\Nova\Fields\Image;
|
||||||
use Laravel\Nova\Fields\Number;
|
use Laravel\Nova\Fields\Number;
|
||||||
@@ -126,14 +124,6 @@ class LoanOrder extends Resource
|
|||||||
return $query->where('user_id', $request->user()->id);
|
return $query->where('user_id', $request->user()->id);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Register a callback to be called after the resource is created.
|
|
||||||
*/
|
|
||||||
public static function afterCreate(NovaRequest $request, Model $model): void
|
|
||||||
{
|
|
||||||
LoanOrderNovaRepo::afterCreate($request, $model);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the fields for index.
|
* Get the fields for index.
|
||||||
*/
|
*/
|
||||||
@@ -158,6 +148,10 @@ class LoanOrder extends Resource
|
|||||||
return [
|
return [
|
||||||
ID::make()->sortable(),
|
ID::make()->sortable(),
|
||||||
|
|
||||||
|
Hidden::make('user_id')
|
||||||
|
->default(auth()->id())
|
||||||
|
->hideWhenUpdating(),
|
||||||
|
|
||||||
Select::make(__('Status'), 'status')
|
Select::make(__('Status'), 'status')
|
||||||
->displayUsingLabels()
|
->displayUsingLabels()
|
||||||
->searchable()
|
->searchable()
|
||||||
@@ -167,14 +161,10 @@ class LoanOrder extends Resource
|
|||||||
->rules('required')
|
->rules('required')
|
||||||
->canSeeWhen('systemUser', $this),
|
->canSeeWhen('systemUser', $this),
|
||||||
|
|
||||||
Text::make(__('Note'), 'status_reason')
|
Text::make(__('Note'), 'notes')
|
||||||
->fullWidth()
|
->fullWidth()
|
||||||
->canSeeWhen('systemUser', $this),
|
->canSeeWhen('systemUser', $this),
|
||||||
|
|
||||||
BelongsTo::make(__('Created by').': ', 'user', User::class)
|
|
||||||
->fullWidth()
|
|
||||||
->canSeeWhen('isMe', $this),
|
|
||||||
|
|
||||||
new Panel(__('Loan'), [
|
new Panel(__('Loan'), [
|
||||||
Select::make(__('Loan type'), 'loan_type')
|
Select::make(__('Loan type'), 'loan_type')
|
||||||
->displayUsingLabels()
|
->displayUsingLabels()
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ namespace App\Providers;
|
|||||||
|
|
||||||
use App\Nova\Dashboards\Main;
|
use App\Nova\Dashboards\Main;
|
||||||
use App\Nova\Resources\Branch\Branch;
|
use App\Nova\Resources\Branch\Branch;
|
||||||
|
use App\Nova\Resources\Order\Card\CardOrder;
|
||||||
use App\Nova\Resources\Order\Card\CardState;
|
use App\Nova\Resources\Order\Card\CardState;
|
||||||
use App\Nova\Resources\Order\Card\CardType;
|
use App\Nova\Resources\Order\Card\CardType;
|
||||||
use App\Nova\Resources\Order\Loan\LoanOrder;
|
use App\Nova\Resources\Order\Loan\LoanOrder;
|
||||||
@@ -120,6 +121,7 @@ class NovaServiceProvider extends NovaApplicationServiceProvider
|
|||||||
|
|
||||||
MenuSection::make(__('Orders'), [
|
MenuSection::make(__('Orders'), [
|
||||||
MenuItem::resource(LoanOrder::class),
|
MenuItem::resource(LoanOrder::class),
|
||||||
|
MenuItem::resource(CardOrder::class),
|
||||||
])->icon('collection')->collapsable(),
|
])->icon('collection')->collapsable(),
|
||||||
|
|
||||||
MenuSection::make(__('System'), [
|
MenuSection::make(__('System'), [
|
||||||
|
|||||||
39
app/Repos/Order/Loan/LoanOrderRepo.php
Normal file
39
app/Repos/Order/Loan/LoanOrderRepo.php
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Repos\Order\Loan;
|
||||||
|
|
||||||
|
use App\Models\Branch\Branch;
|
||||||
|
use Closure;
|
||||||
|
|
||||||
|
class LoanOrderRepo
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* When model is being created
|
||||||
|
*/
|
||||||
|
public static function creating(): Closure
|
||||||
|
{
|
||||||
|
return function ($model) {
|
||||||
|
$model->status = $model->status ?: OrderRepo::defaultStatus();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When model is created
|
||||||
|
*/
|
||||||
|
public static function created(): Closure
|
||||||
|
{
|
||||||
|
return function ($model) {
|
||||||
|
$model->update(['unique_id' => static::fillUniqueId($model)]);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fill unique id
|
||||||
|
*
|
||||||
|
* @param App\Models\Order\Loan\LoanOrder $model
|
||||||
|
*/
|
||||||
|
public static function fillUniqueId($model): string
|
||||||
|
{
|
||||||
|
return sprintf('TB%s-%s', Branch::find($model->branch_id)->unique_code, $model->id) ?? uniqid();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -54,6 +54,7 @@ return new class extends Migration
|
|||||||
|
|
||||||
$table->foreignId('user_id')->constrained('users')->restrictOnDelete();
|
$table->foreignId('user_id')->constrained('users')->restrictOnDelete();
|
||||||
$table->timestamps();
|
$table->timestamps();
|
||||||
|
$table->softDeletes();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user