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 @@
-
{{ item.id }}
{{ item.created_at }}
{{ item.source_email }}
+
{{ item.id }}
{{ item.created_at_with_time }}
{{ item.source_email }}
{{ item.questionnaire.version }}
{{ item.questionnaire.description }}
-
{{ item.question_title }}
+
{{ item.question_title }}
Time(s): {{ item.time }}
{{ parsedAnswer === 'go_back' ? '' : item.answer }}
{{ parsedAnswer }}
-
+
+
+
+ + + +
+
+
+
-
{{ item.time }}
-
- - {{ JSON.parse(item.question_metadata).marking }} - +
+ Reference: {{ JSON.parse(item.question_metadata).marking }} + + + Marking: {{ JSON.parse(item.question_metadata).company.reference }} + + Currency Rate: {{ JSON.parse(item.question_metadata).payment_history[0].currency_rate }} + + Total Amount: {{ JSON.parse(item.question_metadata).payment_history[0].currency.short_code}} {{((Math.round(( JSON.parse(item.question_metadata).payment_history[0].amount + Number.EPSILON) * 100) / 100)).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
@@ -71,11 +98,12 @@
Id
Question Text
-
Order/Booking/Transfer
Answer Text
Answer Value
Documents Uploaded
Time(seconds)
+
Created DateTime
+
Order/Booking/Transfer
diff --git a/resources/assets/vue/components/admin-workflow/elements/QuestionAnswerComponent.vue b/resources/assets/vue/components/admin-workflow/elements/QuestionAnswerComponent.vue index 005c29cf..9d137d43 100644 --- a/resources/assets/vue/components/admin-workflow/elements/QuestionAnswerComponent.vue +++ b/resources/assets/vue/components/admin-workflow/elements/QuestionAnswerComponent.vue @@ -11,7 +11,7 @@
{{ item.answer_value }}
{{ item.source_email }}
{{ item.time }}
-
{{ item.created_at }}
+
{{ item.created_at_with_time }}