ilmedova
/
Attendize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #565 from publicarray/fix-date-time-format-on-dash 

fixes #556
This commit is contained in:
Jeremy Quinton 2019-02-17 18:52:06 +02:00 committed by GitHub
parent 4a4c71cd9d 493e2797e3
commit be87806070
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/ManageEvent/Modals/ManageOrder.blade.php
View File

@ -55,7 +55,7 @@
<b>@lang("Order.order_ref")</b><br> {{$order->order_reference}}
</div>
<div class="col-sm-6 col-xs-6">
<b>@lang("Order.date")</b><br> {{$order->created_at->toDateTimeString()}}
<b>@lang("Order.date")</b><br> {{$order->created_at->format(config('attendize.default_datetime_format'))}}
</div>
<div class="col-sm-6 col-xs-6">
<b>@lang("Order.email")</b><br> {{$order->email}}

2
resources/views/ManageEvent/Orders.blade.php
View File

@ -102,7 +102,7 @@
</a>
</td>
<td>
{{ $order->created_at->toDayDateTimeString() }}
{{ $order->created_at->format(config('attendize.default_datetime_format')) }}
</td>
<td>
{{$order->first_name.' '.$order->last_name}}

4
resources/views/ManageEvent/PrintAttendees.blade.php
View File

@ -19,7 +19,7 @@
</head>
<body style="background-color: #FFFFFF;" onload="window.print();">
<div class="well" style="border:none; margin: 0;">
{{ @trans("Event.n_attendees_for_event", ["num"=>$attendees->count(), "name"=>$event->title, "date"=>$event->start_date->toDayDateTimeString()]) }}
{{ @trans("Event.n_attendees_for_event", ["num"=>$attendees->count(), "name"=>$event->title, "date"=>$event->start_date->format(config('attendize.default_datetime_format'))]) }}
<br>
</div>
@ -48,4 +48,4 @@
</tbody>
</table>
</body>
</html>
</html>

2
resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php
View File

@ -95,7 +95,7 @@
</div>
<div class="col-sm-4 col-xs-6">
<b>@lang("Public_ViewEvent.date")</b><br> {{$order->created_at->toDateTimeString()}}
<b>@lang("Public_ViewEvent.date")</b><br> {{$order->created_at->format(config('attendize.default_datetime_format'))}}
</div>
<div class="col-sm-4 col-xs-6">

4
resources/views/en/Emails/OrderConfirmation.blade.php
View File

@ -11,7 +11,7 @@ Your tickets are attached to this email. You can also view you order details and
<h3>Order Details</h3>
Order Reference: <b>{{$order->order_reference}}</b><br>
Order Name: <b>{{$order->full_name}}</b><br>
Order Date: <b>{{$order->created_at->toDayDateTimeString()}}</b><br>
Order Date: <b>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</b><br>
Order Email: <b>{{$order->email}}</b><br>
<h3>Order Items</h3>
@ -118,4 +118,4 @@ Order Email: <b>{{$order->email}}</b><br>
</div>
<br><br>
Thank you
@stop
@stop

2
resources/views/en/Emails/OrderNotification.blade.php
View File

@ -15,7 +15,7 @@ Order Summary:
<br><br>
Order Reference: <b>{{$order->order_reference}}</b><br>
Order Name: <b>{{$order->full_name}}</b><br>
Order Date: <b>{{$order->created_at->toDayDateTimeString()}}</b><br>
Order Date: <b>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</b><br>
Order Email: <b>{{$order->email}}</b><br>

2
resources/views/en/Mailers/TicketMailer/SendOrderTickets.blade.php
View File

@ -15,7 +15,7 @@ Your tickets are attached to this email. You can also view you order details and
<h3>Order Details</h3>
Order Reference: <b>{{$order->order_reference}}</b><br>
Order Name: <b>{{$order->full_name}}</b><br>
Order Date: <b>{{$order->created_at->toDayDateTimeString()}}</b><br>
Order Date: <b>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</b><br>
Order Email: <b>{{$order->email}}</b><br>
<a href="{!! route('downloadCalendarIcs', ['event_id' => $order->event->id]) !!}">Add To Calendar</a>
<h3>Order Items</h3>

4
resources/views/es/Emails/OrderConfirmation.blade.php
View File

@ -10,7 +10,7 @@
<h3>Resumen del pedido</h3>
Referencia de pedido: <b>{{$order->order_reference}}</b><br>
Nombre del pedido: <b>{{$order->full_name}}</b><br>
Fecha del pedido: <b>{{$order->created_at->toDayDateTimeString()}}</b><br>
Fecha del pedido: <b>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</b><br>
Correo electrónico del pedido: <b>{{$order->email}}</b><br>
<h3>Artículos del pedido</h3>
@ -117,4 +117,4 @@
</div>
<br><br>
Gracias
@stop
@stop

2
resources/views/es/Emails/OrderNotification.blade.php
View File

