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

Fix merge conflicts

This commit is contained in:
EC2 Default User 2018-03-04 16:30:09 +00:00
parent bb7b9e2b72 64a6c44643
commit 01daf61cdd
9 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/EventCheckoutController.php
View File

@ -335,7 +335,6 @@ class EventCheckoutController extends Controller
'description' => 'Order for customer: ' . $request->get('order_email'),
];
switch ($ticket_order['payment_gateway']->id) {
case config('attendize.payment_gateway_paypal'):
case config('attendize.payment_gateway_coinbase'):
@ -661,7 +660,7 @@ class EventCheckoutController extends Controller
* Queue up some tasks - Emails to be sent, PDFs etc.
*/
Log::info('Firing the event');
event(new OrderCompletedEvent($order));
//event(new OrderCompletedEvent($order));
} catch (Exception $e) {

3
app/Http/Controllers/OrganiserController.php
View File

@ -53,6 +53,9 @@ class OrganiserController extends MyBaseController
$organiser->facebook = $request->get('facebook');
$organiser->twitter = $request->get('twitter');
$organiser->confirmation_key = str_random(15);
$organiser->taxname = $request->get('taxname');
$organiser->taxvalue = $request->get('taxvalue');
$organiser->taxid = $request->get('taxid');
$organiser->taxname = $request->get('taxname');
$organiser->taxvalue = round($request->get('taxvalue'),2);

7
app/Models/Organiser.php
View File

@ -18,18 +18,18 @@ class Organiser extends MyBaseModel
'email' => ['required', 'email'],
'taxname' => ['required','max:15'],
'taxvalue' => ['required','numeric'],
'taxid' => ['required','max:100'],
'taxid' => ['required','max:100'],
'organiser_logo' => ['mimes:jpeg,jpg,png', 'max:10000'],
];
/**
* The validation rules for the model.
*
* @var array $rules
* @var array $attributes
*/
protected $attributes = [
'taxname' => 'Tax Name',
'taxvalue' => 'Tax Value',
'taxvalue' => 'Tax Rate',
'taxid' => 'Tax ID',
];
@ -162,3 +162,4 @@ class Organiser extends MyBaseModel
}
}
}

2
public/assets/stylesheet/frontend.css
View File

File diff suppressed because one or more lines are too long

6
public/assets/stylesheet/less/ui/typography.less
View File

@ -85,6 +85,12 @@ h6 > small {
.text-muted {
color: darken(@gray, 30%) !important;
}
/*
* smaller
*/
.text-smaller {
font-size:0.8em;
}
/*
* primary
*/

1
resources/views/ManageOrganiser/CreateOrganiser.blade.php
View File

@ -132,4 +132,3 @@
</div>
</div>
@stop

2
resources/views/ManageOrganiser/Customize.blade.php
View File

@ -235,5 +235,3 @@
</div>
</div>
@stop

3
resources/views/Public/ViewEvent/Partials/EventTicketsSection.blade.php
View File

@ -40,7 +40,7 @@
{{$ticket->description}}
</p>
</td>
<td style="width:180px; text-align: right;">
<td style="width:200px; text-align: right;">
<div class="ticket-pricing" style="margin-right: 20px;">
@if($ticket->is_free)
FREE
@ -50,6 +50,7 @@
$is_free_event = false;
?>
<span title='{{money($ticket->price, $event->currency)}} Ticket Price + {{money($ticket->total_booking_fee, $event->currency)}} Booking Fees'>{{money($ticket->total_price, $event->currency)}} </span>
<span class="tax-amount text-muted">{{ ($event->organiser->taxname && $event->organiser->taxvalue) ? '(+'.money(($ticket->total_price*($event->organiser->taxvalue)/100), $event->currency).' '.$event->organiser->taxname.')' : '' }}</span>
<meta property="priceCurrency"
content="{{ $event->currency->code }}">
<meta property="price"

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

@ -85,13 +85,14 @@
<h4>Attendee Ref.</h4>
{{$attendee->reference}}
<h4>Price</h4>
@php
@php
// Calculating grand total including tax
$grand_total = $attendee->ticket->total_price;
$tax_amt = ($grand_total * $event->organiser->taxvalue) / 100;
$grand_total = $tax_amt + $grand_total;
@endphp
{{money($grand_total, $order->event->currency)}} (inc. {{money($attendee->ticket->total_booking_fee, $order->event->currency)}} Fees) (inc. {{money($tax_amt, $order->event->currency)}}<Br>{{$event->organiser->taxname}})<br>{{$event->organiser->taxname}} ID: {{ $event->organiser->taxid }}
{{money($grand_total, $order->event->currency)}} (inc. {{money($attendee->ticket->total_booking_fee, $order->event->currency)}} Fees) (inc. {{money($tax_amt, $order->event->currency)}} {{$event->organiser->taxname}})
<br><br>{{$event->organiser->taxname}} ID: {{ $event->organiser->taxid }}
</div>
<div class="barcode">
@ -113,4 +114,5 @@
</div>
</div>
</body>
</html>
</html>