Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions app/Console/Commands/SendReminder.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use App\Helpers\Fonnte;
use App\Helpers\Helper;
use App\Models\DaftarReminder;
use App\Models\DaftarSp2d;
use App\Models\UnitKerja;
use App\Models\User;
use Illuminate\Console\Command;
Expand Down Expand Up @@ -43,11 +42,9 @@ public function handle()
'{pj}' => $kegiatan->daftar_kegiatanable_type == 'App\Models\UnitKerja' ? UnitKerja::find($kegiatan->daftar_kegiatanable_id)->unit : User::find($kegiatan->daftar_kegiatanable_id)->name,
]);
$response = Fonnte::make()->sendWhatsAppMessage($kegiatan->wa_group_id, $pesan);
$reminder->status = $response['data']['process'] ?? 'Gagal';
$reminder->status = $response['data']['process'] ?? 'Gagal';
$reminder->message_id = $response['data']['id'][0];
$reminder->save();
}


}
}
21 changes: 10 additions & 11 deletions app/Helpers/Fonnte.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ class Fonnte

// Konstanta endpoint API Fonnte
const ENDPOINTS = [
'send_message' => 'https://api.fonnte.com/send',
'update_group' =>'https://api.fonnte.com/fetch-group',
'list_group' =>'https://api.fonnte.com/get-whatsapp-group',
'send_message' => 'https://api.fonnte.com/send',
'update_group' => 'https://api.fonnte.com/fetch-group',
'list_group' => 'https://api.fonnte.com/get-whatsapp-group',

];

Expand All @@ -28,35 +28,35 @@ public function __construct()

protected function makeRequest($endpoint, $params = [])
{
$token = $this->account_token;
$token = $this->account_token;

if (!$token) {
if (! $token) {
return ['status' => false, 'error' => 'API token or device token is required.'];
}

// Gunakan JSON format dan pastikan Content-Type header benar
$response = Http::withHeaders([
'Authorization' => $token,
'Content-Type' => 'application/json', // Tambahkan header
'Content-Type' => 'application/json', // Tambahkan header
])->post($endpoint, $params);

if ($response->failed()) {
return [
'status' => false,
'error' => $response->json()['reason'] ?? 'Unknown error occurred',
'error' => $response->json()['reason'] ?? 'Unknown error occurred',
];
}

return [
'status' => true,
'data' => $response->json(),
'data' => $response->json(),
];
}

public function sendWhatsAppMessage($phoneNumber, $message)
{
return $this->makeRequest(self::ENDPOINTS['send_message'], [
'target' => $phoneNumber,
'target' => $phoneNumber,
'message' => $message,
]);
}
Expand All @@ -70,5 +70,4 @@ public function getWhatsappGroupList()
{
return $this->makeRequest(self::ENDPOINTS['list_group']);
}

}
}
7 changes: 3 additions & 4 deletions app/Helpers/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ public static function getTanggalSebelum($tanggal_deadline, $jumlah_hari, $ref =
$hariLibur = array_map(function ($date) {
return Carbon::parse($date)->format('Y-m-d');
}, $hariLibur);

$count = 0;
while ($count < $jumlah_hari) {
$tanggal_deadline->subDay();
Expand All @@ -452,9 +452,7 @@ public static function getTanggalSebelum($tanggal_deadline, $jumlah_hari, $ref =
}
$count++;
}

}
else {
} else {
$tanggal_deadline->subDay($jumlah_hari);
}

Expand Down Expand Up @@ -1523,6 +1521,7 @@ public static function setOptionsWaGroup()
$result[$group['id']] = $group['name'];
}
}

return $result;
}

Expand Down
13 changes: 6 additions & 7 deletions app/Nova/DaftarKegiatan.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use Laravel\Nova\Actions\Action;
use Laravel\Nova\Actions\DestructiveAction;
use Laravel\Nova\Fields\ActionFields;
use Laravel\Nova\Fields\Badge;
use Laravel\Nova\Fields\Date;
use Laravel\Nova\Fields\FormData;
use Laravel\Nova\Fields\MorphTo;
Expand Down Expand Up @@ -234,12 +233,12 @@ public function actions(NovaRequest $request)
}
}
})->standalone();
$actions[] =
Action::using('Stop Reminder', function (ActionFields $fields, Collection $models) {
$model = $models->first();
$model->query()->where('id', $model->id)->update(['status' => 'sent']);
$model->daftarReminder()->update(['status' => 'sent']);
})
$actions[] =
Action::using('Stop Reminder', function (ActionFields $fields, Collection $models) {
$model = $models->first();
$model->query()->where('id', $model->id)->update(['status' => 'sent']);
$model->daftarReminder()->update(['status' => 'sent']);
})
->showInline()
->showOnDetail()
->canSee(function ($request) {
Expand Down
1 change: 0 additions & 1 deletion app/Nova/DaftarReminder.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Nova;

use App\Helpers\Helper;
use Laravel\Nova\Fields\Badge;
use Laravel\Nova\Fields\BelongsTo;
use Laravel\Nova\Fields\Date;
use Laravel\Nova\Fields\Text;
Expand Down
7 changes: 2 additions & 5 deletions app/Providers/CalendarDataProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,11 @@ protected function customizeEvent(Event $event): Event
}
if ($event->model()->jenis == 'Kegiatan' || $event->model()->jenis == 'Deadline') {
$pj = $event->model()->daftar_kegiatanable_type == 'App\Models\UnitKerja' ? UnitKerja::find($event->model()->daftar_kegiatanable_id)->unit : User::find($event->model()->daftar_kegiatanable_id)->name;
$event->notes('PJ: '. $pj);
$event->notes('PJ: '.$pj);
}



$event->notes($event->model()->notes);

return $event;
}


}
2 changes: 1 addition & 1 deletion public/webhook.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
// Cek koneksi
if ($conn->connect_error) {
echo json_encode(['error' => 'Failed to connect to MySQL: '.$conn->connect_error]);
exit();
exit;
}

// Mendapatkan data JSON dari input
Expand Down
1 change: 0 additions & 1 deletion routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@
->name('daftar-file')
->middleware(ValidateAccessToken::class)
->prefix(Nova::path());