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

settings and page view

This commit is contained in:
merdan 2020-04-08 17:46:45 +05:00
parent c7189424f3
commit 7d3be592bc
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Services/EventOrderService.php
View File

@ -58,6 +58,7 @@ class EventOrderService
}
/**
* Calculates the final costs for an event and sets the various totals
*/
@ -73,7 +74,13 @@ class EventOrderService
$this->grandTotal = $this->orderTotalWithBookingFee + $this->taxAmount;
}
public function getTotalBookingFee($currencyFormatted = false){
if ($currencyFormatted == false ) {
return number_format($this->totalBookingFee, 2, '.', '');
}
return money($this->totalBookingFee, $this->event->currency);
}
/**
* @param bool $currencyFormatted
* @return float|string

4
resources/views/desktop/Partials/CreateOrderSection.blade.php
View File

@ -224,7 +224,7 @@
@endif
</td>
{{-- <td style="text-align: right;">{{money($ticket['total_booking_fee'], $event->currency)}}</td>--}}
<td style="text-align: right;">{{money($ticket['price']+$ticket['organiser_booking_fee']+$ticket['booking_fee'], $event->currency)}}</td>
<td style="text-align: right;">{{money($ticket['price'] * $ticket['qty'], $event->currency)}}</td>
</tr>
@endforeach
@if($orderService->totalBookingFee)
@ -233,7 +233,7 @@
@lang('Public_ViewEvent.booking_fees')
</td>
<td>{{$orderService->totalBookingFee}}</td>
<td style="text-align: right;">{{$orderService->getTotalBookingFee()}}</td>
</tr>
@endif
</table>

13
resources/views/mobile/Partials/CreateOrderSection.blade.php
View File

@ -18,7 +18,6 @@
<tr>
<th></th>
<th style="text-align: right;">@lang('Public_ViewEvent.price')</th>
<th style="text-align: right;">@lang('Public_ViewEvent.booking_fees')</th>
<th style="text-align: right;">@lang('Public_ViewEvent.sub_total')</th>
</tr>
</thead>
@ -32,10 +31,18 @@
{{ money($ticket['original_price'], $event->currency) }}
@endif
</td>
<td style="text-align: right; font-size: 12px;">{{money($ticket['total_booking_fee'], $event->currency)}}</td>
<td style="text-align: right;font-size: 12px;">{{money($ticket['price']+$ticket['organiser_booking_fee']+$ticket['booking_fee'], $event->currency)}}</td>
<td style="text-align: right;font-size: 12px;">{{money($ticket['price'] * $ticket['qty'], $event->currency)}}</td>
</tr>
@endforeach
@if($orderService->totalBookingFee)
<tr>
<td colspan="2">
@lang('Public_ViewEvent.booking_fees')
</td>
<td style="text-align: right;font-size: 12px;">{{$orderService->getTotalBookingFee()}}</td>
</tr>
@endif
</table>
</div>
@if($order_total > 0)