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

Added TAX ID field in Create Organizer, Customise Organiser 

Same is shown in Invoice.
This commit is contained in:
Sachin 2018-03-01 22:13:51 +05:30
parent d7cce49f3c
commit 95d3806c0f
7 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,7 @@ class OrganiserController extends MyBaseController
$organiser->taxname = $request->get('taxname');
$organiser->taxvalue = round($request->get('taxvalue'),2);
$organiser->taxid = $request->get('taxid');
if ($request->hasFile('organiser_logo')) {
$organiser->setLogo($request->file('organiser_logo'));

1
app/Http/Controllers/OrganiserCustomizeController.php
View File

@ -52,6 +52,7 @@ class OrganiserCustomizeController extends MyBaseController
$organiser->twitter = $request->get('twitter');
$organiser->taxname = $request->get('taxname');
$organiser->taxvalue = $request->get('taxvalue');
$organiser->taxid = $request->get('taxid');
if ($request->get('remove_current_image') == '1') {
$organiser->logo_path = '';

2
app/Models/Organiser.php
View File

@ -18,6 +18,7 @@ class Organiser extends MyBaseModel
'email' => ['required', 'email'],
'taxname' => ['required','max:15'],
'taxvalue' => ['required','numeric'],
'taxid' => ['required','max:100'],
'organiser_logo' => ['mimes:jpeg,jpg,png', 'max:10000'],
];
@ -29,6 +30,7 @@ class Organiser extends MyBaseModel
protected $attributes = [
'taxname' => 'Tax Name',
'taxvalue' => 'Tax Value',
'taxid' => 'Tax ID',
];
/**

31
database/migrations/2018_03_01_150711_add_taxid_to_organisers.php Normal file
View File

@ -0,0 +1,31 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddTaxidToOrganisers extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('organisers', function($table) {
$table->string('taxid',100);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('organisers', function($table) {
$table->dropColumn('taxid');
});
}
}

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

@ -68,19 +68,27 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
{!! Form::label('taxid', 'Tax ID', array('class'=>'control-label required')) !!}
{!! Form::text('taxid', Input::old('taxid'), array('class'=>'form-control', 'placeholder'=>'Tax ID')) !!}
</div>
</div>
<div class="col-md-3">
<div class="form-group">
{!! Form::label('taxname', 'Tax name', array('class'=>'control-label required')) !!}
{!! Form::text('taxname', Input::old('taxname'), array('class'=>'form-control', 'placeholder'=>'Tax name')) !!}
</div>
</div>
<div class="col-md-6">
<div class="col-md-3">
<div class="form-group">
{!! Form::label('taxvalue', 'Tax value', array('class'=>'control-label required')) !!}
{!! Form::text('taxvalue', Input::old('taxvalue'), array('class'=>'form-control', 'placeholder'=>'Tax Value')) !!}
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">

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

@ -95,13 +95,20 @@
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
{!! Form::label('taxid', 'Tax ID', array('class'=>'control-label required')) !!}
{!! Form::text('taxid', Input::old('taxid'), array('class'=>'form-control', 'placeholder'=>'Tax ID')) !!}
</div>
</div>
<div class="col-md-3">
<div class="form-group">
{!! Form::label('taxname', 'Tax name', array('class'=>'control-label required')) !!}
{!! Form::text('taxname', Input::old('taxname'), array('class'=>'form-control', 'placeholder'=>'Tax name')) !!}
</div>
</div>
<div class="col-md-6">
<div class="col-md-3">
<div class="form-group">
{!! Form::label('taxvalue', 'Tax value', array('class'=>'control-label required')) !!}
{!! Form::text('taxvalue', Input::old('taxvalue'), array('class'=>'form-control', 'placeholder'=>'Tax Value')) !!}

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

@ -91,7 +91,7 @@
$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}})
{{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 }}
</div>
<div class="barcode">