diff --git a/app/Http/Resources/BookingBaseResource.php b/app/Http/Resources/BookingBaseResource.php index 0e6d1939..1579551d 100644 --- a/app/Http/Resources/BookingBaseResource.php +++ b/app/Http/Resources/BookingBaseResource.php @@ -35,7 +35,6 @@ class BookingBaseResource extends JsonResource }), 'status' => $this->status, 'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'), - // 'created_at_with_time' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'), $this->mergeWhen($this->relationLoaded('transactions'), [ 'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){ $query->where(function($query){ @@ -51,4 +50,4 @@ class BookingBaseResource extends JsonResource ]) ]; } -} \ No newline at end of file +} diff --git a/app/Http/Resources/QuestionsAnswersResource.php b/app/Http/Resources/QuestionsAnswersResource.php index 78c0a7e6..b3ff2974 100644 --- a/app/Http/Resources/QuestionsAnswersResource.php +++ b/app/Http/Resources/QuestionsAnswersResource.php @@ -44,6 +44,7 @@ class QuestionsAnswersResource extends JsonResource 'source_email' => $user ? $user->email : $source->email, 'time' => $this->time_used_seconds, 'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'), + 'created_at_with_time' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'), ]; } } diff --git a/resources/assets/vue/components/admin-workflow/elements/QuestionAnswer2Component.vue b/resources/assets/vue/components/admin-workflow/elements/QuestionAnswer2Component.vue index 50408325..256e1eb8 100644 --- a/resources/assets/vue/components/admin-workflow/elements/QuestionAnswer2Component.vue +++ b/resources/assets/vue/components/admin-workflow/elements/QuestionAnswer2Component.vue @@ -4,12 +4,35 @@