Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"paypal/paypal-checkout-sdk": "^1.0",
"pixelfear/composer-dist-plugin": "^0.1.0",
"spatie/ignition": "^1.13",
"statamic/cms": "^6.0.0-alpha.1",
"statamic/cms": "^6.0.0-beta.1",
"stillat/proteus": "^4.0",
"stripe/stripe-php": "^13.0"
},
Expand Down
9 changes: 7 additions & 2 deletions resources/js/components/Fieldtypes/StatusLogFieldtype.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
@click="showStatusLog = true"
/>

<Stack name="status-log" v-if="showStatusLog" @closed="showStatusLog = false" :narrow="true">
<Stack
ref="statusLogStack"
size="narrow"
:title="__('Status Log')"
v-model:open="showStatusLog"
>
<status-log
slot-scope="{ close }"
:index-url="meta.indexUrl"
Expand All @@ -18,7 +23,7 @@
:payment-statuses="meta.paymentStatuses"
:current-order-status="currentOrderStatus"
:current-payment-status="currentPaymentStatus"
@closed="close"
@closed="$refs.statusLogStack.close()"
/>
</Stack>
</div>
Expand Down
11 changes: 2 additions & 9 deletions resources/js/components/StatusLog/StatusLog.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
<template>
<div class="m-2 flex h-full flex-col rounded-xl bg-white dark:bg-gray-800">
<header
class="flex items-center justify-between rounded-t-xl border-b border-gray-300 px-4 mb-3 py-2 dark:border-gray-950 dark:bg-gray-800"
>
<Heading size="lg">{{ __('Status Log') }}</Heading>
<Button icon="x" variant="ghost" class="-me-2" @click="close" />
</header>

<div class="flex-1 overflow-auto">
<div>
<div>
<div class="loading flex h-full items-center justify-center" v-if="loading">
<Icon name="loading" />
</div>
Expand Down
5 changes: 5 additions & 0 deletions resources/js/components/StatusLog/StatusLogEvent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

<script>
import axios from 'axios';
import { DateFormatter } from '@statamic/cms';
import { Badge, Subheading, Avatar } from '@statamic/cms/ui'

export default {
Expand Down Expand Up @@ -73,6 +74,10 @@ export default {
return moment.unix(this.event.timestamp);
},

time() {
return DateFormatter.format(this.event.timestamp * 1000, 'time');
},

isCurrent() {
return this.event.status === this.currentOrderStatus
|| this.event.status === this.currentPaymentStatus;
Expand Down
Loading