cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug date error in update announcement function in settings page

Browse Source
This commit is contained in:
edmondlang
2023-04-19 13:26:06 +08:00
parent bf2528d98a
commit 204068d864
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Announcements/ControllersLogic/CreateAnnouncementLogic.php
+3 -3
View File
@@ -11,7 +11,7 @@ use App\Classes\Modules\Announcements\Services\CreatesAnnouncement;
use App\Classes\Modules\Announcements\Processors\AssignAnnouncementToSegmentProcessor;
use App\Http\Resources\AnnouncementResource;
use Carbon\Carbon;
use ErrorException;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -67,8 +67,8 @@ class CreateAnnouncementLogic extends AbstractControllerLogic
$annoucement_object = new AnnouncementObject(
$request->input('title'),
$request->input('description'),
$request->input('starting_on'),
$request->input('ending_on')
Carbon::createFromFormat('d-m-Y', $request->input('starting_on'))->format('Y-m-d H:i:s'),
Carbon::createFromFormat('d-m-Y', $request->input('ending_on'))->format('Y-m-d H:i:s')
);
$this->canCreateAnnouncement->passes($annoucement_object);
app/Classes/Modules/Announcements/ControllersLogic/UpdateAnnouncementLogic.php
+3 -3
View File
@@ -10,7 +10,7 @@ use App\Classes\Modules\Announcements\Services\FetchesAnnouncement;
use App\Classes\Modules\Announcements\Services\UpdatesAnnouncement;
use App\Http\Resources\AnnouncementResource;
use Carbon\Carbon;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
@@ -66,8 +66,8 @@ class UpdateAnnouncementLogic extends AbstractControllerLogic
$annoucement_object = new AnnouncementObject(
$request->input('title'),
$request->input('description'),
$request->input('starting_on'),
$request->input('ending_on')
Carbon::createFromFormat('d-m-Y', $request->input('starting_on'))->format('Y-m-d H:i:s'),
Carbon::createFromFormat('d-m-Y', $request->input('ending_on'))->format('Y-m-d H:i:s')
);
$this->canUpdateAnnouncement->passes($annoucement_object);
app/Http/Resources/AnnouncementResource.php
+2 -2
View File
@@ -20,8 +20,8 @@ class AnnouncementResource extends JsonResource
'title' => $this->title,
'description' => $this->description,
'segments' => $this->segments,
'starting_on' => Carbon::parse($this->starting_on)->format('Y-m-d'),
'ending_on' => Carbon::parse($this->ending_on)->format('Y-m-d'),
'starting_on' => Carbon::parse($this->starting_on)->format('d-m-Y'),
'ending_on' => Carbon::parse($this->ending_on)->format('d-m-Y'),
'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'),
];
}
resources/assets/vue/components/settings/forms/AnnouncementFormComponent.vue
+4 -4
View File
@@ -32,16 +32,16 @@
</div>
<div class="row m-b-20">
<div class="col-6">
<div class="col-6 p-r-0">
<validation-wrapper-component :validator="$v.parameters.starting_on">
<label>Start Date</label>
<input type="date" v-model="parameters.starting_on">
<date-picker-component v-model="parameters.starting_on"></date-picker-component>
</validation-wrapper-component>
</div>
<div class="col-6">
<div class="col-6 p-l-0">
<validation-wrapper-component :validator="$v.parameters.ending_on">
<label>End Date</label>
<input type="date" v-model="parameters.ending_on">
<date-picker-component v-model="parameters.ending_on"></date-picker-component>
</validation-wrapper-component>
</div>
</div>