diff --git a/app/Classes/Jobs/Commands/V2/EmailDoToVTV2CommandJob.php b/app/Classes/Jobs/Commands/V2/EmailDoToVTV2CommandJob.php index 28912ae0..1499a22b 100644 --- a/app/Classes/Jobs/Commands/V2/EmailDoToVTV2CommandJob.php +++ b/app/Classes/Jobs/Commands/V2/EmailDoToVTV2CommandJob.php @@ -74,7 +74,7 @@ class EmailDoToVTV2CommandJob implements ShouldQueue Mail::raw( "Attention to VT Admin team:\r\n\r\nKindly refer to the attachment for our DAILY DO COMPILATION ".$startDate->format('d-m-Y')." - ".$endDate->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, $startDate, $endDate){ $message->from('exchange@cief-malaysia.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', 'uldvstar@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', 'vtnation9@gmail.com']); $message->subject('CIEF DO COMPILATION '.$startDate->format('d-m-Y').' - '.$endDate->format('d-m-Y')); $message->attach($attachment); @@ -101,7 +101,7 @@ class EmailDoToVTV2CommandJob implements ShouldQueue Mail::raw( "Attention to VT Admin team:\r\n\r\nKindly refer to the attachment for our DAILY DO COMPILATION ".$startDate->format('d-m-Y')." - ".$endDate->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, $startDate, $endDate){ $message->from('exchange@cief-malaysia.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', 'uldvstar@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', 'vtnation9@gmail.com']); $message->subject('CIEF DO COMPILATION '.$startDate->format('d-m-Y').' - '.$endDate->format('d-m-Y')); $message->attach($attachment); diff --git a/app/Console/Commands/EmailDoToVTCommand.php b/app/Console/Commands/EmailDoToVTCommand.php index 00395268..ef039ee1 100644 --- a/app/Console/Commands/EmailDoToVTCommand.php +++ b/app/Console/Commands/EmailDoToVTCommand.php @@ -82,7 +82,7 @@ class EmailDoToVTCommand extends Command Mail::raw( "Attention to VT Admin team:\r\n\r\nKindly refer to the attachment for our DAILY DO COMPILATION ".$startDate->format('d-m-Y')." - ".$endDate->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, $startDate, $endDate){ $message->from('exchange@cief-malaysia.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', 'uldvstar@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', 'vtnation9@gmail.com']); $message->subject('CIEF DO COMPILATION '.$startDate->format('d-m-Y').' - '.$endDate->format('d-m-Y')); $message->attach($attachment); diff --git a/app/Http/Resources/KeyValueBasicResource.php b/app/Http/Resources/KeyValueBasicResource.php index 94725a0a..1b5d753e 100644 --- a/app/Http/Resources/KeyValueBasicResource.php +++ b/app/Http/Resources/KeyValueBasicResource.php @@ -2,7 +2,7 @@ namespace App\Http\Resources; - +use Carbon\Carbon; use Illuminate\Http\Resources\Json\JsonResource; class KeyValueBasicResource extends JsonResource @@ -19,6 +19,7 @@ class KeyValueBasicResource extends JsonResource // 'id' => $this->id, 'key' => $this->key, 'value' => $this->value, + 'year' => Carbon::parse($this->created_at)->format('Y'), ]; } } diff --git a/resources/assets/vue/components/vouchers/elements/SingleVoucherCampaignItemComponent.vue b/resources/assets/vue/components/vouchers/elements/SingleVoucherCampaignItemComponent.vue index 71199099..a5a6cbbc 100644 --- a/resources/assets/vue/components/vouchers/elements/SingleVoucherCampaignItemComponent.vue +++ b/resources/assets/vue/components/vouchers/elements/SingleVoucherCampaignItemComponent.vue @@ -15,7 +15,7 @@