mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-10 19:11:07 +03:30
fix the issue with the previous commit. event was called before the labels attached to a cycle.
This commit is contained in:
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
|
use App\Events\CycleSaved;
|
||||||
use App\Http\Requests\StoreCycleRequest;
|
use App\Http\Requests\StoreCycleRequest;
|
||||||
use App\Http\Resources\CycleResource;
|
use App\Http\Resources\CycleResource;
|
||||||
use App\Interfaces\CycleRepositoryInterface;
|
use App\Interfaces\CycleRepositoryInterface;
|
||||||
@@ -72,6 +73,8 @@ class CycleController extends Controller
|
|||||||
foreach ( $Labels as $Label => $Count ) {
|
foreach ( $Labels as $Label => $Count ) {
|
||||||
$CycleObj->labels()->attach( array( $Label ) , [ 'count' => $Count ] );
|
$CycleObj->labels()->attach( array( $Label ) , [ 'count' => $Count ] );
|
||||||
}
|
}
|
||||||
|
event(new CycleSaved($CycleObj));
|
||||||
|
|
||||||
return MessageResponse::success( trans( 'messages.success' ) );
|
return MessageResponse::success( trans( 'messages.success' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,6 +112,7 @@ class CycleController extends Controller
|
|||||||
foreach ( $Labels as $Label => $Count ) {
|
foreach ( $Labels as $Label => $Count ) {
|
||||||
$Cycle->labels()->attach( array( $Label ) , [ 'count' => $Count ] );
|
$Cycle->labels()->attach( array( $Label ) , [ 'count' => $Count ] );
|
||||||
}
|
}
|
||||||
|
event(new CycleSaved($Cycle));
|
||||||
return MessageResponse::success( trans( 'messages.success' ) );
|
return MessageResponse::success( trans( 'messages.success' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ class UpdateLabelsCycleNumber
|
|||||||
{
|
{
|
||||||
$cycle = $event->cycle;
|
$cycle = $event->cycle;
|
||||||
$cycleNumber = $cycle->cycle_number;
|
$cycleNumber = $cycle->cycle_number;
|
||||||
|
// dd($cycle->labels);
|
||||||
|
|
||||||
$cycle->labels()->update(['cycle_number' => $cycleNumber]);
|
$cycle->labels()->update(['cycle_number' => $cycleNumber]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,16 +15,6 @@ class Cycle extends Model
|
|||||||
'date', 'user_id', 'cycle_number', 'sterilizer_id', 'note', 'verified', 'unique_id'
|
'date', 'user_id', 'cycle_number', 'sterilizer_id', 'note', 'verified', 'unique_id'
|
||||||
];
|
];
|
||||||
|
|
||||||
protected static function booted()
|
|
||||||
{
|
|
||||||
static::created(function ($cycle) {
|
|
||||||
event(new CycleSaved($cycle));
|
|
||||||
});
|
|
||||||
|
|
||||||
static::updated(function ($cycle) {
|
|
||||||
event(new CycleSaved($cycle));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public function user(): BelongsTo
|
public function user(): BelongsTo
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user