diff --git a/app/Console/Commands/EmailDoToVTCommand.php b/app/Console/Commands/EmailDoToVTCommand.php index 65e389d1..ea4c1540 100644 --- a/app/Console/Commands/EmailDoToVTCommand.php +++ b/app/Console/Commands/EmailDoToVTCommand.php @@ -51,13 +51,13 @@ class EmailDoToVTCommand extends Command { Auth::login(User::findOrFail(1)); - $zip_file = 'do_from_24_nov_to_12_dec.zip'; + $zip_file = 'do_' . Carbon::yesterday()->format('Y_m_d') . '.zip'; $attachment = storage_path() . '/' . $zip_file; $zip = new ZipArchive(); if ($zip->open($attachment, ZIPARCHIVE::CREATE | ZipArchive::OVERWRITE)) { - $bookings = \App\Models\Booking::where('status', ApprovalStatus::COMPLETED)->whereDate('updated_at', '>=', Carbon::parse('24-11-2021'))->whereDate('updated_at', '<=', Carbon::parse('12-12-2021')) + $bookings = \App\Models\Booking::where('status', ApprovalStatus::COMPLETED)->whereDate('updated_at', Carbon::yesterday()) ->whereHas('transactions', function ($query) { return $query->where('type', TransactionType::BILL)->where('issuer', 2); })->get(); @@ -74,12 +74,12 @@ class EmailDoToVTCommand extends Command $zip->close(); - Mail::raw("Attention to VT Admin team:\r\n\r\nKindly refer to the attachment for our DAILY DO COMPILATION from 24-11-2021 to 12-12-2021.\r\n\r\n**This is an automatically generated email – please do not reply to it. If you have any queries kindly contact our admin team through Wechat.\r\n\r\n\r\nCIEF WORLDWIDE SDN BHD", function ($message) use ($attachment) { + Mail::raw("Attention to VT Admin team:\r\n\r\nKindly refer to the attachment for our DAILY DO COMPILATION " . Carbon::yesterday()->format('d-m-Y') . ".\r\n\r\n**This is an automatically generated email – please do not reply to it. If you have any queries kindly contact our admin team through Wechat.\r\n\r\n\r\nCIEF WORLDWIDE SDN BHD", function ($message) use ($attachment) { $message->from('exchange@cief-malaysia.com'); $message->to(['uldvstar@gmail.com']); -// $message->to(['vtnation16@gmail.com', 'vtnation@gmail.com', 'atvantic04@gmail.com', 'vtnation2@gmail.com']); -// $message->cc(['shafiqa_sukeri@cief-malaysia.com', 'frontendcief@gmail.com', 'pm@cief-malaysia.com', 'hasan@cief-malaysia.com', 'shipping_admin@cief-malaysia.com', 'hasanakbar27@gmail.com', 'pmwong2019@gmail.com']); - $message->subject('CIEF DO COMPILATION from 24-11-2021 to 12-12-2021'); + // $message->to(['vtnation16@gmail.com', 'vtnation@gmail.com', 'atvantic04@gmail.com', 'vtnation2@gmail.com']); + // $message->cc(['shafiqa_sukeri@cief-malaysia.com', 'frontendcief@gmail.com', 'pm@cief-malaysia.com', 'hasan@cief-malaysia.com', 'shipping_admin@cief-malaysia.com', 'hasanakbar27@gmail.com', 'pmwong2019@gmail.com']); + $message->subject('CIEF DO COMPILATION ' . Carbon::yesterday()->format('d-m-Y')); $message->attach($attachment); });