arifal/CKB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

partial update create mutations workflow

Browse Source
This commit is contained in:
arifal
2025-06-12 15:10:51 +07:00
parent a5e1348436
commit 1a01efb1b5
33 changed files with 560 additions and 12994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
app/Http/Controllers/WarehouseManagement/MutationsController.php
View File

@@ -19,7 +19,7 @@ class MutationsController extends Controller
$menu = Menu::where('link','mutations.index')->first();
if ($request->ajax()) {
$data = Mutation::with(['fromDealer', 'toDealer', 'requestedBy', 'approvedBy', 'receivedBy'])
$data = Mutation::with(['fromDealer', 'toDealer', 'requestedBy.role', 'approvedBy.role', 'receivedBy.role'])
->select('mutations.*');
// Filter berdasarkan dealer jika user bukan admin
@@ -47,7 +47,19 @@ class MutationsController extends Controller
->addColumn('status', function($row) {
$statusColor = $row->status_color;
$statusLabel = $row->status_label;
return "<span class=\"kt-badge kt-badge--{$statusColor} kt-badge--dot\"></span>&nbsp;<span class=\"kt-font-bold kt-font-{$statusColor}\">{$statusLabel}</span>";
$textColorClass = match($statusColor) {
'success' => 'text-success',
'warning' => 'text-warning',
'danger' => 'text-danger',
'info' => 'text-info',
'primary' => 'text-primary',
'brand' => 'text-primary',
'secondary' => 'text-muted',
default => 'text-dark'
};
return "<span class=\"font-weight-bold {$textColorClass}\">{$statusLabel}</span>";
})
->addColumn('total_items', function($row) {
return number_format($row->total_items, 0);
@@ -79,7 +91,6 @@ class MutationsController extends Controller
$request->validate([
'from_dealer_id' => 'required|exists:dealers,id',
'to_dealer_id' => 'required|exists:dealers,id|different:from_dealer_id',
'notes' => 'nullable|string',
'products' => 'required|array|min:1',
'products.*.product_id' => 'required|exists:products,id',
'products.*.quantity_requested' => 'required|numeric|min:0.01'
@@ -92,8 +103,7 @@ class MutationsController extends Controller
'from_dealer_id' => $request->from_dealer_id,
'to_dealer_id' => $request->to_dealer_id,
'status' => 'sent',
'requested_by' => auth()->id(),
'notes' => $request->notes
'requested_by' => auth()->id()
]);
// Buat mutation details
@@ -101,8 +111,7 @@ class MutationsController extends Controller
MutationDetail::create([
'mutation_id' => $mutation->id,
'product_id' => $productData['product_id'],
'quantity_requested' => $productData['quantity_requested'],
'notes' => $productData['notes'] ?? null
'quantity_requested' => $productData['quantity_requested']
]);
}
@@ -118,24 +127,63 @@ class MutationsController extends Controller
public function show(Mutation $mutation)
{
$mutation->load(['fromDealer', 'toDealer', 'requestedBy', 'approvedBy', 'receivedBy', 'mutationDetails.product']);
$mutation->load(['fromDealer', 'toDealer', 'requestedBy.role', 'approvedBy.role', 'receivedBy.role', 'mutationDetails.product']);
return view('warehouse_management.mutations.show', compact('mutation'));
}
public function receive(Mutation $mutation)
public function receive(Request $request, Mutation $mutation)
{
$request->validate([
'notes' => 'nullable|string',
'products' => 'required|array',
'products.*.quantity_approved' => 'required|numeric|min:0',
'products.*.notes' => 'nullable|string'
]);
if (!$mutation->canBeReceived()) {
return back()->withErrors(['error' => 'Mutasi tidak dapat diterima dalam status saat ini']);
}
DB::beginTransaction();
try {
// Update mutation notes jika ada
if ($request->notes) {
$mutation->update(['notes' => $request->notes]);
}
// Update product details dengan quantity_approved dan notes
if ($request->products) {
foreach ($request->products as $detailId => $productData) {
$updateData = [];
// Set quantity_approved
if (isset($productData['quantity_approved'])) {
$updateData['quantity_approved'] = $productData['quantity_approved'];
}
// Set notes jika ada
if (isset($productData['notes']) && !empty($productData['notes'])) {
$updateData['notes'] = $productData['notes'];
}
if (!empty($updateData)) {
MutationDetail::where('id', $detailId)
->where('mutation_id', $mutation->id)
->update($updateData);
}
}
}
// Receive mutation
$mutation->receive(auth()->id());
DB::commit();
return redirect()->route('mutations.index')
->with('success', 'Mutasi berhasil diterima dan menunggu persetujuan pengirim');
} catch (\Exception $e) {
DB::rollback();
return back()->withErrors(['error' => 'Gagal menerima mutasi: ' . $e->getMessage()]);
}
}
@@ -143,34 +191,21 @@ class MutationsController extends Controller
public function approve(Request $request, Mutation $mutation)
{
$request->validate([
'notes' => 'nullable|string',
'details' => 'required|array',
'details.*.quantity_approved' => 'required|numeric|min:0'
'notes' => 'nullable|string'
]);
if (!$mutation->canBeApproved()) {
return back()->withErrors(['error' => 'Mutasi tidak dapat disetujui dalam status saat ini']);
}
DB::beginTransaction();
try {
// Update mutation details dengan quantity approved
foreach ($request->details as $detailId => $detailData) {
$mutationDetail = MutationDetail::findOrFail($detailId);
$mutationDetail->update([
'quantity_approved' => $detailData['quantity_approved']
]);
}
// Approve mutation
// Approve mutation (quantity_approved sudah diisi saat receive)
$mutation->approve(auth()->id(), $request->notes);
DB::commit();
return redirect()->route('mutations.index')
->with('success', 'Mutasi berhasil disetujui');
} catch (\Exception $e) {
DB::rollback();
return back()->withErrors(['error' => 'Gagal menyetujui mutasi: ' . $e->getMessage()]);
}
}
@@ -230,36 +265,7 @@ class MutationsController extends Controller
}
}
// API untuk mendapatkan detail mutasi untuk approval
public function getDetails(Mutation $mutation)
{
$mutation->load(['mutationDetails.product', 'fromDealer']);
$details = $mutation->mutationDetails->map(function($detail) use ($mutation) {
$availableStock = $detail->product->getStockByDealer($mutation->from_dealer_id);
return [
'id' => $detail->id,
'product' => [
'id' => $detail->product->id,
'name' => $detail->product->name
],
'quantity_requested' => $detail->quantity_requested,
'quantity_approved' => $detail->quantity_approved,
'available_stock' => $availableStock
];
});
return response()->json([
'mutation' => [
'id' => $mutation->id,
'mutation_number' => $mutation->mutation_number,
'from_dealer' => $mutation->fromDealer->name,
'to_dealer' => $mutation->toDealer->name
],
'details' => $details
]);
}
// API untuk mendapatkan stock produk di dealer tertentu
public function getProductStock(Request $request)

