diff --git a/app/Jobs/WhatsappUnsoldCommodityNotification.php b/app/Jobs/WhatsappUnsoldCommodityNotification.php
index 2f6eaea..1d7b15d 100644
--- a/app/Jobs/WhatsappUnsoldCommodityNotification.php
+++ b/app/Jobs/WhatsappUnsoldCommodityNotification.php
@@ -37,7 +37,11 @@ class WhatsappUnsoldCommodityNotification extends Job
         $start_time = $settings->where('key', 'start_time')->first()->value;
         $end_time = $settings->where('key', 'end_time')->first()->value;
         $message = $settings->where('key', 'message')->first()->value;
-        $isAllKomoditiSold = KomuditiPurchase::on('mysql7')->latest()->first()->unit_komuditi === 0;
+
+        $latestKomoditi = KomuditiPurchase::on('mysql7')->latest()->first();
+        $isAllKomoditiSold = $latestKomoditi->unit_komuditi === 0.0;
+        $isLatestKomoditiToday = $latestKomoditi->created_at->isToday();
+
         $isWabotCredentialNotComplete = env('WABOT_API') === null || env('WABOT_INSTANCES_ID') === null || env('WABOT_TOKEN_KEYS') === null;
         $isNotActiveJobServer = env('ACTIVE_JOB_SERVER') !== true;
 
@@ -77,8 +81,8 @@ class WhatsappUnsoldCommodityNotification extends Job
             return false;
         }
 
-        if ($isAllKomoditiSold) {
-            Log::info('All komoditi is sold');
+        if ($isLatestKomoditiToday && $isAllKomoditiSold) {
+            Log::info('All today komoditi is sold');
             return false;
         }
 
@@ -97,7 +101,7 @@ class WhatsappUnsoldCommodityNotification extends Job
             $logblastwasap = new BlastWasap();
             $logblastwasap->kodcaw = 'OPERASI';
             $logblastwasap->notelefon = $phone_number;
-            $logblastwasap->norujukan = 'Notifikasi Komoditi Tidak Terjual';
+            $logblastwasap->norujukan = 'Notifikasi Komoditi Tidak Terjual. ' . 'baki : ' . KomuditiPurchase::on('mysql7')->latest()->first()->unit_komuditi;
             $logblastwasap->status = $response;
             $logblastwasap->created_at = Carbon::now();
             $logblastwasap->updated_at = Carbon::now();
@@ -108,6 +112,6 @@ class WhatsappUnsoldCommodityNotification extends Job
 
 
 
-        dispatch((new WhatsappUnsoldCommodityNotification($this->message))->delay(Carbon::now()->addMinutes(5)));
+        dispatch((new WhatsappUnsoldCommodityNotification($this->message))->delay(Carbon::now()->addMinutes(15)));
     }
 }