@ -14,7 +14,7 @@
<br><br>
Referencia de pedido: <b>{{$order->order_reference}}</b><br>
Nombre del pedido: <b>{{$order->full_name}}</b><br>
Fecha del pedido: <b>{{$order->created_at->toDayDateTimeString()}}</b><br>
Fecha del pedido: <b>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</b><br>
Order Email: <b>{{$order->email}}</b><br>
<h3>Artículos del pedido</h3>

2
resources/views/es/Mailers/TicketMailer/SendOrderTickets.blade.php
View File

@ -16,7 +16,7 @@
<h3>Resumen del pedido</h3>
Referencia de pedido: <b>{{$order->order_reference}}</b><br>
Nombre del pedido: <b>{{$order->full_name}}</b><br>
Fecha del pedido: <b>{{$order->created_at->toDayDateTimeString()}}</b><br>
Fecha del pedido: <b>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</b><br>
Correo electrónico del pedido: <b>{{$order->email}}</b><br>
<a href="{!! route('downloadCalendarIcs', ['event_id' => $order->event->id]) !!}">Añadir al Calendario</a>
<h3>Order Items</h3>

2
resources/views/fr/Emails/OrderConfirmation.blade.php
View File

@ -11,7 +11,7 @@ Vos billets sont joints à ce message. Vous pouvez aussi voir les détails de vo
<h3>Détails de la commande</h3>
Référence de la commande : <b>{{$order->order_reference}}</b><br>
Nom de la commande : <b>{{$order->full_name}}</b><br>
Date de la commande : <b>{{$order->created_at->toDayDateTimeString()}}</b><br>
Date de la commande : <b>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</b><br>
Courriel de la commande : <b>{{$order->email}}</b><br>
<h3>Éléments de la commande</h3>

2
resources/views/fr/Emails/OrderNotification.blade.php
View File

@ -15,7 +15,7 @@ Résumé de la commande :
<br><br>
Référence de la commande : <b>{{$order->order_reference}}</b><br>
Nom de la commande : <b>{{$order->full_name}}</b><br>
Date de la commande : <b>{{$order->created_at->toDayDateTimeString()}}</b><br>
Date de la commande : <b>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</b><br>
Courriel de la commande : <b>{{$order->email}}</b><br>
<h3>Éléments de la commande</h3>

2
resources/views/fr/Mailers/TicketMailer/SendOrderTickets.blade.php
View File

@ -15,7 +15,7 @@ Vos billets sont joints à ce message. Vous pouvez aussi voir les détails de vo
<h3>Détails</h3>
Référence de la commande : <b>{{$order->order_reference}}</b><br>
Nom de la commande : <b>{{$order->full_name}}</b><br>
Date de la commande : <b>{{$order->created_at->toDayDateTimeString()}}</b><br>
Date de la commande : <b>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</b><br>
Courriel de la commande : <b>{{$order->email}}</b><br>
<a href="{!! route('downloadCalendarIcs', ['event_id' => $order->event->id]) !!}">Ajouter au calendrier</a>
<h3>Éléments de la commande</h3>

2
resources/views/pl/Emails/OrderConfirmation.blade.php
View File

@ -11,7 +11,7 @@ Twoje bilety są dołączone do tego emaila. Możesz przejrzeć szczegóły dot.
<h3>Podsumowanie zamówienia</h3>
Identyfikator zamówienia: <b>{{$order->order_reference}}</b><br>
Imię i Nazwisko: <b>{{$order->full_name}}</b><br>
Data: <b>{{$order->created_at->toDayDateTimeString()}}</b><br>
Data: <b>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</b><br>
Email: <b>{{$order->email}}</b><br>
<h3>Przedmioty zamówienia</h3>

2
resources/views/pl/Emails/OrderNotification.blade.php
View File

@ -15,7 +15,7 @@ Podsumowanie zamówienia:
<br><br>
Identyfikator zamówienia: <b>{{$order->order_reference}}</b><br>
Nazwa: <b>{{$order->full_name}}</b><br>
Data: <b>{{$order->created_at->toDayDateTimeString()}}</b><br>
Data: <b>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</b><br>
Email: <b>{{$order->email}}</b><br>

2
resources/views/pl/Mailers/TicketMailer/SendOrderTickets.blade.php
View File

@ -15,7 +15,7 @@ Twoje bilety zostały dołączone do tego emaila. Możesz przejrzeć szczegóły
<h3>Szczegóły zamówienia</h3>
Identyfikator zamówienia: <b>{{$order->order_reference}}</b><br>
Nazwa: <b>{{$order->full_name}}</b><br>
Data: <b>{{$order->created_at->toDayDateTimeString()}}</b><br>
Data: <b>{{$order->created_at->format(config('attendize.default_datetime_format'))}}</b><br>
Email: <b>{{$order->email}}</b><br>
<a href="{!! route('downloadCalendarIcs', ['event_id' => $order->event->id]) !!}">Dodaj do kalendarza</a>
<h3>Przedmioty zamówienia</h3>