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

Merge pull request #34 from bretto36/view-cancelled-order 

Viewing cancelled order
This commit is contained in:
Dave Earley 2016-03-13 22:47:43 +00:00
parent f53ea9bf75 fb2c056b2a
commit 0210beb20b
4 changed files with 80 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/user_content/event_images/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
*
!.gitignore

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

@ -154,7 +154,7 @@
<div class="col-xs-6"> <div class="col-xs-6">
<div class="form-group"> <div class="form-group">
{!! Form::label('card-expiry-year', 'Exipry Year') !!} {!! Form::label('card-expiry-year', 'Exipry Year') !!}
{!! Form::selectRange('card-expiry-year',14,24,null, [ {!! Form::selectRange('card-expiry-year',date('Y'),date('Y')+10,null, [
'class' => 'form-control card-expiry-year', 'class' => 'form-control card-expiry-year',
'data-stripe' => 'exp_year' 'data-stripe' => 'exp_year'
] ) !!}</div> ] ) !!}</div>

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

@ -168,6 +168,36 @@
{{money($order->total_amount, $order->event->currency->code)}} {{money($order->total_amount, $order->event->currency->code)}}
</td> </td>
</tr> </tr>
@if($order->is_refunded || $order->is_partially_refunded)
<tr>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
<b>Refunded Amount</b>
</td>
<td colspan="2">
{{money($order->amount_refunded, $order->event->currency->code)}}
</td>
</tr>
<tr>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
<b>Total</b>
</td>
<td colspan="2">
{{money($order->total_amount - $order->amount_refunded, $order->event->currency->code)}}
</td>
</tr>
@endif
</tbody> </tbody>
</table> </table>
@ -190,6 +220,11 @@
<td> <td>
{{{$attendee->ticket->title}}} {{{$attendee->ticket->title}}}
</td> </td>
<td>
@if($attendee->is_cancelled)
Cancelled
@endif
</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>

4
resources/views/Public/ViewEvent/Partials/PDFTicket.blade.php
View File

@ -136,10 +136,10 @@
{{--</div>--}} {{--</div>--}}
@foreach($attendees as $attendee) @foreach($attendees as $attendee)
@if(!$attendee->is_cancelled)
<div class="ticket"> <div class="ticket">
<div class='logo'> <div class='logo'>
<!-- <img src="http://dev.attendize.com/assets/images/logo-100x100-lightBg.png" />-->
<img src="{{empty(config('attendize.cdn_url_user_assets')) ? url('/'.$event->organiser->logo_path) : config('attendize.cdn_url_user_assets').'/'.$event->organiser->logo_path}}" /> <img src="{{empty(config('attendize.cdn_url_user_assets')) ? url('/'.$event->organiser->logo_path) : config('attendize.cdn_url_user_assets').'/'.$event->organiser->logo_path}}" />
</div> </div>
@ -180,7 +180,7 @@
{!! DNS1D::getBarcodeSVG($attendee->private_reference_number, "EAN2", 1, 40) !!} {!! DNS1D::getBarcodeSVG($attendee->private_reference_number, "EAN2", 1, 40) !!}
</div> </div>
</div> </div>
@endif
@endforeach @endforeach
<div class="bottom_info"> <div class="bottom_info">