15
app/Http/Controllers/WarehouseManagement/OpnamesController.php
View File

@@ -39,14 +39,25 @@ class OpnamesController extends Controller
return Carbon::parse($row->created_at)->format('d M Y H:i');
})
->editColumn('status', function ($row) {
$statusClass = [
$statusColor = [
'draft' => 'warning',
'pending' => 'info',
'approved' => 'success',
'rejected' => 'danger'
][$row->status] ?? 'secondary';
return '<span class="badge badge-' . $statusClass . '">' . ucfirst($row->status) . '</span>';
$textColorClass = match($statusColor) {
'success' => 'text-success',
'warning' => 'text-warning',
'danger' => 'text-danger',
'info' => 'text-info',
'primary' => 'text-primary',
'brand' => 'text-primary',
'secondary' => 'text-muted',
default => 'text-dark'
};
return "<span class=\"font-weight-bold {$textColorClass}\">" . ucfirst($row->status) . "</span>";
})
->addColumn('action', function ($row) use ($menu) {
$btn = '<div class="d-flex">';

38
app/Models/Mutation.php
View File

@@ -6,6 +6,7 @@ use App\Enums\MutationStatus;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Facades\DB;
class Mutation extends Model
{
@@ -192,18 +193,20 @@ class Mutation extends Model
throw new \Exception('Mutasi tidak dapat diselesaikan dalam status saat ini');
}
\DB::beginTransaction();
DB::beginTransaction();
try {
foreach ($this->mutationDetails as $detail) {
if ($detail->quantity_approved > 0) {
// Proses semua detail yang memiliki quantity_requested > 0
// karena barang sudah dikirim dari dealer asal
if ($detail->quantity_requested > 0) {
$this->processStockMovement($detail);
}
}
$this->update(['status' => MutationStatus::COMPLETED]);
\DB::commit();
DB::commit();
} catch (\Exception $e) {
\DB::rollback();
DB::rollback();
throw $e;
}
@@ -212,23 +215,23 @@ class Mutation extends Model
private function processStockMovement(MutationDetail $detail)
{
// Kurangi stock dari dealer asal
// Kurangi stock dari dealer asal berdasarkan quantity_requested (barang yang dikirim)
$fromStock = Stock::firstOrCreate([
'product_id' => $detail->product_id,
'dealer_id' => $this->from_dealer_id
], ['quantity' => 0]);
if ($fromStock->quantity < $detail->quantity_approved) {
if ($fromStock->quantity < $detail->quantity_requested) {
throw new \Exception("Stock tidak mencukupi untuk produk {$detail->product->name} di {$this->fromDealer->name}");
}
$fromStock->updateStock(
$fromStock->quantity - $detail->quantity_approved,
$fromStock->quantity - $detail->quantity_requested,
$this,
"Mutasi keluar ke {$this->toDealer->name} - {$this->mutation_number}"
"Mutasi keluar ke {$this->toDealer->name} - {$this->mutation_number} (Dikirim: {$detail->quantity_requested}, Diterima: {$detail->quantity_approved})"
);
// Tambah stock ke dealer tujuan
// Tambah stock ke dealer tujuan berdasarkan quantity_approved (barang yang diterima)
$toStock = Stock::firstOrCreate([
'product_id' => $detail->product_id,
'dealer_id' => $this->to_dealer_id
@@ -237,8 +240,23 @@ class Mutation extends Model
$toStock->updateStock(
$toStock->quantity + $detail->quantity_approved,
$this,
"Mutasi masuk dari {$this->fromDealer->name} - {$this->mutation_number}"
"Mutasi masuk dari {$this->fromDealer->name} - {$this->mutation_number} (Dikirim: {$detail->quantity_requested}, Diterima: {$detail->quantity_approved})"
);
// Jika ada selisih (kehilangan), catat sebagai stock log terpisah untuk audit
$lostQuantity = $detail->quantity_requested - $detail->quantity_approved;
if ($lostQuantity > 0) {
// Buat stock log untuk barang yang hilang/rusak
StockLog::create([
'stock_id' => $fromStock->id,
'previous_quantity' => $fromStock->quantity + $detail->quantity_requested, // Stock sebelum pengurangan
'new_quantity' => $fromStock->quantity, // Stock setelah pengurangan
'source_type' => get_class($this),
'source_id' => $this->id,
'description' => "Kehilangan/kerusakan saat mutasi ke {$this->toDealer->name} - {$this->mutation_number} (Hilang: {$lostQuantity})",
'user_id' => auth()->id()
]);
}
}
private function generateMutationNumber()

24
app/Models/MutationDetail.php
View File

@@ -40,21 +40,31 @@ class MutationDetail extends Model
public function isFullyApproved()
{
return $this->quantity_approved == $this->quantity_requested;
return $this->quantity_approved !== null && $this->quantity_approved == $this->quantity_requested;
}
public function isPartiallyApproved()
{
return $this->quantity_approved > 0 && $this->quantity_approved < $this->quantity_requested;
return $this->quantity_approved !== null && $this->quantity_approved > 0 && $this->quantity_approved < $this->quantity_requested;
}
public function isRejected()
{
return $this->quantity_approved == 0;
// Hanya dianggap ditolak jika mutasi sudah di-approve/reject dan quantity_approved = 0
$mutationStatus = $this->mutation->status->value ?? null;
return in_array($mutationStatus, ['approved', 'completed', 'rejected']) && $this->quantity_approved == 0;
}
public function getApprovalStatusAttribute()
{
$mutationStatus = $this->mutation->status->value ?? null;
// Jika mutasi belum di-approve, semua detail statusnya "Menunggu"
if (!in_array($mutationStatus, ['approved', 'completed', 'rejected'])) {
return 'Menunggu';
}
// Jika mutasi sudah di-approve/complete, baru cek quantity_approved
if ($this->isFullyApproved()) {
return 'Disetujui Penuh';
} elseif ($this->isPartiallyApproved()) {
@@ -68,6 +78,14 @@ class MutationDetail extends Model
public function getApprovalStatusColorAttribute()
{
$mutationStatus = $this->mutation->status->value ?? null;
// Jika mutasi belum di-approve, semua detail statusnya "info" (menunggu)
if (!in_array($mutationStatus, ['approved', 'completed', 'rejected'])) {
return 'info';
}
// Jika mutasi sudah di-approve/complete, baru cek quantity_approved
if ($this->isFullyApproved()) {
return 'success';
} elseif ($this->isPartiallyApproved()) {

57
app/Models/User.php
View File

@@ -75,4 +75,61 @@ class User extends Authenticatable
{
return $this->hasOne(Dealer::class, 'id', 'dealer_id');
}
/**
* Get the role associated with the User
*
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function role()
{
return $this->belongsTo(Role::class, 'role_id');
}
/**
* Check if user has a specific role
*
* @param string $roleName
* @return bool
*/
public function hasRole($roleName)
{
// If role_id is 0 or null, user has no role
if (!$this->role_id) {
return false;
}
// For admin role, we can check if user has admin privileges
if (strtolower($roleName) === 'admin') {
return $this->isAdmin();
}
// Load role if not already loaded
if (!$this->relationLoaded('role')) {
$this->load('role');
}
return $this->role && strtolower($this->role->name) === strtolower($roleName);
}
/**
* Check if user is admin by checking admin privileges
*
* @return bool
*/
public function isAdmin()
{
// Check if user has admin privileges by checking if they can access admin area
try {
$adminPrivilege = \App\Models\Privilege::join('menus', 'menus.id', '=', 'privileges.menu_id')
->where('menus.link', 'adminarea')
->where('privileges.role_id', $this->role_id)
->where('privileges.view', 1)
->first();
return $adminPrivilege !== null;
} catch (\Exception $e) {
return false;
}
}
}