diff --git a/composer.json b/composer.json index dbc1a6617..27a7202f0 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,6 @@ "laravel/socialite": "^5.6", "laravel/tinker": "^2.8", "laravel/ui": "^4.2", - "laravelcollective/html": "^6.4", "mailgun/mailgun-php": "^3.5", "nyholm/psr7": "^1.5", "owen-it/laravel-auditing": "^13.1", @@ -35,7 +34,8 @@ "spatie/laravel-stripe-webhooks": "^3.2", "stuyam/laravel-phone-validator": "^1.0", "symfony/http-client": "^6.2", - "symfony/mailgun-mailer": "^6.2" + "symfony/mailgun-mailer": "^6.2", + "spatie/laravel-html": "^3.2" }, "require-dev": { "barryvdh/laravel-debugbar": "^3.8", diff --git a/resources/views/activities/add_group.blade.php b/resources/views/activities/add_group.blade.php index 00b2f9e92..170cc67d8 100644 --- a/resources/views/activities/add_group.blade.php +++ b/resources/views/activities/add_group.blade.php @@ -4,56 +4,50 @@

Create Group Touchpoint

- {!! Form::open(['url' => 'touchpoint/add_group', 'method' => 'post', 'class' => 'form-horizontal panel']) !!} + {{ html()->form('POST', 'touchpoint/add_group')->class('form-horizontal panel')->open() }}
- {!! Form::label('touched_at', 'Date of contact:', ['class' => 'col-md-3']) !!} - {!! Form::text('touched_at',date('F j, Y g:i A', strtotime(\Carbon\Carbon::now())) , ['class' => 'col-md-3']) !!} + {{ html()->label('Date of contact:', 'touched_at')->class('col-md-3') }} + {{ html()->text('touched_at', date('F j, Y g:i A', strtotime(\Carbon\Carbon::now())))->class('col-md-3') }}
- {!! Form::label('group_id', 'Name of Group:', ['class' => 'col-md-3']) !!} + {{ html()->label('Name of Group:', 'group_id')->class('col-md-3') }} @if (isset($defaults['group_id'])) - {!! Form::select('group_id', $groups, $defaults['group_id'], ['class' => 'col-md-3']) !!} + {{ html()->select('group_id', $groups, $defaults['group_id'])->class('col-md-3') }} @else - {!! Form::select('group_id', $groups, NULL, ['class' => 'col-md-3']) !!} + {{ html()->select('group_id', $groups)->class('col-md-3') }} @endif
- {!! Form::label('staff_id', 'Contacted by:', ['class' => 'col-md-3']) !!} + {{ html()->label('Contacted by:', 'staff_id')->class('col-md-3') }} @if (isset($defaults['user_id'])) - {!! Form::select('staff_id', $staff, $defaults['user_id'], ['class' => 'col-md-3']) !!} + {{ html()->select('staff_id', $staff, $defaults['user_id'])->class('col-md-3') }} @else - {!! Form::select('staff_id', $staff, NULL, ['class' => 'col-md-3']) !!} + {{ html()->select('staff_id', $staff)->class('col-md-3') }} @endif
- {!! Form::label('type', 'Type of Contact:', ['class' => 'col-md-3']) !!} - {!! Form::select('type', [ - 'Call' => 'Call', - 'Email' => 'Email', - 'Face' => 'Face to Face', - 'Letter' => 'Letter', - 'Other' => 'Other', - ], NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Type of Contact:', 'type')->class('col-md-3') }} + {{ html()->select('type', ['Call' => 'Call', 'Email' => 'Email', 'Face' => 'Face to Face', 'Letter' => 'Letter', 'Other' => 'Other'])->class('col-md-3') }}
- {!! Form::label('notes', 'Notes:', ['class' => 'col-md-3']) !!} - {!! Form::textarea('notes', NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Notes:', 'notes')->class('col-md-3') }} + {{ html()->textarea('notes')->class('col-md-3') }}
- {!! Form::submit('Add Group Touchpoint', ['class'=>'btn btn-primary']) !!} + {{ html()->submit('Add Group Touchpoint')->class('btn btn-primary') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/activities/add_retreat.blade.php b/resources/views/activities/add_retreat.blade.php index 34a57a14f..75de50294 100644 --- a/resources/views/activities/add_retreat.blade.php +++ b/resources/views/activities/add_retreat.blade.php @@ -4,53 +4,47 @@

Create Retreat Touchpoint for {{$retreat->title}}

- {!! Form::open(['url' => 'touchpoint/add_retreat', 'method' => 'post', 'class' => 'form-horizontal panel']) !!} + {{ html()->form('POST', 'touchpoint/add_retreat')->class('form-horizontal panel')->open() }}

A retreat touchpoint will add a touchpoint to each of the retreat participants.

- {!! Form::label('touched_at', 'Date of contact:', ['class' => 'col-md-3']) !!} - {!! Form::text('touched_at',date('F j, Y g:i A', strtotime(\Carbon\Carbon::now())) , ['class' => 'col-md-3']) !!} + {{ html()->label('Date of contact:', 'touched_at')->class('col-md-3') }} + {{ html()->text('touched_at', date('F j, Y g:i A', strtotime(\Carbon\Carbon::now())))->class('col-md-3') }}
- {!! Form::label('event_id', 'Name of Retreat:', ['class' => 'col-md-3']) !!} - {!! Form::select('event_id', [$defaults['event_id']=>$defaults['event_description']],$defaults['event_id'], ['class' => 'col-md-3']) !!} + {{ html()->label('Name of Retreat:', 'event_id')->class('col-md-3') }} + {{ html()->select('event_id', [$defaults['event_id'] => $defaults['event_description']], $defaults['event_id'])->class('col-md-3') }}
- {!! Form::label('staff_id', 'Contacted by:', ['class' => 'col-md-3']) !!} + {{ html()->label('Contacted by:', 'staff_id')->class('col-md-3') }} @if (isset($defaults['user_id'])) - {!! Form::select('staff_id', $staff, $defaults['user_id'], ['class' => 'col-md-3']) !!} + {{ html()->select('staff_id', $staff, $defaults['user_id'])->class('col-md-3') }} @else - {!! Form::select('staff_id', $staff, NULL, ['class' => 'col-md-3']) !!} + {{ html()->select('staff_id', $staff)->class('col-md-3') }} @endif
- {!! Form::label('type', 'Type of Contact:', ['class' => 'col-md-3']) !!} - {!! Form::select('type', [ - 'Call' => 'Call', - 'Email' => 'Email', - 'Face' => 'Face to Face', - 'Letter' => 'Letter', - 'Other' => 'Other', - ], NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Type of Contact:', 'type')->class('col-md-3') }} + {{ html()->select('type', ['Call' => 'Call', 'Email' => 'Email', 'Face' => 'Face to Face', 'Letter' => 'Letter', 'Other' => 'Other'])->class('col-md-3') }}
- {!! Form::label('notes', 'Notes:', ['class' => 'col-md-3']) !!} - {!! Form::textarea('notes', NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Notes:', 'notes')->class('col-md-3') }} + {{ html()->textarea('notes')->class('col-md-3') }}
- {!! Form::submit('Add Retreat Touchpoint', ['class'=>'btn btn-primary']) !!} + {{ html()->submit('Add Retreat Touchpoint')->class('btn btn-primary') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/activities/create.blade.php b/resources/views/activities/create.blade.php index b2bc08678..351881180 100644 --- a/resources/views/activities/create.blade.php +++ b/resources/views/activities/create.blade.php @@ -4,69 +4,69 @@

Create Activity

- {!! Form::open(['url' => 'activity', 'method' => 'post', 'class' => 'form-horizontal panel']) !!} + {{ html()->form('POST', 'activity')->class('form-horizontal panel')->open() }}
- {!! Form::label('activity_date_time', 'Date of activity:', ['class' => 'col-md-3']) !!} - {!! Form::text('activity_date_time',date('F j, Y g:i A', strtotime(\Carbon\Carbon::now())) , ['class' => 'col-md-3']) !!} + {{ html()->label('Date of activity:', 'activity_date_time')->class('col-md-3') }} + {{ html()->text('activity_date_time', date('F j, Y g:i A', strtotime(\Carbon\Carbon::now())))->class('col-md-3') }}
- {!! Form::label('activity_type_id', 'Activity type:', ['class' => 'col-md-3']) !!} - {!! Form::select('activity_type_id', $activity_type, NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Activity type:', 'activity_type_id')->class('col-md-3') }} + {{ html()->select('activity_type_id', $activity_type)->class('col-md-3') }}
- {!! Form::label('staff_id', 'Contacted by:', ['class' => 'col-md-3']) !!} + {{ html()->label('Contacted by:', 'staff_id')->class('col-md-3') }} @if (isset($defaults['user_id'])) - {!! Form::select('staff_id', $staff, $defaults['user_id'], ['class' => 'col-md-3']) !!} + {{ html()->select('staff_id', $staff, $defaults['user_id'])->class('col-md-3') }} @else - {!! Form::select('staff_id', $staff, NULL, ['class' => 'col-md-3']) !!} + {{ html()->select('staff_id', $staff)->class('col-md-3') }} @endif
- {!! Form::label('person_id', 'Name of Contact:', ['class' => 'col-md-3']) !!} + {{ html()->label('Name of Contact:', 'person_id')->class('col-md-3') }} @if (isset($defaults['contact_id'])) - {!! Form::select('person_id', $persons, $defaults['contact_id'], ['class' => 'col-md-3']) !!} + {{ html()->select('person_id', $persons, $defaults['contact_id'])->class('col-md-3') }} @else - {!! Form::select('person_id', $persons, NULL, ['class' => 'col-md-3']) !!} + {{ html()->select('person_id', $persons)->class('col-md-3') }} @endif
- {!! Form::label('subject', 'Subject:', ['class' => 'col-md-3']) !!} - {!! Form::text('subject',null, ['class' => 'col-md-3']) !!} + {{ html()->label('Subject:', 'subject')->class('col-md-3') }} + {{ html()->text('subject')->class('col-md-3') }}
- {!! Form::label('details', 'Details:', ['class' => 'col-md-3']) !!} - {!! Form::textarea('details', NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Details:', 'details')->class('col-md-3') }} + {{ html()->textarea('details')->class('col-md-3') }}
- {!! Form::label('medium_id', 'Activity medium:', ['class' => 'col-md-3']) !!} - {!! Form::select('medium_id', $medium, NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Activity medium:', 'medium_id')->class('col-md-3') }} + {{ html()->select('medium_id', $medium)->class('col-md-3') }}
- {!! Form::label('status_id', 'Activity status:', ['class' => 'col-md-3']) !!} - {!! Form::select('status_id', $status, NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Activity status:', 'status_id')->class('col-md-3') }} + {{ html()->select('status_id', $status)->class('col-md-3') }}
- {!! Form::label('duration', 'Duration (minutes): ', ['class' => 'col-md-3']) !!} - {!! Form::text('duration', null, ['class' => 'col-md-3']) !!} + {{ html()->label('Duration (minutes): ', 'duration')->class('col-md-3') }} + {{ html()->text('duration')->class('col-md-3') }}
- {!! Form::label('priority_id', 'Activity priority:', ['class' => 'col-md-3']) !!} - {!! Form::select('priority_id', array_map('ucfirst',array_flip(config('polanco.priority'))), NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Activity priority:', 'priority_id')->class('col-md-3') }} + {{ html()->select('priority_id', array_map('ucfirst', array_flip(config('polanco.priority'))))->class('col-md-3') }}
- {!! Form::label('location', 'Location: ', ['class' => 'col-md-3']) !!} - {!! Form::text('location', null, ['class' => 'col-md-3']) !!} + {{ html()->label('Location: ', 'location')->class('col-md-3') }} + {{ html()->text('location')->class('col-md-3') }}
- {!! Form::label('created_by', 'Created by:', ['class' => 'col-md-3']) !!} + {{ html()->label('Created by:', 'created_by')->class('col-md-3') }} @if (isset($defaults['user_id'])) - {!! Form::select('created_by', $staff, $defaults['user_id'], ['class' => 'col-md-3']) !!} + {{ html()->select('created_by', $staff, $defaults['user_id'])->class('col-md-3') }} @else - {!! Form::select('created_by', $staff, NULL, ['class' => 'col-md-3']) !!} + {{ html()->select('created_by', $staff)->class('col-md-3') }} @endif @@ -75,9 +75,9 @@
- {!! Form::submit('Add Activity', ['class'=>'btn btn-primary']) !!} + {{ html()->submit('Add Activity')->class('btn btn-primary') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/activities/edit.blade.php b/resources/views/activities/edit.blade.php index 322330e14..1a433bae6 100644 --- a/resources/views/activities/edit.blade.php +++ b/resources/views/activities/edit.blade.php @@ -5,62 +5,62 @@

Edit Activity:

- {!! Form::open(['method' => 'PUT', 'route' => ['activity.update', $activity->id]]) !!} - {!! Form::hidden('id', $activity->id) !!} + {{ html()->form('PUT', route('activity.update', [$activity->id]))->open() }} + {{ html()->hidden('id', $activity->id) }}

Activity details

- {!! Form::label('activity_date_time', 'Date of contact:', ['class' => 'col-md-3']) !!} - {!! Form::text('activity_date_time', date('F j, Y g:i A', strtotime($activity->activity_date_time)), ['class' => 'col-md-3']) !!} + {{ html()->label('Date of contact:', 'activity_date_time')->class('col-md-3') }} + {{ html()->text('activity_date_time', date('F j, Y g:i A', strtotime($activity->activity_date_time)))->class('col-md-3') }}
- {!! Form::label('activity_type_id', 'Activity type:', ['class' => 'col-md-3']) !!} - {!! Form::select('activity_type_id', $activity_type, $activity->activity_type_id, ['class' => 'col-md-3']) !!} + {{ html()->label('Activity type:', 'activity_type_id')->class('col-md-3') }} + {{ html()->select('activity_type_id', $activity_type, $activity->activity_type_id)->class('col-md-3') }}
- {!! Form::label('assignee_id', 'Contacted by:', ['class' => 'col-md-3']) !!} - {!! Form::select('assignee_id', $staff, $assignee->contact_id, ['class' => 'col-md-3']) !!} + {{ html()->label('Contacted by:', 'assignee_id')->class('col-md-3') }} + {{ html()->select('assignee_id', $staff, $assignee->contact_id)->class('col-md-3') }}
- {!! Form::label('target_id', 'Name of Contact:', ['class' => 'col-md-3']) !!} - {!! Form::select('target_id', $persons, $target->contact_id, ['class' => 'col-md-3']) !!} + {{ html()->label('Name of Contact:', 'target_id')->class('col-md-3') }} + {{ html()->select('target_id', $persons, $target->contact_id)->class('col-md-3') }}
- {!! Form::label('subject', 'Subject:', ['class' => 'col-md-3']) !!} - {!! Form::text('subject',$activity->subject, ['class' => 'col-md-3']) !!} + {{ html()->label('Subject:', 'subject')->class('col-md-3') }} + {{ html()->text('subject', $activity->subject)->class('col-md-3') }}
- {!! Form::label('details', 'Details:', ['class' => 'col-md-3']) !!} - {!! Form::textarea('details', $activity->details, ['class' => 'col-md-3']) !!} + {{ html()->label('Details:', 'details')->class('col-md-3') }} + {{ html()->textarea('details', $activity->details)->class('col-md-3') }}
- {!! Form::label('medium_id', 'Activity medium:', ['class' => 'col-md-3']) !!} - {!! Form::select('medium_id', $medium, $activity->medium_id, ['class' => 'col-md-3']) !!} + {{ html()->label('Activity medium:', 'medium_id')->class('col-md-3') }} + {{ html()->select('medium_id', $medium, $activity->medium_id)->class('col-md-3') }}
- {!! Form::label('status_id', 'Activity status:', ['class' => 'col-md-3']) !!} - {!! Form::select('status_id', $status, $activity->status_id, ['class' => 'col-md-3']) !!} + {{ html()->label('Activity status:', 'status_id')->class('col-md-3') }} + {{ html()->select('status_id', $status, $activity->status_id)->class('col-md-3') }}
- {!! Form::label('duration', 'Duration (minutes): ', ['class' => 'col-md-3']) !!} - {!! Form::text('duration', $activity->duration, ['class' => 'col-md-3']) !!} + {{ html()->label('Duration (minutes): ', 'duration')->class('col-md-3') }} + {{ html()->text('duration', $activity->duration)->class('col-md-3') }}
- {!! Form::label('priority_id', 'Activity priority:', ['class' => 'col-md-3']) !!} - {!! Form::select('priority_id', array_map('ucfirst',array_flip(config('polanco.priority'))), $activity->priority_id, ['class' => 'col-md-3']) !!} + {{ html()->label('Activity priority:', 'priority_id')->class('col-md-3') }} + {{ html()->select('priority_id', array_map('ucfirst', array_flip(config('polanco.priority'))), $activity->priority_id)->class('col-md-3') }}
- {!! Form::label('location', 'Location: ', ['class' => 'col-md-3']) !!} - {!! Form::text('location', $activity->location, ['class' => 'col-md-3']) !!} + {{ html()->label('Location: ', 'location')->class('col-md-3') }} + {{ html()->text('location', $activity->location)->class('col-md-3') }}
- {!! Form::label('creator_id', 'Created by:', ['class' => 'col-md-3']) !!} + {{ html()->label('Created by:', 'creator_id')->class('col-md-3') }} @if (isset($creator->contact_id)) - {!! Form::select('creator_id', $staff, $creator->contact_id, ['class' => 'col-md-3']) !!} + {{ html()->select('creator_id', $staff, $creator->contact_id)->class('col-md-3') }} @else - {!! Form::select('creator_id', $staff, NULL, ['class' => 'col-md-3']) !!} + {{ html()->select('creator_id', $staff)->class('col-md-3') }} @endif @@ -72,8 +72,8 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-primary']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-primary']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/activities/index.blade.php b/resources/views/activities/index.blade.php index a924245e9..aa5e078b1 100644 --- a/resources/views/activities/index.blade.php +++ b/resources/views/activities/index.blade.php @@ -10,7 +10,7 @@ ({{$activities->total()}} records) @can('update-activity') - {!! Html::image('images/create.png', 'Add Activity',array('title'=>"Add Activity",'class' => 'btn btn-primary')) !!} + {{ html()->img('images/create.png', 'Add Activity')->attribute('title', "Add Activity")->class('btn btn-primary') }} @endCan diff --git a/resources/views/activities/show.blade.php b/resources/views/activities/show.blade.php index 1210b605e..1cb7b755d 100644 --- a/resources/views/activities/show.blade.php +++ b/resources/views/activities/show.blade.php @@ -37,14 +37,14 @@
@can('update-activity') @endCan @can('delete-activity')
- {!! Form::open(['method' => 'DELETE', 'route' => ['activity.destroy', $activity->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('activity.destroy', [$activity->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }}
@endCan
diff --git a/resources/views/addresses/create.blade.php b/resources/views/addresses/create.blade.php index 104f8174b..e2dfeb72d 100644 --- a/resources/views/addresses/create.blade.php +++ b/resources/views/addresses/create.blade.php @@ -6,69 +6,69 @@

Create address

- {!! Form::open(['url'=>'address', 'method'=>'post']) !!} + {{ html()->form('POST', 'address')->open() }}
- {!! Form::label('contact_id', 'Name of Contact:') !!} + {{ html()->label('Name of Contact:', 'contact_id') }} @if (isset($defaults['contact_id'])) - {!! Form::select('contact_id', $contacts, $defaults['contact_id'], ['class' => 'form-control', 'required']) !!} + {{ html()->select('contact_id', $contacts, $defaults['contact_id'])->class('form-control')->required() }} @else - {!! Form::select('contact_id', $contacts, NULL, ['class' => 'form-control', 'required']) !!} + {{ html()->select('contact_id', $contacts)->class('form-control')->required() }} @endif
- {!! Form::label('location_type_id', 'Location type') !!} - {!! Form::select('location_type_id', $location_types, config('polanco.location_type.home'), ['class' => 'form-control']) !!} + {{ html()->label('Location type', 'location_type_id') }} + {{ html()->select('location_type_id', $location_types, config('polanco.location_type.home'))->class('form-control') }}
- {!! Form::label("street_address", "Address Line 1:") !!} - {!! Form::text("street_address", null, ["class" => "form-control"]) !!} + {{ html()->label("Address Line 1:", "street_address") }} + {{ html()->text("street_address")->class("form-control") }}
- {!! Form::label("supplemental_address_1", "Address Line 2:") !!} - {!! Form::text("supplemental_address_1", null, ["class" => "form-control"]) !!} + {{ html()->label("Address Line 2:", "supplemental_address_1") }} + {{ html()->text("supplemental_address_1")->class("form-control") }}
- {!! Form::label("city", "City:") !!} - {!! Form::text("city", null, ["class" => "form-control"]) !!} + {{ html()->label("City:", "city") }} + {{ html()->text("city")->class("form-control") }}
- {!! Form::label("state_province_id", "State:") !!} - {!! Form::select("state_province_id", $states, "1042", ["class" => "form-control"]) !!} + {{ html()->label("State:", "state_province_id") }} + {{ html()->select("state_province_id", $states, "1042")->class("form-control") }}
- {!! Form::label("postal_code", "Zip:") !!} - {!! Form::text("postal_code", null, ["class" => "form-control"]) !!} + {{ html()->label("Zip:", "postal_code") }} + {{ html()->text("postal_code")->class("form-control") }}
- {!! Form::label("country_id", "Country:") !!} - {!! Form::select("country_id", $countries, config('polanco.country_id_usa'), ["class" => "form-control"]) !!} + {{ html()->label("Country:", "country_id") }} + {{ html()->select("country_id", $countries, config('polanco.country_id_usa'))->class("form-control") }}
- {!! Form::checkbox("is_primary", 1, 0,["class" => "form-check-input", "id" => "do_not_mail"]) !!} - {!! Form::label("is_primary", "Is primary", ["class" => "form-check-label", "id" => "do_not_mail"]) !!} + {{ html()->checkbox("is_primary", 0, 1)->class("form-check-input")->id("do_not_mail") }} + {{ html()->label("Is primary", "is_primary")->class("form-check-label")->id("do_not_mail") }}
- {!! Form::submit('Add address', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add address')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/addresses/edit.blade.php b/resources/views/addresses/edit.blade.php index 1084ad581..a375391a1 100644 --- a/resources/views/addresses/edit.blade.php +++ b/resources/views/addresses/edit.blade.php @@ -11,65 +11,65 @@
- {!! Form::open(['method' => 'PUT', 'route' => ['address.update', $address->id]]) !!} - {!! Form::hidden('id', $address->id) !!} + {{ html()->form('PUT', route('address.update', [$address->id]))->open() }} + {{ html()->hidden('id', $address->id) }}
- {!! Form::label('contact_id', 'Name of Contact:') !!} - {!! Form::select('contact_id', $contacts, $address->contact_id, ['class' => 'form-control', 'required']) !!} + {{ html()->label('Name of Contact:', 'contact_id') }} + {{ html()->select('contact_id', $contacts, $address->contact_id)->class('form-control')->required() }}
- {!! Form::label('location_type_id', 'Location type') !!} - {!! Form::select('location_type_id', $location_types, $address->location_type_id, ['class' => 'form-control']) !!} + {{ html()->label('Location type', 'location_type_id') }} + {{ html()->select('location_type_id', $location_types, $address->location_type_id)->class('form-control') }}
- {!! Form::label("street_address", "Address Line 1:") !!} - {!! Form::text("street_address", $address->street_address, ["class" => "form-control"]) !!} + {{ html()->label("Address Line 1:", "street_address") }} + {{ html()->text("street_address", $address->street_address)->class("form-control") }}
- {!! Form::label("supplemental_address_1", "Address Line 2:") !!} - {!! Form::text("supplemental_address_1", $address->supplemental_address_1, ["class" => "form-control"]) !!} + {{ html()->label("Address Line 2:", "supplemental_address_1") }} + {{ html()->text("supplemental_address_1", $address->supplemental_address_1)->class("form-control") }}
- {!! Form::label("city", "City:") !!} - {!! Form::text("city", $address->city, ["class" => "form-control"]) !!} + {{ html()->label("City:", "city") }} + {{ html()->text("city", $address->city)->class("form-control") }}
- {!! Form::label("state_province_id", "State:") !!} - {!! Form::select("state_province_id", $states, $address->state_province_id, ["class" => "form-control"]) !!} + {{ html()->label("State:", "state_province_id") }} + {{ html()->select("state_province_id", $states, $address->state_province_id)->class("form-control") }}
- {!! Form::label("postal_code", "Zip:") !!} - {!! Form::text("postal_code", $address->postal_code, ["class" => "form-control"]) !!} + {{ html()->label("Zip:", "postal_code") }} + {{ html()->text("postal_code", $address->postal_code)->class("form-control") }}
- {!! Form::label("country_id", "Country:") !!} - {!! Form::select("country_id", $countries, $address->country_id, ["class" => "form-control"]) !!} + {{ html()->label("Country:", "country_id") }} + {{ html()->select("country_id", $countries, $address->country_id)->class("form-control") }}
- {!! Form::checkbox("is_primary", 1, $address->is_primary,["class" => "form-check-input", "id" => "is_primary"]) !!} - {!! Form::label("is_primary", "Is primary", ["class" => "form-check-label", "id" => "is_primary"]) !!} + {{ html()->checkbox("is_primary", $address->is_primary, 1)->class("form-check-input")->id("is_primary") }} + {{ html()->label("Is primary", "is_primary")->class("form-check-label")->id("is_primary") }}
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/addresses/show.blade.php b/resources/views/addresses/show.blade.php index 7c683b339..d51b9bedb 100644 --- a/resources/views/addresses/show.blade.php +++ b/resources/views/addresses/show.blade.php @@ -27,14 +27,14 @@
@can('update-address') - {!! Html::image('images/edit.png', 'Edit address',array('title'=>"Edit address")) !!} + {{ html()->img('images/edit.png', 'Edit address')->attribute('title', "Edit address") }} @endcan @can('delete-address') - {!! Form::open(['method' => 'DELETE', 'route' => ['address.destroy', $address->id], 'onsubmit'=>'return ConfirmDelete()', 'class' => 'd-inline']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete address']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('address.destroy', [$address->id]))->attribute('onsubmit', 'return ConfirmDelete()')->class('d-inline')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete address']) }} + {{ html()->form()->close() }} @endcan
diff --git a/resources/views/admin/asset_types/create.blade.php b/resources/views/admin/asset_types/create.blade.php index a037b6c4a..e240a63f5 100644 --- a/resources/views/admin/asset_types/create.blade.php +++ b/resources/views/admin/asset_types/create.blade.php @@ -6,43 +6,43 @@

Create asset type

- {!! Form::open(['url'=>'admin/asset_type', 'method'=>'post']) !!} + {{ html()->form('POST', 'admin/asset_type')->open() }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name')->class('form-control') }}
- {!! Form::label('label', 'Label') !!} - {!! Form::text('label', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Label', 'label') }} + {{ html()->text('label')->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description')->class('form-control')->rows(3) }}
- {!! Form::label('parent_asset_type_id', 'Parent asset type') !!} - {!! Form::select('parent_asset_type_id', $asset_types, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Parent asset type', 'parent_asset_type_id') }} + {{ html()->select('parent_asset_type_id', $asset_types)->class('form-control') }}
- {!! Form::label('is_active', 'Active:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_active', 1, true,['class' => 'col-md-1']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-1') }} + {{ html()->checkbox('is_active', true, 1)->class('col-md-1') }}
- {!! Form::submit('Add asset type', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add asset type')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/admin/asset_types/edit.blade.php b/resources/views/admin/asset_types/edit.blade.php index bd33d9ba2..5ca647725 100644 --- a/resources/views/admin/asset_types/edit.blade.php +++ b/resources/views/admin/asset_types/edit.blade.php @@ -10,38 +10,38 @@

Asset type

- {!! Form::open(['method' => 'PUT', 'route' => ['asset_type.update', $asset_type->id]]) !!} - {!! Form::hidden('id', $asset_type->id) !!} + {{ html()->form('PUT', route('asset_type.update', [$asset_type->id]))->open() }} + {{ html()->hidden('id', $asset_type->id) }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', $asset_type->name, ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name', $asset_type->name)->class('form-control') }}
- {!! Form::label('label', 'Label') !!} - {!! Form::text('label', $asset_type->label, ['class' => 'form-control']) !!} + {{ html()->label('Label', 'label') }} + {{ html()->text('label', $asset_type->label)->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::text('description', $asset_type->description, ['class' => 'form-control']) !!} + {{ html()->label('Description', 'description') }} + {{ html()->text('description', $asset_type->description)->class('form-control') }}
- {!! Form::label('parent_asset_type_id', 'Parent asset type') !!} - {!! Form::select('parent_asset_type_id', $asset_types, $asset_type->parent_asset_type_id, ['class' => 'form-control']) !!} + {{ html()->label('Parent asset type', 'parent_asset_type_id') }} + {{ html()->select('parent_asset_type_id', $asset_types, $asset_type->parent_asset_type_id)->class('form-control') }}
- {!! Form::label('is_active', 'Active:', ['class' => 'col-md-2']) !!} - {!! Form::checkbox('is_active', 1, $asset_type->is_active,['class' => 'col-md-2']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-2') }} + {{ html()->checkbox('is_active', $asset_type->is_active, 1)->class('col-md-2') }}
@@ -49,10 +49,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/admin/asset_types/show.blade.php b/resources/views/admin/asset_types/show.blade.php index a3c6ce545..081c56318 100644 --- a/resources/views/admin/asset_types/show.blade.php +++ b/resources/views/admin/asset_types/show.blade.php @@ -27,12 +27,12 @@
@can('update-asset-type') - {!! Html::image('images/edit.png', 'Edit',array('title'=>"Edit")) !!} + {{ html()->img('images/edit.png', 'Edit')->attribute('title', "Edit") }} @endCan @can('delete-asset-type') - {!! Form::open(['method' => 'DELETE', 'route' => ['asset_type.destroy', $asset_type->id],'onsubmit'=>'return ConfirmDelete()','class' => 'd-inline']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('asset_type.destroy', [$asset_type->id]))->attribute('onsubmit', 'return ConfirmDelete()')->class('d-inline')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
diff --git a/resources/views/admin/audits/index.blade.php b/resources/views/admin/audits/index.blade.php index f6d2e7d41..7d227e494 100644 --- a/resources/views/admin/audits/index.blade.php +++ b/resources/views/admin/audits/index.blade.php @@ -6,7 +6,7 @@

Audits - {!! Html::image('images/search.png', 'Search audits',array('title'=>"Search audits",'class' => 'btn btn-link')) !!} + {{ html()->img('images/search.png', 'Search audits')->attribute('title', "Search audits")->class('btn btn-link') }}

diff --git a/resources/views/admin/audits/results.blade.php b/resources/views/admin/audits/results.blade.php index 4e9c0f197..2756d41e8 100644 --- a/resources/views/admin/audits/results.blade.php +++ b/resources/views/admin/audits/results.blade.php @@ -7,7 +7,7 @@ @if ($audits->isEmpty()) diff --git a/resources/views/admin/audits/search.blade.php b/resources/views/admin/audits/search.blade.php index d979fb8a2..a61fe9ba2 100644 --- a/resources/views/admin/audits/search.blade.php +++ b/resources/views/admin/audits/search.blade.php @@ -8,12 +8,12 @@

Search Audit Logs

- {!! Form::open(['method' => 'GET', 'class' => 'form-horizontal', 'route' => ['audits.results']]) !!} + {{ html()->form('GET', route('audits.results', ))->class('form-horizontal')->open() }}

- {!! Form::image('images/submit.png','btnSave',['class' => 'btn btn-outline-dark pull-right']) !!} + {{ html()->image('images/submit.png', 'btnSave', ['class' => 'btn btn-outline-dark pull-right']) }}

@@ -21,57 +21,57 @@

Audit information

- {!! Form::label('created_at_operator', 'Comp.') !!} - {!! Form::select('created_at_operator', config('polanco.operators'), '=', ['class' => 'form-control']) !!} + {{ html()->label('Comp.', 'created_at_operator') }} + {{ html()->select('created_at_operator', config('polanco.operators'), '=')->class('form-control') }}
- {!! Form::label('created_at', 'Created:') !!} - {!! Form::date('created_at', NULL, ['class'=>'form-control flatpickr-date-time']) !!} + {{ html()->label('Created:', 'created_at') }} + {{ html()->date('created_at')->class('form-control flatpickr-date-time') }}
- {!! Form::label('user_id', 'User') !!} - {!! Form::select('user_id', $users, NULL, ['class' => 'form-control']) !!} + {{ html()->label('User', 'user_id') }} + {{ html()->select('user_id', $users)->class('form-control') }}
- {!! Form::label('auditable_type', 'Model:') !!} - {!! Form::select('auditable_type', $models, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Model:', 'auditable_type') }} + {{ html()->select('auditable_type', $models)->class('form-control') }}
- {!! Form::label('auditable_id', 'ID#:') !!} - {!! Form::number('auditable_id', NULL, ['class' => 'form-control']) !!} + {{ html()->label('ID#:', 'auditable_id') }} + {{ html()->number('auditable_id')->class('form-control') }}
- {!! Form::label('event', 'Action:') !!} - {!! Form::select('event', $actions, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Action:', 'event') }} + {{ html()->select('event', $actions)->class('form-control') }}
- {!! Form::label('old_values', 'Old value:') !!} - {!! Form::text('old_values', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Old value:', 'old_values') }} + {{ html()->text('old_values')->class('form-control') }}
- {!! Form::label('new_values', 'New value:') !!} - {!! Form::text('new_values', NULL, ['class' => 'form-control']) !!} + {{ html()->label('New value:', 'new_values') }} + {{ html()->text('new_values')->class('form-control') }}
- {!! Form::label('url', 'URL:') !!} - {!! Form::text('url', NULL, ['class' => 'form-control']) !!} + {{ html()->label('URL:', 'url') }} + {{ html()->text('url')->class('form-control') }}
- {!! Form::label('tags', 'Tags:') !!} - {!! Form::text('tags', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Tags:', 'tags') }} + {{ html()->text('tags')->class('form-control') }}
- {!! Form::close() !!} + {{ html()->form()->close() }} @stop diff --git a/resources/views/admin/departments/create.blade.php b/resources/views/admin/departments/create.blade.php index b65c6f682..0db7d4d64 100644 --- a/resources/views/admin/departments/create.blade.php +++ b/resources/views/admin/departments/create.blade.php @@ -6,50 +6,50 @@

Create department

- {!! Form::open(['url'=>'admin/department', 'method'=>'post']) !!} + {{ html()->form('POST', 'admin/department')->open() }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name')->class('form-control') }}
- {!! Form::label('label', 'Label') !!} - {!! Form::text('label', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Label', 'label') }} + {{ html()->text('label')->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description')->class('form-control')->rows(3) }}
- {!! Form::label('parent_id', 'Parent') !!} - {!! Form::select('parent_id', $parents, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Parent', 'parent_id') }} + {{ html()->select('parent_id', $parents)->class('form-control') }}
- {!! Form::label('notes', 'Notes') !!} - {!! Form::textarea('notes', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Notes', 'notes') }} + {{ html()->textarea('notes')->class('form-control')->rows(3) }}
- {!! Form::label('is_active', 'Active:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_active', 1, true,['class' => 'col-md-1']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-1') }} + {{ html()->checkbox('is_active', true, 1)->class('col-md-1') }}
- {!! Form::submit('Add department', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add department')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/admin/departments/edit.blade.php b/resources/views/admin/departments/edit.blade.php index 9763affb3..e007652b4 100644 --- a/resources/views/admin/departments/edit.blade.php +++ b/resources/views/admin/departments/edit.blade.php @@ -10,44 +10,44 @@

Location

- {!! Form::open(['method' => 'PUT', 'route' => ['department.update', $department->id]]) !!} - {!! Form::hidden('id', $department->id) !!} + {{ html()->form('PUT', route('department.update', [$department->id]))->open() }} + {{ html()->hidden('id', $department->id) }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', $department->name , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name', $department->name)->class('form-control') }}
- {!! Form::label('label', 'Label') !!} - {!! Form::text('label', $department->label , ['class' => 'form-control']) !!} + {{ html()->label('Label', 'label') }} + {{ html()->text('label', $department->label)->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', $department->description, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description', $department->description)->class('form-control')->rows(3) }}
- {!! Form::label('parent_id', 'Parent') !!} - {!! Form::select('parent_id', $parents, $department->parent_id, ['class' => 'form-control']) !!} + {{ html()->label('Parent', 'parent_id') }} + {{ html()->select('parent_id', $parents, $department->parent_id)->class('form-control') }}
- {!! Form::label('notes', 'Notes') !!} - {!! Form::textarea('notes', $department->notes, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Notes', 'notes') }} + {{ html()->textarea('notes', $department->notes)->class('form-control')->rows(3) }}
- {!! Form::label('is_active', 'Active:', ['class' => 'col-md-2']) !!} - {!! Form::checkbox('is_active', 1, $department->is_active,['class' => 'col-md-2']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-2') }} + {{ html()->checkbox('is_active', $department->is_active, 1)->class('col-md-2') }}
@@ -55,10 +55,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/admin/departments/show.blade.php b/resources/views/admin/departments/show.blade.php index 0e2178e4f..7d72bb1d2 100644 --- a/resources/views/admin/departments/show.blade.php +++ b/resources/views/admin/departments/show.blade.php @@ -63,14 +63,14 @@
@can('delete-department') - {!! Form::open(['method' => 'DELETE', 'route' => ['department.destroy', $department->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('department.destroy', [$department->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
diff --git a/resources/views/admin/donation_types/create.blade.php b/resources/views/admin/donation_types/create.blade.php index 968bd7546..542b13673 100644 --- a/resources/views/admin/donation_types/create.blade.php +++ b/resources/views/admin/donation_types/create.blade.php @@ -6,41 +6,41 @@

Create donation type

- {!! Form::open(['url'=>'admin/donation_type', 'method'=>'post']) !!} + {{ html()->form('POST', 'admin/donation_type')->open() }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name')->class('form-control') }}
- {!! Form::label('label', 'Label') !!} - {!! Form::text('label', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Label', 'label') }} + {{ html()->text('label')->class('form-control') }}
- {!! Form::label('value', 'Value') !!} - {!! Form::text('value', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Value', 'value') }} + {{ html()->text('value')->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description')->class('form-control')->rows(3) }}
- {!! Form::label('is_active', 'Active:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_active', 1, true,['class' => 'col-md-1']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-1') }} + {{ html()->checkbox('is_active', true, 1)->class('col-md-1') }}
- {!! Form::submit('Add donation type', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add donation type')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/admin/donation_types/edit.blade.php b/resources/views/admin/donation_types/edit.blade.php index f1a00e873..2447c6cde 100644 --- a/resources/views/admin/donation_types/edit.blade.php +++ b/resources/views/admin/donation_types/edit.blade.php @@ -10,35 +10,35 @@

Donation type

- {!! Form::open(['method' => 'PUT', 'route' => ['donation_type.update', $donation_type->id]]) !!} - {!! Form::hidden('id', $donation_type->id) !!} + {{ html()->form('PUT', route('donation_type.update', [$donation_type->id]))->open() }} + {{ html()->hidden('id', $donation_type->id) }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', $donation_type->name, ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name', $donation_type->name)->class('form-control') }}
- {!! Form::label('label', 'Label') !!} - {!! Form::text('label', $donation_type->label, ['class' => 'form-control']) !!} + {{ html()->label('Label', 'label') }} + {{ html()->text('label', $donation_type->label)->class('form-control') }}
- {!! Form::label('value', 'Value') !!} - {!! Form::text('value', $donation_type->value, ['class' => 'form-control']) !!} + {{ html()->label('Value', 'value') }} + {{ html()->text('value', $donation_type->value)->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::text('description', $donation_type->description, ['class' => 'form-control']) !!} + {{ html()->label('Description', 'description') }} + {{ html()->text('description', $donation_type->description)->class('form-control') }}
- {!! Form::label('is_active', 'Active:', ['class' => 'col-md-2']) !!} - {!! Form::checkbox('is_active', 1, $donation_type->is_active,['class' => 'col-md-2']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-2') }} + {{ html()->checkbox('is_active', $donation_type->is_active, 1)->class('col-md-2') }}
@@ -46,10 +46,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/admin/donation_types/show.blade.php b/resources/views/admin/donation_types/show.blade.php index 9b65056dc..e63e67053 100644 --- a/resources/views/admin/donation_types/show.blade.php +++ b/resources/views/admin/donation_types/show.blade.php @@ -27,14 +27,14 @@
@can('delete-donation-type') - {!! Form::open(['method' => 'DELETE', 'route' => ['donation_type.destroy', $donation_type->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('donation_type.destroy', [$donation_type->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
diff --git a/resources/views/admin/export_lists/create.blade.php b/resources/views/admin/export_lists/create.blade.php index 69f637899..5746399a5 100644 --- a/resources/views/admin/export_lists/create.blade.php +++ b/resources/views/admin/export_lists/create.blade.php @@ -7,59 +7,59 @@
- {!! Form::open(['url'=>'admin/export_list', 'method'=>'post']) !!} + {{ html()->form('POST', 'admin/export_list')->open() }}
- {!! Form::label('title', 'Title') !!} - {!! Form::text('title', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Title', 'title') }} + {{ html()->text('title')->class('form-control') }}
- {!! Form::label('label', 'Label') !!} - {!! Form::text('label', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Label', 'label') }} + {{ html()->text('label')->class('form-control') }}
- {!! Form::label('type', 'Type') !!} - {!! Form::select('type', $export_list_types, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Type', 'type') }} + {{ html()->select('type', $export_list_types)->class('form-control') }}
- {!! Form::label('start_date', 'Starts: ') !!} - {!! Form::text('start_date', null, ['id' => 'start_date', 'class' => 'form-control flatpickr-date-time bg-white']) !!} + {{ html()->label('Starts: ', 'start_date') }} + {{ html()->text('start_date')->id('start_date')->class('form-control flatpickr-date-time bg-white') }}
- {!! Form::label('end_date', 'Ends: ') !!} - {!! Form::text('end_date', null, ['id' => 'end_date', 'class' => 'form-control flatpickr-date-time bg-white']) !!} + {{ html()->label('Ends: ', 'end_date') }} + {{ html()->text('end_date')->id('end_date')->class('form-control flatpickr-date-time bg-white') }}
- {!! Form::label('last_run_date', 'Last run: ') !!} - {!! Form::text('last_run_date', null, ['id' => 'last_run_date', 'class' => 'form-control flatpickr-date-time bg-white']) !!} + {{ html()->label('Last run: ', 'last_run_date') }} + {{ html()->text('last_run_date')->id('last_run_date')->class('form-control flatpickr-date-time bg-white') }}
- {!! Form::label('next_scheduled_date', 'Next scheduled: ') !!} - {!! Form::text('next_scheduled_date', null, ['id' => 'next_scheduled_date', 'class' => 'form-control flatpickr-date-time bg-white']) !!} + {{ html()->label('Next scheduled: ', 'next_scheduled_date') }} + {{ html()->text('next_scheduled_date')->id('next_scheduled_date')->class('form-control flatpickr-date-time bg-white') }}
- {!! Form::label('fields', 'Fields') !!} - {!! Form::textarea('fields', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Fields', 'fields') }} + {{ html()->textarea('fields')->class('form-control') }}
- {!! Form::label('filters', 'Filters') !!} - {!! Form::textarea('filters', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Filters', 'filters') }} + {{ html()->textarea('filters')->class('form-control') }}
- {!! Form::submit('Add export list', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add export list')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/admin/export_lists/edit.blade.php b/resources/views/admin/export_lists/edit.blade.php index 2b5313e1b..4981d62c4 100644 --- a/resources/views/admin/export_lists/edit.blade.php +++ b/resources/views/admin/export_lists/edit.blade.php @@ -10,55 +10,55 @@

Export list

- {!! Form::open(['method' => 'PUT', 'route' => ['export_list.update', $export_list->id]]) !!} - {!! Form::hidden('id', $export_list->id) !!} + {{ html()->form('PUT', route('export_list.update', [$export_list->id]))->open() }} + {{ html()->hidden('id', $export_list->id) }}
- {!! Form::label('title', 'Title') !!} - {!! Form::text('title', $export_list->title , ['class' => 'form-control']) !!} + {{ html()->label('Title', 'title') }} + {{ html()->text('title', $export_list->title)->class('form-control') }}
- {!! Form::label('label', 'Label') !!} - {!! Form::text('label', $export_list->label , ['class' => 'form-control']) !!} + {{ html()->label('Label', 'label') }} + {{ html()->text('label', $export_list->label)->class('form-control') }}
- {!! Form::label('type', 'Type') !!} - {!! Form::select('type', $export_list_types, $export_list->type, ['class' => 'form-control']) !!} + {{ html()->label('Type', 'type') }} + {{ html()->select('type', $export_list_types, $export_list->type)->class('form-control') }}
- {!! Form::label('start_date', 'Starts: ') !!} - {!! Form::text('start_date', $export_list->start_date, ['id' => 'start_date', 'class' => 'form-control flatpickr-date-time bg-white']) !!} + {{ html()->label('Starts: ', 'start_date') }} + {{ html()->text('start_date', $export_list->start_date)->id('start_date')->class('form-control flatpickr-date-time bg-white') }}
- {!! Form::label('end_date', 'Ends: ') !!} - {!! Form::text('end_date', $export_list->end_date, ['id' => 'end_date', 'class' => 'form-control flatpickr-date-time bg-white']) !!} + {{ html()->label('Ends: ', 'end_date') }} + {{ html()->text('end_date', $export_list->end_date)->id('end_date')->class('form-control flatpickr-date-time bg-white') }}
- {!! Form::label('last_run_date', 'Last run: ') !!} - {!! Form::text('last_run_date', $export_list->last_run_date, ['id' => 'last_run_date', 'class' => 'form-control flatpickr-date-time bg-white']) !!} + {{ html()->label('Last run: ', 'last_run_date') }} + {{ html()->text('last_run_date', $export_list->last_run_date)->id('last_run_date')->class('form-control flatpickr-date-time bg-white') }}
- {!! Form::label('next_scheduled_date', 'Next scheduled: ') !!} - {!! Form::text('next_scheduled_date', $export_list->next_scheduled_date, ['id' => 'next_scheduled_date', 'class' => 'form-control flatpickr-date-time bg-white']) !!} + {{ html()->label('Next scheduled: ', 'next_scheduled_date') }} + {{ html()->text('next_scheduled_date', $export_list->next_scheduled_date)->id('next_scheduled_date')->class('form-control flatpickr-date-time bg-white') }}
- {!! Form::label('fields', 'Fields') !!} - {!! Form::textarea('fields', $export_list->fields , ['class' => 'form-control']) !!} + {{ html()->label('Fields', 'fields') }} + {{ html()->textarea('fields', $export_list->fields)->class('form-control') }}
- {!! Form::label('filters', 'Filters') !!} - {!! Form::textarea('filters', $export_list->filters , ['class' => 'form-control']) !!} + {{ html()->label('Filters', 'filters') }} + {{ html()->textarea('filters', $export_list->filters)->class('form-control') }}
@@ -66,10 +66,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/admin/export_lists/show.blade.php b/resources/views/admin/export_lists/show.blade.php index ce3ae61ff..07bf68f10 100644 --- a/resources/views/admin/export_lists/show.blade.php +++ b/resources/views/admin/export_lists/show.blade.php @@ -30,14 +30,14 @@
@can('delete-export-list') - {!! Form::open(['method' => 'DELETE', 'route' => ['export_list.destroy', $export_list->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('export_list.destroy', [$export_list->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
diff --git a/resources/views/admin/locations/create.blade.php b/resources/views/admin/locations/create.blade.php index 8bb71e028..1fa27b99a 100644 --- a/resources/views/admin/locations/create.blade.php +++ b/resources/views/admin/locations/create.blade.php @@ -6,65 +6,65 @@

Create location

- {!! Form::open(['url'=>'admin/location', 'method'=>'post']) !!} + {{ html()->form('POST', 'admin/location')->open() }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name')->class('form-control') }}
- {!! Form::label('label', 'Label') !!} - {!! Form::text('label', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Label', 'label') }} + {{ html()->text('label')->class('form-control') }}
- {!! Form::label('type', 'Type') !!} - {!! Form::select('type', $location_types, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Type', 'type') }} + {{ html()->select('type', $location_types)->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description')->class('form-control')->rows(3) }}
- {!! Form::label('latitude', 'Latitude') !!} - {!! Form::text('latitude', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Latitude', 'latitude') }} + {{ html()->text('latitude')->class('form-control') }}
- {!! Form::label('longitude', 'Longitude') !!} - {!! Form::text('longitude', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Longitude', 'longitude') }} + {{ html()->text('longitude')->class('form-control') }}
- {!! Form::label('occupancy', 'Occupancy') !!} - {!! Form::text('occupancy', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Occupancy', 'occupancy') }} + {{ html()->text('occupancy')->class('form-control') }}
- {!! Form::label('room_id', 'Room') !!} - {!! Form::select('room_id', $rooms, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Room', 'room_id') }} + {{ html()->select('room_id', $rooms)->class('form-control') }}
- {!! Form::label('parent_id', 'Parent') !!} - {!! Form::select('parent_id', $parents, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Parent', 'parent_id') }} + {{ html()->select('parent_id', $parents)->class('form-control') }}
- {!! Form::label('notes', 'Notes') !!} - {!! Form::textarea('notes', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Notes', 'notes') }} + {{ html()->textarea('notes')->class('form-control')->rows(3) }}
- {!! Form::submit('Add location', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add location')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/admin/locations/edit.blade.php b/resources/views/admin/locations/edit.blade.php index f4425d24e..12b1642f7 100644 --- a/resources/views/admin/locations/edit.blade.php +++ b/resources/views/admin/locations/edit.blade.php @@ -10,60 +10,60 @@

Location

- {!! Form::open(['method' => 'PUT', 'route' => ['location.update', $location->id]]) !!} - {!! Form::hidden('id', $location->id) !!} + {{ html()->form('PUT', route('location.update', [$location->id]))->open() }} + {{ html()->hidden('id', $location->id) }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', $location->name , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name', $location->name)->class('form-control') }}
- {!! Form::label('label', 'Label') !!} - {!! Form::text('label', $location->label , ['class' => 'form-control']) !!} + {{ html()->label('Label', 'label') }} + {{ html()->text('label', $location->label)->class('form-control') }}
- {!! Form::label('type', 'Type') !!} - {!! Form::select('type', $location_types, $location->type, ['class' => 'form-control']) !!} + {{ html()->label('Type', 'type') }} + {{ html()->select('type', $location_types, $location->type)->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', $location->description, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description', $location->description)->class('form-control')->rows(3) }}
- {!! Form::label('latitude', 'Latitude') !!} - {!! Form::text('latitude', number_format($location->latitude,8) , ['class' => 'form-control']) !!} + {{ html()->label('Latitude', 'latitude') }} + {{ html()->text('latitude', number_format($location->latitude, 8))->class('form-control') }}
- {!! Form::label('longitude', 'Longitude') !!} - {!! Form::text('longitude', number_format($location->longitude,8) , ['class' => 'form-control']) !!} + {{ html()->label('Longitude', 'longitude') }} + {{ html()->text('longitude', number_format($location->longitude, 8))->class('form-control') }}
- {!! Form::label('occupancy', 'Occupancy') !!} - {!! Form::text('occupancy', $location->occupancy, ['class' => 'form-control']) !!} + {{ html()->label('Occupancy', 'occupancy') }} + {{ html()->text('occupancy', $location->occupancy)->class('form-control') }}
- {!! Form::label('room_id', 'Room') !!} - {!! Form::select('room_id', $rooms, $location->room_id, ['class' => 'form-control']) !!} + {{ html()->label('Room', 'room_id') }} + {{ html()->select('room_id', $rooms, $location->room_id)->class('form-control') }}
- {!! Form::label('parent_id', 'Parent') !!} - {!! Form::select('parent_id', $parents, $location->parent_id, ['class' => 'form-control']) !!} + {{ html()->label('Parent', 'parent_id') }} + {{ html()->select('parent_id', $parents, $location->parent_id)->class('form-control') }}
- {!! Form::label('notes', 'Notes') !!} - {!! Form::textarea('notes', $location->notes, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Notes', 'notes') }} + {{ html()->textarea('notes', $location->notes)->class('form-control')->rows(3) }}
@@ -72,10 +72,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/admin/locations/show.blade.php b/resources/views/admin/locations/show.blade.php index dd9f5290a..5d6ac2e80 100644 --- a/resources/views/admin/locations/show.blade.php +++ b/resources/views/admin/locations/show.blade.php @@ -66,14 +66,14 @@
@can('delete-location') - {!! Form::open(['method' => 'DELETE', 'route' => ['location.destroy', $location->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('location.destroy', [$location->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
diff --git a/resources/views/admin/permissions/create.blade.php b/resources/views/admin/permissions/create.blade.php index 5130961a6..1fb03417b 100644 --- a/resources/views/admin/permissions/create.blade.php +++ b/resources/views/admin/permissions/create.blade.php @@ -6,31 +6,31 @@

Create Permission

- {!! Form::open(['url' => 'admin/permission', 'method' => 'post', 'class' => 'form-horizontal panel']) !!} + {{ html()->form('POST', 'admin/permission')->class('form-horizontal panel')->open() }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name')->class('form-control') }}
- {!! Form::label('display_name', 'Display Name') !!} - {!! Form::text('display_name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Display Name', 'display_name') }} + {{ html()->text('display_name')->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description')->class('form-control')->rows(3) }}
- {!! Form::submit('Add Permission', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add Permission')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop \ No newline at end of file diff --git a/resources/views/admin/permissions/edit.blade.php b/resources/views/admin/permissions/edit.blade.php index 51b3b1661..cf274c7a1 100644 --- a/resources/views/admin/permissions/edit.blade.php +++ b/resources/views/admin/permissions/edit.blade.php @@ -6,30 +6,30 @@

Permission details

- {!! Form::open(['method' => 'PUT', 'route' => ['permission.update', $permission->id]]) !!} - {!! Form::hidden('id', $permission->id) !!} + {{ html()->form('PUT', route('permission.update', [$permission->id]))->open() }} + {{ html()->hidden('id', $permission->id) }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', $permission->name, ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name', $permission->name)->class('form-control') }}
- {!! Form::label('display_name', 'Display name') !!} - {!! Form::text('display_name', $permission->display_name, ['class' => 'form-control']) !!} + {{ html()->label('Display name', 'display_name') }} + {{ html()->text('display_name', $permission->display_name)->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::text('description', $permission->description, ['class' => 'form-control']) !!} + {{ html()->label('Description', 'description') }} + {{ html()->text('description', $permission->description)->class('form-control') }}
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop \ No newline at end of file diff --git a/resources/views/admin/permissions/index.blade.php b/resources/views/admin/permissions/index.blade.php index 551f0d8f2..a917e292d 100644 --- a/resources/views/admin/permissions/index.blade.php +++ b/resources/views/admin/permissions/index.blade.php @@ -8,7 +8,7 @@ @can('create-permission') - {!! Html::image('images/create.png', 'Add Permission',array('title'=>"Add Permission",'class' => 'btn btn-light')) !!} + {{ html()->img('images/create.png', 'Add Permission')->attribute('title', "Add Permission")->class('btn btn-light') }} @endcan @@ -16,19 +16,19 @@
@can('manage-permission') - {!! Form::open(['url' => 'admin/permission', 'method' => 'GET', 'route' => ['admin.permission'], 'class' => 'form-inline']) !!} + {{ html()->form('GET', 'admin/permission')->class('form-inline')->open() }}
- {!! Form::label('action', 'Action') !!} - {!! Form::select('action', $actions, 0, ['id'=>'action','class' => 'form-control mx-1']) !!} + {{ html()->label('Action', 'action') }} + {{ html()->select('action', $actions, 0)->id('action')->class('form-control mx-1') }}
- {!! Form::label('model', 'Model') !!} - {!! Form::select('model', $models, 0, ['id'=>'model','class' => 'form-control mx-1']) !!} + {{ html()->label('Model', 'model') }} + {{ html()->select('model', $models, 0)->id('model')->class('form-control mx-1') }}
- {!! Form::submit('Search', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Search')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }} @endCan
diff --git a/resources/views/admin/permissions/show.blade.php b/resources/views/admin/permissions/show.blade.php index 2adcdbf7a..9649e1f18 100644 --- a/resources/views/admin/permissions/show.blade.php +++ b/resources/views/admin/permissions/show.blade.php @@ -20,14 +20,14 @@
@can('manage-permission') - {!! Form::open(['url' => 'admin/permission/update_roles', 'method' => 'POST', 'route' => ['admin.permission.update_roles']]) !!} + {{ html()->form('POST', 'admin/permission/update_roles')->open() }}
- {!! Form::hidden('id', $permission->id) !!} - {!! Form::label('roles', 'Assigned roles:') !!} - {!! Form::select('roles[]', $roles, $permission->roles->pluck('id')->toArray(), ['id'=>'roles','class' => 'form-control select2','multiple' => 'multiple']) !!} - {!! Form::submit('Update role assignments', ['class' => 'btn btn-outline-dark mt-3']) !!} + {{ html()->hidden('id', $permission->id) }} + {{ html()->label('Assigned roles:', 'roles') }} + {{ html()->multiselect('roles[]', $roles, $permission->roles->pluck('id')->toArray())->id('roles')->class('form-control select2') }} + {{ html()->submit('Update role assignments')->class('btn btn-outline-dark mt-3') }}
- {!! Form::close() !!} + {{ html()->form()->close() }} @endCan
Users with {{ $permission->name }} permission: @@ -44,13 +44,13 @@
- {!! Form::open(['method' => 'DELETE', 'route' => ['permission.destroy', $permission->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!}
+ {{ html()->form('DELETE', route('permission.destroy', [$permission->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }}
diff --git a/resources/views/admin/roles/create.blade.php b/resources/views/admin/roles/create.blade.php index b900e0f12..63a767352 100644 --- a/resources/views/admin/roles/create.blade.php +++ b/resources/views/admin/roles/create.blade.php @@ -6,31 +6,31 @@

Create Role

- {!! Form::open(['url'=>'admin/role', 'method'=>'post']) !!} + {{ html()->form('POST', 'admin/role')->open() }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name')->class('form-control') }}
- {!! Form::label('display_name', 'Display Name') !!} - {!! Form::text('display_name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Display Name', 'display_name') }} + {{ html()->text('display_name')->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description')->class('form-control')->rows(3) }}
- {!! Form::submit('Add Role', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add Role')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop \ No newline at end of file diff --git a/resources/views/admin/roles/edit.blade.php b/resources/views/admin/roles/edit.blade.php index 953e5260e..eef29273d 100644 --- a/resources/views/admin/roles/edit.blade.php +++ b/resources/views/admin/roles/edit.blade.php @@ -10,23 +10,23 @@

Permission Details

- {!! Form::open(['method' => 'PUT', 'route' => ['role.update', $role->id]]) !!} - {!! Form::hidden('id', $role->id) !!} + {{ html()->form('PUT', route('role.update', [$role->id]))->open() }} + {{ html()->hidden('id', $role->id) }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', $role->name, ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name', $role->name)->class('form-control') }}
- {!! Form::label('display_name', 'Display name') !!} - {!! Form::text('display_name', $role->display_name, ['class' => 'form-control']) !!} + {{ html()->label('Display name', 'display_name') }} + {{ html()->text('display_name', $role->display_name)->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::text('description', $role->description, ['class' => 'form-control']) !!} + {{ html()->label('Description', 'description') }} + {{ html()->text('description', $role->description)->class('form-control') }}
@@ -34,10 +34,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/admin/roles/show.blade.php b/resources/views/admin/roles/show.blade.php index e8758520a..0cf6cc754 100644 --- a/resources/views/admin/roles/show.blade.php +++ b/resources/views/admin/roles/show.blade.php @@ -18,9 +18,9 @@ Update Role @endcan @can('delete-role') - {!! Form::open(['method' => 'DELETE', 'route' => ['role.destroy', $role->id], 'onsubmit'=>'return ConfirmDelete()', 'class' => 'd-inline']) !!} - {!! Form::submit('Delete Role', ['class'=>'btn btn-danger']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('role.destroy', [$role->id]))->attribute('onsubmit', 'return ConfirmDelete()')->class('d-inline')->open() }} + {{ html()->submit('Delete Role')->class('btn btn-danger') }} + {{ html()->form()->close() }} @endcan
@@ -30,40 +30,40 @@
@can('manage-permission')
- {!! Form::open(['url' => 'admin/role/update_permissions', 'method' => 'POST', 'route' => ['role.update_permissions']]) !!} - {!! Form::hidden('id',$role->id) !!} + {{ html()->form('POST', 'admin/role/update_permissions')->open() }} + {{ html()->hidden('id', $role->id) }}
- {!! Form::label('permissions',$role->name.' Permissions:') !!} - {!! Form::select('permissions[]', $permissions, $role->permissions->pluck('id')->toArray(), ['id'=>'permissions','class' => 'form-control select2','multiple' => 'multiple']) !!} + {{ html()->label($role->name . ' Permissions:', 'permissions') }} + {{ html()->multiselect('permissions[]', $permissions, $role->permissions->pluck('id')->toArray())->id('permissions')->class('form-control select2') }}
- {!! Form::submit('Update Permissions', ['class'=>'btn btn-light']) !!} + {{ html()->submit('Update Permissions')->class('btn btn-light') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
- {!! Form::open(['url' => 'admin/role/update_users', 'method' => 'POST', 'route' => ['role.update_users']]) !!} - {!! Form::hidden('id',$role->id) !!} + {{ html()->form('POST', 'admin/role/update_users')->open() }} + {{ html()->hidden('id', $role->id) }}
- {!! Form::label('users', 'Users with '.$role->name.' role:') !!} - {!! Form::select('users[]', $users, $role->users->pluck('id')->toArray(), ['id'=>'users', 'class' => 'form-control select2','multiple' => 'multiple']) !!} + {{ html()->label('Users with ' . $role->name . ' role:', 'users') }} + {{ html()->multiselect('users[]', $users, $role->users->pluck('id')->toArray())->id('users')->class('form-control select2') }}
- {!! Form::submit('Update Users', ['class'=>'btn btn-light']) !!} + {{ html()->submit('Update Users')->class('btn btn-light') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@endCan diff --git a/resources/views/admin/snippets/create.blade.php b/resources/views/admin/snippets/create.blade.php index bd1593a41..7bd079450 100644 --- a/resources/views/admin/snippets/create.blade.php +++ b/resources/views/admin/snippets/create.blade.php @@ -6,35 +6,35 @@

Create snippet

- {!! Form::open(['url'=>'admin/snippet', 'method'=>'post']) !!} + {{ html()->form('POST', 'admin/snippet')->open() }}
- {!! Form::label('title', 'Title') !!} - {!! Form::text('title', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Title', 'title') }} + {{ html()->text('title')->class('form-control') }}
- {!! Form::label('label', 'Label') !!} - {!! Form::text('label', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Label', 'label') }} + {{ html()->text('label')->class('form-control') }}
- {!! Form::label('locale', 'Language') !!} - {!! Form::select('locale', $locales, 'en_US', ['class' => 'form-control']) !!} + {{ html()->label('Language', 'locale') }} + {{ html()->select('locale', $locales, 'en_US')->class('form-control') }}
- {!! Form::label('snippet', 'Snippet') !!} - {!! Form::textarea('snippet', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Snippet', 'snippet') }} + {{ html()->textarea('snippet')->class('form-control')->rows(3) }}
- {!! Form::submit('Add snippet', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add snippet')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/admin/snippets/edit.blade.php b/resources/views/admin/snippets/edit.blade.php index 9e1893f5c..1242a88c6 100644 --- a/resources/views/admin/snippets/edit.blade.php +++ b/resources/views/admin/snippets/edit.blade.php @@ -10,29 +10,29 @@

Snippet

- {!! Form::open(['method' => 'PUT', 'route' => ['snippet.update', $snippet->id]]) !!} - {!! Form::hidden('id', $snippet->id) !!} + {{ html()->form('PUT', route('snippet.update', [$snippet->id]))->open() }} + {{ html()->hidden('id', $snippet->id) }}
- {!! Form::label('title', 'Title') !!} - {!! Form::text('title', $snippet->title , ['class' => 'form-control']) !!} + {{ html()->label('Title', 'title') }} + {{ html()->text('title', $snippet->title)->class('form-control') }}
- {!! Form::label('label', 'Label') !!} - {!! Form::text('label', $snippet->label , ['class' => 'form-control']) !!} + {{ html()->label('Label', 'label') }} + {{ html()->text('label', $snippet->label)->class('form-control') }}
- {!! Form::label('locale', 'Locale') !!} - {!! Form::select('locale', $locales, $snippet->locale, ['class' => 'form-control']) !!} + {{ html()->label('Locale', 'locale') }} + {{ html()->select('locale', $locales, $snippet->locale)->class('form-control') }}
- {!! Form::label('snippet', 'Snippet') !!} - {!! Form::textarea('snippet', $snippet->snippet, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Snippet', 'snippet') }} + {{ html()->textarea('snippet', $snippet->snippet)->class('form-control')->rows(3) }}
@@ -40,10 +40,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/admin/snippets/show.blade.php b/resources/views/admin/snippets/show.blade.php index 23a4bbd40..79b307afc 100644 --- a/resources/views/admin/snippets/show.blade.php +++ b/resources/views/admin/snippets/show.blade.php @@ -26,14 +26,14 @@
@can('delete-snippet') - {!! Form::open(['method' => 'DELETE', 'route' => ['snippet.destroy', $snippet->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('snippet.destroy', [$snippet->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
diff --git a/resources/views/admin/snippets/test.blade.php b/resources/views/admin/snippets/test.blade.php index 74178be96..ec634508c 100644 --- a/resources/views/admin/snippets/test.blade.php +++ b/resources/views/admin/snippets/test.blade.php @@ -7,29 +7,29 @@

Use this page to test snippets by sending an email to your self with fake data.

- {!! Form::open(['url'=>'admin/snippet/test', 'method'=>'post']) !!} + {{ html()->form('POST', 'admin/snippet/test')->open() }}
- {!! Form::label('title', 'Title') !!} - {!! Form::select('title', $titles, $title, ['class' => 'form-control']) !!} + {{ html()->label('Title', 'title') }} + {{ html()->select('title', $titles, $title)->class('form-control') }}
- {!! Form::label('email', 'Email') !!} - {!! Form::text('email', $email, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Email', 'email') }} + {{ html()->text('email', $email)->class('form-control')->attribute('rows', 3) }}
- {!! Form::label('language', 'Language') !!} - {!! Form::select('language', $languages, $language, ['class' => 'form-control']) !!} + {{ html()->label('Language', 'language') }} + {{ html()->select('language', $languages, $language)->class('form-control') }}
- {!! Form::submit('Run snippet test', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Run snippet test')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/admin/squarespace/custom_forms/create.blade.php b/resources/views/admin/squarespace/custom_forms/create.blade.php index 8c1dd2226..f1f3586c7 100644 --- a/resources/views/admin/squarespace/custom_forms/create.blade.php +++ b/resources/views/admin/squarespace/custom_forms/create.blade.php @@ -6,21 +6,21 @@

Create Squarespace Custom Form

- {!! Form::open(['url'=>'admin/squarespace/custom_form/', 'method'=>'post']) !!} + {{ html()->form('POST', 'admin/squarespace/custom_form/')->open() }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name')->class('form-control') }}
- {!! Form::submit('Add Custom Form', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add Custom Form')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/admin/squarespace/custom_forms/edit.blade.php b/resources/views/admin/squarespace/custom_forms/edit.blade.php index 75fde2268..90c28bfc3 100644 --- a/resources/views/admin/squarespace/custom_forms/edit.blade.php +++ b/resources/views/admin/squarespace/custom_forms/edit.blade.php @@ -10,15 +10,15 @@

Custom Form Field

- {!! Form::open(['method' => 'PUT', 'route' => ['custom_form.update', $custom_form->id]]) !!} - {!! Form::hidden('id', $custom_form->id) !!} + {{ html()->form('PUT', route('custom_form.update', [$custom_form->id]))->open() }} + {{ html()->hidden('id', $custom_form->id) }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', $custom_form->name , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name', $custom_form->name)->class('form-control') }}
@@ -26,10 +26,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/admin/squarespace/custom_forms/fields/create.blade.php b/resources/views/admin/squarespace/custom_forms/fields/create.blade.php index 84fa025fe..622180628 100644 --- a/resources/views/admin/squarespace/custom_forms/fields/create.blade.php +++ b/resources/views/admin/squarespace/custom_forms/fields/create.blade.php @@ -6,36 +6,36 @@

Create Squarespace Custom Form Field

- {!! Form::open(['url'=>'admin/squarespace/custom_form/' . $custom_form->id . '/store', 'method'=>'post']) !!} - {!! Form::hidden('id', $custom_form->id) !!} - {!! Form::hidden('form_id', $custom_form->id) !!} + {{ html()->form('POST', 'admin/squarespace/custom_form/' . $custom_form->id . '/store')->open() }} + {{ html()->hidden('id', $custom_form->id) }} + {{ html()->hidden('form_id', $custom_form->id) }}

Custom Form: {{ $custom_form->name }}

- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name')->class('form-control') }}
- {!! Form::label('type', 'Type') !!} - {!! Form::text('type', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Type', 'type') }} + {{ html()->text('type')->class('form-control') }}
- {!! Form::label('variable_name', 'Variable name') !!} - {!! Form::text('variable_name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Variable name', 'variable_name') }} + {{ html()->text('variable_name')->class('form-control') }}
- {!! Form::label('sort_order', 'Sort order') !!} - {!! Form::text('sort_order', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Sort order', 'sort_order') }} + {{ html()->text('sort_order')->class('form-control') }}
- {!! Form::submit('Add Custom Form', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add Custom Form')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/admin/squarespace/custom_forms/fields/edit.blade.php b/resources/views/admin/squarespace/custom_forms/fields/edit.blade.php index b8a4e1ece..63ddc337a 100644 --- a/resources/views/admin/squarespace/custom_forms/fields/edit.blade.php +++ b/resources/views/admin/squarespace/custom_forms/fields/edit.blade.php @@ -7,28 +7,28 @@
- {!! Form::open(['method' => 'PUT', 'route' => ['custom_form.field.update', $custom_form_field->id]]) !!} - {!! Form::hidden('id', $custom_form_field->id) !!} - {!! Form::hidden('form_id', $custom_form_field->form_id) !!} + {{ html()->form('PUT', route('custom_form.field.update', [$custom_form_field->id]))->open() }} + {{ html()->hidden('id', $custom_form_field->id) }} + {{ html()->hidden('form_id', $custom_form_field->form_id) }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', $custom_form_field->name , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name', $custom_form_field->name)->class('form-control') }}
- {!! Form::label('type', 'Type') !!} - {!! Form::text('type', $custom_form_field->type , ['class' => 'form-control']) !!} + {{ html()->label('Type', 'type') }} + {{ html()->text('type', $custom_form_field->type)->class('form-control') }}
- {!! Form::label('variable_name', 'Variable name') !!} - {!! Form::text('variable_name', $custom_form_field->variable_name , ['class' => 'form-control']) !!} + {{ html()->label('Variable name', 'variable_name') }} + {{ html()->text('variable_name', $custom_form_field->variable_name)->class('form-control') }}
- {!! Form::label('sort_order', 'Sort order') !!} - {!! Form::number('sort_order', $custom_form_field->sort_order , ['class' => 'form-control']) !!} + {{ html()->label('Sort order', 'sort_order') }} + {{ html()->number('sort_order', $custom_form_field->sort_order)->class('form-control') }}
@@ -36,10 +36,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/admin/squarespace/custom_forms/index.blade.php b/resources/views/admin/squarespace/custom_forms/index.blade.php index e77e234c7..6b946b52e 100644 --- a/resources/views/admin/squarespace/custom_forms/index.blade.php +++ b/resources/views/admin/squarespace/custom_forms/index.blade.php @@ -10,7 +10,7 @@ @can('create-group') - {!! Html::image('images/create.png', 'Add Custom Form',array('title'=>"Add Custom Form",'class' => 'btn btn-primary')) !!} + {{ html()->img('images/create.png', 'Add Custom Form')->attribute('title', "Add Custom Form")->class('btn btn-primary') }} diff --git a/resources/views/admin/squarespace/custom_forms/show.blade.php b/resources/views/admin/squarespace/custom_forms/show.blade.php index e9e7b78f6..a6061fb6a 100644 --- a/resources/views/admin/squarespace/custom_forms/show.blade.php +++ b/resources/views/admin/squarespace/custom_forms/show.blade.php @@ -20,7 +20,7 @@ @can('create-squarespace-custom-form') id) }}> - {!! Html::image('images/create.png', 'Create Form Field',array('title'=>"Create Form Field",'class' => 'btn btn-light')) !!} + {{ html()->img('images/create.png', 'Create Form Field')->attribute('title', "Create Form Field")->class('btn btn-light') }} @endCan @@ -45,13 +45,13 @@
@can('update-ss-custom-form') - {!! Html::image('images/edit.png', 'Edit',array('title'=>"Edit")) !!} + {{ html()->img('images/edit.png', 'Edit')->attribute('title', "Edit") }} @endcan @can('delete-ss-custom-form') - {!! Form::open(['method' => 'DELETE', 'route' => ['custom_form.destroy', $custom_form->id], 'onsubmit'=>'return ConfirmDelete()', 'class' => 'd-inline']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('custom_form.destroy', [$custom_form->id]))->attribute('onsubmit', 'return ConfirmDelete()')->class('d-inline')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endcan diff --git a/resources/views/admin/squarespace/inventory/create.blade.php b/resources/views/admin/squarespace/inventory/create.blade.php index 88c43691f..1a5a51011 100644 --- a/resources/views/admin/squarespace/inventory/create.blade.php +++ b/resources/views/admin/squarespace/inventory/create.blade.php @@ -6,20 +6,20 @@

Create Squarespace Inventory

- {!! Form::open(['url'=>'admin/squarespace/inventory/', 'method'=>'post']) !!} + {{ html()->form('POST', 'admin/squarespace/inventory/')->open() }}
- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name')->class('form-control') }}
- {!! Form::label('custom_form_id', 'Custom Form:') !!} - {!! Form::select('custom_form_id', $custom_forms, null, ['class' => 'form-control']) !!} + {{ html()->label('Custom Form:', 'custom_form_id') }} + {{ html()->select('custom_form_id', $custom_forms)->class('form-control') }}
- {!! Form::label('variant_options', 'Variant options:') !!} - {!! Form::number('variant_options', 0, ['class' => 'form-control','step'=>'1']) !!} + {{ html()->label('Variant options:', 'variant_options') }} + {{ html()->number('variant_options', 0)->class('form-control')->attribute('step', '1') }}
@@ -27,10 +27,10 @@
- {!! Form::submit('Add Squarespace Inventory', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add Squarespace Inventory')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/admin/squarespace/inventory/edit.blade.php b/resources/views/admin/squarespace/inventory/edit.blade.php index b390a9f8b..ea92a8696 100644 --- a/resources/views/admin/squarespace/inventory/edit.blade.php +++ b/resources/views/admin/squarespace/inventory/edit.blade.php @@ -10,23 +10,23 @@

Squarespace Inventory

- {!! Form::open(['method' => 'PUT', 'route' => ['inventory.update', $inventory->id]]) !!} - {!! Form::hidden('id', $inventory->id) !!} + {{ html()->form('PUT', route('inventory.update', [$inventory->id]))->open() }} + {{ html()->hidden('id', $inventory->id) }}
- {!! Form::label('name', 'Name:') !!} - {!! Form::text('name', $inventory->name , ['class' => 'form-control']) !!} + {{ html()->label('Name:', 'name') }} + {{ html()->text('name', $inventory->name)->class('form-control') }}
- {!! Form::label('custom_form_id', 'Custom Form:') !!} - {!! Form::select('custom_form_id', $custom_forms, $inventory->custom_form_id, ['class' => 'form-control']) !!} + {{ html()->label('Custom Form:', 'custom_form_id') }} + {{ html()->select('custom_form_id', $custom_forms, $inventory->custom_form_id)->class('form-control') }}
- {!! Form::label('variant_options', 'Variant options:') !!} - {!! Form::number('variant_options', $inventory->variant_options, ['class' => 'form-control','step'=>'1']) !!} + {{ html()->label('Variant options:', 'variant_options') }} + {{ html()->number('variant_options', $inventory->variant_options)->class('form-control')->attribute('step', '1') }}
@@ -34,10 +34,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/admin/squarespace/inventory/index.blade.php b/resources/views/admin/squarespace/inventory/index.blade.php index 237b4bbcc..b8f601f89 100644 --- a/resources/views/admin/squarespace/inventory/index.blade.php +++ b/resources/views/admin/squarespace/inventory/index.blade.php @@ -10,7 +10,7 @@ @can('create-group') - {!! Html::image('images/create.png', 'Add Squarespace Inventory',array('title'=>"Add Squarespace Inventory",'class' => 'btn btn-primary')) !!} + {{ html()->img('images/create.png', 'Add Squarespace Inventory')->attribute('title', "Add Squarespace Inventory")->class('btn btn-primary') }} diff --git a/resources/views/admin/squarespace/inventory/show.blade.php b/resources/views/admin/squarespace/inventory/show.blade.php index 92aed5f7d..6d6cb86bc 100644 --- a/resources/views/admin/squarespace/inventory/show.blade.php +++ b/resources/views/admin/squarespace/inventory/show.blade.php @@ -26,13 +26,12 @@
@can('update-ss-custom-form') {!! Html::image('images/edit.png', 'Edit', ['title' => 'Edit']) !!} + class="btn btn-info">{{ html()->img('images/edit.png', 'Edit')->attribute('title', 'Edit') }} @endcan @can('delete-ss-custom-form') - {!! Form::open(['method' => 'DELETE', 'route' => ['inventory.destroy', $inventory->id], 'onsubmit' => - 'return ConfirmDelete()', 'class' => 'd-inline']) !!} - {!! Form::image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('inventory.destroy', [$inventory->id]))->attribute('onsubmit', 'return ConfirmDelete()')->class('d-inline')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endcan
diff --git a/resources/views/admin/uoms/create.blade.php b/resources/views/admin/uoms/create.blade.php index 1f8b1aa36..79b7f7b22 100644 --- a/resources/views/admin/uoms/create.blade.php +++ b/resources/views/admin/uoms/create.blade.php @@ -6,41 +6,41 @@

Create unit of measure

- {!! Form::open(['url'=>'admin/uom', 'method'=>'post']) !!} + {{ html()->form('POST', 'admin/uom')->open() }}
- {!! Form::label('unit_name', 'Unit name') !!} - {!! Form::text('unit_name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Unit name', 'unit_name') }} + {{ html()->text('unit_name')->class('form-control') }}
- {!! Form::label('type', 'Type') !!} - {!! Form::select('type', $uom_types, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Type', 'type') }} + {{ html()->select('type', $uom_types)->class('form-control') }}
- {!! Form::label('unit_symbol', 'Unit symbol') !!} - {!! Form::text('unit_symbol', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Unit symbol', 'unit_symbol') }} + {{ html()->text('unit_symbol')->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description')->class('form-control')->rows(3) }}
- {!! Form::label('is_active', 'Active:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_active', 1, true,['class' => 'col-md-1']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-1') }} + {{ html()->checkbox('is_active', true, 1)->class('col-md-1') }}
- {!! Form::submit('Add unit of measure', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add unit of measure')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/admin/uoms/edit.blade.php b/resources/views/admin/uoms/edit.blade.php index c82d25c3d..60d40c7c7 100644 --- a/resources/views/admin/uoms/edit.blade.php +++ b/resources/views/admin/uoms/edit.blade.php @@ -10,37 +10,37 @@

Unit of measure

- {!! Form::open(['method' => 'PUT', 'route' => ['uom.update', $uom->id]]) !!} - {!! Form::hidden('id', $uom->id) !!} + {{ html()->form('PUT', route('uom.update', [$uom->id]))->open() }} + {{ html()->hidden('id', $uom->id) }}
- {!! Form::label('type', 'Type') !!} - {!! Form::select('type', $uom_types, $uom->type, ['class' => 'form-control']) !!} + {{ html()->label('Type', 'type') }} + {{ html()->select('type', $uom_types, $uom->type)->class('form-control') }}
- {!! Form::label('unit_name', 'Unit name') !!} - {!! Form::text('unit_name', $uom->unit_name, ['class' => 'form-control']) !!} + {{ html()->label('Unit name', 'unit_name') }} + {{ html()->text('unit_name', $uom->unit_name)->class('form-control') }}
- {!! Form::label('unit_symbol', 'Unit symbol') !!} - {!! Form::text('unit_symbol', $uom->unit_symbol, ['class' => 'form-control']) !!} + {{ html()->label('Unit symbol', 'unit_symbol') }} + {{ html()->text('unit_symbol', $uom->unit_symbol)->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::text('description', $uom->description, ['class' => 'form-control']) !!} + {{ html()->label('Description', 'description') }} + {{ html()->text('description', $uom->description)->class('form-control') }}
- {!! Form::label('is_active', 'Active:', ['class' => 'col-md-2']) !!} - {!! Form::checkbox('is_active', 1, $uom->is_active,['class' => 'col-md-2']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-2') }} + {{ html()->checkbox('is_active', $uom->is_active, 1)->class('col-md-2') }}
@@ -48,10 +48,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/admin/uoms/show.blade.php b/resources/views/admin/uoms/show.blade.php index 9f0694775..0617ddbef 100644 --- a/resources/views/admin/uoms/show.blade.php +++ b/resources/views/admin/uoms/show.blade.php @@ -27,14 +27,14 @@
@can('delete-uom') - {!! Form::open(['method' => 'DELETE', 'route' => ['uom.destroy', $uom->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('uom.destroy', [$uom->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
diff --git a/resources/views/admin/websites/create.blade.php b/resources/views/admin/websites/create.blade.php index 81ce1b528..923c83fa8 100644 --- a/resources/views/admin/websites/create.blade.php +++ b/resources/views/admin/websites/create.blade.php @@ -6,41 +6,41 @@

Create website (URL)

- {!! Form::open(['url'=>'admin/website', 'method'=>'post']) !!} + {{ html()->form('POST', 'admin/website')->open() }}
- {!! Form::label('url', 'URL') !!} - {!! Form::text('url', NULL , ['class' => 'form-control']) !!} + {{ html()->label('URL', 'url') }} + {{ html()->text('url')->class('form-control') }}
- {!! Form::label('website_type', 'Type') !!} - {!! Form::select('website_type', config('polanco.website_types'), NULL, ['class' => 'form-control']) !!} + {{ html()->label('Type', 'website_type') }} + {{ html()->select('website_type', config('polanco.website_types'))->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description')->class('form-control')->rows(3) }}
- {!! Form::label('asset_id', 'Asset ID') !!} - {!! Form::text('asset_id', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Asset ID', 'asset_id') }} + {{ html()->text('asset_id')->class('form-control') }}
- {!! Form::label('contact_id', 'Contact ID') !!} - {!! Form::text('contact_id', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Contact ID', 'contact_id') }} + {{ html()->text('contact_id')->class('form-control') }}
- {!! Form::submit('Add website (URL)', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add website (URL)')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/admin/websites/edit.blade.php b/resources/views/admin/websites/edit.blade.php index dfcdac9f0..9b733c9d5 100644 --- a/resources/views/admin/websites/edit.blade.php +++ b/resources/views/admin/websites/edit.blade.php @@ -8,40 +8,40 @@

Website

- {!! Form::open(['method' => 'PUT', 'route' => ['website.update', $website->id]]) !!} - {!! Form::hidden('id', $website->id) !!} + {{ html()->form('PUT', route('website.update', [$website->id]))->open() }} + {{ html()->hidden('id', $website->id) }}
- {!! Form::label('url', 'URL') !!} - {!! Form::text('url', $website->url , ['class' => 'form-control']) !!} + {{ html()->label('URL', 'url') }} + {{ html()->text('url', $website->url)->class('form-control') }}
- {!! Form::label('website_type', 'Type') !!} - {!! Form::select('website_type', config('polanco.website_types'), $website->website_type, ['class' => 'form-control']) !!} + {{ html()->label('Type', 'website_type') }} + {{ html()->select('website_type', config('polanco.website_types'), $website->website_type)->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', $website->description, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description', $website->description)->class('form-control')->rows(3) }}
- {!! Form::label('asset_id', 'Asset ID') !!} - {!! Form::text('asset_id', $website->asset_id , ['class' => 'form-control']) !!} + {{ html()->label('Asset ID', 'asset_id') }} + {{ html()->text('asset_id', $website->asset_id)->class('form-control') }}
- {!! Form::label('contact_id', 'Contact ID') !!} - {!! Form::text('contact_id', $website->contact_id, ['class' => 'form-control']) !!} + {{ html()->label('Contact ID', 'contact_id') }} + {{ html()->text('contact_id', $website->contact_id)->class('form-control') }}
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
-{!! Form::close() !!} +{{ html()->form()->close() }} @stop diff --git a/resources/views/admin/websites/show.blade.php b/resources/views/admin/websites/show.blade.php index 4fba8231d..bffd1a328 100644 --- a/resources/views/admin/websites/show.blade.php +++ b/resources/views/admin/websites/show.blade.php @@ -26,14 +26,14 @@
@can('delete-website') - {!! Form::open(['method' => 'DELETE', 'route' => ['website.destroy', $website->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('website.destroy', [$website->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
diff --git a/resources/views/asset_jobs/create.blade.php b/resources/views/asset_jobs/create.blade.php index 315584e77..c439c5ab3 100644 --- a/resources/views/asset_jobs/create.blade.php +++ b/resources/views/asset_jobs/create.blade.php @@ -6,83 +6,83 @@

Create asset job

- {!! Form::open(['url'=>'asset_job', 'method'=>'post', 'enctype'=>'multipart/form-data']) !!} + {{ html()->form('POST', 'asset_job')->acceptsFiles()->open() }}

Job info

- {!! Form::label('asset_task_id', 'Asset task') !!} - {!! Form::select('asset_task_id', $asset_tasks, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Asset task', 'asset_task_id') }} + {{ html()->select('asset_task_id', $asset_tasks)->class('form-control') }}
- {!! Form::label('assigned_to_id', 'Assigned to') !!} - {!! Form::select('assigned_to_id', $staff, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Assigned to', 'assigned_to_id') }} + {{ html()->select('assigned_to_id', $staff)->class('form-control') }}
- {!! Form::label('status', 'Status') !!} - {!! Form::select('status', $status, config('polanco.asset_job_status.scheduled'), ['class' => 'form-control']) !!} + {{ html()->label('Status', 'status') }} + {{ html()->select('status', $status, config('polanco.asset_job_status.scheduled'))->class('form-control') }}

Job dates

- {!! Form::label('scheduled_date', 'Scheduled') !!} - {!! Form::date('scheduled_date', null, ['class'=>'form-control flatpickr-date-time', 'autocomplete'=> 'off']) !!} + {{ html()->label('Scheduled', 'scheduled_date') }} + {{ html()->date('scheduled_date')->class('form-control flatpickr-date-time')->attribute('autocomplete', 'off') }}
- {!! Form::label('start_date', 'Started') !!} - {!! Form::date('start_date', null, ['class'=>'form-control flatpickr-date-time', 'autocomplete'=> 'off']) !!} + {{ html()->label('Started', 'start_date') }} + {{ html()->date('start_date')->class('form-control flatpickr-date-time')->attribute('autocomplete', 'off') }}
- {!! Form::label('end_date', 'Ended') !!} - {!! Form::date('end_date', null, ['class'=>'form-control flatpickr-date-time', 'autocomplete'=> 'off']) !!} + {{ html()->label('Ended', 'end_date') }} + {{ html()->date('end_date')->class('form-control flatpickr-date-time')->attribute('autocomplete', 'off') }}

Labor & materials

- {!! Form::label('actual_labor', 'Actual labor (minutes)') !!} - {!! Form::text('actual_labor', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Actual labor (minutes)', 'actual_labor') }} + {{ html()->text('actual_labor')->class('form-control') }}
- {!! Form::label('actual_labor_cost', 'Actual labor cost') !!} - {!! Form::number('actual_labor_cost', 0, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Actual labor cost', 'actual_labor_cost') }} + {{ html()->number('actual_labor_cost', 0)->class('form-control')->attribute('step', '0.01') }}
- {!! Form::label('additional_materials', 'Additional materials') !!} - {!! Form::textarea('additional_materials', NULL, ['class' => 'form-control', 'rows' => 2]) !!} + {{ html()->label('Additional materials', 'additional_materials') }} + {{ html()->textarea('additional_materials')->class('form-control')->rows(2) }}
- {!! Form::label('actual_material_cost', 'Actual material cost') !!} - {!! Form::number('actual_material_cost', 0, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Actual material cost', 'actual_material_cost') }} + {{ html()->number('actual_material_cost', 0)->class('form-control')->attribute('step', '0.01') }}

Notes

- {!! Form::label('note', 'Note') !!} - {!! Form::textarea('note', NULL, ['class' => 'form-control', 'rows' => 2]) !!} + {{ html()->label('Note', 'note') }} + {{ html()->textarea('note')->class('form-control')->rows(2) }}
- {!! Form::label('tag', 'Tag') !!} - {!! Form::text('tag', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Tag', 'tag') }} + {{ html()->text('tag')->class('form-control') }}
- {!! Form::submit('Add asset job', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add asset job')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/asset_jobs/edit.blade.php b/resources/views/asset_jobs/edit.blade.php index f75927969..d4b7c58bb 100644 --- a/resources/views/asset_jobs/edit.blade.php +++ b/resources/views/asset_jobs/edit.blade.php @@ -7,8 +7,8 @@
- {!! Form::open(['method' => 'PUT', 'route' => ['asset_job.update', $asset_job->id],'enctype'=>'multipart/form-data']) !!} - {!! Form::hidden('id', $asset_job->id) !!} + {{ html()->form('PUT', route('asset_job.update', [$asset_job->id]))->acceptsFiles()->open() }} + {{ html()->hidden('id', $asset_job->id) }}

Job info

@@ -17,67 +17,67 @@ Asset: {{ $asset_job->asset_task->asset->name }}
- {!! Form::label('asset_task_id', 'Asset task') !!} - {!! Form::select('asset_task_id', $asset_tasks, $asset_job->asset_task_id, ['class' => 'form-control']) !!} + {{ html()->label('Asset task', 'asset_task_id') }} + {{ html()->select('asset_task_id', $asset_tasks, $asset_job->asset_task_id)->class('form-control') }}
- {!! Form::label('assigned_to_id', 'Assigned to') !!} - {!! Form::select('assigned_to_id', $staff, $asset_job->assigned_to_id, ['class' => 'form-control']) !!} + {{ html()->label('Assigned to', 'assigned_to_id') }} + {{ html()->select('assigned_to_id', $staff, $asset_job->assigned_to_id)->class('form-control') }}
- {!! Form::label('status', 'Status') !!} - {!! Form::select('status', $status, $asset_job->status, ['class' => 'form-control']) !!} + {{ html()->label('Status', 'status') }} + {{ html()->select('status', $status, $asset_job->status)->class('form-control') }}

Job dates

- {!! Form::label('scheduled_date', 'Scheduled') !!} - {!! Form::date('scheduled_date', $asset_job->scheduled_date, ['class'=>'form-control flatpickr-date-time', 'autocomplete'=> 'off']) !!} + {{ html()->label('Scheduled', 'scheduled_date') }} + {{ html()->date('scheduled_date', $asset_job->scheduled_date)->class('form-control flatpickr-date-time')->attribute('autocomplete', 'off') }}
- {!! Form::label('start_date', 'Started') !!} - {!! Form::date('start_date', $asset_job->start_date, ['class'=>'form-control flatpickr-date-time', 'autocomplete'=> 'off']) !!} + {{ html()->label('Started', 'start_date') }} + {{ html()->date('start_date', $asset_job->start_date)->class('form-control flatpickr-date-time')->attribute('autocomplete', 'off') }}
- {!! Form::label('end_date', 'Ended') !!} - {!! Form::date('end_date', $asset_job->end_date, ['class'=>'form-control flatpickr-date-time', 'autocomplete'=> 'off']) !!} + {{ html()->label('Ended', 'end_date') }} + {{ html()->date('end_date', $asset_job->end_date)->class('form-control flatpickr-date-time')->attribute('autocomplete', 'off') }}

Labor & materials

- {!! Form::label('actual_labor', 'Actual labor (minutes)') !!} - {!! Form::text('actual_labor', $asset_job->actual_labor , ['class' => 'form-control']) !!} + {{ html()->label('Actual labor (minutes)', 'actual_labor') }} + {{ html()->text('actual_labor', $asset_job->actual_labor)->class('form-control') }}
- {!! Form::label('actual_labor_cost', 'Actual labor cost') !!} - {!! Form::number('actual_labor_cost', $asset_job->actual_labor_cost, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Actual labor cost', 'actual_labor_cost') }} + {{ html()->number('actual_labor_cost', $asset_job->actual_labor_cost)->class('form-control')->attribute('step', '0.01') }}
- {!! Form::label('additional_materials', 'Additional materials') !!} - {!! Form::textarea('additional_materials', $asset_job->additional_materials, ['class' => 'form-control', 'rows' => 2]) !!} + {{ html()->label('Additional materials', 'additional_materials') }} + {{ html()->textarea('additional_materials', $asset_job->additional_materials)->class('form-control')->rows(2) }}
- {!! Form::label('actual_material_cost', 'Actual material cost') !!} - {!! Form::number('actual_material_cost', $asset_job->actual_material_cost, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Actual material cost', 'actual_material_cost') }} + {{ html()->number('actual_material_cost', $asset_job->actual_material_cost)->class('form-control')->attribute('step', '0.01') }}

Notes

- {!! Form::label('note', 'Notes') !!} - {!! Form::textarea('note', $asset_job->note, ['class' => 'form-control', 'rows' => 2]) !!} + {{ html()->label('Notes', 'note') }} + {{ html()->textarea('note', $asset_job->note)->class('form-control')->rows(2) }}
- {!! Form::label('tag', 'Tag') !!} - {!! Form::text('tag', $asset_job->tag , ['class' => 'form-control']) !!} + {{ html()->label('Tag', 'tag') }} + {{ html()->text('tag', $asset_job->tag)->class('form-control') }}
@@ -85,10 +85,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }} @stop diff --git a/resources/views/asset_jobs/show.blade.php b/resources/views/asset_jobs/show.blade.php index 7ec797409..b2827cfbf 100644 --- a/resources/views/asset_jobs/show.blade.php +++ b/resources/views/asset_jobs/show.blade.php @@ -64,14 +64,14 @@
@can('delete-asset') - {!! Form::open(['method' => 'DELETE', 'route' => ['asset_job.destroy', $asset_job->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('asset_job.destroy', [$asset_job->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
diff --git a/resources/views/asset_tasks/create.blade.php b/resources/views/asset_tasks/create.blade.php index 8ebe27faa..c8ea7cbe1 100644 --- a/resources/views/asset_tasks/create.blade.php +++ b/resources/views/asset_tasks/create.blade.php @@ -6,107 +6,107 @@

Create asset task

- {!! Form::open(['url'=>'asset_task', 'method'=>'post', 'enctype'=>'multipart/form-data']) !!} + {{ html()->form('POST', 'asset_task')->acceptsFiles()->open() }}
- {!! Form::label('asset_id', 'Asset') !!} - {!! Form::select('asset_id', $assets, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Asset', 'asset_id') }} + {{ html()->select('asset_id', $assets)->class('form-control') }}
- {!! Form::label('title', 'Task') !!} - {!! Form::text('title', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Task', 'title') }} + {{ html()->text('title')->class('form-control') }}
- {!! Form::label('start_date', 'Start date') !!} - {!! Form::date('start_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Start date', 'start_date') }} + {{ html()->date('start_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('scheduled_until_date', 'Scheduled until date') !!} - {!! Form::date('scheduled_until_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Scheduled until date', 'scheduled_until_date') }} + {{ html()->date('scheduled_until_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('frequency_interval', 'Every') !!} - {!! Form::text('frequency_interval', 1, ['class' => 'form-control']) !!} + {{ html()->label('Every', 'frequency_interval') }} + {{ html()->text('frequency_interval', 1)->class('form-control') }}
- {!! Form::label('frequency', 'Frequency') !!} - {!! Form::select('frequency', $frequencies, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Frequency', 'frequency') }} + {{ html()->select('frequency', $frequencies)->class('form-control') }}
- {!! Form::label('frequency_month', 'Month') !!} - {!! Form::text('frequency_month', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Month', 'frequency_month') }} + {{ html()->text('frequency_month')->class('form-control') }}
- {!! Form::label('frequency_day', 'Day') !!} - {!! Form::text('frequency_day', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Day', 'frequency_day') }} + {{ html()->text('frequency_day')->class('form-control') }}
- {!! Form::label('frequency_time', 'Time') !!} - {!! Form::text('frequency_time', null, ['class'=>'form-control flatpickr-time', 'autocomplete'=> 'off']) !!} + {{ html()->label('Time', 'frequency_time') }} + {{ html()->text('frequency_time')->class('form-control flatpickr-time')->attribute('autocomplete', 'off') }}
- {!! Form::label('description', 'Detailed description') !!} - {!! Form::textarea('description', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Detailed description', 'description') }} + {{ html()->textarea('description')->class('form-control')->rows(3) }}
- {!! Form::label('priority_id', 'Priority') !!} - {!! Form::select('priority_id', $priorities, 3, ['class' => 'form-control']) !!} + {{ html()->label('Priority', 'priority_id') }} + {{ html()->select('priority_id', $priorities, 3)->class('form-control') }}
- {!! Form::label('needed_labor_minutes', 'Estimated labor (minutes)') !!} - {!! Form::text('needed_labor_minutes', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Estimated labor (minutes)', 'needed_labor_minutes') }} + {{ html()->text('needed_labor_minutes')->class('form-control') }}
- {!! Form::label('estimated_labor_cost', 'Estimated labor cost') !!} - {!! Form::text('estimated_labor_cost', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Estimated labor cost', 'estimated_labor_cost') }} + {{ html()->text('estimated_labor_cost')->class('form-control') }}
- {!! Form::label('needed_material', 'Needed materials') !!} - {!! Form::textarea('needed_material', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Needed materials', 'needed_material') }} + {{ html()->textarea('needed_material')->class('form-control')->rows(3) }}
- {!! Form::label('estimated_material_cost', 'Estimated material cost') !!} - {!! Form::text('estimated_material_cost', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Estimated material cost', 'estimated_material_cost') }} + {{ html()->text('estimated_material_cost')->class('form-control') }}
- {!! Form::label('vendor_id', 'Vendor') !!} - {!! Form::select('vendor_id', $vendors, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Vendor', 'vendor_id') }} + {{ html()->select('vendor_id', $vendors)->class('form-control') }}
- {!! Form::label('category', 'Category') !!} - {!! Form::text('category', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Category', 'category') }} + {{ html()->text('category')->class('form-control') }}
- {!! Form::label('tag', 'Tag') !!} - {!! Form::text('tag', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Tag', 'tag') }} + {{ html()->text('tag')->class('form-control') }}
- {!! Form::submit('Add asset task', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add asset task')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/asset_tasks/edit.blade.php b/resources/views/asset_tasks/edit.blade.php index c79118f98..9c847c419 100644 --- a/resources/views/asset_tasks/edit.blade.php +++ b/resources/views/asset_tasks/edit.blade.php @@ -10,108 +10,108 @@

Asset task

- {!! Form::open(['method' => 'PUT', 'route' => ['asset_task.update', $asset_task->id],'enctype'=>'multipart/form-data']) !!} - {!! Form::hidden('id', $asset_task->id) !!} + {{ html()->form('PUT', route('asset_task.update', [$asset_task->id]))->acceptsFiles()->open() }} + {{ html()->hidden('id', $asset_task->id) }}
- {!! Form::label('asset_id', 'Asset') !!} - {!! Form::select('asset_id', $assets, $asset_task->asset_id, ['class' => 'form-control']) !!} + {{ html()->label('Asset', 'asset_id') }} + {{ html()->select('asset_id', $assets, $asset_task->asset_id)->class('form-control') }}
- {!! Form::label('title', 'Title') !!} - {!! Form::text('title', $asset_task->title , ['class' => 'form-control']) !!} + {{ html()->label('Title', 'title') }} + {{ html()->text('title', $asset_task->title)->class('form-control') }}
- {!! Form::label('start_date', 'Start date') !!} - {!! Form::date('start_date', $asset_task->start_date, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Start date', 'start_date') }} + {{ html()->date('start_date', $asset_task->start_date)->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('scheduled_until_date', 'Scheduled until date') !!} - {!! Form::date('scheduled_until_date', $asset_task->scheduled_until_date, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Scheduled until date', 'scheduled_until_date') }} + {{ html()->date('scheduled_until_date', $asset_task->scheduled_until_date)->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('frequency_interval', 'Every') !!} - {!! Form::text('frequency_interval', $asset_task->frequency_interval , ['class' => 'form-control']) !!} + {{ html()->label('Every', 'frequency_interval') }} + {{ html()->text('frequency_interval', $asset_task->frequency_interval)->class('form-control') }}
- {!! Form::label('frequency', 'Frequency') !!} - {!! Form::select('frequency', $frequencies, $asset_task->frequency, ['class' => 'form-control']) !!} + {{ html()->label('Frequency', 'frequency') }} + {{ html()->select('frequency', $frequencies, $asset_task->frequency)->class('form-control') }}
- {!! Form::label('frequency_month', 'Month') !!} - {!! Form::text('frequency_month', $asset_task->frequency_month , ['class' => 'form-control']) !!} + {{ html()->label('Month', 'frequency_month') }} + {{ html()->text('frequency_month', $asset_task->frequency_month)->class('form-control') }}
- {!! Form::label('frequency_day', 'Day') !!} - {!! Form::text('frequency_day', $asset_task->frequency_day , ['class' => 'form-control']) !!} + {{ html()->label('Day', 'frequency_day') }} + {{ html()->text('frequency_day', $asset_task->frequency_day)->class('form-control') }}
- {!! Form::label('frequency_time', 'Time') !!} - {!! Form::text('frequency_time', $asset_task->frequency_time, ['class'=>'form-control flatpickr-time', 'autocomplete'=> 'off']) !!} + {{ html()->label('Time', 'frequency_time') }} + {{ html()->text('frequency_time', $asset_task->frequency_time)->class('form-control flatpickr-time')->attribute('autocomplete', 'off') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', $asset_task->description, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description', $asset_task->description)->class('form-control')->rows(3) }}
- {!! Form::label('priority_id', 'Priority') !!} - {!! Form::select('priority_id', $priorities, $asset_task->priority_id, ['class' => 'form-control']) !!} + {{ html()->label('Priority', 'priority_id') }} + {{ html()->select('priority_id', $priorities, $asset_task->priority_id)->class('form-control') }}
- {!! Form::label('needed_labor_minutes', 'Estimated labor (minutes)') !!} - {!! Form::text('needed_labor_minutes', $asset_task->needed_labor_minutes , ['class' => 'form-control']) !!} + {{ html()->label('Estimated labor (minutes)', 'needed_labor_minutes') }} + {{ html()->text('needed_labor_minutes', $asset_task->needed_labor_minutes)->class('form-control') }}
- {!! Form::label('estimated_labor_cost', 'Estimated labor cost') !!} - {!! Form::number('estimated_labor_cost', $asset_task->estimated_labor_cost , ['class' => 'form-control']) !!} + {{ html()->label('Estimated labor cost', 'estimated_labor_cost') }} + {{ html()->number('estimated_labor_cost', $asset_task->estimated_labor_cost)->class('form-control') }}
- {!! Form::label('needed_material', 'Needed materials') !!} - {!! Form::textarea('needed_material', $asset_task->needed_material, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Needed materials', 'needed_material') }} + {{ html()->textarea('needed_material', $asset_task->needed_material)->class('form-control')->rows(3) }}
- {!! Form::label('estimated_material_cost', 'Estimated material cost') !!} - {!! Form::number('estimated_material_cost', $asset_task->estimated_material_cost , ['class' => 'form-control']) !!} + {{ html()->label('Estimated material cost', 'estimated_material_cost') }} + {{ html()->number('estimated_material_cost', $asset_task->estimated_material_cost)->class('form-control') }}
- {!! Form::label('vendor_id', 'Vendor') !!} - {!! Form::select('vendor_id', $vendors, $asset_task->vendor_id, ['class' => 'form-control']) !!} + {{ html()->label('Vendor', 'vendor_id') }} + {{ html()->select('vendor_id', $vendors, $asset_task->vendor_id)->class('form-control') }}
- {!! Form::label('category', 'Category') !!} - {!! Form::text('category', $asset_task->category , ['class' => 'form-control']) !!} + {{ html()->label('Category', 'category') }} + {{ html()->text('category', $asset_task->category)->class('form-control') }}
- {!! Form::label('tag', 'Tag') !!} - {!! Form::text('tag', $asset_task->tag , ['class' => 'form-control']) !!} + {{ html()->label('Tag', 'tag') }} + {{ html()->text('tag', $asset_task->tag)->class('form-control') }}
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
diff --git a/resources/views/asset_tasks/show.blade.php b/resources/views/asset_tasks/show.blade.php index 682a76540..6871705bb 100644 --- a/resources/views/asset_tasks/show.blade.php +++ b/resources/views/asset_tasks/show.blade.php @@ -130,14 +130,14 @@
@can('delete-asset-task') - {!! Form::open(['method' => 'DELETE', 'route' => ['asset_task.destroy', $asset_task->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('asset_task.destroy', [$asset_task->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
diff --git a/resources/views/assets/create.blade.php b/resources/views/assets/create.blade.php index 5161f4be1..5e6197865 100644 --- a/resources/views/assets/create.blade.php +++ b/resources/views/assets/create.blade.php @@ -6,74 +6,74 @@

Create asset

- {!! Form::open(['url'=>'asset', 'method'=>'post', 'enctype'=>'multipart/form-data']) !!} + {{ html()->form('POST', 'asset')->acceptsFiles()->open() }}

General information

- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name')->class('form-control') }}
- {!! Form::label('asset_type_id', 'Asset type') !!} - {!! Form::select('asset_type_id', $asset_types, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Asset type', 'asset_type_id') }} + {{ html()->select('asset_type_id', $asset_types)->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', NULL, ['class' => 'form-control', 'rows' => 1]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description')->class('form-control')->rows(1) }}
- {!! Form::label('asset_photo', 'Picture of asset (max 10M):') !!} - {!! Form::file('asset_photo'); !!} + {{ html()->label('Picture of asset (max 10M):', 'asset_photo') }} + {{ html()->file('asset_photo') }}
- {!! Form::label('manufacturer', 'Manufacturer') !!} - {!! Form::text('manufacturer', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Manufacturer', 'manufacturer') }} + {{ html()->text('manufacturer')->class('form-control') }}
- {!! Form::label('model', 'Model') !!} - {!! Form::text('model', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Model', 'model') }} + {{ html()->text('model')->class('form-control') }}
- {!! Form::label('serial_number', 'Serial number') !!} - {!! Form::text('serial_number', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Serial number', 'serial_number') }} + {{ html()->text('serial_number')->class('form-control') }}
- {!! Form::label('year', 'Year') !!} - {!! Form::text('year', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Year', 'year') }} + {{ html()->text('year')->class('form-control') }}
- {!! Form::label('location_id', 'Location') !!} - {!! Form::select('location_id', $locations, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Location', 'location_id') }} + {{ html()->select('location_id', $locations)->class('form-control') }}
- {!! Form::label('department_id', 'Department') !!} - {!! Form::select('department_id', $departments, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Department', 'department_id') }} + {{ html()->select('department_id', $departments)->class('form-control') }}
- {!! Form::label('parent_id', 'Parent') !!} - {!! Form::select('parent_id', $parents, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Parent', 'parent_id') }} + {{ html()->select('parent_id', $parents)->class('form-control') }}
- {!! Form::label('status', 'Status') !!} - {!! Form::text('status', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Status', 'status') }} + {{ html()->text('status')->class('form-control') }}
- {!! Form::label('remarks', 'Remarks') !!} - {!! Form::textarea('remarks', NULL, ['class' => 'form-control', 'rows' => 1]) !!} + {{ html()->label('Remarks', 'remarks') }} + {{ html()->textarea('remarks')->class('form-control')->rows(1) }}
- {!! Form::label('is_active', 'Active:', ['class' => 'col-lg-2']) !!} - {!! Form::checkbox('is_active', 1, true,['class' => 'col-lg-1']) !!} + {{ html()->label('Active:', 'is_active')->class('col-lg-2') }} + {{ html()->checkbox('is_active', true, 1)->class('col-lg-1') }}
@@ -81,104 +81,104 @@

Service information

- {!! Form::label('manufacturer_id', 'Manufacturer') !!} - {!! Form::select('manufacturer_id', $vendors, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Manufacturer', 'manufacturer_id') }} + {{ html()->select('manufacturer_id', $vendors)->class('form-control') }}
- {!! Form::label('vendor_id', 'Vendor') !!} - {!! Form::select('vendor_id', $vendors, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Vendor', 'vendor_id') }} + {{ html()->select('vendor_id', $vendors)->class('form-control') }}

Power specifications

- {!! Form::label('power_line_voltage', 'Power line voltage') !!} - {!! Form::text('power_line_voltage', NULL , ['class' => 'form-control']) !!} - {!! Form::select('power_line_voltage_uom_id', $uoms_electric, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Power line voltage', 'power_line_voltage') }} + {{ html()->text('power_line_voltage')->class('form-control') }} + {{ html()->select('power_line_voltage_uom_id', $uoms_electric)->class('form-control') }}
- {!! Form::label('power_phase_voltage', 'Power phase voltage') !!} - {!! Form::text('power_phase_voltage', NULL , ['class' => 'form-control']) !!} - {!! Form::select('power_phase_voltage_uom_id', $uoms_electric, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Power phase voltage', 'power_phase_voltage') }} + {{ html()->text('power_phase_voltage')->class('form-control') }} + {{ html()->select('power_phase_voltage_uom_id', $uoms_electric)->class('form-control') }}
- {!! Form::label('power_phases', 'Power phases') !!} - {!! Form::text('power_phases', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Power phases', 'power_phases') }} + {{ html()->text('power_phases')->class('form-control') }}
- {!! Form::label('power_amp', 'Power amps') !!} - {!! Form::text('power_amp', NULL , ['class' => 'form-control']) !!} - {!! Form::select('power_amp_uom_id', $uoms_electric, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Power amps', 'power_amp') }} + {{ html()->text('power_amp')->class('form-control') }} + {{ html()->select('power_amp_uom_id', $uoms_electric)->class('form-control') }}

Physical specifications

- {!! Form::label('length', 'Length') !!} - {!! Form::text('length', NULL , ['class' => 'form-control']) !!} - {!! Form::select('length_uom_id', $uoms_length, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Length', 'length') }} + {{ html()->text('length')->class('form-control') }} + {{ html()->select('length_uom_id', $uoms_length)->class('form-control') }}
- {!! Form::label('width', 'Width') !!} - {!! Form::text('width', NULL , ['class' => 'form-control']) !!} - {!! Form::select('width_uom_id', $uoms_length, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Width', 'width') }} + {{ html()->text('width')->class('form-control') }} + {{ html()->select('width_uom_id', $uoms_length)->class('form-control') }}
- {!! Form::label('height', 'Height') !!} - {!! Form::text('height', NULL , ['class' => 'form-control']) !!} - {!! Form::select('height_uom_id', $uoms_length, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Height', 'height') }} + {{ html()->text('height')->class('form-control') }} + {{ html()->select('height_uom_id', $uoms_length)->class('form-control') }}
- {!! Form::label('weight', 'Weight') !!} - {!! Form::text('weight', NULL , ['class' => 'form-control']) !!} - {!! Form::select('weight_uom_id', $uoms_weight, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Weight', 'weight') }} + {{ html()->text('weight')->class('form-control') }} + {{ html()->select('weight_uom_id', $uoms_weight)->class('form-control') }}
- {!! Form::label('capacity', 'Capacity') !!} - {!! Form::text('capacity', NULL , ['class' => 'form-control']) !!} - {!! Form::select('capacity_uom_id', $uoms_capacity, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Capacity', 'capacity') }} + {{ html()->text('capacity')->class('form-control') }} + {{ html()->select('capacity_uom_id', $uoms_capacity)->class('form-control') }}

Purchase info

- {!! Form::label('purchase_date', 'Purchase date') !!} - {!! Form::date('purchase_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Purchase date', 'purchase_date') }} + {{ html()->date('purchase_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('purchase_price', 'Purchase price') !!} - {!! Form::text('purchase_price', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Purchase price', 'purchase_price') }} + {{ html()->text('purchase_price')->class('form-control') }}
- {!! Form::label('start_date', 'Start date') !!} - {!! Form::text('start_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Start date', 'start_date') }} + {{ html()->text('start_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('end_date', 'End date') !!} - {!! Form::text('end_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('End date', 'end_date') }} + {{ html()->text('end_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('life_expectancy', 'Life expectancy') !!} - {!! Form::text('life_expectancy', NULL , ['class' => 'form-control']) !!} - {!! Form::select('life_expectancy_uom_id', $uoms_time, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Life expectancy', 'life_expectancy') }} + {{ html()->text('life_expectancy')->class('form-control') }} + {{ html()->select('life_expectancy_uom_id', $uoms_time)->class('form-control') }}
- {!! Form::label('replacement_id', 'Replacement') !!} - {!! Form::select('replacement_id', $parents, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Replacement', 'replacement_id') }} + {{ html()->select('replacement_id', $parents)->class('form-control') }}

Warranty info

- {!! Form::label('warranty_start_date', 'Warranty start date') !!} - {!! Form::text('warranty_start_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Warranty start date', 'warranty_start_date') }} + {{ html()->text('warranty_start_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('warranty_end_date', 'Warranty end date') !!} - {!! Form::text('warranty_end_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Warranty end date', 'warranty_end_date') }} + {{ html()->text('warranty_end_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
@@ -186,38 +186,38 @@

Depreciation info

- {!! Form::label('depreciation_start_date', 'Depreciation start date') !!} - {!! Form::text('depreciation_start_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Depreciation start date', 'depreciation_start_date') }} + {{ html()->text('depreciation_start_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('depreciation_end_date', 'Depreciation end date') !!} - {!! Form::text('depreciation_end_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Depreciation end date', 'depreciation_end_date') }} + {{ html()->text('depreciation_end_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('depreciation_type_id', 'Depreciation type') !!} - {!! Form::select('depreciation_type_id', $depreciation_types, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Depreciation type', 'depreciation_type_id') }} + {{ html()->select('depreciation_type_id', $depreciation_types)->class('form-control') }}
- {!! Form::label('depreciation_rate', 'Depreciation rate') !!} - {!! Form::text('depreciation_rate', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Depreciation rate', 'depreciation_rate') }} + {{ html()->text('depreciation_rate')->class('form-control') }}
- {!! Form::label('depreciation_value', 'Depreciation value') !!} - {!! Form::text('depreciation_value', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Depreciation value', 'depreciation_value') }} + {{ html()->text('depreciation_value')->class('form-control') }}
- {!! Form::label('depreciation_time', 'Depreciation time') !!} - {!! Form::text('depreciation_time', NULL , ['class' => 'form-control']) !!} - {!! Form::select('depreciation_time_uom_id', $uoms_time, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Depreciation time', 'depreciation_time') }} + {{ html()->text('depreciation_time')->class('form-control') }} + {{ html()->select('depreciation_time_uom_id', $uoms_time)->class('form-control') }}
- {!! Form::submit('Add asset', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add asset')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/assets/edit.blade.php b/resources/views/assets/edit.blade.php index 6a200ba05..9ea37ffd7 100644 --- a/resources/views/assets/edit.blade.php +++ b/resources/views/assets/edit.blade.php @@ -10,75 +10,75 @@

Asset

- {!! Form::open(['method' => 'PUT', 'route' => ['asset.update', $asset->id],'enctype'=>'multipart/form-data']) !!} - {!! Form::hidden('id', $asset->id) !!} + {{ html()->form('PUT', route('asset.update', [$asset->id]))->acceptsFiles()->open() }} + {{ html()->hidden('id', $asset->id) }}

General information

- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', $asset->name , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name', $asset->name)->class('form-control') }}
- {!! Form::label('asset_type_id', 'Asset type') !!} - {!! Form::select('asset_type_id', $asset_types, $asset->asset_type_id, ['class' => 'form-control']) !!} + {{ html()->label('Asset type', 'asset_type_id') }} + {{ html()->select('asset_type_id', $asset_types, $asset->asset_type_id)->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', $asset->description, ['class' => 'form-control', 'rows' => 1]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description', $asset->description)->class('form-control')->rows(1) }}
- {!! Form::label('asset_photo', 'Picture of asset (max 10M):') !!} - {!! Form::file('asset_photo'); !!} + {{ html()->label('Picture of asset (max 10M):', 'asset_photo') }} + {{ html()->file('asset_photo') }}
- {!! Form::label('manufacturer', 'Manufacturer') !!} - {!! Form::text('manufacturer', $asset->manufacturer , ['class' => 'form-control']) !!} + {{ html()->label('Manufacturer', 'manufacturer') }} + {{ html()->text('manufacturer', $asset->manufacturer)->class('form-control') }}
- {!! Form::label('model', 'Model') !!} - {!! Form::text('model', $asset->model , ['class' => 'form-control']) !!} + {{ html()->label('Model', 'model') }} + {{ html()->text('model', $asset->model)->class('form-control') }}
- {!! Form::label('serial_number', 'Serial number') !!} - {!! Form::text('serial_number', $asset->serial_number , ['class' => 'form-control']) !!} + {{ html()->label('Serial number', 'serial_number') }} + {{ html()->text('serial_number', $asset->serial_number)->class('form-control') }}
- {!! Form::label('year', 'Year') !!} - {!! Form::text('year', $asset->year , ['class' => 'form-control']) !!} + {{ html()->label('Year', 'year') }} + {{ html()->text('year', $asset->year)->class('form-control') }}
- {!! Form::label('location_id', 'Location') !!} - {!! Form::select('location_id', $locations, $asset->location_id, ['class' => 'form-control']) !!} + {{ html()->label('Location', 'location_id') }} + {{ html()->select('location_id', $locations, $asset->location_id)->class('form-control') }}
- {!! Form::label('department_id', 'Department') !!} - {!! Form::select('department_id', $departments, $asset->department_id, ['class' => 'form-control']) !!} + {{ html()->label('Department', 'department_id') }} + {{ html()->select('department_id', $departments, $asset->department_id)->class('form-control') }}
- {!! Form::label('parent_id', 'Parent') !!} - {!! Form::select('parent_id', $parents, $asset->parent_id, ['class' => 'form-control']) !!} + {{ html()->label('Parent', 'parent_id') }} + {{ html()->select('parent_id', $parents, $asset->parent_id)->class('form-control') }}
- {!! Form::label('status', 'Status') !!} - {!! Form::text('status', $asset->status , ['class' => 'form-control']) !!} + {{ html()->label('Status', 'status') }} + {{ html()->text('status', $asset->status)->class('form-control') }}
- {!! Form::label('remarks', 'Remarks') !!} - {!! Form::textarea('remarks', $asset->remarks, ['class' => 'form-control', 'rows' => 1]) !!} + {{ html()->label('Remarks', 'remarks') }} + {{ html()->textarea('remarks', $asset->remarks)->class('form-control')->rows(1) }}
- {!! Form::label('is_active', 'Active:', ['class' => 'col-lg-2']) !!} - {!! Form::checkbox('is_active', 1, $asset->is_active,['class' => 'col-lg-1']) !!} + {{ html()->label('Active:', 'is_active')->class('col-lg-2') }} + {{ html()->checkbox('is_active', $asset->is_active, 1)->class('col-lg-1') }}
@@ -86,144 +86,144 @@

Service information

- {!! Form::label('manufacturer_id', 'Manufacturer') !!} - {!! Form::select('manufacturer_id', $vendors, $asset->manufacturer_id, ['class' => 'form-control']) !!} + {{ html()->label('Manufacturer', 'manufacturer_id') }} + {{ html()->select('manufacturer_id', $vendors, $asset->manufacturer_id)->class('form-control') }}
- {!! Form::label('vendor_id', 'Vendor') !!} - {!! Form::select('vendor_id', $vendors, $asset->vendor_id, ['class' => 'form-control']) !!} + {{ html()->label('Vendor', 'vendor_id') }} + {{ html()->select('vendor_id', $vendors, $asset->vendor_id)->class('form-control') }}

Power specifications

- {!! Form::label('power_line_voltage', 'Power line voltage') !!} - {!! Form::text('power_line_voltage', $asset->power_line_voltage , ['class' => 'form-control']) !!} - {!! Form::select('power_line_voltage_uom_id', $uoms_electric, $asset->power_line_voltage_uom_id, ['class' => 'form-control']) !!} + {{ html()->label('Power line voltage', 'power_line_voltage') }} + {{ html()->text('power_line_voltage', $asset->power_line_voltage)->class('form-control') }} + {{ html()->select('power_line_voltage_uom_id', $uoms_electric, $asset->power_line_voltage_uom_id)->class('form-control') }}
- {!! Form::label('power_phase_voltage', 'Power phase voltage') !!} - {!! Form::text('power_phase_voltage', $asset->power_phase_voltage , ['class' => 'form-control']) !!} - {!! Form::select('power_phase_voltage_uom_id', $uoms_electric, $asset->power_phase_voltage_uom_id, ['class' => 'form-control']) !!} + {{ html()->label('Power phase voltage', 'power_phase_voltage') }} + {{ html()->text('power_phase_voltage', $asset->power_phase_voltage)->class('form-control') }} + {{ html()->select('power_phase_voltage_uom_id', $uoms_electric, $asset->power_phase_voltage_uom_id)->class('form-control') }}
- {!! Form::label('power_phases', 'Power phases') !!} - {!! Form::text('power_phases', $asset->power_phases , ['class' => 'form-control']) !!} + {{ html()->label('Power phases', 'power_phases') }} + {{ html()->text('power_phases', $asset->power_phases)->class('form-control') }}
- {!! Form::label('power_amp', 'Power amps') !!} - {!! Form::text('power_amp', $asset->power_amp , ['class' => 'form-control']) !!} - {!! Form::select('power_amp_uom_id', $uoms_electric, $asset->power_amp_uom_id, ['class' => 'form-control']) !!} + {{ html()->label('Power amps', 'power_amp') }} + {{ html()->text('power_amp', $asset->power_amp)->class('form-control') }} + {{ html()->select('power_amp_uom_id', $uoms_electric, $asset->power_amp_uom_id)->class('form-control') }}

Physical specifications

- {!! Form::label('length', 'Length') !!} - {!! Form::text('length', $asset->length , ['class' => 'form-control']) !!} - {!! Form::select('length_uom_id', $uoms_length, $asset->length_uom_id, ['class' => 'form-control']) !!} + {{ html()->label('Length', 'length') }} + {{ html()->text('length', $asset->length)->class('form-control') }} + {{ html()->select('length_uom_id', $uoms_length, $asset->length_uom_id)->class('form-control') }}
- {!! Form::label('width', 'Width') !!} - {!! Form::text('width', $asset->width , ['class' => 'form-control']) !!} - {!! Form::select('width_uom_id', $uoms_length, $asset->width_uom_id, ['class' => 'form-control']) !!} + {{ html()->label('Width', 'width') }} + {{ html()->text('width', $asset->width)->class('form-control') }} + {{ html()->select('width_uom_id', $uoms_length, $asset->width_uom_id)->class('form-control') }}
- {!! Form::label('height', 'Height') !!} - {!! Form::text('height', $asset->height , ['class' => 'form-control']) !!} - {!! Form::select('height_uom_id', $uoms_length, $asset->height_uom_id, ['class' => 'form-control']) !!} + {{ html()->label('Height', 'height') }} + {{ html()->text('height', $asset->height)->class('form-control') }} + {{ html()->select('height_uom_id', $uoms_length, $asset->height_uom_id)->class('form-control') }}
- {!! Form::label('weight', 'Weight') !!} - {!! Form::text('weight', $asset->weight , ['class' => 'form-control']) !!} - {!! Form::select('weight_uom_id', $uoms_weight, $asset->weight_uom_id, ['class' => 'form-control']) !!} + {{ html()->label('Weight', 'weight') }} + {{ html()->text('weight', $asset->weight)->class('form-control') }} + {{ html()->select('weight_uom_id', $uoms_weight, $asset->weight_uom_id)->class('form-control') }}
- {!! Form::label('capacity', 'Capacity') !!} - {!! Form::text('capacity', $asset->capacity , ['class' => 'form-control']) !!} - {!! Form::select('capacity_uom_id', $uoms_capacity, $asset->capacity_uom_id, ['class' => 'form-control']) !!} + {{ html()->label('Capacity', 'capacity') }} + {{ html()->text('capacity', $asset->capacity)->class('form-control') }} + {{ html()->select('capacity_uom_id', $uoms_capacity, $asset->capacity_uom_id)->class('form-control') }}

Purchase info

- {!! Form::label('purchase_date', 'Purchase date') !!} - {!! Form::date('purchase_date', $asset->purchase_date, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Purchase date', 'purchase_date') }} + {{ html()->date('purchase_date', $asset->purchase_date)->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('purchase_price', 'Purchase price') !!} - {!! Form::text('purchase_price', $asset->purchase_price , ['class' => 'form-control']) !!} + {{ html()->label('Purchase price', 'purchase_price') }} + {{ html()->text('purchase_price', $asset->purchase_price)->class('form-control') }}
- {!! Form::label('start_date', 'Start date') !!} - {!! Form::text('start_date', $asset->start_date, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Start date', 'start_date') }} + {{ html()->text('start_date', $asset->start_date)->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('end_date', 'End date') !!} - {!! Form::text('end_date', $asset->end_date, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('End date', 'end_date') }} + {{ html()->text('end_date', $asset->end_date)->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('life_expectancy', 'Life expectancy') !!} - {!! Form::text('life_expectancy', $asset->life_expectancy , ['class' => 'form-control']) !!} - {!! Form::select('life_expectancy_uom_id', $uoms_time, $asset->life_expectancy_uom_id, ['class' => 'form-control']) !!} + {{ html()->label('Life expectancy', 'life_expectancy') }} + {{ html()->text('life_expectancy', $asset->life_expectancy)->class('form-control') }} + {{ html()->select('life_expectancy_uom_id', $uoms_time, $asset->life_expectancy_uom_id)->class('form-control') }}
- {!! Form::label('replacement_id', 'Replacement') !!} - {!! Form::select('replacement_id', $parents, $asset->replacement_id, ['class' => 'form-control']) !!} + {{ html()->label('Replacement', 'replacement_id') }} + {{ html()->select('replacement_id', $parents, $asset->replacement_id)->class('form-control') }}

Warranty info

- {!! Form::label('warranty_start_date', 'Warranty start date') !!} - {!! Form::text('warranty_start_date', $asset->warranty_start_date, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Warranty start date', 'warranty_start_date') }} + {{ html()->text('warranty_start_date', $asset->warranty_start_date)->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('warranty_end_date', 'Warranty end date') !!} - {!! Form::text('warranty_end_date', $asset->warranty_end_date, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Warranty end date', 'warranty_end_date') }} + {{ html()->text('warranty_end_date', $asset->warranty_end_date)->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}

Depreciation info

- {!! Form::label('depreciation_start_date', 'Depreciation start date') !!} - {!! Form::text('depreciation_start_date', $asset->depreciation_start_date, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Depreciation start date', 'depreciation_start_date') }} + {{ html()->text('depreciation_start_date', $asset->depreciation_start_date)->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('depreciation_end_date', 'Depreciation end date') !!} - {!! Form::text('depreciation_end_date', $asset->depreciation_end_date, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Depreciation end date', 'depreciation_end_date') }} + {{ html()->text('depreciation_end_date', $asset->depreciation_end_date)->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('depreciation_type_id', 'Depreciation type') !!} - {!! Form::select('depreciation_type_id', $depreciation_types, $asset->depreciation_type_id, ['class' => 'form-control']) !!} + {{ html()->label('Depreciation type', 'depreciation_type_id') }} + {{ html()->select('depreciation_type_id', $depreciation_types, $asset->depreciation_type_id)->class('form-control') }}
- {!! Form::label('depreciation_rate', 'Depreciation rate') !!} - {!! Form::text('depreciation_rate', $asset->depreciation_rate , ['class' => 'form-control']) !!} + {{ html()->label('Depreciation rate', 'depreciation_rate') }} + {{ html()->text('depreciation_rate', $asset->depreciation_rate)->class('form-control') }}
- {!! Form::label('depreciation_value', 'Depreciation value') !!} - {!! Form::text('depreciation_value', $asset->depreciation_value , ['class' => 'form-control']) !!} + {{ html()->label('Depreciation value', 'depreciation_value') }} + {{ html()->text('depreciation_value', $asset->depreciation_value)->class('form-control') }}
- {!! Form::label('depreciation_time', 'Depreciation time') !!} - {!! Form::text('depreciation_time', $asset->depreciation_time , ['class' => 'form-control']) !!} - {!! Form::select('depreciation_time_uom_id', $uoms_time, $asset->depreciation_time_uom_id, ['class' => 'form-control']) !!} + {{ html()->label('Depreciation time', 'depreciation_time') }} + {{ html()->text('depreciation_time', $asset->depreciation_time)->class('form-control') }} + {{ html()->select('depreciation_time_uom_id', $uoms_time, $asset->depreciation_time_uom_id)->class('form-control') }}

Attachments

- {!! Form::label('attachment', 'Attachment (max 20M): ') !!} - {!! Form::file('attachment',['class' => 'form-control']); !!} + {{ html()->label('Attachment (max 20M): ', 'attachment') }} + {{ html()->file('attachment')->class('form-control') }}
- {!! Form::label('attachment_description', 'Description: (max 200)') !!} - {!! Form::text('attachment_description', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Description: (max 200)', 'attachment_description') }} + {{ html()->text('attachment_description')->class('form-control') }}
@@ -231,10 +231,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }} @stop diff --git a/resources/views/assets/index.blade.php b/resources/views/assets/index.blade.php index fd831a025..2f06cc3ce 100644 --- a/resources/views/assets/index.blade.php +++ b/resources/views/assets/index.blade.php @@ -13,7 +13,7 @@ @endCan - {!! Html::image('images/search.png', 'Search assets',array('title'=>"Search assets",'class' => 'btn btn-link')) !!} + {{ html()->img('images/search.png', 'Search assets')->attribute('title', "Search assets")->class('btn btn-link') }} diff --git a/resources/views/assets/results.blade.php b/resources/views/assets/results.blade.php index 39a93397a..457be2070 100644 --- a/resources/views/assets/results.blade.php +++ b/resources/views/assets/results.blade.php @@ -7,7 +7,7 @@ @if ($assets->isEmpty())

Oops, no known assets with the given search criteria

diff --git a/resources/views/assets/search.blade.php b/resources/views/assets/search.blade.php index 772237c29..5d92119e1 100644 --- a/resources/views/assets/search.blade.php +++ b/resources/views/assets/search.blade.php @@ -8,12 +8,12 @@

Search Assets

- {!! Form::open(['method' => 'GET', 'class' => 'form-horizontal', 'route' => ['assets.results']]) !!} + {{ html()->form('GET', route('assets.results', ))->class('form-horizontal')->open() }}

- {!! Form::image('images/submit.png','btnSave',['class' => 'btn btn-outline-dark pull-right']) !!} + {{ html()->image('images/submit.png', 'btnSave', ['class' => 'btn btn-outline-dark pull-right']) }}

@@ -21,64 +21,64 @@

General information

- {!! Form::label('name', 'Name') !!} - {!! Form::text('name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Name', 'name') }} + {{ html()->text('name')->class('form-control') }}
- {!! Form::label('asset_type_id', 'Asset type') !!} - {!! Form::select('asset_type_id', $asset_types, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Asset type', 'asset_type_id') }} + {{ html()->select('asset_type_id', $asset_types)->class('form-control') }}
- {!! Form::label('description', 'Description') !!} - {!! Form::textarea('description', NULL, ['class' => 'form-control', 'rows' => 1]) !!} + {{ html()->label('Description', 'description') }} + {{ html()->textarea('description')->class('form-control')->rows(1) }}
- {!! Form::label('manufacturer', 'Manufacturer') !!} - {!! Form::text('manufacturer', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Manufacturer', 'manufacturer') }} + {{ html()->text('manufacturer')->class('form-control') }}
- {!! Form::label('model', 'Model') !!} - {!! Form::text('model', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Model', 'model') }} + {{ html()->text('model')->class('form-control') }}
- {!! Form::label('serial_number', 'Serial number') !!} - {!! Form::text('serial_number', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Serial number', 'serial_number') }} + {{ html()->text('serial_number')->class('form-control') }}
- {!! Form::label('year', 'Year') !!} - {!! Form::text('year', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Year', 'year') }} + {{ html()->text('year')->class('form-control') }}
- {!! Form::label('location_id', 'Location') !!} - {!! Form::select('location_id', $locations, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Location', 'location_id') }} + {{ html()->select('location_id', $locations)->class('form-control') }}
- {!! Form::label('department_id', 'Department') !!} - {!! Form::select('department_id', $departments, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Department', 'department_id') }} + {{ html()->select('department_id', $departments)->class('form-control') }}
- {!! Form::label('parent_id', 'Parent') !!} - {!! Form::select('parent_id', $parents, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Parent', 'parent_id') }} + {{ html()->select('parent_id', $parents)->class('form-control') }}
- {!! Form::label('status', 'Status') !!} - {!! Form::text('status', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Status', 'status') }} + {{ html()->text('status')->class('form-control') }}
- {!! Form::label('remarks', 'Remarks') !!} - {!! Form::textarea('remarks', NULL, ['class' => 'form-control', 'rows' => 1]) !!} + {{ html()->label('Remarks', 'remarks') }} + {{ html()->textarea('remarks')->class('form-control')->rows(1) }}
- {!! Form::label('is_active', 'Active') !!} - {!! Form::select('is_active', array('' => 'N/A', '1' => 'Yes', '0' => 'No'), NULL, ['class' => 'form-control']) !!} + {{ html()->label('Active', 'is_active') }} + {{ html()->select('is_active', array('' => 'N/A', '1' => 'Yes', '0' => 'No'))->class('form-control') }}
@@ -86,140 +86,140 @@

Service information

- {!! Form::label('manufacturer_id', 'Manufacturer') !!} - {!! Form::select('manufacturer_id', $vendors, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Manufacturer', 'manufacturer_id') }} + {{ html()->select('manufacturer_id', $vendors)->class('form-control') }}
- {!! Form::label('vendor_id', 'Vendor') !!} - {!! Form::select('vendor_id', $vendors, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Vendor', 'vendor_id') }} + {{ html()->select('vendor_id', $vendors)->class('form-control') }}

Power specifications

- {!! Form::label('power_line_voltage', 'Power line voltage') !!} - {!! Form::text('power_line_voltage', NULL , ['class' => 'form-control']) !!} - {!! Form::select('power_line_voltage_uom_id', $uoms_electric, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Power line voltage', 'power_line_voltage') }} + {{ html()->text('power_line_voltage')->class('form-control') }} + {{ html()->select('power_line_voltage_uom_id', $uoms_electric)->class('form-control') }}
- {!! Form::label('power_phase_voltage', 'Power phase voltage') !!} - {!! Form::text('power_phase_voltage', NULL , ['class' => 'form-control']) !!} - {!! Form::select('power_phase_voltage_uom_id', $uoms_electric, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Power phase voltage', 'power_phase_voltage') }} + {{ html()->text('power_phase_voltage')->class('form-control') }} + {{ html()->select('power_phase_voltage_uom_id', $uoms_electric)->class('form-control') }}
- {!! Form::label('power_phases', 'Power phases') !!} - {!! Form::text('power_phases', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Power phases', 'power_phases') }} + {{ html()->text('power_phases')->class('form-control') }}
- {!! Form::label('power_amp', 'Power amps') !!} - {!! Form::text('power_amp', NULL , ['class' => 'form-control']) !!} - {!! Form::select('power_amp_uom_id', $uoms_electric, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Power amps', 'power_amp') }} + {{ html()->text('power_amp')->class('form-control') }} + {{ html()->select('power_amp_uom_id', $uoms_electric)->class('form-control') }}

Physical specifications

- {!! Form::label('length', 'Length') !!} - {!! Form::text('length', NULL , ['class' => 'form-control']) !!} - {!! Form::select('length_uom_id', $uoms_length, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Length', 'length') }} + {{ html()->text('length')->class('form-control') }} + {{ html()->select('length_uom_id', $uoms_length)->class('form-control') }}
- {!! Form::label('width', 'Width') !!} - {!! Form::text('width', NULL , ['class' => 'form-control']) !!} - {!! Form::select('width_uom_id', $uoms_length, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Width', 'width') }} + {{ html()->text('width')->class('form-control') }} + {{ html()->select('width_uom_id', $uoms_length)->class('form-control') }}
- {!! Form::label('height', 'Height') !!} - {!! Form::text('height', NULL , ['class' => 'form-control']) !!} - {!! Form::select('height_uom_id', $uoms_length, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Height', 'height') }} + {{ html()->text('height')->class('form-control') }} + {{ html()->select('height_uom_id', $uoms_length)->class('form-control') }}
- {!! Form::label('weight', 'Weight') !!} - {!! Form::text('weight', NULL , ['class' => 'form-control']) !!} - {!! Form::select('weight_uom_id', $uoms_weight, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Weight', 'weight') }} + {{ html()->text('weight')->class('form-control') }} + {{ html()->select('weight_uom_id', $uoms_weight)->class('form-control') }}
- {!! Form::label('capacity', 'Capacity') !!} - {!! Form::text('capacity', NULL , ['class' => 'form-control']) !!} - {!! Form::select('capacity_uom_id', $uoms_capacity, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Capacity', 'capacity') }} + {{ html()->text('capacity')->class('form-control') }} + {{ html()->select('capacity_uom_id', $uoms_capacity)->class('form-control') }}

Purchase info

- {!! Form::label('purchase_date', 'Purchase date') !!} - {!! Form::date('purchase_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Purchase date', 'purchase_date') }} + {{ html()->date('purchase_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('purchase_price', 'Purchase price') !!} - {!! Form::text('purchase_price', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Purchase price', 'purchase_price') }} + {{ html()->text('purchase_price')->class('form-control') }}
- {!! Form::label('start_date', 'Start date') !!} - {!! Form::text('start_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Start date', 'start_date') }} + {{ html()->text('start_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('end_date', 'End date') !!} - {!! Form::text('end_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('End date', 'end_date') }} + {{ html()->text('end_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('life_expectancy', 'Life expectancy') !!} - {!! Form::text('life_expectancy', NULL , ['class' => 'form-control']) !!} - {!! Form::select('life_expectancy_uom_id', $uoms_time, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Life expectancy', 'life_expectancy') }} + {{ html()->text('life_expectancy')->class('form-control') }} + {{ html()->select('life_expectancy_uom_id', $uoms_time)->class('form-control') }}
- {!! Form::label('replacement_id', 'Replacement') !!} - {!! Form::select('replacement_id', $parents, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Replacement', 'replacement_id') }} + {{ html()->select('replacement_id', $parents)->class('form-control') }}

Warranty info

- {!! Form::label('warranty_start_date', 'Warranty start date') !!} - {!! Form::text('warranty_start_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Warranty start date', 'warranty_start_date') }} + {{ html()->text('warranty_start_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('warranty_end_date', 'Warranty end date') !!} - {!! Form::text('warranty_end_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Warranty end date', 'warranty_end_date') }} + {{ html()->text('warranty_end_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}

Depreciation info

- {!! Form::label('depreciation_start_date', 'Depreciation start date') !!} - {!! Form::text('depreciation_start_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Depreciation start date', 'depreciation_start_date') }} + {{ html()->text('depreciation_start_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('depreciation_end_date', 'Depreciation end date') !!} - {!! Form::text('depreciation_end_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->label('Depreciation end date', 'depreciation_end_date') }} + {{ html()->text('depreciation_end_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
- {!! Form::label('depreciation_type_id', 'Depreciation type') !!} - {!! Form::select('depreciation_type_id', $depreciation_types, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Depreciation type', 'depreciation_type_id') }} + {{ html()->select('depreciation_type_id', $depreciation_types)->class('form-control') }}
- {!! Form::label('depreciation_rate', 'Depreciation rate') !!} - {!! Form::text('depreciation_rate', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Depreciation rate', 'depreciation_rate') }} + {{ html()->text('depreciation_rate')->class('form-control') }}
- {!! Form::label('depreciation_value', 'Depreciation value') !!} - {!! Form::text('depreciation_value', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Depreciation value', 'depreciation_value') }} + {{ html()->text('depreciation_value')->class('form-control') }}
- {!! Form::label('depreciation_time', 'Depreciation time') !!} - {!! Form::text('depreciation_time', NULL , ['class' => 'form-control']) !!} - {!! Form::select('depreciation_time_uom_id', $uoms_time, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Depreciation time', 'depreciation_time') }} + {{ html()->text('depreciation_time')->class('form-control') }} + {{ html()->select('depreciation_time_uom_id', $uoms_time)->class('form-control') }}
- {!! Form::close() !!} + {{ html()->form()->close() }} @stop diff --git a/resources/views/assets/show.blade.php b/resources/views/assets/show.blade.php index eda5f3de8..70338e784 100644 --- a/resources/views/assets/show.blade.php +++ b/resources/views/assets/show.blade.php @@ -188,14 +188,14 @@
@can('delete-asset') - {!! Form::open(['method' => 'DELETE', 'route' => ['asset.destroy', $asset->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('asset.destroy', [$asset->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
diff --git a/resources/views/attachments/edit.blade.php b/resources/views/attachments/edit.blade.php index 0d274ae0d..032dcbc10 100644 --- a/resources/views/attachments/edit.blade.php +++ b/resources/views/attachments/edit.blade.php @@ -5,14 +5,14 @@

Edit Attachment:

- {!! Form::open(['method' => 'PUT', 'route' => ['attachment.update', $attachment->id]]) !!} - {!! Form::hidden('id', $attachment->id) !!} + {{ html()->form('PUT', route('attachment.update', [$attachment->id]))->open() }} + {{ html()->hidden('id', $attachment->id) }}

Attachment details for {{ $attachment->uri }}

- {!! Form::label('description', 'Description:') !!} - {!! Form::textarea('description', $attachment->description, ['class' => 'form-control']) !!} + {{ html()->label('Description:', 'description') }} + {{ html()->textarea('description', $attachment->description)->class('form-control') }}
@@ -31,8 +31,8 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-primary']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-primary']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/attachments/show.blade.php b/resources/views/attachments/show.blade.php index c0c0c9282..eed932cab 100644 --- a/resources/views/attachments/show.blade.php +++ b/resources/views/attachments/show.blade.php @@ -8,7 +8,7 @@

Attachment details: @can('update-attachment') - {!! Html::link(url('attachment/'.$attachment->id.'/edit'),$attachment->uri) !!} + {{ html()->a(url(url('attachment/' . $attachment->id . '/edit')), $attachment->uri) }} @else {{$attachment->uri}} @endCan @@ -32,7 +32,7 @@
@can('update-attachment') @endCan
diff --git a/resources/views/dioceses/create.blade.php b/resources/views/dioceses/create.blade.php index a7caeffc3..93cd50f14 100644 --- a/resources/views/dioceses/create.blade.php +++ b/resources/views/dioceses/create.blade.php @@ -4,60 +4,60 @@

Add a Diocese

- {!! Form::open(['url' => 'diocese', 'method' => 'post', 'class' => 'form-horizontal panel']) !!} + {{ html()->form('POST', 'diocese')->class('form-horizontal panel')->open() }}
- {!! Form::label('bishop_id', 'Bishop') !!} - {!! Form::select('bishop_id', $bishops, 0, ['class' => 'form-control']) !!} + {{ html()->label('Bishop', 'bishop_id') }} + {{ html()->select('bishop_id', $bishops, 0)->class('form-control') }}
- {!! Form::label('organization_name', 'Name') !!} - {!! Form::text('organization_name', null, ['class'=>'form-control']) !!} + {{ html()->label('Name', 'organization_name') }} + {{ html()->text('organization_name')->class('form-control') }}
- {!! Form::label('street_address', 'Address Line 1') !!} - {!! Form::text('street_address', null, ['class'=>'form-control']) !!} + {{ html()->label('Address Line 1', 'street_address') }} + {{ html()->text('street_address')->class('form-control') }}
- {!! Form::label('supplemental_address_1', 'Address Line 2') !!} - {!! Form::text('supplemental_address_1', null, ['class'=>'form-control']) !!} + {{ html()->label('Address Line 2', 'supplemental_address_1') }} + {{ html()->text('supplemental_address_1')->class('form-control') }}
- {!! Form::label('city', 'City') !!} - {!! Form::text('city', null, ['class'=>'form-control']) !!} + {{ html()->label('City', 'city') }} + {{ html()->text('city')->class('form-control') }}
- {!! Form::label('state_province_id', 'State') !!} - {!! Form::select('state_province_id', $states, $defaults['state_province_id'], ['class' => 'form-control']) !!} + {{ html()->label('State', 'state_province_id') }} + {{ html()->select('state_province_id', $states, $defaults['state_province_id'])->class('form-control') }}
- {!! Form::label('postal_code', 'Zip') !!} - {!! Form::text('postal_code', null, ['class'=>'form-control']) !!} + {{ html()->label('Zip', 'postal_code') }} + {{ html()->text('postal_code')->class('form-control') }}
- {!! Form::label('phone_main_phone', 'Phone') !!} - {!! Form::text('phone_main_phone', null, ['class'=>'form-control']) !!} + {{ html()->label('Phone', 'phone_main_phone') }} + {{ html()->text('phone_main_phone')->class('form-control') }}
- {!! Form::label('phone_main_fax', 'Fax') !!} - {!! Form::text('phone_main_fax', null, ['class'=>'form-control']) !!} + {{ html()->label('Fax', 'phone_main_fax') }} + {{ html()->text('phone_main_fax')->class('form-control') }}
- {!! Form::label('email_main', 'Email') !!} - {!! Form::text('email_main', null, ['class'=>'form-control']) !!} + {{ html()->label('Email', 'email_main') }} + {{ html()->text('email_main')->class('form-control') }}
- {!! Form::label('diocese_note', 'Notes') !!} - {!! Form::textarea('diocese_note', null, ['class'=>'form-control', 'rows'=>'3']) !!} + {{ html()->label('Notes', 'diocese_note') }} + {{ html()->textarea('diocese_note')->class('form-control')->rows('3') }}
@@ -71,10 +71,10 @@
- {!! Form::submit('Add Diocese', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add Diocese')->class('btn btn-outline-dark') }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/dioceses/create/urls.blade.php b/resources/views/dioceses/create/urls.blade.php index c4a05cee9..28ee186f7 100644 --- a/resources/views/dioceses/create/urls.blade.php +++ b/resources/views/dioceses/create/urls.blade.php @@ -41,48 +41,48 @@
- {!! Form::label('url_main', 'Personal (main):') !!} - {!! Form::text('url_main', null, ['class' => 'form-control']) !!} + {{ html()->label('Personal (main):', 'url_main') }} + {{ html()->text('url_main')->class('form-control') }}
- {!! Form::label('url_work', 'Work:') !!} - {!! Form::text('url_work', null, ['class' => 'form-control']) !!} + {{ html()->label('Work:', 'url_work') }} + {{ html()->text('url_work')->class('form-control') }}
- {!! Form::label('url_facebook', 'Facebook:') !!} - {!! Form::text('url_facebook', null, ['class' => 'form-control']) !!} + {{ html()->label('Facebook:', 'url_facebook') }} + {{ html()->text('url_facebook')->class('form-control') }}
- {!! Form::label('url_instagram', 'Instagram:') !!} - {!! Form::text('url_instagram', null, ['class' => 'form-control']) !!} + {{ html()->label('Instagram:', 'url_instagram') }} + {{ html()->text('url_instagram')->class('form-control') }}
- {!! Form::label('url_linkedin', 'LinkedIn:') !!} - {!! Form::text('url_linkedin', null, ['class' => 'form-control']) !!} + {{ html()->label('LinkedIn:', 'url_linkedin') }} + {{ html()->text('url_linkedin')->class('form-control') }}
- {!! Form::label('url_twitter', 'Twitter:') !!} - {!! Form::text('url_twitter', null, ['class' => 'form-control']) !!} + {{ html()->label('Twitter:', 'url_twitter') }} + {{ html()->text('url_twitter')->class('form-control') }}
diff --git a/resources/views/dioceses/edit.blade.php b/resources/views/dioceses/edit.blade.php index 471eb3aaa..e925e9d5a 100644 --- a/resources/views/dioceses/edit.blade.php +++ b/resources/views/dioceses/edit.blade.php @@ -7,11 +7,11 @@

Edit: {{ $diocese->full_name }}

- {!! Form::open(['method' => 'PUT', 'files'=>'true', 'route' => ['diocese.update', $diocese->id]]) !!} - {!! Form::hidden('id', $diocese->id) !!} + {{ html()->form('PUT', route('diocese.update', [$diocese->id]))->acceptsFiles()->open() }} + {{ html()->hidden('id', $diocese->id) }}
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
@@ -22,20 +22,20 @@
- {!! Form::label('bishop_id', 'Bishop') !!} - {!! Form::select('bishop_id', $bishops, $diocese->bishop_id, ['class' => 'form-control']) !!} + {{ html()->label('Bishop', 'bishop_id') }} + {{ html()->select('bishop_id', $bishops, $diocese->bishop_id)->class('form-control') }}
- {!! Form::label('organization_name', 'Name') !!} - {!! Form::text('organization_name', $diocese->organization_name, ['class' => 'form-control']) !!} + {{ html()->label('Name', 'organization_name') }} + {{ html()->text('organization_name', $diocese->organization_name)->class('form-control') }}
- {!! Form::label('display_name', 'Display') !!} - {!! Form::text('display_name', $diocese->display_name, ['class' => 'form-control']) !!} + {{ html()->label('Display', 'display_name') }} + {{ html()->text('display_name', $diocese->display_name)->class('form-control') }}
- {!! Form::label('sort_name', 'Sort') !!} - {!! Form::text('sort_name', $diocese->sort_name, ['class' => 'form-control']) !!} + {{ html()->label('Sort', 'sort_name') }} + {{ html()->text('sort_name', $diocese->sort_name)->class('form-control') }}
@@ -49,24 +49,24 @@
- {!! Form::label('street_address', 'Address Line 1') !!} - {!! Form::text('street_address', $diocese->address_primary_street, ['class' => 'form-control']) !!} + {{ html()->label('Address Line 1', 'street_address') }} + {{ html()->text('street_address', $diocese->address_primary_street)->class('form-control') }}
- {!! Form::label('supplemental_address_1', 'Address Line 2') !!} - {!! Form::text('supplemental_address_1', $diocese->address_primary_supplemental_address, ['class' => 'form-control']) !!} + {{ html()->label('Address Line 2', 'supplemental_address_1') }} + {{ html()->text('supplemental_address_1', $diocese->address_primary_supplemental_address)->class('form-control') }}
- {!! Form::label('city', 'City') !!} - {!! Form::text('city', $diocese->address_primary_city, ['class' => 'form-control']) !!} + {{ html()->label('City', 'city') }} + {{ html()->text('city', $diocese->address_primary_city)->class('form-control') }}
- {!! Form::label('state_province_id', 'State') !!} - {!! Form::select('state_province_id', $states, $diocese->address_primary_state_id, ['class' => 'form-control']) !!} + {{ html()->label('State', 'state_province_id') }} + {{ html()->select('state_province_id', $states, $diocese->address_primary_state_id)->class('form-control') }}
- {!! Form::label('postal_code', 'Zip') !!} - {!! Form::text('postal_code', $diocese->address_primary_postal_code, ['class' => 'form-control']) !!} + {{ html()->label('Zip', 'postal_code') }} + {{ html()->text('postal_code', $diocese->address_primary_postal_code)->class('form-control') }}
@@ -80,20 +80,20 @@
- {!! Form::label('phone_main_phone', 'Phone') !!} - {!! Form::text('phone_main_phone', $diocese->phone_main_phone_number, ['class' => 'form-control']) !!} + {{ html()->label('Phone', 'phone_main_phone') }} + {{ html()->text('phone_main_phone', $diocese->phone_main_phone_number)->class('form-control') }}
- {!! Form::label('phone_main_fax', 'Fax') !!} - {!! Form::text('phone_main_fax', $diocese->phone_main_fax_number, ['class' => 'form-control']) !!} + {{ html()->label('Fax', 'phone_main_fax') }} + {{ html()->text('phone_main_fax', $diocese->phone_main_fax_number)->class('form-control') }}
- {!! Form::label('email_primary', 'Email') !!} - {!! Form::text('email_primary', $diocese->email_primary_text, ['class' => 'form-control']) !!} + {{ html()->label('Email', 'email_primary') }} + {{ html()->text('email_primary', $diocese->email_primary_text)->class('form-control') }}
- {!! Form::label('diocese_note', 'Note:') !!} - {!! Form::textarea('diocese_note', $diocese->note_diocese_text, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Note:', 'diocese_note') }} + {{ html()->textarea('diocese_note', $diocese->note_diocese_text)->class('form-control')->rows(3) }}
@@ -117,20 +117,20 @@
- {!! Form::label('avatar', 'Picture (max 5M)') !!} - {!! Form::file('avatar'); !!} + {{ html()->label('Picture (max 5M)', 'avatar') }} + {{ html()->file('avatar') }}
- {!! Form::label('attachment', 'Attachment (max 10M): ', ['class' => '']) !!} - {!! Form::file('attachment',['class' => '']); !!} + {{ html()->label('Attachment (max 10M): ', 'attachment')->class('') }} + {{ html()->file('attachment')->class('') }}
- {!! Form::label('attachment_description', 'Attachment Description (max 200)') !!} - {!! Form::text('attachment_description', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Attachment Description (max 200)', 'attachment_description') }} + {{ html()->text('attachment_description')->class('form-control') }}
@@ -140,10 +140,10 @@
- {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
- {!! Form::close() !!} + {{ html()->form()->close() }}
@stop diff --git a/resources/views/dioceses/index.blade.php b/resources/views/dioceses/index.blade.php index 9f89a4487..9fdacfcff 100644 --- a/resources/views/dioceses/index.blade.php +++ b/resources/views/dioceses/index.blade.php @@ -8,7 +8,7 @@ @can('create-contact') - {!! Html::image('images/create.png', 'Create Diocese',array('title'=>"Create Diocese",'class' => 'btn btn-light')) !!} + {{ html()->img('images/create.png', 'Create Diocese')->attribute('title', "Create Diocese")->class('btn btn-light') }} @endCan diff --git a/resources/views/dioceses/show.blade.php b/resources/views/dioceses/show.blade.php index 2159ac997..5074bac8c 100644 --- a/resources/views/dioceses/show.blade.php +++ b/resources/views/dioceses/show.blade.php @@ -15,16 +15,16 @@

- {!! Html::link('#notes','Notes',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#touchpoints','Touchpoints',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#relationships','Relationships',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#registrations','Registrations',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#attachments','Attachments',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#donations','Donations',array('class' => 'btn btn-outline-dark')) !!} + {{ html()->a(url('#notes'), 'Notes')->class('btn btn-outline-dark') }} + {{ html()->a(url('#touchpoints'), 'Touchpoints')->class('btn btn-outline-dark') }} + {{ html()->a(url('#relationships'), 'Relationships')->class('btn btn-outline-dark') }} + {{ html()->a(url('#registrations'), 'Registrations')->class('btn btn-outline-dark') }} + {{ html()->a(url('#attachments'), 'Attachments')->class('btn btn-outline-dark') }} + {{ html()->a(url('#donations'), 'Donations')->class('btn btn-outline-dark') }}
- {!! Html::image('images/diocese.png', 'Diocese Index', array('title'=>"Diocese Index",'class' => 'btn btn-outline-dark')) !!} + {{ html()->img('images/diocese.png', 'Diocese Index')->attribute('title', "Diocese Index")->class('btn btn-outline-dark') }} id) }} class="btn btn-outline-dark"> Add Touchpoint @@ -142,10 +142,10 @@ @foreach($diocese->a_relationships as $a_relationship)
  • @can('delete-relationship') - {!! Form::open(['method' => 'DELETE', 'route' => ['relationship.destroy', $a_relationship->id],'onsubmit'=>'return ConfirmDelete()']) !!} + {{ html()->form('DELETE', route('relationship.destroy', [$a_relationship->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} {!!$diocese->contact_link!!} {{ $a_relationship->relationship_type->label_a_b }} {!! $a_relationship->contact_b->contact_link !!} - {!! Form::close() !!} + {{ html()->form()->close() }} @else {!!$diocese->contact_link!!} {{ $a_relationship->relationship_type->label_a_b }} {!! $a_relationship->contact_b->contact_link !!} @endCan @@ -155,10 +155,10 @@ @foreach($diocese->b_relationships as $b_relationship)
  • @can('delete-relationship') - {!! Form::open(['method' => 'DELETE', 'route' => ['relationship.destroy', $b_relationship->id],'onsubmit'=>'return ConfirmDelete()']) !!} + {{ html()->form('DELETE', route('relationship.destroy', [$b_relationship->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} {!!$diocese->contact_link!!} is {{ $b_relationship->relationship_type->label_b_a }} {!! $b_relationship->contact_a->contact_link !!} - {!! Form::close() !!} + {{ html()->form()->close() }} @else {!!$diocese->contact_link!!} is {{ $b_relationship->relationship_type->label_b_a }} {!! $b_relationship->contact_a->contact_link !!} @endCan @@ -216,7 +216,7 @@

    Donations for {{ $diocese->display_name }} ({{$donations->total() }} donations totaling: ${{ number_format($donations->sum('donation_amount'),2)}})

    @can('create-donation') - {!! Html::link(route('donation.add',$diocese->id),'Add donation',array('class' => 'btn btn-outline-dark'))!!} + {{ html()->a(url(route('donation.add', $diocese->id)), 'Add donation')->class('btn btn-outline-dark') }} @endCan @if ($donations->isEmpty())
    @@ -270,14 +270,14 @@
    @can('delete-contact') - {!! Form::open(['method' => 'DELETE', 'route' => ['diocese.destroy', $diocese->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('diocese.destroy', [$diocese->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
    diff --git a/resources/views/dioceses/update/urls.blade.php b/resources/views/dioceses/update/urls.blade.php index d3894367f..cd205f755 100644 --- a/resources/views/dioceses/update/urls.blade.php +++ b/resources/views/dioceses/update/urls.blade.php @@ -41,48 +41,48 @@
    - {!! Form::label('url_main', 'Personal (main):') !!} - {!! Form::text('url_main', $defaults['Main']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Personal (main):', 'url_main') }} + {{ html()->text('url_main', $defaults['Main']['url'])->class('form-control') }}
    - {!! Form::label('url_work', 'Work:') !!} - {!! Form::text('url_work', $defaults['Work']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Work:', 'url_work') }} + {{ html()->text('url_work', $defaults['Work']['url'])->class('form-control') }}
    - {!! Form::label('url_facebook', 'Facebook:') !!} - {!! Form::text('url_facebook', $defaults['Facebook']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Facebook:', 'url_facebook') }} + {{ html()->text('url_facebook', $defaults['Facebook']['url'])->class('form-control') }}
    - {!! Form::label('url_instagram', 'Instagram:') !!} - {!! Form::text('url_instagram', $defaults['Instagram']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Instagram:', 'url_instagram') }} + {{ html()->text('url_instagram', $defaults['Instagram']['url'])->class('form-control') }}
    - {!! Form::label('url_linkedin', 'LinkedIn:') !!} - {!! Form::text('url_linkedin', $defaults['LinkedIn']['url'], ['class' => 'form-control']) !!} + {{ html()->label('LinkedIn:', 'url_linkedin') }} + {{ html()->text('url_linkedin', $defaults['LinkedIn']['url'])->class('form-control') }}
    - {!! Form::label('url_twitter', 'Twitter:') !!} - {!! Form::text('url_twitter', $defaults['Twitter']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Twitter:', 'url_twitter') }} + {{ html()->text('url_twitter', $defaults['Twitter']['url'])->class('form-control') }}
    diff --git a/resources/views/donations/create.blade.php b/resources/views/donations/create.blade.php index b0290ad70..0ed443cf0 100644 --- a/resources/views/donations/create.blade.php +++ b/resources/views/donations/create.blade.php @@ -6,7 +6,7 @@

    Create Donation

    - {!! Form::open(['url' => 'donation', 'method' => 'post']) !!} + {{ html()->form('POST', 'donation')->open() }}

    Basic Details

    @@ -15,34 +15,34 @@
    - {!! Form::label('donor_id', 'Donor') !!} + {{ html()->label('Donor', 'donor_id') }} @if (isset($defaults['donor_id'])) - {!! Form::select('donor_id', $donors, $defaults['donor_id'], ['class' => 'form-control']) !!} + {{ html()->select('donor_id', $donors, $defaults['donor_id'])->class('form-control') }} @else - {!! Form::select('donor_id', $donors, NULL, ['class' => 'form-control']) !!} + {{ html()->select('donor_id', $donors)->class('form-control') }} @endif
    - {!! Form::label('donation_description', 'Description') !!} - {!! Form::select('donation_description', $descriptions, 'Retreat Offering', ['class' => 'form-control']) !!} + {{ html()->label('Description', 'donation_description') }} + {{ html()->select('donation_description', $descriptions, 'Retreat Offering')->class('form-control') }}
    - {!! Form::label('event_id', 'Retreat') !!} + {{ html()->label('Retreat', 'event_id') }} @if (isset($defaults['event_id'])) - {!! Form::select('event_id', $retreats, $defaults['event_id'], ['class' => 'form-control']) !!} + {{ html()->select('event_id', $retreats, $defaults['event_id'])->class('form-control') }} @else - {!! Form::select('event_id', $retreats, NULL, ['class' => 'form-control']) !!} + {{ html()->select('event_id', $retreats)->class('form-control') }} @endif
    - {!! Form::label('donation_date', 'Date of donation') !!} - {!! Form::text('donation_date',now() , ['class' => 'flatpickr-date']) !!} + {{ html()->label('Date of donation', 'donation_date') }} + {{ html()->text('donation_date', now())->class('flatpickr-date') }}
    - {!! Form::label('donation_amount', 'Donation amount (pledged)') !!} - {!! Form::number('donation_amount', 0, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Donation amount (pledged)', 'donation_amount') }} + {{ html()->number('donation_amount', 0)->class('form-control')->attribute('step', '0.01') }}
    @@ -57,20 +57,20 @@
    - {!! Form::label('payment_date', 'Date of payment') !!} - {!! Form::text('payment_date',now(), ['class' => 'flatpickr-date']) !!} + {{ html()->label('Date of payment', 'payment_date') }} + {{ html()->text('payment_date', now())->class('flatpickr-date') }}
    - {!! Form::label('payment_amount', 'Payment amount (paid)') !!} - {!! Form::number('payment_amount', 0, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Payment amount (paid)', 'payment_amount') }} + {{ html()->number('payment_amount', 0)->class('form-control')->attribute('step', '0.01') }}
    - {!! Form::label('payment_description', 'Payment method') !!} - {!! Form::select('payment_description', $payment_methods, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Payment method', 'payment_description') }} + {{ html()->select('payment_description', $payment_methods)->class('form-control') }}
    - {!! Form::label('payment_idnumber', 'Check/CC Number') !!} - {!! Form::number('payment_idnumber', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Check/CC Number', 'payment_idnumber') }} + {{ html()->number('payment_idnumber')->class('form-control') }}
    @@ -85,30 +85,30 @@
    - {!! Form::label('notes1', 'Primary contact for invoice') !!} - {!! Form::text('notes1', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Primary contact for invoice', 'notes1') }} + {{ html()->text('notes1')->class('form-control') }}
    - {!! Form::label('notes', 'Notes') !!} - {!! Form::text('notes', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Notes', 'notes') }} + {{ html()->text('notes')->class('form-control') }}
    - {!! Form::label('terms', 'Terms') !!} - {!! Form::text('terms', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Terms', 'terms') }} + {{ html()->text('terms')->class('form-control') }}
    - {!! Form::label('start_date', 'Start date') !!} - {!! Form::text('start_date', NULL, ['class'=>'flatpickr-date']) !!} + {{ html()->label('Start date', 'start_date') }} + {{ html()->text('start_date')->class('flatpickr-date') }}
    - {!! Form::label('end_date', 'End date') !!} - {!! Form::text('end_date', NULL, ['class'=>'flatpickr-date']) !!} + {{ html()->label('End date', 'end_date') }} + {{ html()->text('end_date')->class('flatpickr-date') }}
    - {!! Form::label('donation_install', 'Installment') !!} - {!! Form::number('donation_install', 0.00, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Installment', 'donation_install') }} + {{ html()->number('donation_install', 0.0)->class('form-control')->attribute('step', '0.01') }}
    @@ -117,11 +117,11 @@
    - {!! Form::submit('Add donation', ['class'=>'btn btn-light']) !!} + {{ html()->submit('Add donation')->class('btn btn-light') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/donations/edit.blade.php b/resources/views/donations/edit.blade.php index 29563c7cb..36b80db58 100644 --- a/resources/views/donations/edit.blade.php +++ b/resources/views/donations/edit.blade.php @@ -7,78 +7,78 @@

    Donation details

    - {!! Form::open(['method' => 'PUT', 'route' => ['donation.update', $donation->donation_id]]) !!} - {!! Form::hidden('donation_id', $donation->donation_id) !!} - {!! Form::hidden('donor_id', $donation->contact_id) !!} + {{ html()->form('PUT', route('donation.update', [$donation->donation_id]))->open() }} + {{ html()->hidden('donation_id', $donation->donation_id) }} + {{ html()->hidden('donor_id', $donation->contact_id) }}
    - {!! Form::label('donation_description', 'Description') !!} - {!! Form::select('donation_description', $descriptions, $donation->donation_description, ['class' => 'form-control']) !!} + {{ html()->label('Description', 'donation_description') }} + {{ html()->select('donation_description', $descriptions, $donation->donation_description)->class('form-control') }}
    - {!! Form::label('event_id', 'Retreat') !!} + {{ html()->label('Retreat', 'event_id') }} @if (isset($defaults['event_id'])) - {!! Form::select('event_id', $retreats, $defaults['event_id'], ['class' => 'form-control']) !!} + {{ html()->select('event_id', $retreats, $defaults['event_id'])->class('form-control') }} @else - {!! Form::select('event_id', $retreats, $donation->event_id, ['class' => 'form-control']) !!} + {{ html()->select('event_id', $retreats, $donation->event_id)->class('form-control') }} @endif
    - {!! Form::label('donation_date', 'Date') !!} - {!! Form::date('donation_date', $donation->donation_date, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Date', 'donation_date') }} + {{ html()->date('donation_date', $donation->donation_date)->class('form-control flatpickr-date') }}
    - {!! Form::label('donation_amount', 'Amount') !!} - {!! Form::number('donation_amount', $donation->donation_amount, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Amount', 'donation_amount') }} + {{ html()->number('donation_amount', $donation->donation_amount)->class('form-control')->attribute('step', '0.01') }}
    - {!! Form::label('notes1', 'Primary contact for invoice') !!} - {!! Form::text('notes1', $donation->Notes1, ['class' => 'form-control']) !!} + {{ html()->label('Primary contact for invoice', 'notes1') }} + {{ html()->text('notes1', $donation->Notes1)->class('form-control') }}
    - {!! Form::label('notes', 'Notes') !!} - {!! Form::text('notes', $donation->Notes, ['class' => 'form-control']) !!} + {{ html()->label('Notes', 'notes') }} + {{ html()->text('notes', $donation->Notes)->class('form-control') }}
    - {!! Form::label('donation_thank_you', 'Thank you letter') !!} - {!! Form::select('donation_thank_you', ['Y' => 'Yes','N' => 'No'], $donation->donation_thank_you_sent, ['class' => 'form-control']) !!} + {{ html()->label('Thank you letter', 'donation_thank_you') }} + {{ html()->select('donation_thank_you', ['Y' => 'Yes', 'N' => 'No'], $donation->donation_thank_you_sent)->class('form-control') }}
    - {!! Form::label('start_date', 'Start date') !!} - {!! Form::date('start_date', $donation->start_date, ['class' => 'form-control flatpickr-date']) !!} + {{ html()->label('Start date', 'start_date') }} + {{ html()->date('start_date', $donation->start_date)->class('form-control flatpickr-date') }}
    - {!! Form::label('end_date', 'End date') !!} - {!! Form::date('end_date', $donation->end_date, ['class' => 'form-control flatpickr-date']) !!} + {{ html()->label('End date', 'end_date') }} + {{ html()->date('end_date', $donation->end_date)->class('form-control flatpickr-date') }}
    - {!! Form::label('donation_install', 'Installment') !!} - {!! Form::number('donation_install', $donation->donation_install, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Installment', 'donation_install') }} + {{ html()->number('donation_install', $donation->donation_install)->class('form-control')->attribute('step', '0.01') }}
    - {!! Form::label('terms', 'Terms') !!} - {!! Form::text('terms', $donation->terms, ['class' => 'form-control']) !!} + {{ html()->label('Terms', 'terms') }} + {{ html()->text('terms', $donation->terms)->class('form-control') }}
    - {!! Form::label('stripe_invoice', 'Stripe Invoice #') !!} - {!! Form::text('stripe_invoice', $donation->stripe_invoice, ['class' => 'form-control']) !!} + {{ html()->label('Stripe Invoice #', 'stripe_invoice') }} + {{ html()->text('stripe_invoice', $donation->stripe_invoice)->class('form-control') }}
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/donations/index.blade.php b/resources/views/donations/index.blade.php index 0cba6bd6b..16efd043f 100644 --- a/resources/views/donations/index.blade.php +++ b/resources/views/donations/index.blade.php @@ -8,11 +8,11 @@ @can('create-donation') - {!! Html::image('images/create.png', 'Add Donation',array('title'=>"Add Donation",'class' => 'btn btn-light')) !!} + {{ html()->img('images/create.png', 'Add Donation')->attribute('title', "Add Donation")->class('btn btn-light') }} @endCan - {!! Html::image('images/search.png', 'Search donations',array('title'=>"Search donations",'class' => 'btn btn-link')) !!} + {{ html()->img('images/search.png', 'Search donations')->attribute('title', "Search donations")->class('btn btn-link') }}

    {{$donations->total()}} records

    diff --git a/resources/views/donations/mergeable.blade.php b/resources/views/donations/mergeable.blade.php index 9698ac5b5..997643c31 100644 --- a/resources/views/donations/mergeable.blade.php +++ b/resources/views/donations/mergeable.blade.php @@ -41,7 +41,7 @@ {{ $donation->max_donation_id}} {{ $donation->donation_count }} - {!! Html::link(action([\App\Http\Controllers\DonationController::class, 'merge'], [$donation->min_donation_id, $donation->max_donation_id]),'Merge Donations',array('class' => 'btn btn-secondary'))!!} + {{ html()->a(url(action([\App\Http\Controllers\DonationController::class, 'merge'], [$donation->min_donation_id, $donation->max_donation_id])), 'Merge Donations')->class('btn btn-secondary') }} @endforeach diff --git a/resources/views/donations/results.blade.php b/resources/views/donations/results.blade.php index 5cd08cf74..867e5448b 100644 --- a/resources/views/donations/results.blade.php +++ b/resources/views/donations/results.blade.php @@ -7,7 +7,7 @@

    {{$donations->total()}} result(s) found - {!! Html::image('images/search.png', 'New search',array('title'=>"New search",'class' => 'btn btn-link')) !!} + {{ html()->img('images/search.png', 'New search')->attribute('title', "New search")->class('btn btn-link') }}

    ${{number_format($all_donations->sum('payments_paid'),2)}} paid of ${{number_format($all_donations->sum('donation_amount'),2) }} pledged @if ($all_donations->sum('donation_amount') > 0) diff --git a/resources/views/donations/search.blade.php b/resources/views/donations/search.blade.php index ae7c5bb67..7c3dd13ed 100644 --- a/resources/views/donations/search.blade.php +++ b/resources/views/donations/search.blade.php @@ -8,12 +8,12 @@

    Search Donations

    - {!! Form::open(['method' => 'GET', 'class' => 'form-horizontal', 'route' => ['donations.results']]) !!} + {{ html()->form('GET', route('donations.results', ))->class('form-horizontal')->open() }}

    - {!! Form::image('images/submit.png','btnSave',['class' => 'btn btn-outline-dark pull-right']) !!} + {{ html()->image('images/submit.png', 'btnSave', ['class' => 'btn btn-outline-dark pull-right']) }}

    @@ -21,78 +21,78 @@

    Donation information

    - {!! Form::label('donation_date_operator', 'Comp.') !!} - {!! Form::select('donation_date_operator', config('polanco.operators'), '=', ['class' => 'form-control']) !!} + {{ html()->label('Comp.', 'donation_date_operator') }} + {{ html()->select('donation_date_operator', config('polanco.operators'), '=')->class('form-control') }}
    - {!! Form::label('donation_date', 'Date') !!} - {!! Form::date('donation_date', NULL, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Date', 'donation_date') }} + {{ html()->date('donation_date')->class('form-control flatpickr-date') }}
    - {!! Form::label('donation_description', 'Description') !!} - {!! Form::select('donation_description', $descriptions, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Description', 'donation_description') }} + {{ html()->select('donation_description', $descriptions)->class('form-control') }}
    - {!! Form::label('event_id', 'Retreat') !!} - {!! Form::select('event_id', $retreats, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Retreat', 'event_id') }} + {{ html()->select('event_id', $retreats)->class('form-control') }}
    - {!! Form::label('donation_amount_operator', 'Comp.') !!} - {!! Form::select('donation_amount_operator', config('polanco.operators'), '=', ['class' => 'form-control']) !!} + {{ html()->label('Comp.', 'donation_amount_operator') }} + {{ html()->select('donation_amount_operator', config('polanco.operators'), '=')->class('form-control') }}
    - {!! Form::label('donation_amount', 'Amount') !!} - {!! Form::number('donation_amount', NULL, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Amount', 'donation_amount') }} + {{ html()->number('donation_amount')->class('form-control')->attribute('step', '0.01') }}
    - {!! Form::label('notes1', 'Primary contact for invoice') !!} - {!! Form::text('notes1', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Primary contact for invoice', 'notes1') }} + {{ html()->text('notes1')->class('form-control') }}
    - {!! Form::label('notes', 'Notes') !!} - {!! Form::text('notes', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Notes', 'notes') }} + {{ html()->text('notes')->class('form-control') }}
    - {!! Form::label('start_date_operator', 'Comp.') !!} - {!! Form::select('start_date_operator', config('polanco.operators'), '=', ['class' => 'form-control']) !!} + {{ html()->label('Comp.', 'start_date_operator') }} + {{ html()->select('start_date_operator', config('polanco.operators'), '=')->class('form-control') }}
    - {!! Form::label('start_date', 'Start date') !!} - {!! Form::date('start_date', NULL, ['class' => 'form-control flatpickr-date']) !!} + {{ html()->label('Start date', 'start_date') }} + {{ html()->date('start_date')->class('form-control flatpickr-date') }}
    - {!! Form::label('end_date_operator', 'Comp.') !!} - {!! Form::select('end_date_operator', config('polanco.operators'), '=', ['class' => 'form-control']) !!} + {{ html()->label('Comp.', 'end_date_operator') }} + {{ html()->select('end_date_operator', config('polanco.operators'), '=')->class('form-control') }}
    - {!! Form::label('end_date', 'End date') !!} - {!! Form::date('end_date', NULL, ['class' => 'form-control flatpickr-date']) !!} + {{ html()->label('End date', 'end_date') }} + {{ html()->date('end_date')->class('form-control flatpickr-date') }}
    - {!! Form::label('stripe_invoice', 'Stripe Invoice #') !!} - {!! Form::text('stripe_invoice', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Stripe Invoice #', 'stripe_invoice') }} + {{ html()->text('stripe_invoice')->class('form-control') }}
    - {!! Form::label('donation_install_operator', 'Comp.') !!} - {!! Form::select('donation_install_operator', config('polanco.operators'), '=', ['class' => 'form-control']) !!} + {{ html()->label('Comp.', 'donation_install_operator') }} + {{ html()->select('donation_install_operator', config('polanco.operators'), '=')->class('form-control') }}
    - {!! Form::label('donation_install', 'Installment') !!} - {!! Form::number('donation_install', NULL, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Installment', 'donation_install') }} + {{ html()->number('donation_install')->class('form-control')->attribute('step', '0.01') }}
    - {!! Form::label('terms', 'Terms') !!} - {!! Form::text('terms', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Terms', 'terms') }} + {{ html()->text('terms')->class('form-control') }}
    - {!! Form::label('donation_thank_you', 'Thank you letter') !!} - {!! Form::select('donation_thank_you', ['' => 'N/A', 'Y' => 'Yes', 'N' => 'No'], NULL, ['class' => 'form-control']) !!} + {{ html()->label('Thank you letter', 'donation_thank_you') }} + {{ html()->select('donation_thank_you', ['' => 'N/A', 'Y' => 'Yes', 'N' => 'No'])->class('form-control') }}
    @@ -100,7 +100,7 @@
  • - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/donations/show.blade.php b/resources/views/donations/show.blade.php index 2653d1db5..fb77b7700 100644 --- a/resources/views/donations/show.blade.php +++ b/resources/views/donations/show.blade.php @@ -11,16 +11,16 @@ @endCan for {!!$donation->contact->contact_link_full_name!!} - {!! Html::link(action([\App\Http\Controllers\PageController::class, 'finance_invoice'],$donation->donation_id),'Invoice',array('class' => 'm-1 btn btn-outline-dark'))!!} + {{ html()->a(url(action([\App\Http\Controllers\PageController::class, 'finance_invoice'], $donation->donation_id)), 'Invoice')->class('m-1 btn btn-outline-dark') }} @can('create-payment') donation_id) }} class="m-1 btn btn-outline-dark">Add payment @endCan @if (in_array($donation->donation_description, config('polanco.agc_donation_descriptions')) ) @if(isset($donation['Thank You'])) - {!! Html::link(action([\App\Http\Controllers\PageController::class, 'finance_agc_acknowledge'],$donation->donation_id),"Reprint AGC acknowledgement",array('class' => 'm-1 btn btn-outline-dark')) !!} + {{ html()->a(url(action([\App\Http\Controllers\PageController::class, 'finance_agc_acknowledge'], $donation->donation_id)), "Reprint AGC acknowledgement")->class('m-1 btn btn-outline-dark') }} @else @if ($donation->percent_paid >= 100) - {!! Html::link(action([\App\Http\Controllers\PageController::class, 'finance_agc_acknowledge'],$donation->donation_id),"Print AGC acknowledgement",array('class' => 'm-1 btn btn-outline-dark')) !!} + {{ html()->a(url(action([\App\Http\Controllers\PageController::class, 'finance_agc_acknowledge'], $donation->donation_id)), "Print AGC acknowledgement")->class('m-1 btn btn-outline-dark') }} @else
    AGC awaiting full payment
    @endIf @@ -96,14 +96,14 @@
    @can('delete-donation') - {!! Form::open(['method' => 'DELETE', 'route' => ['donation.destroy', $donation->donation_id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'm-1 btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('donation.destroy', [$donation->donation_id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'm-1 btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
    diff --git a/resources/views/donors/create.blade.php b/resources/views/donors/create.blade.php index 64dc18f55..dcd266683 100644 --- a/resources/views/donors/create.blade.php +++ b/resources/views/donors/create.blade.php @@ -4,37 +4,37 @@

    Create Group

    - {!! Form::open(['url' => 'group', 'method' => 'post', 'class' => 'form-horizontal panel']) !!} + {{ html()->form('POST', 'group')->class('form-horizontal panel')->open() }}
    - {!! Form::label('name', 'Name:', ['class' => 'col-md-3']) !!} + {{ html()->label('Name:', 'name')->class('col-md-3') }} - {!! Form::text('name', null, ['class' => 'col-md-3']) !!} + {{ html()->text('name')->class('col-md-3') }}
    - {!! Form::label('title', 'Title:', ['class' => 'col-md-3']) !!} + {{ html()->label('Title:', 'title')->class('col-md-3') }} - {!! Form::text('title', null, ['class' => 'col-md-3']) !!} + {{ html()->text('title')->class('col-md-3') }}
    - {!! Form::label('description', 'Description:', ['class' => 'col-md-3']) !!} - {!! Form::textarea('description', NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Description:', 'description')->class('col-md-3') }} + {{ html()->textarea('description')->class('col-md-3') }}
    - {!! Form::label('is_active', 'Active:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_active', 1, false,['class' => 'col-md-1']) !!} - {!! Form::label('is_hidden', 'Hidden:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_hidden', 0, false,['class' => 'col-md-1']) !!} - {!! Form::label('is_reserved', 'Reserved:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_reserved', 0, false,['class' => 'col-md-1']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-1') }} + {{ html()->checkbox('is_active', false, 1)->class('col-md-1') }} + {{ html()->label('Hidden:', 'is_hidden')->class('col-md-1') }} + {{ html()->checkbox('is_hidden', false, 0)->class('col-md-1') }} + {{ html()->label('Reserved:', 'is_reserved')->class('col-md-1') }} + {{ html()->checkbox('is_reserved', false, 0)->class('col-md-1') }}
    - {!! Form::submit('Add Group', ['class'=>'btn btn-primary']) !!} + {{ html()->submit('Add Group')->class('btn btn-primary') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    diff --git a/resources/views/donors/edit.blade.php b/resources/views/donors/edit.blade.php index 50f073580..a6a4bdba8 100644 --- a/resources/views/donors/edit.blade.php +++ b/resources/views/donors/edit.blade.php @@ -5,32 +5,32 @@

    Edit Group:

    - {!! Form::open(['method' => 'PUT', 'route' => ['group.update', $group->id]]) !!} - {!! Form::hidden('id', $group->id) !!} + {{ html()->form('PUT', route('group.update', [$group->id]))->open() }} + {{ html()->hidden('id', $group->id) }}

    Group details

    - {!! Form::label('name', 'Name:', ['class' => 'col-md-3']) !!} + {{ html()->label('Name:', 'name')->class('col-md-3') }} - {!! Form::text('name', $group->name, ['class' => 'col-md-3']) !!} + {{ html()->text('name', $group->name)->class('col-md-3') }}
    - {!! Form::label('title', 'Title:', ['class' => 'col-md-3']) !!} + {{ html()->label('Title:', 'title')->class('col-md-3') }} - {!! Form::text('title', $group->title, ['class' => 'col-md-3']) !!} + {{ html()->text('title', $group->title)->class('col-md-3') }}
    - {!! Form::label('description', 'Description:', ['class' => 'col-md-3']) !!} - {!! Form::textarea('description', $group->description, ['class' => 'col-md-3']) !!} + {{ html()->label('Description:', 'description')->class('col-md-3') }} + {{ html()->textarea('description', $group->description)->class('col-md-3') }}
    - {!! Form::label('is_active', 'Active:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_active', 1, $group->is_active, ['class' => 'col-md-1']) !!} - {!! Form::label('is_hidden', 'Hidden:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_hidden', 1, $group->is_hidden, ['class' => 'col-md-1']) !!} - {!! Form::label('is_reserved', 'Reserved:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_reserved', 1, $group->is_reserved, ['class' => 'col-md-1']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-1') }} + {{ html()->checkbox('is_active', $group->is_active, 1)->class('col-md-1') }} + {{ html()->label('Hidden:', 'is_hidden')->class('col-md-1') }} + {{ html()->checkbox('is_hidden', $group->is_hidden, 1)->class('col-md-1') }} + {{ html()->label('Reserved:', 'is_reserved')->class('col-md-1') }} + {{ html()->checkbox('is_reserved', $group->is_reserved, 1)->class('col-md-1') }}
    @@ -39,8 +39,8 @@
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-primary']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-primary']) }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop \ No newline at end of file diff --git a/resources/views/donors/index.blade.php b/resources/views/donors/index.blade.php index 23b00f363..629d04416 100644 --- a/resources/views/donors/index.blade.php +++ b/resources/views/donors/index.blade.php @@ -12,7 +12,7 @@ @can('create-donor') - {!! Html::image('images/create.png', 'Add Donor',array('title'=>"Add Donor",'class' => 'btn btn-primary')) !!} + {{ html()->img('images/create.png', 'Add Donor')->attribute('title', "Add Donor")->class('btn btn-primary') }} diff --git a/resources/views/donors/show.blade.php b/resources/views/donors/show.blade.php index ccaecbc7d..b5be10dc6 100644 --- a/resources/views/donors/show.blade.php +++ b/resources/views/donors/show.blade.php @@ -8,7 +8,7 @@

    @can('update-donor') - {!! Html::link(url('donor/'.$donor->donor_id.'/edit'),$donor->sort_name) !!} + {{ html()->a(url(url('donor/' . $donor->donor_id . '/edit')), $donor->sort_name) }} @else {{$donor->name}} group @endCan diff --git a/resources/views/errors/403.blade.php b/resources/views/errors/403.blade.php index 04d0c6555..17ecbf068 100644 --- a/resources/views/errors/403.blade.php +++ b/resources/views/errors/403.blade.php @@ -3,7 +3,7 @@
    Oops! 403 - Looks like you do not have access to this page.
    - {!! Html::image('images/403.png', '403 Error',array('title'=>"403 Error")) !!} + {{ html()->img('images/403.png', '403 Error')->attribute('title', "403 Error") }}
    diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index 639adf981..ef6ec4a9f 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -3,7 +3,7 @@
    Oops! 404 - I'm confused, what you are looking for cannot be found.
    - {!! Html::image('images/404.png', '404 Error',array('title'=>"404 Error")) !!} + {{ html()->img('images/404.png', '404 Error')->attribute('title', "404 Error") }}
    diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php index d63472a41..2ac9a8755 100644 --- a/resources/views/errors/500.blade.php +++ b/resources/views/errors/500.blade.php @@ -5,7 +5,7 @@
    Oops! Looks like {{config('polanco.admin_name')}} is using the SQL to corrupt Polanco.
    - {!! Html::image('images/error.png', 'System Error',array('title'=>"System Error")) !!} + {{ html()->img('images/error.png', 'System Error')->attribute('title', "System Error") }}

    A report of this error has been submitted to {{config('polanco.admin_name')}} who will hunt down the error and destroy it.

    diff --git a/resources/views/gift_certificates/create.blade.php b/resources/views/gift_certificates/create.blade.php index 0007d8079..a03f2a511 100644 --- a/resources/views/gift_certificates/create.blade.php +++ b/resources/views/gift_certificates/create.blade.php @@ -36,7 +36,7 @@
    - {!! Form::open(['url'=>'gift_certificate', 'method'=>'post', 'enctype'=>'multipart/form-data']) !!} + {{ html()->form('POST', 'gift_certificate')->acceptsFiles()->open() }}

    Info

    @@ -44,8 +44,8 @@ @if (!isset($purchasers))
    - {!! Form::label('purchaser_name', 'Name of Purchaser:') !!} - {!! Form::text('purchaser_name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Name of Purchaser:', 'purchaser_name') }} + {{ html()->text('purchaser_name')->class('form-control') }}
    @else
    @@ -53,8 +53,8 @@ @if (!isset($recipients))
    - {!! Form::label('recipient_name', 'Name of Recipient:') !!} - {!! Form::text('recipient_name', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Name of Recipient:', 'recipient_name') }} + {{ html()->text('recipient_name')->class('form-control') }}
    @else
    @@ -63,7 +63,7 @@ @if (!isset($purchasers) || !isset($recipients))

    - {!! Form::submit('Retrieve Purchasers and Recipients', ['class'=>'text-wrap btn btn-md btn-outline-dark']) !!} + {{ html()->submit('Retrieve Purchasers and Recipients')->class('text-wrap btn btn-md btn-outline-dark') }}
    @endif
    @@ -71,30 +71,30 @@
    @if (isset($purchasers)) - {!! Form::label('purchaser_id', 'Purchaser:') !!} - {!! Form::select('purchaser_id', $purchasers, null, ['class' => 'form-control']) !!} - {!! Form::hidden('purchaser_name', str_replace(" (Add New Person)","", $purchasers[0])) !!} + {{ html()->label('Purchaser:', 'purchaser_id') }} + {{ html()->select('purchaser_id', $purchasers)->class('form-control') }} + {{ html()->hidden('purchaser_name', str_replace(" (Add New Person)", "", $purchasers[0])) }} @endif
    @if (isset($recipients)) - {!! Form::label('recipient_id', 'Recipient:') !!} - {!! Form::select('recipient_id', $recipients, null, ['class' => 'form-control']) !!} - {!! Form::hidden('recipient_name', str_replace(" (Add New Person)","", $recipients[0])) !!} + {{ html()->label('Recipient:', 'recipient_id') }} + {{ html()->select('recipient_id', $recipients)->class('form-control') }} + {{ html()->hidden('recipient_name', str_replace(" (Add New Person)", "", $recipients[0])) }} @endIf
    - {!! Form::label('squarespace_order_number', 'Squarespace Order #:') !!} - {!! Form::number('squarespace_order_number', null, ['class' => 'form-control']) !!} + {{ html()->label('Squarespace Order #:', 'squarespace_order_number') }} + {{ html()->number('squarespace_order_number')->class('form-control') }}
    - {!! Form::label('sequential_number', 'Sequential #:') !!} - {!! Form::number('sequential_number', null, ['class' => 'form-control']) !!} + {{ html()->label('Sequential #:', 'sequential_number') }} + {{ html()->number('sequential_number')->class('form-control') }}
    @@ -103,17 +103,17 @@

    Dates

    - {!! Form::label('purchase_date', 'Scheduled:') !!} - {!! Form::date('purchase_date', now(), ['class'=>'form-control flatpickr-date-time', 'autocomplete'=> 'off']) !!} + {{ html()->label('Scheduled:', 'purchase_date') }} + {{ html()->date('purchase_date', now())->class('form-control flatpickr-date-time')->attribute('autocomplete', 'off') }}
    - {!! Form::label('issue_date', 'Issued:') !!} - {!! Form::date('issue_date', now(), ['class'=>'form-control flatpickr-date-time', 'autocomplete'=> 'off']) !!} + {{ html()->label('Issued:', 'issue_date') }} + {{ html()->date('issue_date', now())->class('form-control flatpickr-date-time')->attribute('autocomplete', 'off') }}
    - {!! Form::label('expiration_date', 'Expiration:') !!} - {!! Form::date('expiration_date', \Carbon\Carbon::now()->addYear()->addDay(), ['class'=>'form-control flatpickr-date-time', 'autocomplete'=> 'off']) !!} + {{ html()->label('Expiration:', 'expiration_date') }} + {{ html()->date('expiration_date', \Carbon\Carbon::now()->addYear()->addDay())->class('form-control flatpickr-date-time')->attribute('autocomplete', 'off') }}
    @@ -122,16 +122,16 @@

    Funding

    - {!! Form::label('funded_amount', 'Funded amount:') !!} - {!! Form::number('funded_amount', 0, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Funded amount:', 'funded_amount') }} + {{ html()->number('funded_amount', 0)->class('form-control')->attribute('step', '0.01') }}
    - {!! Form::label('donation_id', 'Donation ID:') !!} - {!! Form::number('donation_id', null, ['class' => 'form-control']) !!} + {{ html()->label('Donation ID:', 'donation_id') }} + {{ html()->number('donation_id')->class('form-control') }}
    - {!! Form::label('participant_id', 'Participant ID:') !!} - {!! Form::number('participant_id', null, ['class' => 'form-control']) !!} + {{ html()->label('Participant ID:', 'participant_id') }} + {{ html()->number('participant_id')->class('form-control') }}
    @@ -140,12 +140,12 @@

    Notes

    - {!! Form::label('notes', 'Notes:') !!} - {!! Form::textarea('notes', NULL, ['class' => 'form-control', 'rows' => 2]) !!} + {{ html()->label('Notes:', 'notes') }} + {{ html()->textarea('notes')->class('form-control')->rows(2) }}
    - {!! Form::label('retreat_type', 'Retreat type:') !!} - {!! Form::text('retreat_type', NULL , ['class' => 'form-control']) !!} + {{ html()->label('Retreat type:', 'retreat_type') }} + {{ html()->text('retreat_type')->class('form-control') }}
    @@ -153,10 +153,10 @@
    - {!! Form::submit('Add Gift Certificate', ['class'=>'text-wrap btn btn-md btn-outline-dark']) !!} + {{ html()->submit('Add Gift Certificate')->class('text-wrap btn btn-md btn-outline-dark') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }} @stop diff --git a/resources/views/gift_certificates/edit.blade.php b/resources/views/gift_certificates/edit.blade.php index cfb6ce96a..f3c52cc96 100644 --- a/resources/views/gift_certificates/edit.blade.php +++ b/resources/views/gift_certificates/edit.blade.php @@ -5,31 +5,31 @@

    Edit Gift Certificate #{{$gift_certificate->certificate_number}}

    - {!! Form::open(['method' => 'PUT', 'route' => ['gift_certificate.update', $gift_certificate->id],'enctype'=>'multipart/form-data']) !!} - {!! Form::hidden('id', $gift_certificate->id) !!} + {{ html()->form('PUT', route('gift_certificate.update', [$gift_certificate->id]))->acceptsFiles()->open() }} + {{ html()->hidden('id', $gift_certificate->id) }}

    Info

    - {!! Form::label('purchaser_id', 'Purchaser ID:') !!} {!!$gift_certificate->purchaser?->contact_link_full_name !!} - {!! Form::number('purchaser_id', $gift_certificate->purchaser_id, ['class' => 'form-control']) !!} + {{ html()->label('Purchaser ID:', 'purchaser_id') }} {!!$gift_certificate->purchaser?->contact_link_full_name !!} + {{ html()->number('purchaser_id', $gift_certificate->purchaser_id)->class('form-control') }}
    - {!! Form::label('recipient_id', 'Recipient ID:') !!} {!!$gift_certificate->recipient?->contact_link_full_name !!} - {!! Form::number('recipient_id', $gift_certificate->recipient_id, ['class' => 'form-control']) !!} + {{ html()->label('Recipient ID:', 'recipient_id') }} {!!$gift_certificate->recipient?->contact_link_full_name !!} + {{ html()->number('recipient_id', $gift_certificate->recipient_id)->class('form-control') }}
    - {!! Form::label('squarespace_order_number', 'Squarespace Order #:') !!} - {!! Form::number('squarespace_order_number', $gift_certificate->squarespace_order_number, ['class' => 'form-control']) !!} + {{ html()->label('Squarespace Order #:', 'squarespace_order_number') }} + {{ html()->number('squarespace_order_number', $gift_certificate->squarespace_order_number)->class('form-control') }}
    - {!! Form::label('sequential_number', 'Sequential #:') !!} - {!! Form::number('sequential_number', $gift_certificate->sequential_number, ['class' => 'form-control']) !!} + {{ html()->label('Sequential #:', 'sequential_number') }} + {{ html()->number('sequential_number', $gift_certificate->sequential_number)->class('form-control') }}
    @@ -39,17 +39,17 @@

    Dates

    - {!! Form::label('purchase_date', 'Purchased:') !!} - {!! Form::date('purchase_date', $gift_certificate->purchase_date, ['class'=>'form-control flatpickr-date-time bg-white', 'autocomplete'=> 'off']) !!} + {{ html()->label('Purchased:', 'purchase_date') }} + {{ html()->date('purchase_date', $gift_certificate->purchase_date)->class('form-control flatpickr-date-time bg-white')->attribute('autocomplete', 'off') }}
    - {!! Form::label('issue_date', 'Issued:') !!} - {!! Form::date('issue_date', $gift_certificate->issue_date, ['class'=>'form-control flatpickr-date-time bg-white', 'autocomplete'=> 'off']) !!} + {{ html()->label('Issued:', 'issue_date') }} + {{ html()->date('issue_date', $gift_certificate->issue_date)->class('form-control flatpickr-date-time bg-white')->attribute('autocomplete', 'off') }}
    - {!! Form::label('expiration_date', 'Expiration:') !!} - {!! Form::date('expiration_date', $gift_certificate->expiration_date, ['class'=>'form-control flatpickr-date-time bg-white', 'autocomplete'=> 'off']) !!} + {{ html()->label('Expiration:', 'expiration_date') }} + {{ html()->date('expiration_date', $gift_certificate->expiration_date)->class('form-control flatpickr-date-time bg-white')->attribute('autocomplete', 'off') }}
    @@ -58,16 +58,16 @@

    Funding

    - {!! Form::label('funded_amount', 'Funded amount:') !!} - {!! Form::number('funded_amount', $gift_certificate->funded_amount, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Funded amount:', 'funded_amount') }} + {{ html()->number('funded_amount', $gift_certificate->funded_amount)->class('form-control')->attribute('step', '0.01') }}
    - {!! Form::label('donation_id', 'Donation ID:') !!} - {!! Form::number('donation_id', $gift_certificate->donation_id, ['class' => 'form-control']) !!} + {{ html()->label('Donation ID:', 'donation_id') }} + {{ html()->number('donation_id', $gift_certificate->donation_id)->class('form-control') }}
    - {!! Form::label('participant_id', 'Participant ID:') !!} - {!! Form::number('participant_id', $gift_certificate->participant_id, ['class' => 'form-control']) !!} + {{ html()->label('Participant ID:', 'participant_id') }} + {{ html()->number('participant_id', $gift_certificate->participant_id)->class('form-control') }}
    @@ -76,12 +76,12 @@

    Notes

    - {!! Form::label('retreat_type', 'Retreat type:') !!} - {!! Form::text('retreat_type', $gift_certificate->retreat_type , ['class' => 'form-control']) !!} + {{ html()->label('Retreat type:', 'retreat_type') }} + {{ html()->text('retreat_type', $gift_certificate->retreat_type)->class('form-control') }}
    - {!! Form::label('notes', 'Notes:') !!} - {!! Form::textarea('notes', $gift_certificate->notes, ['class' => 'form-control', 'rows' => 1]) !!} + {{ html()->label('Notes:', 'notes') }} + {{ html()->textarea('notes', $gift_certificate->notes)->class('form-control')->rows(1) }}
    @@ -90,10 +90,10 @@
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
    - {!! Form::close() !!} + {{ html()->form()->close() }} diff --git a/resources/views/gift_certificates/show.blade.php b/resources/views/gift_certificates/show.blade.php index a46229d58..b989fd54d 100644 --- a/resources/views/gift_certificates/show.blade.php +++ b/resources/views/gift_certificates/show.blade.php @@ -56,14 +56,14 @@
    @can('delete-asset') - {!! Form::open(['method' => 'DELETE', 'route' => ['gift_certificate.destroy', $gift_certificate->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('gift_certificate.destroy', [$gift_certificate->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
    diff --git a/resources/views/groups/create.blade.php b/resources/views/groups/create.blade.php index 8308f7ea5..ee42da43c 100644 --- a/resources/views/groups/create.blade.php +++ b/resources/views/groups/create.blade.php @@ -4,37 +4,37 @@

    Create Group

    - {!! Form::open(['url' => 'group', 'method' => 'post', 'class' => 'form-horizontal panel']) !!} + {{ html()->form('POST', 'group')->class('form-horizontal panel')->open() }}
    - {!! Form::label('name', 'Name:', ['class' => 'col-md-3']) !!} + {{ html()->label('Name:', 'name')->class('col-md-3') }} - {!! Form::text('name', null, ['class' => 'col-md-3']) !!} + {{ html()->text('name')->class('col-md-3') }}
    - {!! Form::label('title', 'Title:', ['class' => 'col-md-3']) !!} + {{ html()->label('Title:', 'title')->class('col-md-3') }} - {!! Form::text('title', null, ['class' => 'col-md-3']) !!} + {{ html()->text('title')->class('col-md-3') }}
    - {!! Form::label('description', 'Description:', ['class' => 'col-md-3']) !!} - {!! Form::textarea('description', NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Description:', 'description')->class('col-md-3') }} + {{ html()->textarea('description')->class('col-md-3') }}
    - {!! Form::label('is_active', 'Active:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_active', 1, true,['class' => 'col-md-1']) !!} - {!! Form::label('is_hidden', 'Hidden:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_hidden', 0, false,['class' => 'col-md-1']) !!} - {!! Form::label('is_reserved', 'Reserved:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_reserved', 0, false,['class' => 'col-md-1']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-1') }} + {{ html()->checkbox('is_active', true, 1)->class('col-md-1') }} + {{ html()->label('Hidden:', 'is_hidden')->class('col-md-1') }} + {{ html()->checkbox('is_hidden', false, 0)->class('col-md-1') }} + {{ html()->label('Reserved:', 'is_reserved')->class('col-md-1') }} + {{ html()->checkbox('is_reserved', false, 0)->class('col-md-1') }}
    - {!! Form::submit('Add Group', ['class'=>'btn btn-primary']) !!} + {{ html()->submit('Add Group')->class('btn btn-primary') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php index 50f073580..a6a4bdba8 100644 --- a/resources/views/groups/edit.blade.php +++ b/resources/views/groups/edit.blade.php @@ -5,32 +5,32 @@

    Edit Group:

    - {!! Form::open(['method' => 'PUT', 'route' => ['group.update', $group->id]]) !!} - {!! Form::hidden('id', $group->id) !!} + {{ html()->form('PUT', route('group.update', [$group->id]))->open() }} + {{ html()->hidden('id', $group->id) }}

    Group details

    - {!! Form::label('name', 'Name:', ['class' => 'col-md-3']) !!} + {{ html()->label('Name:', 'name')->class('col-md-3') }} - {!! Form::text('name', $group->name, ['class' => 'col-md-3']) !!} + {{ html()->text('name', $group->name)->class('col-md-3') }}
    - {!! Form::label('title', 'Title:', ['class' => 'col-md-3']) !!} + {{ html()->label('Title:', 'title')->class('col-md-3') }} - {!! Form::text('title', $group->title, ['class' => 'col-md-3']) !!} + {{ html()->text('title', $group->title)->class('col-md-3') }}
    - {!! Form::label('description', 'Description:', ['class' => 'col-md-3']) !!} - {!! Form::textarea('description', $group->description, ['class' => 'col-md-3']) !!} + {{ html()->label('Description:', 'description')->class('col-md-3') }} + {{ html()->textarea('description', $group->description)->class('col-md-3') }}
    - {!! Form::label('is_active', 'Active:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_active', 1, $group->is_active, ['class' => 'col-md-1']) !!} - {!! Form::label('is_hidden', 'Hidden:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_hidden', 1, $group->is_hidden, ['class' => 'col-md-1']) !!} - {!! Form::label('is_reserved', 'Reserved:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_reserved', 1, $group->is_reserved, ['class' => 'col-md-1']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-1') }} + {{ html()->checkbox('is_active', $group->is_active, 1)->class('col-md-1') }} + {{ html()->label('Hidden:', 'is_hidden')->class('col-md-1') }} + {{ html()->checkbox('is_hidden', $group->is_hidden, 1)->class('col-md-1') }} + {{ html()->label('Reserved:', 'is_reserved')->class('col-md-1') }} + {{ html()->checkbox('is_reserved', $group->is_reserved, 1)->class('col-md-1') }}
    @@ -39,8 +39,8 @@
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-primary']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-primary']) }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop \ No newline at end of file diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php index 52330fe2b..96e6b6b57 100644 --- a/resources/views/groups/index.blade.php +++ b/resources/views/groups/index.blade.php @@ -10,7 +10,7 @@ @can('create-group') - {!! Html::image('images/create.png', 'Add Group',array('title'=>"Add Group",'class' => 'btn btn-primary')) !!} + {{ html()->img('images/create.png', 'Add Group')->attribute('title', "Add Group")->class('btn btn-primary') }} diff --git a/resources/views/groups/show.blade.php b/resources/views/groups/show.blade.php index 8226880c8..d86667699 100644 --- a/resources/views/groups/show.blade.php +++ b/resources/views/groups/show.blade.php @@ -8,7 +8,7 @@

    @can('update-group') - {!! Html::link(url('group/'.$group->id.'/edit'),$group->name.' group') !!} + {{ html()->a(url(url('group/' . $group->id . '/edit')), $group->name . ' group') }} @else {{$group->name}} group @endCan @@ -57,14 +57,14 @@
    @can('update-group') @endCan @can('delete-group')
    - {!! Form::open(['method' => 'DELETE', 'route' => ['group.destroy', $group->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('group.destroy', [$group->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }}
    @endCan
    diff --git a/resources/views/mailgun/show.blade.php b/resources/views/mailgun/show.blade.php index 019559c78..3a7ef7e56 100644 --- a/resources/views/mailgun/show.blade.php +++ b/resources/views/mailgun/show.blade.php @@ -10,7 +10,7 @@ Mailgun Message Details for #{{$message->id}} - {{ $message->subject }}

    - {!! Html::image('images/news29.png', 'Message Index',array('title'=>"Message Index",'class' => 'btn btn-primary')) !!} + {{ html()->img('images/news29.png', 'Message Index')->attribute('title', "Message Index")->class('btn btn-primary') }}
    Timestamp: {{ $message->mailgun_timestamp}}
    @@ -34,14 +34,14 @@
    @can('update-message') @endCan @can('delete-message')
    - {!! Form::open(['method' => 'DELETE', 'route' => ['mailgun.destroy', $message->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('mailgun.destroy', [$message->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }}
    @endCan
    diff --git a/resources/views/offeringdedup/show.blade.php b/resources/views/offeringdedup/show.blade.php index 9ab92870c..6408a8df1 100644 --- a/resources/views/offeringdedup/show.blade.php +++ b/resources/views/offeringdedup/show.blade.php @@ -8,7 +8,7 @@

    Offering Dedup Details for {{$combo}}
    - {!! Html::link(action([\App\Http\Controllers\SystemController::class, 'offeringdedup_index']),'Offering Dedup Index',array('class' => 'btn btn-outline-dark'))!!} + {{ html()->a(url(action([\App\Http\Controllers\SystemController::class, 'offeringdedup_index'])), 'Offering Dedup Index')->class('btn btn-outline-dark') }}


    diff --git a/resources/views/organizations/create.blade.php b/resources/views/organizations/create.blade.php index 2e7ab7750..abb6653c3 100644 --- a/resources/views/organizations/create.blade.php +++ b/resources/views/organizations/create.blade.php @@ -6,60 +6,60 @@

    Add an Organization

    - {!! Form::open(['url' => 'organization', 'method' => 'post']) !!} + {{ html()->form('POST', 'organization')->open() }}
    - {!! Form::label('subcontact_type', 'Type') !!} - {!! Form::select('subcontact_type', $subcontact_types, 0, ['class' => 'form-control']) !!} + {{ html()->label('Type', 'subcontact_type') }} + {{ html()->select('subcontact_type', $subcontact_types, 0)->class('form-control') }}
    - {!! Form::label('organization_name', 'Name') !!} - {!! Form::text('organization_name', null, ['class'=>'form-control']) !!} + {{ html()->label('Name', 'organization_name') }} + {{ html()->text('organization_name')->class('form-control') }}
    - {!! Form::label('street_address', 'Address Line 1') !!} - {!! Form::text('street_address', null, ['class'=>'form-control']) !!} + {{ html()->label('Address Line 1', 'street_address') }} + {{ html()->text('street_address')->class('form-control') }}
    - {!! Form::label('supplemental_address_1', 'Address Line 2') !!} - {!! Form::text('supplemental_address_1', null, ['class'=>'form-control']) !!} + {{ html()->label('Address Line 2', 'supplemental_address_1') }} + {{ html()->text('supplemental_address_1')->class('form-control') }}
    - {!! Form::label('city', 'City') !!} - {!! Form::text('city', null, ['class'=>'form-control']) !!} + {{ html()->label('City', 'city') }} + {{ html()->text('city')->class('form-control') }}
    - {!! Form::label('state_province_id', 'State') !!} - {!! Form::select('state_province_id', $states, $defaults['state_province_id'], ['class' => 'form-control']) !!} + {{ html()->label('State', 'state_province_id') }} + {{ html()->select('state_province_id', $states, $defaults['state_province_id'])->class('form-control') }}
    - {!! Form::label('postal_code', 'Zip') !!} - {!! Form::text('postal_code', null, ['class'=>'form-control']) !!} + {{ html()->label('Zip', 'postal_code') }} + {{ html()->text('postal_code')->class('form-control') }}
    - {!! Form::label('phone_main_phone', 'Phone') !!} - {!! Form::text('phone_main_phone', null, ['class'=>'form-control']) !!} + {{ html()->label('Phone', 'phone_main_phone') }} + {{ html()->text('phone_main_phone')->class('form-control') }}
    - {!! Form::label('phone_main_fax', 'Fax') !!} - {!! Form::text('phone_main_fax', null, ['class'=>'form-control']) !!} + {{ html()->label('Fax', 'phone_main_fax') }} + {{ html()->text('phone_main_fax')->class('form-control') }}
    - {!! Form::label('email_main', 'Email') !!} - {!! Form::text('email_main', null, ['class'=>'form-control']) !!} + {{ html()->label('Email', 'email_main') }} + {{ html()->text('email_main')->class('form-control') }}
    - {!! Form::label('note', 'Notes') !!} - {!! Form::textarea('note', null, ['class'=>'form-control', 'rows'=>'3']) !!} + {{ html()->label('Notes', 'note') }} + {{ html()->textarea('note')->class('form-control')->rows('3') }}
    @@ -73,10 +73,10 @@
    - {!! Form::submit('Add Organization', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add Organization')->class('btn btn-outline-dark') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop \ No newline at end of file diff --git a/resources/views/organizations/create/urls.blade.php b/resources/views/organizations/create/urls.blade.php index 40b5401fa..4c66c82aa 100644 --- a/resources/views/organizations/create/urls.blade.php +++ b/resources/views/organizations/create/urls.blade.php @@ -41,56 +41,56 @@
    - {!! Form::label('url_main', 'Personal (main):') !!} - {!! Form::text('url_main', null, ['class' => 'form-control']) !!} + {{ html()->label('Personal (main):', 'url_main') }} + {{ html()->text('url_main')->class('form-control') }}
    - {!! Form::label('url_work', 'Work:') !!} - {!! Form::text('url_work', null, ['class' => 'form-control']) !!} + {{ html()->label('Work:', 'url_work') }} + {{ html()->text('url_work')->class('form-control') }}
    - {!! Form::label('url_facebook', 'Facebook:') !!} - {!! Form::text('url_facebook', null, ['class' => 'form-control']) !!} + {{ html()->label('Facebook:', 'url_facebook') }} + {{ html()->text('url_facebook')->class('form-control') }}
    - {!! Form::label('url_google', 'Google+:') !!} - {!! Form::text('url_google', null, ['class' => 'form-control']) !!} + {{ html()->label('Google+:', 'url_google') }} + {{ html()->text('url_google')->class('form-control') }}
    - {!! Form::label('url_instagram', 'Instagram:') !!} - {!! Form::text('url_instagram', null, ['class' => 'form-control']) !!} + {{ html()->label('Instagram:', 'url_instagram') }} + {{ html()->text('url_instagram')->class('form-control') }}
    - {!! Form::label('url_linkedin', 'LinkedIn:') !!} - {!! Form::text('url_linkedin', null, ['class' => 'form-control']) !!} + {{ html()->label('LinkedIn:', 'url_linkedin') }} + {{ html()->text('url_linkedin')->class('form-control') }}
    - {!! Form::label('url_twitter', 'Twitter:') !!} - {!! Form::text('url_twitter', null, ['class' => 'form-control']) !!} + {{ html()->label('Twitter:', 'url_twitter') }} + {{ html()->text('url_twitter')->class('form-control') }}
    diff --git a/resources/views/organizations/edit.blade.php b/resources/views/organizations/edit.blade.php index c501469c6..5c2878896 100644 --- a/resources/views/organizations/edit.blade.php +++ b/resources/views/organizations/edit.blade.php @@ -7,11 +7,11 @@

    Edit: {{ $organization->organization_name }}

    - {!! Form::open(['method' => 'PUT', 'files'=>'true', 'route' => ['organization.update', $organization->id]]) !!} - {!! Form::hidden('id', $organization->id) !!} + {{ html()->form('PUT', route('organization.update', [$organization->id]))->acceptsFiles()->open() }} + {{ html()->hidden('id', $organization->id) }}
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
    @@ -20,20 +20,20 @@
    - {!! Form::label('organization_name', 'Name') !!} - {!! Form::text('organization_name', $organization->organization_name, ['class' => 'form-control']) !!} + {{ html()->label('Name', 'organization_name') }} + {{ html()->text('organization_name', $organization->organization_name)->class('form-control') }}
    - {!! Form::label('subcontact_type', 'Subcontact type') !!} - {!! Form::select('subcontact_type', $subcontact_types, $organization->subcontact_type, ['class' => 'form-control']) !!} + {{ html()->label('Subcontact type', 'subcontact_type') }} + {{ html()->select('subcontact_type', $subcontact_types, $organization->subcontact_type)->class('form-control') }}
    - {!! Form::label('display_name', 'Display Name') !!} - {!! Form::text('display_name', $organization->display_name, ['class' => 'form-control']) !!} + {{ html()->label('Display Name', 'display_name') }} + {{ html()->text('display_name', $organization->display_name)->class('form-control') }}
    - {!! Form::label('sort_name', 'Sort Name') !!} - {!! Form::text('sort_name', $organization->sort_name, ['class' => 'form-control']) !!} + {{ html()->label('Sort Name', 'sort_name') }} + {{ html()->text('sort_name', $organization->sort_name)->class('form-control') }}
    @@ -43,26 +43,26 @@
    - {!! Form::label('street_address', 'Address Line 1') !!} - {!! Form::text('street_address', $organization->address_primary_street, ['class' => 'form-control']) !!} + {{ html()->label('Address Line 1', 'street_address') }} + {{ html()->text('street_address', $organization->address_primary_street)->class('form-control') }}
    - {!! Form::label('supplemental_address_1', 'Address Line 2') !!} - {!! Form::text('supplemental_address_1', $organization->address_primary_supplemental_address, ['class' => 'form-control']) !!} + {{ html()->label('Address Line 2', 'supplemental_address_1') }} + {{ html()->text('supplemental_address_1', $organization->address_primary_supplemental_address)->class('form-control') }}
    - {!! Form::label('city', 'City') !!} - {!! Form::text('city', $organization->address_primary_city, ['class' => 'form-control']) !!} + {{ html()->label('City', 'city') }} + {{ html()->text('city', $organization->address_primary_city)->class('form-control') }}
    - {!! Form::label('state_province_id', 'State') !!} - {!! Form::select('state_province_id', $states, $organization->address_primary_state_id, ['class' => 'form-control']) !!} + {{ html()->label('State', 'state_province_id') }} + {{ html()->select('state_province_id', $states, $organization->address_primary_state_id)->class('form-control') }}
    - {!! Form::label('postal_code', 'Zip') !!} - {!! Form::text('postal_code', $organization->address_primary_postal_code, ['class' => 'form-control']) !!} + {{ html()->label('Zip', 'postal_code') }} + {{ html()->text('postal_code', $organization->address_primary_postal_code)->class('form-control') }}
    @@ -72,19 +72,19 @@
    - {!! Form::label('phone_main_phone', 'Phone') !!} - {!! Form::text('phone_main_phone', $organization->phone_main_phone_number, ['class' => 'form-control']) !!} + {{ html()->label('Phone', 'phone_main_phone') }} + {{ html()->text('phone_main_phone', $organization->phone_main_phone_number)->class('form-control') }}
    - {!! Form::label('phone_main_fax', 'Fax') !!} - {!! Form::text('phone_main_fax', $organization->phone_main_fax_number, ['class' => 'form-control']) !!} + {{ html()->label('Fax', 'phone_main_fax') }} + {{ html()->text('phone_main_fax', $organization->phone_main_fax_number)->class('form-control') }}
    - {!! Form::label('email_primary', 'Email:', ['class' => 'col-md-2']) !!} + {{ html()->label('Email:', 'email_primary')->class('col-md-2') }} @if (isset($organization->email_primary)) - {!! Form::text('email_primary', $organization->email_primary_text, ['class' => 'form-control']) !!} + {{ html()->text('email_primary', $organization->email_primary_text)->class('form-control') }} @else - {!! Form::text('email_primary', NULL, ['class' => 'form-control']) !!} + {{ html()->text('email_primary')->class('form-control') }} @endIf
    @@ -101,32 +101,32 @@
    - {!! Form::label('note', 'Notes') !!} - {!! Form::textarea('note', $organization->note_organization_text, ['class'=>'form-control', 'rows'=>'3']) !!} + {{ html()->label('Notes', 'note') }} + {{ html()->textarea('note', $organization->note_organization_text)->class('form-control')->rows('3') }}
    - {!! Form::label('avatar', 'Picture (max 5M)') !!} - {!! Form::file('avatar'); !!} + {{ html()->label('Picture (max 5M)', 'avatar') }} + {{ html()->file('avatar') }}
    @if ($organization->id == env('SELF_CONTACT_ID'))
    - {!! Form::label('signature', 'Signature (max 5M)') !!} - {!! Form::file('signature'); !!} + {{ html()->label('Signature (max 5M)', 'signature') }} + {{ html()->file('signature') }}
    @endIf
    - {!! Form::label('attachment', 'Attachment (max 10M): ', ['class' => '']) !!} - {!! Form::file('attachment'); !!} + {{ html()->label('Attachment (max 10M): ', 'attachment')->class('') }} + {{ html()->file('attachment') }}
    - {!! Form::label('attachment_description', 'Attachment Description (max 200)') !!} - {!! Form::text('attachment_description', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Attachment Description (max 200)', 'attachment_description') }} + {{ html()->text('attachment_description')->class('form-control') }}
    @@ -134,10 +134,10 @@
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/organizations/index.blade.php b/resources/views/organizations/index.blade.php index f2cc286ac..a43968d4c 100644 --- a/resources/views/organizations/index.blade.php +++ b/resources/views/organizations/index.blade.php @@ -8,7 +8,7 @@ @can('create-contact') - {!! Html::image('images/create.png', 'Create Organization',array('title'=>"Create Organization",'class' => 'btn btn-light')) !!} + {{ html()->img('images/create.png', 'Create Organization')->attribute('title', "Create Organization")->class('btn btn-light') }} @endCan diff --git a/resources/views/organizations/show.blade.php b/resources/views/organizations/show.blade.php index 0e4be4203..43e73e682 100644 --- a/resources/views/organizations/show.blade.php +++ b/resources/views/organizations/show.blade.php @@ -13,15 +13,15 @@
    - {!! Html::link('#notes','Notes',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#relationships','Relationships',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#touchpoints','Touchpoints',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#registrations','Registrations',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#attachments','Attachments',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#donations','Donations',array('class' => 'btn btn-outline-dark')) !!} + {{ html()->a(url('#notes'), 'Notes')->class('btn btn-outline-dark') }} + {{ html()->a(url('#relationships'), 'Relationships')->class('btn btn-outline-dark') }} + {{ html()->a(url('#touchpoints'), 'Touchpoints')->class('btn btn-outline-dark') }} + {{ html()->a(url('#registrations'), 'Registrations')->class('btn btn-outline-dark') }} + {{ html()->a(url('#attachments'), 'Attachments')->class('btn btn-outline-dark') }} + {{ html()->a(url('#donations'), 'Donations')->class('btn btn-outline-dark') }}
    - {!! Html::image('images/organization.png', 'Organization Index',array('title'=>"Organization Index",'class' => 'btn btn-outline-dark')) !!} + {{ html()->img('images/organization.png', 'Organization Index')->attribute('title', "Organization Index")->class('btn btn-outline-dark') }} @can('create-touchpoint') id) }}>Add Touchpoint @@ -83,10 +83,10 @@ @foreach($organization->a_relationships as $a_relationship)
  • @can('delete-relationship') - {!! Form::open(['method' => 'DELETE', 'route' => ['relationship.destroy', $a_relationship->id],'onsubmit'=>'return ConfirmDelete()']) !!} + {{ html()->form('DELETE', route('relationship.destroy', [$a_relationship->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} {!!$organization->contact_link!!} is {{ $a_relationship->relationship_type->label_a_b }} {!! $a_relationship->contact_b->contact_link !!} - {!! Form::close() !!} + {{ html()->form()->close() }} @else {!!$organization->contact_link!!} is {{ $a_relationship->relationship_type->label_a_b }} {!! $a_relationship->contact_b->contact_link !!} @endCan @@ -95,10 +95,10 @@ @foreach($organization->b_relationships as $b_relationship)
  • @can('delete-relationship') - {!! Form::open(['method' => 'DELETE', 'route' => ['relationship.destroy', $b_relationship->id],'onsubmit'=>'return ConfirmDelete()']) !!} + {{ html()->form('DELETE', route('relationship.destroy', [$b_relationship->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} {!!$organization->contact_link!!} is {{ $b_relationship->relationship_type->label_b_a }} {!! $b_relationship->contact_a->contact_link !!} - {!! Form::close() !!} + {{ html()->form()->close() }} @else {!!$organization->contact_link!!} is {{ $b_relationship->relationship_type->label_b_a }} {!! $b_relationship->contact_a->contact_link !!} @endcan @@ -107,24 +107,24 @@ @can('create-relationship')
    - {!! Form::open(['method' => 'POST', 'route' => ['relationship_type.addme']]) !!} + {{ html()->form('POST', route('relationship_type.addme', ))->open() }}
    Create a New Relationship
    - {!! Form::label('relationship_type_name', 'Relationship: ', ['class' => 'font-weight-bold']) !!} - {!! Form::select('relationship_type_name', $relationship_filter_types, NULL, ['class' => 'form-control']) !!} - {!! Form::hidden('contact_id',$organization->id)!!} + {{ html()->label('Relationship: ', 'relationship_type_name')->class('font-weight-bold') }} + {{ html()->select('relationship_type_name', $relationship_filter_types)->class('form-control') }} + {{ html()->hidden('contact_id', $organization->id) }}
    - {!! Form::label('relationship_filter_alternate_name', 'Alternate name: ', ['class' => 'font-weight-bold']) !!} - {!! Form::text('relationship_filter_alternate_name', null, ['class' => 'form-control','required']) !!} + {{ html()->label('Alternate name: ', 'relationship_filter_alternate_name')->class('font-weight-bold') }} + {{ html()->text('relationship_filter_alternate_name')->class('form-control')->required() }}
    - {!! Form::submit('Create', ['class' => 'm-1 btn btn-primary']) !!} - {!! Form::close() !!} + {{ html()->submit('Create')->class('m-1 btn btn-primary') }} + {{ html()->form()->close() }}
    @@ -214,7 +214,7 @@

    Donations for {{ $organization->display_name }} ({{$donations->total() }} donations totaling: ${{ number_format($donations->sum('donation_amount'),2)}})

    @can('create-donation') - {!! Html::link(route('donation.add',$organization->id),'Create donation',array('class' => 'btn btn-outline-dark'))!!} + {{ html()->a(url(route('donation.add', $organization->id)), 'Create donation')->class('btn btn-outline-dark') }} @endCan @if ($donations->isEmpty())
    @@ -268,14 +268,14 @@
    @can('delete-contact') - {!! Form::open(['method' => 'DELETE', 'route' => ['organization.destroy', $organization->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('organization.destroy', [$organization->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
    diff --git a/resources/views/organizations/update/urls.blade.php b/resources/views/organizations/update/urls.blade.php index d3894367f..cd205f755 100644 --- a/resources/views/organizations/update/urls.blade.php +++ b/resources/views/organizations/update/urls.blade.php @@ -41,48 +41,48 @@
    - {!! Form::label('url_main', 'Personal (main):') !!} - {!! Form::text('url_main', $defaults['Main']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Personal (main):', 'url_main') }} + {{ html()->text('url_main', $defaults['Main']['url'])->class('form-control') }}
    - {!! Form::label('url_work', 'Work:') !!} - {!! Form::text('url_work', $defaults['Work']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Work:', 'url_work') }} + {{ html()->text('url_work', $defaults['Work']['url'])->class('form-control') }}
    - {!! Form::label('url_facebook', 'Facebook:') !!} - {!! Form::text('url_facebook', $defaults['Facebook']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Facebook:', 'url_facebook') }} + {{ html()->text('url_facebook', $defaults['Facebook']['url'])->class('form-control') }}
    - {!! Form::label('url_instagram', 'Instagram:') !!} - {!! Form::text('url_instagram', $defaults['Instagram']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Instagram:', 'url_instagram') }} + {{ html()->text('url_instagram', $defaults['Instagram']['url'])->class('form-control') }}
    - {!! Form::label('url_linkedin', 'LinkedIn:') !!} - {!! Form::text('url_linkedin', $defaults['LinkedIn']['url'], ['class' => 'form-control']) !!} + {{ html()->label('LinkedIn:', 'url_linkedin') }} + {{ html()->text('url_linkedin', $defaults['LinkedIn']['url'])->class('form-control') }}
    - {!! Form::label('url_twitter', 'Twitter:') !!} - {!! Form::text('url_twitter', $defaults['Twitter']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Twitter:', 'url_twitter') }} + {{ html()->text('url_twitter', $defaults['Twitter']['url'])->class('form-control') }}
    diff --git a/resources/views/pages/about.blade.php b/resources/views/pages/about.blade.php index 8a1ed3373..701f32426 100644 --- a/resources/views/pages/about.blade.php +++ b/resources/views/pages/about.blade.php @@ -10,5 +10,5 @@
  • Icons made by Freepik from www.flaticon.com is licensed by CC 3.0 BY

    This is an alpha version of the Montserrat Retreat House database. It is a work in progress!

    - {!! Html::image('images/codetest.png', 'Code test ;)',array('title'=>"Code test ;)",'style'=>"height: 300px;")) !!} + {{ html()->img('images/codetest.png', 'Code test ;)')->attribute('title', "Code test ;)")->attribute('style', "height: 300px;") }} @stop diff --git a/resources/views/pages/retreat.blade.php b/resources/views/pages/retreat.blade.php index 5ad40a107..36986b5f6 100644 --- a/resources/views/pages/retreat.blade.php +++ b/resources/views/pages/retreat.blade.php @@ -3,8 +3,8 @@

    Welcome to the Montserrat Retreat House Database!

    This is the retreat page. You will be able to create a retreat and see a list of the retreats from where you can edit or delete existing retreats.

    - {!! Html::image('images/create.png', 'Create a Retreat',array('title'=>"Create Retreat")) !!}

  • - {!! Html::image('images/index.png', 'Index of Retreats',array('title'=>"Retreat Index")) !!} + {{ html()->img('images/create.png', 'Create a Retreat')->attribute('title', "Create Retreat") }} + {{ html()->img('images/index.png', 'Index of Retreats')->attribute('title', "Retreat Index") }}

    @stop diff --git a/resources/views/parishes/create.blade.php b/resources/views/parishes/create.blade.php index 1ee2d885e..470deec30 100644 --- a/resources/views/parishes/create.blade.php +++ b/resources/views/parishes/create.blade.php @@ -5,70 +5,70 @@

    Add a Parish

    - {!! Form::open(['url' => 'parish', 'method' => 'post']) !!} + {{ html()->form('POST', 'parish')->open() }}
    - {!! Form::label('diocese_id', 'Diocese:') !!} - {!! Form::select('diocese_id', $dioceses, 0, ['class' => 'form-control']) !!} + {{ html()->label('Diocese:', 'diocese_id') }} + {{ html()->select('diocese_id', $dioceses, 0)->class('form-control') }}
    - {!! Form::label('pastor_id', 'Pastor:') !!} - {!! Form::select('pastor_id', $pastors, 0, ['class' => 'form-control']) !!} + {{ html()->label('Pastor:', 'pastor_id') }} + {{ html()->select('pastor_id', $pastors, 0)->class('form-control') }}
    - {!! Form::label('organization_name', 'Name:') !!} - {!! Form::text('organization_name', null, ['class'=>'form-control']) !!} + {{ html()->label('Name:', 'organization_name') }} + {{ html()->text('organization_name')->class('form-control') }}
    - {!! Form::label('street_address', 'Address Line 1:') !!} - {!! Form::text('street_address', null, ['class'=>'form-control']) !!} + {{ html()->label('Address Line 1:', 'street_address') }} + {{ html()->text('street_address')->class('form-control') }}
    - {!! Form::label('supplemental_address_1', 'Address Line 2:') !!} - {!! Form::text('supplemental_address_1', null, ['class'=>'form-control']) !!} + {{ html()->label('Address Line 2:', 'supplemental_address_1') }} + {{ html()->text('supplemental_address_1')->class('form-control') }}
    - {!! Form::label('city', 'City:') !!} - {!! Form::text('city', null, ['class'=>'form-control']) !!} + {{ html()->label('City:', 'city') }} + {{ html()->text('city')->class('form-control') }}
    - {!! Form::label('state_province_id', 'State:') !!} - {!! Form::select('state_province_id', $states, $defaults['state_province_id'], ['class' => 'form-control']) !!} + {{ html()->label('State:', 'state_province_id') }} + {{ html()->select('state_province_id', $states, $defaults['state_province_id'])->class('form-control') }}
    - {!! Form::label('postal_code', 'Zip:') !!} - {!! Form::text('postal_code', null, ['class'=>'form-control']) !!} + {{ html()->label('Zip:', 'postal_code') }} + {{ html()->text('postal_code')->class('form-control') }}
    - {!! Form::label('country_id', 'Country:') !!} - {!! Form::select('country_id', $countries, $defaults['country_id'], ['class' => 'form-control']) !!} + {{ html()->label('Country:', 'country_id') }} + {{ html()->select('country_id', $countries, $defaults['country_id'])->class('form-control') }}
    - {!! Form::label('phone_main_phone', 'Phone:') !!} - {!! Form::text('phone_main_phone', null, ['class'=>'form-control']) !!} + {{ html()->label('Phone:', 'phone_main_phone') }} + {{ html()->text('phone_main_phone')->class('form-control') }}
    - {!! Form::label('phone_main_fax', 'Fax:') !!} - {!! Form::text('phone_main_fax', null, ['class'=>'form-control']) !!} + {{ html()->label('Fax:', 'phone_main_fax') }} + {{ html()->text('phone_main_fax')->class('form-control') }}
    - {!! Form::label('email_main', 'Email:') !!} - {!! Form::text('email_main', null, ['class'=>'form-control']) !!} + {{ html()->label('Email:', 'email_main') }} + {{ html()->text('email_main')->class('form-control') }}
    - {!! Form::label('parish_note', 'Note:') !!} - {!! Form::textarea('parish_note', null, ['class'=>'form-control', 'rows'=>'3']) !!} + {{ html()->label('Note:', 'parish_note') }} + {{ html()->textarea('parish_note')->class('form-control')->rows('3') }}
    @@ -81,11 +81,11 @@
    - {!! Form::submit('Add Parish', ['class'=>'btn btn-light']) !!} + {{ html()->submit('Add Parish')->class('btn btn-light') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/parishes/create/urls.blade.php b/resources/views/parishes/create/urls.blade.php index 4b4ee6e2d..53cdbb1e8 100644 --- a/resources/views/parishes/create/urls.blade.php +++ b/resources/views/parishes/create/urls.blade.php @@ -47,56 +47,56 @@
    - {!! Form::label('url_main', 'Personal (main):') !!} - {!! Form::text('url_main', null, ['class' => 'form-control']) !!} + {{ html()->label('Personal (main):', 'url_main') }} + {{ html()->text('url_main')->class('form-control') }}
    - {!! Form::label('url_work', 'Work:') !!} - {!! Form::text('url_work', null, ['class' => 'form-control']) !!} + {{ html()->label('Work:', 'url_work') }} + {{ html()->text('url_work')->class('form-control') }}
    - {!! Form::label('url_facebook', 'Facebook:') !!} - {!! Form::text('url_facebook', null, ['class' => 'form-control']) !!} + {{ html()->label('Facebook:', 'url_facebook') }} + {{ html()->text('url_facebook')->class('form-control') }}
    - {!! Form::label('url_google', 'Google+:') !!} - {!! Form::text('url_google', null, ['class' => 'form-control']) !!} + {{ html()->label('Google+:', 'url_google') }} + {{ html()->text('url_google')->class('form-control') }}
    - {!! Form::label('url_instagram', 'Instagram:') !!} - {!! Form::text('url_instagram', null, ['class' => 'form-control']) !!} + {{ html()->label('Instagram:', 'url_instagram') }} + {{ html()->text('url_instagram')->class('form-control') }}
    - {!! Form::label('url_linkedin', 'LinkedIn:') !!} - {!! Form::text('url_linkedin', null, ['class' => 'form-control']) !!} + {{ html()->label('LinkedIn:', 'url_linkedin') }} + {{ html()->text('url_linkedin')->class('form-control') }}
    - {!! Form::label('url_twitter', 'Twitter:') !!} - {!! Form::text('url_twitter', null, ['class' => 'form-control']) !!} + {{ html()->label('Twitter:', 'url_twitter') }} + {{ html()->text('url_twitter')->class('form-control') }}
    diff --git a/resources/views/parishes/edit.blade.php b/resources/views/parishes/edit.blade.php index 429dceedb..adcd69e54 100644 --- a/resources/views/parishes/edit.blade.php +++ b/resources/views/parishes/edit.blade.php @@ -9,103 +9,103 @@
    - {!! Form::open(['method' => 'PUT', 'files'=>'true', 'route' => ['parish.update', $parish->id]]) !!} - {!! Form::hidden('id', $parish->id) !!} + {{ html()->form('PUT', route('parish.update', [$parish->id]))->acceptsFiles()->open() }} + {{ html()->hidden('id', $parish->id) }}
    - {!! Form::label('organization_name', 'Name:') !!} - {!! Form::text('organization_name', $parish->organization_name, ['class' => 'form-control']) !!} + {{ html()->label('Name:', 'organization_name') }} + {{ html()->text('organization_name', $parish->organization_name)->class('form-control') }}
    - {!! Form::label('display_name', 'Display:') !!} - {!! Form::text('display_name', $parish->display_name, ['class' => 'form-control']) !!} + {{ html()->label('Display:', 'display_name') }} + {{ html()->text('display_name', $parish->display_name)->class('form-control') }}
    - {!! Form::label('sort_name', 'Sort:') !!} - {!! Form::text('sort_name', $parish->sort_name, ['class' => 'form-control']) !!} + {{ html()->label('Sort:', 'sort_name') }} + {{ html()->text('sort_name', $parish->sort_name)->class('form-control') }}
    - {!! Form::label('diocese_id', 'Diocese:') !!} - {!! Form::select('diocese_id', $dioceses, $parish->diocese_id, ['class' => 'form-control']) !!} + {{ html()->label('Diocese:', 'diocese_id') }} + {{ html()->select('diocese_id', $dioceses, $parish->diocese_id)->class('form-control') }}
    - {!! Form::label('pastor_id', 'Pastor:') !!} + {{ html()->label('Pastor:', 'pastor_id') }} @if (empty($parish->pastor->contact_b)) - {!! Form::select('pastor_id', $pastors, 0, ['class' => 'form-control']) !!} + {{ html()->select('pastor_id', $pastors, 0)->class('form-control') }} @else - {!! Form::select('pastor_id', $pastors, $parish->pastor->contact_b->id, ['class' => 'form-control']) !!} + {{ html()->select('pastor_id', $pastors, $parish->pastor->contact_b->id)->class('form-control') }} @endIf
    - {!! Form::label('street_address', 'Address:') !!} - {!! Form::text('street_address', $parish->address_primary_street, ['class' => 'form-control']) !!} + {{ html()->label('Address:', 'street_address') }} + {{ html()->text('street_address', $parish->address_primary_street)->class('form-control') }}
    - {!! Form::label('city', 'City:') !!} - {!! Form::text('city', $parish->address_primary_city, ['class' => 'form-control']) !!} + {{ html()->label('City:', 'city') }} + {{ html()->text('city', $parish->address_primary_city)->class('form-control') }}
    - {!! Form::label('state_province_id', 'State:') !!} - {!! Form::select('state_province_id', $states, $parish->address_primary_state_id, ['class' => 'form-control']) !!} + {{ html()->label('State:', 'state_province_id') }} + {{ html()->select('state_province_id', $states, $parish->address_primary_state_id)->class('form-control') }}
    - {!! Form::label('postal_code', 'Zip:') !!} - {!! Form::text('postal_code', $parish->address_primary_postal_code, ['class' => 'form-control']) !!} + {{ html()->label('Zip:', 'postal_code') }} + {{ html()->text('postal_code', $parish->address_primary_postal_code)->class('form-control') }}
    - {!! Form::label('phone_main_phone', 'Phone:') !!} + {{ html()->label('Phone:', 'phone_main_phone') }} @if (empty($parish->phone_main_phone_number)) - {!! Form::text('phone_main_phone', NULL, ['class' => 'form-control']) !!} + {{ html()->text('phone_main_phone')->class('form-control') }} @else - {!! Form::text('phone_main_phone', $parish->phone_main_phone_number, ['class' => 'form-control']) !!} + {{ html()->text('phone_main_phone', $parish->phone_main_phone_number)->class('form-control') }} @endif
    - {!! Form::label('phone_main_fax', 'Fax:') !!} + {{ html()->label('Fax:', 'phone_main_fax') }} @if (empty($parish->phone_main_fax_number)) - {!! Form::text('phone_main_fax', NULL, ['class' => 'form-control']) !!} + {{ html()->text('phone_main_fax')->class('form-control') }} @else - {!! Form::text('phone_main_fax', $parish->phone_main_fax_number, ['class' => 'form-control']) !!} + {{ html()->text('phone_main_fax', $parish->phone_main_fax_number)->class('form-control') }} @endif
    - {!! Form::label('email_primary', 'Email:') !!} - {!! Form::text('email_primary', $parish->email_primary_text, ['class' => 'form-control']) !!} + {{ html()->label('Email:', 'email_primary') }} + {{ html()->text('email_primary', $parish->email_primary_text)->class('form-control') }}
    - {!! Form::label('parish_note', 'Parish note:') !!} - {!! Form::textarea('parish_note', $parish->note_parish_text, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Parish note:', 'parish_note') }} + {{ html()->textarea('parish_note', $parish->note_parish_text)->class('form-control')->rows(3) }}
    - {!! Form::label('avatar', 'Picture (max 5M): ') !!} - {!! Form::file('avatar'); !!} + {{ html()->label('Picture (max 5M): ', 'avatar') }} + {{ html()->file('avatar') }}
    - {!! Form::label('attachment', 'Attachment (max 10M): ') !!} - {!! Form::file('attachment'); !!} + {{ html()->label('Attachment (max 10M): ', 'attachment') }} + {{ html()->file('attachment') }}
    - {!! Form::label('attachment_description', 'Description: (max 200)') !!} - {!! Form::textarea('attachment_description', NULL, ['class' => 'form-control', 'rows' => 3]) !!} + {{ html()->label('Description: (max 200)', 'attachment_description') }} + {{ html()->textarea('attachment_description')->class('form-control')->rows(3) }}
    @@ -115,11 +115,11 @@
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/parishes/index.blade.php b/resources/views/parishes/index.blade.php index c8e0b579a..f7cb9f64a 100644 --- a/resources/views/parishes/index.blade.php +++ b/resources/views/parishes/index.blade.php @@ -7,7 +7,7 @@ @can('create-contact') - {!! Html::image('images/create.png', 'Create Parish',array('title'=>"Create Parish",'class' => 'btn btn-light')) !!} + {{ html()->img('images/create.png', 'Create Parish')->attribute('title', "Create Parish")->class('btn btn-light') }} @endCan diff --git a/resources/views/parishes/show.blade.php b/resources/views/parishes/show.blade.php index beee3a799..71b57ec0f 100644 --- a/resources/views/parishes/show.blade.php +++ b/resources/views/parishes/show.blade.php @@ -18,20 +18,20 @@
    - {!! Html::link('#notes','Notes',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#parishioners','Parishioners',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#touchpoints','Touchpoints',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#relationships','Relationships',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#registrations','Registrations',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#attachments','Attachments',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#donations','Donations',array('class' => 'btn btn-outline-dark')) !!} + {{ html()->a(url('#notes'), 'Notes')->class('btn btn-outline-dark') }} + {{ html()->a(url('#parishioners'), 'Parishioners')->class('btn btn-outline-dark') }} + {{ html()->a(url('#touchpoints'), 'Touchpoints')->class('btn btn-outline-dark') }} + {{ html()->a(url('#relationships'), 'Relationships')->class('btn btn-outline-dark') }} + {{ html()->a(url('#registrations'), 'Registrations')->class('btn btn-outline-dark') }} + {{ html()->a(url('#attachments'), 'Attachments')->class('btn btn-outline-dark') }} + {{ html()->a(url('#donations'), 'Donations')->class('btn btn-outline-dark') }}
    - {!! Html::image('images/parish.png', 'Parish Index',array('title'=>"Parish Index",'class' => 'btn btn-outline-dark')) !!} + {{ html()->img('images/parish.png', 'Parish Index')->attribute('title', "Parish Index")->class('btn btn-outline-dark') }} @can('create-touchpoint') @@ -121,7 +121,7 @@ @if($parishioner->contact_b->is_ambassador) - {!! Html::image('images/ambassador.png', 'Ambassador',array('title'=>"Ambassador",'class' => 'btn btn-outline-dark')) !!} + {{ html()->img('images/ambassador.png', 'Ambassador')->attribute('title', "Ambassador")->class('btn btn-outline-dark') }} @endIf {!! $parishioner->contact_b->contact_link_full_name !!} ({{$parishioner->contact_b->participant_count}}) @@ -209,10 +209,10 @@ @foreach($parish->a_relationships as $a_relationship)
  • @can('delete-relationship') - {!! Form::open(['method' => 'DELETE', 'route' => ['relationship.destroy', $a_relationship->id],'onsubmit'=>'return ConfirmDelete()']) !!} + {{ html()->form('DELETE', route('relationship.destroy', [$a_relationship->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} {!!$parish->contact_link!!} {{ $a_relationship->relationship_type->label_a_b }} {!! $a_relationship->contact_b->contact_link !!} - {!! Form::close() !!} + {{ html()->form()->close() }} @else {!!$parish->contact_link!!} {{ $a_relationship->relationship_type->label_a_b }} {!! $a_relationship->contact_b->contact_link !!} @endCan @@ -222,10 +222,10 @@ @foreach($parish->b_relationships as $b_relationship)
  • @can('delete-relationship') - {!! Form::open(['method' => 'DELETE', 'route' => ['relationship.destroy', $b_relationship->id],'onsubmit'=>'return ConfirmDelete()']) !!} + {{ html()->form('DELETE', route('relationship.destroy', [$b_relationship->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} {!!$parish->contact_link!!} is {{ $b_relationship->relationship_type->label_b_a }} {!! $b_relationship->contact_a->contact_link !!} - {!! Form::close() !!} + {{ html()->form()->close() }} @else {!!$parish->contact_link!!} is {{ $b_relationship->relationship_type->label_b_a }} {!! $b_relationship->contact_a->contact_link !!} @endCan @@ -237,24 +237,24 @@ @can('create-relationship')
    - {!! Form::open(['method' => 'POST', 'route' => ['relationship_type.addme']]) !!} + {{ html()->form('POST', route('relationship_type.addme', ))->open() }}
    Create a New Relationship
    - {!! Form::label('relationship_type_name', 'Relationship: ', ['class' => 'font-weight-bold']) !!} - {!! Form::select('relationship_type_name', $relationship_filter_types, NULL, ['class' => 'form-control']) !!} - {!! Form::hidden('contact_id',$parish->id)!!} + {{ html()->label('Relationship: ', 'relationship_type_name')->class('font-weight-bold') }} + {{ html()->select('relationship_type_name', $relationship_filter_types)->class('form-control') }} + {{ html()->hidden('contact_id', $parish->id) }}
    - {!! Form::label('relationship_filter_alternate_name', 'Alternate name: ', ['class' => 'font-weight-bold']) !!} - {!! Form::text('relationship_filter_alternate_name', null, ['class' => 'form-control','required']) !!} + {{ html()->label('Alternate name: ', 'relationship_filter_alternate_name')->class('font-weight-bold') }} + {{ html()->text('relationship_filter_alternate_name')->class('form-control')->required() }}
    - {!! Form::submit('Create', ['class' => 'm-1 btn btn-primary']) !!} - {!! Form::close() !!} + {{ html()->submit('Create')->class('m-1 btn btn-primary') }} + {{ html()->form()->close() }}
    @@ -313,7 +313,7 @@
    @can('create-donation') - {!! Html::link(route('donation.add',$parish->id),'Create donation',array('class' => 'btn btn-outline-dark'))!!} + {{ html()->a(url(route('donation.add', $parish->id)), 'Create donation')->class('btn btn-outline-dark') }} @endCan
    @@ -364,13 +364,13 @@
    - {!! Form::open(['method' => 'DELETE', 'route' => ['parish.destroy', $parish->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('parish.destroy', [$parish->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }}
    diff --git a/resources/views/parishes/update/urls.blade.php b/resources/views/parishes/update/urls.blade.php index 717d5927b..4e7385dc6 100644 --- a/resources/views/parishes/update/urls.blade.php +++ b/resources/views/parishes/update/urls.blade.php @@ -41,48 +41,48 @@
    - {!! Form::label('url_main', 'Personal (main):') !!} - {!! Form::text('url_main', $defaults['Main']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Personal (main):', 'url_main') }} + {{ html()->text('url_main', $defaults['Main']['url'])->class('form-control') }}
    - {!! Form::label('url_work', 'Work:') !!} - {!! Form::text('url_work', $defaults['Work']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Work:', 'url_work') }} + {{ html()->text('url_work', $defaults['Work']['url'])->class('form-control') }}
    - {!! Form::label('url_facebook', 'Facebook:') !!} - {!! Form::text('url_facebook', $defaults['Facebook']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Facebook:', 'url_facebook') }} + {{ html()->text('url_facebook', $defaults['Facebook']['url'])->class('form-control') }}
    - {!! Form::label('url_instagram', 'Instagram:') !!} - {!! Form::text('url_instagram', $defaults['Instagram']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Instagram:', 'url_instagram') }} + {{ html()->text('url_instagram', $defaults['Instagram']['url'])->class('form-control') }}
    - {!! Form::label('url_linkedin', 'LinkedIn:') !!} - {!! Form::text('url_linkedin', $defaults['LinkedIn']['url'], ['class' => 'form-control']) !!} + {{ html()->label('LinkedIn:', 'url_linkedin') }} + {{ html()->text('url_linkedin', $defaults['LinkedIn']['url'])->class('form-control') }}
    - {!! Form::label('url_twitter', 'Twitter:') !!} - {!! Form::text('url_twitter', $defaults['Twitter']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Twitter:', 'url_twitter') }} + {{ html()->text('url_twitter', $defaults['Twitter']['url'])->class('form-control') }}
    diff --git a/resources/views/payments/create.blade.php b/resources/views/payments/create.blade.php index e20881f94..8ca038f69 100644 --- a/resources/views/payments/create.blade.php +++ b/resources/views/payments/create.blade.php @@ -6,8 +6,8 @@

    Create payment for Donation {{$donation->donation_id}}

  • - {!! Form::open(['url' => 'payment', 'method' => 'post']) !!} - {!! Form::hidden('donation_id', $donation->donation_id) !!} + {{ html()->form('POST', 'payment')->open() }} + {{ html()->hidden('donation_id', $donation->donation_id) }}
    @@ -16,26 +16,26 @@
    - {!! Form::label('payment_date', 'Payment date') !!} - {!! Form::date('payment_date',\Carbon\Carbon::now(), ['class' => 'form-control flatpickr-date']) !!} + {{ html()->label('Payment date', 'payment_date') }} + {{ html()->date('payment_date', \Carbon\Carbon::now())->class('form-control flatpickr-date') }}
    - {!! Form::label('payment_amount', 'Payment amount (paid)') !!} - {!! Form::number('payment_amount', 0, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Payment amount (paid)', 'payment_amount') }} + {{ html()->number('payment_amount', 0)->class('form-control')->attribute('step', '0.01') }}
    - {!! Form::label('payment_description', 'Payment method') !!} - {!! Form::select('payment_description', $payment_methods, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Payment method', 'payment_description') }} + {{ html()->select('payment_description', $payment_methods)->class('form-control') }}
    - {!! Form::label('payment_idnumber', 'Check/CC Number') !!} - {!! Form::number('payment_idnumber', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Check/CC Number', 'payment_idnumber') }} + {{ html()->number('payment_idnumber')->class('form-control') }}
    - {!! Form::label('note', 'Note') !!} - {!! Form::text('note', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Note', 'note') }} + {{ html()->text('note')->class('form-control') }}
    @@ -76,10 +76,10 @@
    - {!! Form::submit('Add payment', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add payment')->class('btn btn-outline-dark') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/payments/edit.blade.php b/resources/views/payments/edit.blade.php index 6e5a4b7be..61d1bdcce 100644 --- a/resources/views/payments/edit.blade.php +++ b/resources/views/payments/edit.blade.php @@ -6,37 +6,37 @@

    Edit payment for Donation {{$payment->donation->donation_id}}

    - {!! Form::open(['method' => 'PUT', 'route' => ['payment.update', $payment->payment_id]]) !!} - {!! Form::hidden('donation_id', $payment->donation->donation_id) !!} + {{ html()->form('PUT', route('payment.update', [$payment->payment_id]))->open() }} + {{ html()->hidden('donation_id', $payment->donation->donation_id) }}

    Payment Details

    - {!! Form::label('payment_date', 'Payment date') !!} - {!! Form::date('payment_date', $payment->payment_date, ['class' => 'form-control flatpickr-date']) !!} + {{ html()->label('Payment date', 'payment_date') }} + {{ html()->date('payment_date', $payment->payment_date)->class('form-control flatpickr-date') }}
    - {!! Form::label('payment_amount', 'Payment amount (paid)') !!} - {!! Form::number('payment_amount', $payment->payment_amount, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Payment amount (paid)', 'payment_amount') }} + {{ html()->number('payment_amount', $payment->payment_amount)->class('form-control')->attribute('step', '0.01') }}
    - {!! Form::label('payment_description', 'Payment method') !!} - {!! Form::select('payment_description', $payment_methods, $payment->payment_description, ['class' => 'form-control']) !!} + {{ html()->label('Payment method', 'payment_description') }} + {{ html()->select('payment_description', $payment_methods, $payment->payment_description)->class('form-control') }}
    - {!! Form::label('payment_idnumber', 'Check/CC Number') !!} - {!! Form::number('payment_idnumber', $payment->payment_number, ['class' => 'form-control']) !!} + {{ html()->label('Check/CC Number', 'payment_idnumber') }} + {{ html()->number('payment_idnumber', $payment->payment_number)->class('form-control') }}
    - {!! Form::label('note', 'Note') !!} - {!! Form::text('note', $payment->note, ['class' => 'form-control']) !!} + {{ html()->label('Note', 'note') }} + {{ html()->text('note', $payment->note)->class('form-control') }}
    @if ($payment->payment_description == "Credit card" && !isset($payment->stripe_balance_transaction_id))
    - {!! Form::label('stripe_balance_transaction_id', 'Balance Transaction ID') !!} - {!! Form::number('stripe_balance_transaction_id', $payment->stripe_balance_transaction_id, ['class' => 'form-control']) !!} + {{ html()->label('Balance Transaction ID', 'stripe_balance_transaction_id') }} + {{ html()->number('stripe_balance_transaction_id', $payment->stripe_balance_transaction_id)->class('form-control') }}
    @endif
    @@ -80,10 +80,10 @@
    - {!! Form::submit('Update payment', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Update payment')->class('btn btn-outline-dark') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/payments/index.blade.php b/resources/views/payments/index.blade.php index 5cd9a67da..1d7ec407a 100644 --- a/resources/views/payments/index.blade.php +++ b/resources/views/payments/index.blade.php @@ -8,7 +8,7 @@

    Payment Index - {!! Html::image('images/search.png', 'Search payments',array('title'=>"Search payments",'class' => 'btn btn-link')) !!} + {{ html()->img('images/search.png', 'Search payments')->attribute('title', "Search payments")->class('btn btn-link') }}

    ({{$payments->total()}} records)

    diff --git a/resources/views/payments/results.blade.php b/resources/views/payments/results.blade.php index fc98e85c8..35a7b75a2 100644 --- a/resources/views/payments/results.blade.php +++ b/resources/views/payments/results.blade.php @@ -7,7 +7,7 @@ diff --git a/resources/views/payments/search.blade.php b/resources/views/payments/search.blade.php index 9b3341050..b06cd0d81 100644 --- a/resources/views/payments/search.blade.php +++ b/resources/views/payments/search.blade.php @@ -8,12 +8,12 @@

    Search Payments

    - {!! Form::open(['method' => 'GET', 'class' => 'form-horizontal', 'route' => ['payments.results']]) !!} + {{ html()->form('GET', route('payments.results', ))->class('form-horizontal')->open() }}

    - {!! Form::image('images/submit.png','btnSave',['class' => 'btn btn-outline-dark pull-right']) !!} + {{ html()->image('images/submit.png', 'btnSave', ['class' => 'btn btn-outline-dark pull-right']) }}

    @@ -22,46 +22,46 @@
    - {!! Form::label('payment_date_operator', 'Comp.') !!} - {!! Form::select('payment_date_operator', config('polanco.operators'), '=', ['class' => 'form-control']) !!} + {{ html()->label('Comp.', 'payment_date_operator') }} + {{ html()->select('payment_date_operator', config('polanco.operators'), '=')->class('form-control') }}
    - {!! Form::label('payment_date', 'Date') !!} - {!! Form::date('payment_date', NULL, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Date', 'payment_date') }} + {{ html()->date('payment_date')->class('form-control flatpickr-date') }}
    - {!! Form::label('payment_amount_operator', 'Comp.') !!} - {!! Form::select('payment_amount_operator', config('polanco.operators'), '=', ['class' => 'form-control']) !!} + {{ html()->label('Comp.', 'payment_amount_operator') }} + {{ html()->select('payment_amount_operator', config('polanco.operators'), '=')->class('form-control') }}
    - {!! Form::label('payment_amount', 'Amount') !!} - {!! Form::number('payment_amount', NULL, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label('Amount', 'payment_amount') }} + {{ html()->number('payment_amount')->class('form-control')->attribute('step', '0.01') }}
    - {!! Form::label('payment_description', 'Payment method') !!} - {!! Form::select('payment_description', $payment_methods, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Payment method', 'payment_description') }} + {{ html()->select('payment_description', $payment_methods)->class('form-control') }}
    - {!! Form::label('donation_description', 'Donation description') !!} - {!! Form::select('donation_description', $descriptions, NULL, ['class' => 'form-control']) !!} + {{ html()->label('Donation description', 'donation_description') }} + {{ html()->select('donation_description', $descriptions)->class('form-control') }}
    - {!! Form::label('note', 'Notes') !!} - {!! Form::text('note', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Notes', 'note') }} + {{ html()->text('note')->class('form-control') }}
    - {!! Form::label('cknumber', 'Check #') !!} - {!! Form::number('cknumber', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Check #', 'cknumber') }} + {{ html()->number('cknumber')->class('form-control') }}
    - {!! Form::label('ccnumber', 'Credit Card #') !!} - {!! Form::number('ccnumber', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Credit Card #', 'ccnumber') }} + {{ html()->number('ccnumber')->class('form-control') }}
    @@ -69,7 +69,7 @@
    - {!! Form::close() !!} + {{ html()->form()->close() }} @stop diff --git a/resources/views/payments/show.blade.php b/resources/views/payments/show.blade.php index 38c34bcdf..ec70c0318 100644 --- a/resources/views/payments/show.blade.php +++ b/resources/views/payments/show.blade.php @@ -78,14 +78,14 @@
    @can('delete-payment') - {!! Form::open(['method' => 'DELETE', 'route' => ['payment.destroy', $payment->payment_id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('payment.destroy', [$payment->payment_id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
    diff --git a/resources/views/persons/create.blade.php b/resources/views/persons/create.blade.php index 4f08e1c9b..211399db9 100644 --- a/resources/views/persons/create.blade.php +++ b/resources/views/persons/create.blade.php @@ -6,7 +6,7 @@

    Create Person

    - {!! Form::open(['url' => 'person', 'files' => 'true', 'method' => 'post']) !!} + {{ html()->form('POST', 'person')->acceptsFiles()->open() }}

    Basic Information

    @@ -15,51 +15,50 @@
    - {!! Form::label('prefix_id', 'Title: ') !!} - {!! Form::select('prefix_id', $prefixes, 0, ['class' => 'form-control']) !!} + {{ html()->label('Title: ', 'prefix_id') }} + {{ html()->select('prefix_id', $prefixes, 0)->class('form-control') }}
    - {!! Form::label('first_name', 'First: ') !!} - {!! Form::text('first_name', null, ['required'=>'', 'class' => - 'form-control','oninvalid'=>"this.setCustomValidity('First name required')"]) !!} + {{ html()->label('First: ', 'first_name') }} + {{ html()->text('first_name')->required('')->class('form-control')->attribute('oninvalid', "this.setCustomValidity('First name required')") }}
    - {!! Form::label('middle_name', 'Middle: ') !!} - {!! Form::text('middle_name', null, ['class' => 'form-control']) !!} + {{ html()->label('Middle: ', 'middle_name') }} + {{ html()->text('middle_name')->class('form-control') }}
    - {!! Form::label('last_name', 'Last: ') !!} - {!! Form::text('last_name', null, ['required'=>'','class' => 'form-control']) !!} + {{ html()->label('Last: ', 'last_name') }} + {{ html()->text('last_name')->required('')->class('form-control') }}
    - {!! Form::label('suffix_id', 'Suffix: ') !!} - {!! Form::select('suffix_id', $suffixes, 0, ['class' => 'form-control']) !!} + {{ html()->label('Suffix: ', 'suffix_id') }} + {{ html()->select('suffix_id', $suffixes, 0)->class('form-control') }}
    - {!! Form::label('nick_name', 'Nickname: ') !!} - {!! Form::text('nick_name', null, ['class' => 'form-control']) !!} + {{ html()->label('Nickname: ', 'nick_name') }} + {{ html()->text('nick_name')->class('form-control') }}
    - {!! Form::label('contact_type', 'Contact type: ') !!} - {!! Form::select('contact_type', $contact_types, 1, ['class' => 'form-control']) !!} + {{ html()->label('Contact type: ', 'contact_type') }} + {{ html()->select('contact_type', $contact_types, 1)->class('form-control') }}
    - {!! Form::label('subcontact_type', 'Subcontact type: ') !!} - {!! Form::select('subcontact_type', $subcontact_types, 0, ['class' => 'form-control']) !!} + {{ html()->label('Subcontact type: ', 'subcontact_type') }} + {{ html()->select('subcontact_type', $subcontact_types, 0)->class('form-control') }}

    @can('create-avatar') - {!! Form::label('avatar', 'Picture (max 5M): ') !!} - {!! Form::file('avatar', ['class' => 'form-control-file']); !!} + {{ html()->label('Picture (max 5M): ', 'avatar') }} + {{ html()->file('avatar')->class('form-control-file') }} @endCan
    @@ -73,20 +72,20 @@
    - {!! Form::label('emergency_contact_name', 'Name: ') !!} - {!! Form::text('emergency_contact_name', null, ['class' => 'form-control']) !!} + {{ html()->label('Name: ', 'emergency_contact_name') }} + {{ html()->text('emergency_contact_name')->class('form-control') }}
    - {!! Form::label('emergency_contact_relationship', 'Relationship: ') !!} - {!! Form::text('emergency_contact_relationship', null, ['class' => 'form-control']) !!} + {{ html()->label('Relationship: ', 'emergency_contact_relationship') }} + {{ html()->text('emergency_contact_relationship')->class('form-control') }}
    - {!! Form::label('emergency_contact_phone', 'Phone: ') !!} - {!! Form::text('emergency_contact_phone', null, ['class' => 'form-control']) !!} + {{ html()->label('Phone: ', 'emergency_contact_phone') }} + {{ html()->text('emergency_contact_phone')->class('form-control') }}
    - {!! Form::label('emergency_contact_phone_alternate', 'Alt. Phone: ') !!} - {!! Form::text('emergency_contact_phone_alternate', null, ['class' => 'form-control']) !!} + {{ html()->label('Alt. Phone: ', 'emergency_contact_phone_alternate') }} + {{ html()->text('emergency_contact_phone_alternate')->class('form-control') }}
    @@ -98,8 +97,8 @@

    Contact Information

    - {!! Form::label('preferred_communication_method_id', 'Preferred communication method:') !!} - {!! Form::select('preferred_communication_method_id', $preferred_communication_methods, 0, ['class' => 'form-control']) !!} + {{ html()->label('Preferred communication method:', 'preferred_communication_method_id') }} + {{ html()->select('preferred_communication_method_id', $preferred_communication_methods, 0)->class('form-control') }}
    @@ -154,45 +153,41 @@
    - {!! Form::label('gender_id', 'Gender:') !!} - {!! Form::select('gender_id', $genders, 0, ['class' => 'form-control']) !!} + {{ html()->label('Gender:', 'gender_id') }} + {{ html()->select('gender_id', $genders, 0)->class('form-control') }}
    - {!! Form::label('birth_date', 'Birth Date:') !!} - {!! Form::text('birth_date', null, ['class'=>'form-control flatpickr-date', 'autocomplete' - => 'off']) !!} + {{ html()->label('Birth Date:', 'birth_date') }} + {{ html()->text('birth_date')->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }}
    - {!! Form::label('deceased_date', 'Deceased Date:') !!} - {!! Form::text('deceased_date', null, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Deceased Date:', 'deceased_date') }} + {{ html()->text('deceased_date')->class('form-control flatpickr-date') }}
    - {!! Form::checkbox('is_deceased', 1, false,['class' => 'form-check-input', 'id' => - 'is_deceased']) !!} - {!! Form::label('is_deceased', 'Is Deceased', ['class' => 'form-check-label', 'for' => - 'is_deceased']) !!} + {{ html()->checkbox('is_deceased', false, 1)->class('form-check-input')->id('is_deceased') }} + {{ html()->label('Is Deceased', 'is_deceased')->class('form-check-label')->for('is_deceased') }}
    - {!! Form::label('ethnicity_id', 'Ethnicity:') !!} - {!! Form::select('ethnicity_id', $ethnicities, 'Unspecified', ['class' => 'form-control']) - !!} + {{ html()->label('Ethnicity:', 'ethnicity_id') }} + {{ html()->select('ethnicity_id', $ethnicities, 'Unspecified')->class('form-control') }}
    - {!! Form::label('religion_id', 'Religion:') !!} - {!! Form::select('religion_id', $religions, 1, ['class' => 'form-control']) !!} + {{ html()->label('Religion:', 'religion_id') }} + {{ html()->select('religion_id', $religions, 1)->class('form-control') }}
    - {!! Form::label('parish_id', 'Parish:') !!} - {!! Form::select('parish_id', $parish_list, 0, ['class' => 'form-control']) !!} + {{ html()->label('Parish:', 'parish_id') }} + {{ html()->select('parish_id', $parish_list, 0)->class('form-control') }}
    - {!! Form::label('occupation_id', 'Occupation:') !!} - {!! Form::select('occupation_id', $occupations, 0, ['class' => 'form-control']) !!} + {{ html()->label('Occupation:', 'occupation_id') }} + {{ html()->select('occupation_id', $occupations, 0)->class('form-control') }}
    @@ -209,13 +204,12 @@
    - {!! Form::label('languages', 'Languages:') !!} - {!! Form::select('languages[]', $languages, 45, ['id' => 'languages', 'class' => - 'form-control select2', 'multiple' => 'multiple']) !!} + {{ html()->label('Languages:', 'languages') }} + {{ html()->multiselect('languages[]', $languages, 45)->id('languages')->class('form-control select2') }}
    - {!! Form::label('preferred_language_id', 'Preferred Language:') !!} - {!! Form::select('preferred_language_id', $languages, 45, ['class' => 'form-control']) !!} + {{ html()->label('Preferred Language:', 'preferred_language_id') }} + {{ html()->select('preferred_language_id', $languages, 45)->class('form-control') }}
    @@ -229,27 +223,26 @@

    Notes

    - {!! Form::label('note_health', 'Health Notes:') !!} - {!! Form::textarea('note_health', null, ['class' => 'form-control', 'rows' => '3']) !!} + {{ html()->label('Health Notes:', 'note_health') }} + {{ html()->textarea('note_health')->class('form-control')->rows('3') }}
    - {!! Form::label('note_dietary', 'Dietary Notes:') !!} - {!! Form::textarea('note_dietary', null, ['class' => 'form-control', 'rows' => '3']) !!} + {{ html()->label('Dietary Notes:', 'note_dietary') }} + {{ html()->textarea('note_dietary')->class('form-control')->rows('3') }}
    - {!! Form::label('note_contact', 'General Notes:') !!} - {!! Form::textarea('note_contact', null, ['class' => 'form-control', 'rows' => '3']) !!} + {{ html()->label('General Notes:', 'note_contact') }} + {{ html()->textarea('note_contact')->class('form-control')->rows('3') }}
    - {!! Form::label('note_room_preference', 'Room Preference:') !!} - {!! Form::textarea('note_room_preference', null, ['class' => 'form-control', 'rows' => '3']) !!} + {{ html()->label('Room Preference:', 'note_room_preference') }} + {{ html()->textarea('note_room_preference')->class('form-control')->rows('3') }}
    - {!! Form::label('referrals', 'Referral sources:') !!} - {!! Form::select('referrals[]', $referrals, NULL, ['id' => 'referrals', 'class' => - 'form-control select2', 'multiple' => 'multiple']) !!} + {{ html()->label('Referral sources:', 'referrals') }} + {{ html()->multiselect('referrals[]', $referrals)->id('referrals')->class('form-control select2') }}
    @@ -264,112 +257,112 @@
    - {!! Form::checkbox('is_retreatant', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_retreatant', 'Retreatant', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_retreatant', false, 1)->class('form-check-input') }} + {{ html()->label('Retreatant', 'is_retreatant')->class('form-check-label') }}
    - {!! Form::checkbox('is_donor', 1, false, ['class' => 'form-check-input']) !!} - {!! Form::label('is_donor', 'Donor', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_donor', false, 1)->class('form-check-input') }} + {{ html()->label('Donor', 'is_donor')->class('form-check-label') }}
    - {!! Form::checkbox('is_steward', 1, false, ['class' => 'form-check-input']) !!} - {!! Form::label('is_steward', 'Steward', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_steward', false, 1)->class('form-check-input') }} + {{ html()->label('Steward', 'is_steward')->class('form-check-label') }}
    - {!! Form::checkbox('is_ambassador', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_ambassador', 'Ambassador', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_ambassador', false, 1)->class('form-check-input') }} + {{ html()->label('Ambassador', 'is_ambassador')->class('form-check-label') }}
    - {!! Form::checkbox('is_volunteer', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_volunteer', 'Volunteer', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_volunteer', false, 1)->class('form-check-input') }} + {{ html()->label('Volunteer', 'is_volunteer')->class('form-check-label') }}
    - {!! Form::checkbox('is_board', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_board', 'Board Member', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_board', false, 1)->class('form-check-input') }} + {{ html()->label('Board Member', 'is_board')->class('form-check-label') }}
    - {!! Form::checkbox('is_bishop', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_bishop', 'Bishop', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_bishop', false, 1)->class('form-check-input') }} + {{ html()->label('Bishop', 'is_bishop')->class('form-check-label') }}
    - {!! Form::checkbox('is_pastor', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_pastor', 'Pastor', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_pastor', false, 1)->class('form-check-input') }} + {{ html()->label('Pastor', 'is_pastor')->class('form-check-label') }}
    - {!! Form::checkbox('is_priest', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_priest', 'Priest', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_priest', false, 1)->class('form-check-input') }} + {{ html()->label('Priest', 'is_priest')->class('form-check-label') }}
    - {!! Form::checkbox('is_deacon', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_deacon', 'Deacon', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_deacon', false, 1)->class('form-check-input') }} + {{ html()->label('Deacon', 'is_deacon')->class('form-check-label') }}
    - {!! Form::checkbox('is_jesuit', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_jesuit', 'Jesuit', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_jesuit', false, 1)->class('form-check-input') }} + {{ html()->label('Jesuit', 'is_jesuit')->class('form-check-label') }}
    - {!! Form::checkbox('is_provincial', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_provincial', 'Provincial', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_provincial', false, 1)->class('form-check-input') }} + {{ html()->label('Provincial', 'is_provincial')->class('form-check-label') }}
    - {!! Form::checkbox('is_superior', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_superior', 'Superior', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_superior', false, 1)->class('form-check-input') }} + {{ html()->label('Superior', 'is_superior')->class('form-check-label') }}
    - {!! Form::checkbox('is_staff', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_staff', 'Staff', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_staff', false, 1)->class('form-check-input') }} + {{ html()->label('Staff', 'is_staff')->class('form-check-label') }}
    - {!! Form::checkbox('is_director', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_director', 'Retreat Director', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_director', false, 1)->class('form-check-input') }} + {{ html()->label('Retreat Director', 'is_director')->class('form-check-label') }}
    - {!! Form::checkbox('is_innkeeper', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_innkeeper', 'Retreat Innkeeper', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_innkeeper', false, 1)->class('form-check-input') }} + {{ html()->label('Retreat Innkeeper', 'is_innkeeper')->class('form-check-label') }}
    - {!! Form::checkbox('is_assistant', 1, false,['class' => 'form-check-input']) !!} - {!! Form::label('is_assistant', 'Retreat Assistant', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_assistant', false, 1)->class('form-check-input') }} + {{ html()->label('Retreat Assistant', 'is_assistant')->class('form-check-label') }}
    @@ -378,10 +371,10 @@
    - {!! Form::submit('Add Person', ['class'=>'btn btn-light']) !!} + {{ html()->submit('Add Person')->class('btn btn-light') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/persons/create/addresses.blade.php b/resources/views/persons/create/addresses.blade.php index 3e3eaf926..6d7c289b3 100644 --- a/resources/views/persons/create/addresses.blade.php +++ b/resources/views/persons/create/addresses.blade.php @@ -1,8 +1,8 @@
    - {!! Form::label('primary_address_location_id', 'Primary address:') !!} - {!! Form::select('primary_address_location_id', $primary_address_locations, config('polanco.location_type.home'), ['class' => 'form-control']) !!} + {{ html()->label('Primary address:', 'primary_address_location_id') }} + {{ html()->select('primary_address_location_id', $primary_address_locations, config('polanco.location_type.home'))->class('form-control') }}
    @@ -33,31 +33,31 @@
    - {!! Form::label("address_home_address1", "Address Line 1:") !!} - {!! Form::text("address_home_address1", null, ["class" => "form-control"]) !!} + {{ html()->label("Address Line 1:", "address_home_address1") }} + {{ html()->text("address_home_address1")->class("form-control") }}
    - {!! Form::label("address_home_address2", "Address Line 2:") !!} - {!! Form::text("address_home_address2", null, ["class" => "form-control"]) !!} + {{ html()->label("Address Line 2:", "address_home_address2") }} + {{ html()->text("address_home_address2")->class("form-control") }}
    - {!! Form::label("address_home_city", "City:") !!} - {!! Form::text("address_home_city", null, ["class" => "form-control"]) !!} + {{ html()->label("City:", "address_home_city") }} + {{ html()->text("address_home_city")->class("form-control") }}
    - {!! Form::label("address_home_state", "State:") !!} - {!! Form::select("address_home_state", $states, config('polanco.state_province_id_tx'), ["class" => "form-control"]) !!} + {{ html()->label("State:", "address_home_state") }} + {{ html()->select("address_home_state", $states, config('polanco.state_province_id_tx'))->class("form-control") }}
    - {!! Form::label("address_home_zip", "Zip:") !!} - {!! Form::text("address_home_zip", null, ["class" => "form-control"]) !!} + {{ html()->label("Zip:", "address_home_zip") }} + {{ html()->text("address_home_zip")->class("form-control") }}
    - {!! Form::label("address_home_country", "Country:") !!} - {!! Form::select("address_home_country", $countries, config('polanco.country_id_usa'), ["class" => "form-control"]) !!} + {{ html()->label("Country:", "address_home_country") }} + {{ html()->select("address_home_country", $countries, config('polanco.country_id_usa'))->class("form-control") }}
    @@ -67,31 +67,31 @@
    - {!! Form::label("address_work_address1", "Address Line 1:") !!} - {!! Form::text("address_work_address1", null, ["class" => "form-control"]) !!} + {{ html()->label("Address Line 1:", "address_work_address1") }} + {{ html()->text("address_work_address1")->class("form-control") }}
    - {!! Form::label("address_work_address2", "Address Line 2:") !!} - {!! Form::text("address_work_address2", null, ["class" => "form-control"]) !!} + {{ html()->label("Address Line 2:", "address_work_address2") }} + {{ html()->text("address_work_address2")->class("form-control") }}
    - {!! Form::label("address_work_city", "City:") !!} - {!! Form::text("address_work_city", null, ["class" => "form-control"]) !!} + {{ html()->label("City:", "address_work_city") }} + {{ html()->text("address_work_city")->class("form-control") }}
    - {!! Form::label("address_work_state", "State:") !!} - {!! Form::select("address_work_state", $states, 0, ["class" => "form-control"]) !!} + {{ html()->label("State:", "address_work_state") }} + {{ html()->select("address_work_state", $states, 0)->class("form-control") }}
    - {!! Form::label("address_work_zip", "Zip:") !!} - {!! Form::text("address_work_zip", null, ["class" => "form-control"]) !!} + {{ html()->label("Zip:", "address_work_zip") }} + {{ html()->text("address_work_zip")->class("form-control") }}
    - {!! Form::label("address_work_country", "Country:") !!} - {!! Form::select("address_work_country", $countries, config('polanco.country_id_usa'), ["class" => "form-control"]) !!} + {{ html()->label("Country:", "address_work_country") }} + {{ html()->select("address_work_country", $countries, config('polanco.country_id_usa'))->class("form-control") }}
    @@ -102,31 +102,31 @@
    - {!! Form::label("address_other_address1", "Address Line 1:") !!} - {!! Form::text("address_other_address1", null, ["class" => "form-control"]) !!} + {{ html()->label("Address Line 1:", "address_other_address1") }} + {{ html()->text("address_other_address1")->class("form-control") }}
    - {!! Form::label("address_other_address2", "Address Line 2:") !!} - {!! Form::text("address_other_address2", null, ["class" => "form-control"]) !!} + {{ html()->label("Address Line 2:", "address_other_address2") }} + {{ html()->text("address_other_address2")->class("form-control") }}
    - {!! Form::label("address_other_city", "City:") !!} - {!! Form::text("address_other_city", null, ["class" => "form-control"]) !!} + {{ html()->label("City:", "address_other_city") }} + {{ html()->text("address_other_city")->class("form-control") }}
    - {!! Form::label("address_other_state", "State:") !!} - {!! Form::select("address_other_state", $states, 0, ["class" => "form-control"]) !!} + {{ html()->label("State:", "address_other_state") }} + {{ html()->select("address_other_state", $states, 0)->class("form-control") }}
    - {!! Form::label("address_other_zip", "Zip:") !!} - {!! Form::text("address_other_zip", null, ["class" => "form-control"]) !!} + {{ html()->label("Zip:", "address_other_zip") }} + {{ html()->text("address_other_zip")->class("form-control") }}
    - {!! Form::label("address_other_country", "Country:") !!} - {!! Form::select("address_other_country", $countries, config('polanco.country_id_usa'), ["class" => "form-control"]) !!} + {{ html()->label("Country:", "address_other_country") }} + {{ html()->select("address_other_country", $countries, config('polanco.country_id_usa'))->class("form-control") }}
    @@ -137,8 +137,8 @@
    - {!! Form::checkbox("do_not_mail", 1, 0,["class" => "form-check-input", "id" => "do_not_mail"]) !!} - {!! Form::label("do_not_mail", "Do not mail", ["class" => "form-check-label", "id" => "do_not_mail"]) !!} + {{ html()->checkbox("do_not_mail", 0, 1)->class("form-check-input")->id("do_not_mail") }} + {{ html()->label("Do not mail", "do_not_mail")->class("form-check-label")->id("do_not_mail") }}
    diff --git a/resources/views/persons/create/emails.blade.php b/resources/views/persons/create/emails.blade.php index 9cafe1fc0..ebde454b3 100644 --- a/resources/views/persons/create/emails.blade.php +++ b/resources/views/persons/create/emails.blade.php @@ -1,8 +1,8 @@
    - {!! Form::label('primary_email_location_id', 'Primary email:') !!} - {!! Form::select('primary_email_location_id', $primary_email_locations, config('polanco.location_type.home'), ['class' => 'form-control']) !!} + {{ html()->label('Primary email:', 'primary_email_location_id') }} + {{ html()->select('primary_email_location_id', $primary_email_locations, config('polanco.location_type.home'))->class('form-control') }}
    @@ -32,8 +32,8 @@

    Home email

    - {!! Form::label('email_home', 'Email:') !!} - {!! Form::text('email_home', null, ['class' => 'form-control']) !!} + {{ html()->label('Email:', 'email_home') }} + {{ html()->text('email_home')->class('form-control') }}
    @@ -41,8 +41,8 @@

    Work email

    - {!! Form::label('email_work', 'Email:') !!} - {!! Form::text('email_work', null, ['class' => 'form-control']) !!} + {{ html()->label('Email:', 'email_work') }} + {{ html()->text('email_work')->class('form-control') }}
    @@ -50,14 +50,14 @@

    Other email

    - {!! Form::label('email_other', 'Email:') !!} - {!! Form::text('email_other', null, ['class' => 'form-control']) !!} + {{ html()->label('Email:', 'email_other') }} + {{ html()->text('email_other')->class('form-control') }}
    - {!! Form::checkbox('do_not_email', 1, 0,['class' => 'form-check-input', 'id' => 'do_not_email']) !!} - {!! Form::label('do_not_email', 'Do not email', ['class' => 'form-check-label', 'id' => 'do_not_email']) !!} + {{ html()->checkbox('do_not_email', 0, 1)->class('form-check-input')->id('do_not_email') }} + {{ html()->label('Do not email', 'do_not_email')->class('form-check-label')->id('do_not_email') }}
    diff --git a/resources/views/persons/create/phones.blade.php b/resources/views/persons/create/phones.blade.php index 888ede090..ad6991a3b 100644 --- a/resources/views/persons/create/phones.blade.php +++ b/resources/views/persons/create/phones.blade.php @@ -1,8 +1,8 @@
    - {!! Form::label('primary_phone_location_id', 'Primary phone:') !!} - {!! Form::select('primary_phone_location_id', $primary_phones, config('polanco.location_type.home').":Phone", ['class' => 'form-control']) !!} + {{ html()->label('Primary phone:', 'primary_phone_location_id') }} + {{ html()->select('primary_phone_location_id', $primary_phones, config('polanco.location_type.home') . ":Phone")->class('form-control') }}
    @@ -32,16 +32,16 @@
    - {!! Form::label('phone_home_phone', 'Main:') !!} - {!! Form::text('phone_home_phone', null, ['class' => 'form-control']) !!} + {{ html()->label('Main:', 'phone_home_phone') }} + {{ html()->text('phone_home_phone')->class('form-control') }}
    - {!! Form::label('phone_home_mobile', 'Mobile:') !!} - {!! Form::text('phone_home_mobile', null, ['class' => 'form-control']) !!} + {{ html()->label('Mobile:', 'phone_home_mobile') }} + {{ html()->text('phone_home_mobile')->class('form-control') }}
    - {!! Form::label('phone_home_fax', 'Fax:') !!} - {!! Form::text('phone_home_fax', null, ['class' => 'form-control']) !!} + {{ html()->label('Fax:', 'phone_home_fax') }} + {{ html()->text('phone_home_fax')->class('form-control') }}
    @@ -50,16 +50,16 @@
    - {!! Form::label('phone_work_phone', 'Main:') !!} - {!! Form::text('phone_work_phone', null, ['class' => 'form-control']) !!} + {{ html()->label('Main:', 'phone_work_phone') }} + {{ html()->text('phone_work_phone')->class('form-control') }}
    - {!! Form::label('phone_work_mobile', 'Mobile:') !!} - {!! Form::text('phone_work_mobile', null, ['class' => 'form-control']) !!} + {{ html()->label('Mobile:', 'phone_work_mobile') }} + {{ html()->text('phone_work_mobile')->class('form-control') }}
    - {!! Form::label('phone_work_fax', 'Fax:') !!} - {!! Form::text('phone_work_fax', null, ['class' => 'form-control']) !!} + {{ html()->label('Fax:', 'phone_work_fax') }} + {{ html()->text('phone_work_fax')->class('form-control') }}
    @@ -68,26 +68,26 @@
    - {!! Form::label('phone_other_phone', 'Main:') !!} - {!! Form::text('phone_other_phone', null, ['class' => 'form-control']) !!} + {{ html()->label('Main:', 'phone_other_phone') }} + {{ html()->text('phone_other_phone')->class('form-control') }}
    - {!! Form::label('phone_other_mobile', 'Mobile:') !!} - {!! Form::text('phone_other_mobile', null, ['class' => 'form-control']) !!} + {{ html()->label('Mobile:', 'phone_other_mobile') }} + {{ html()->text('phone_other_mobile')->class('form-control') }}
    - {!! Form::label('phone_other_fax', 'Fax:') !!} - {!! Form::text('phone_other_fax', null, ['class' => 'form-control']) !!} + {{ html()->label('Fax:', 'phone_other_fax') }} + {{ html()->text('phone_other_fax')->class('form-control') }}
    - {!! Form::checkbox('do_not_phone', 1, 0,['class' => 'form-check-input', 'id' => 'do_not_phone']) !!} - {!! Form::label('do_not_phone', 'Do not call', ['class' => 'form-check-label', 'id' => 'do_not_phone']) !!} + {{ html()->checkbox('do_not_phone', 0, 1)->class('form-check-input')->id('do_not_phone') }} + {{ html()->label('Do not call', 'do_not_phone')->class('form-check-label')->id('do_not_phone') }}
    - {!! Form::checkbox('do_not_sms', 1, 0,['class' => 'form-check-input', 'id' => 'do_not_sms']) !!} - {!! Form::label('do_not_sms', 'Do not text', ['class' => 'form-check-label', 'id' => 'do_not_sms']) !!} + {{ html()->checkbox('do_not_sms', 0, 1)->class('form-check-input')->id('do_not_sms') }} + {{ html()->label('Do not text', 'do_not_sms')->class('form-check-label')->id('do_not_sms') }}
    diff --git a/resources/views/persons/create/urls.blade.php b/resources/views/persons/create/urls.blade.php index 4b4ee6e2d..53cdbb1e8 100644 --- a/resources/views/persons/create/urls.blade.php +++ b/resources/views/persons/create/urls.blade.php @@ -47,56 +47,56 @@
    - {!! Form::label('url_main', 'Personal (main):') !!} - {!! Form::text('url_main', null, ['class' => 'form-control']) !!} + {{ html()->label('Personal (main):', 'url_main') }} + {{ html()->text('url_main')->class('form-control') }}
    - {!! Form::label('url_work', 'Work:') !!} - {!! Form::text('url_work', null, ['class' => 'form-control']) !!} + {{ html()->label('Work:', 'url_work') }} + {{ html()->text('url_work')->class('form-control') }}
    - {!! Form::label('url_facebook', 'Facebook:') !!} - {!! Form::text('url_facebook', null, ['class' => 'form-control']) !!} + {{ html()->label('Facebook:', 'url_facebook') }} + {{ html()->text('url_facebook')->class('form-control') }}
    - {!! Form::label('url_google', 'Google+:') !!} - {!! Form::text('url_google', null, ['class' => 'form-control']) !!} + {{ html()->label('Google+:', 'url_google') }} + {{ html()->text('url_google')->class('form-control') }}
    - {!! Form::label('url_instagram', 'Instagram:') !!} - {!! Form::text('url_instagram', null, ['class' => 'form-control']) !!} + {{ html()->label('Instagram:', 'url_instagram') }} + {{ html()->text('url_instagram')->class('form-control') }}
    - {!! Form::label('url_linkedin', 'LinkedIn:') !!} - {!! Form::text('url_linkedin', null, ['class' => 'form-control']) !!} + {{ html()->label('LinkedIn:', 'url_linkedin') }} + {{ html()->text('url_linkedin')->class('form-control') }}
    - {!! Form::label('url_twitter', 'Twitter:') !!} - {!! Form::text('url_twitter', null, ['class' => 'form-control']) !!} + {{ html()->label('Twitter:', 'url_twitter') }} + {{ html()->text('url_twitter')->class('form-control') }}
    diff --git a/resources/views/persons/edit.blade.php b/resources/views/persons/edit.blade.php index f4b8be8b8..16112666a 100644 --- a/resources/views/persons/edit.blade.php +++ b/resources/views/persons/edit.blade.php @@ -7,42 +7,42 @@

    Edit: {{ $person->full_name }}

    - @if ($person->is_board_member) {!! Html::image('images/board.png', 'Board Members Group',array('title'=>"Board Members Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_ambassador) {!! Html::image('images/ambassador.png', 'Ambassador Group',array('title'=>"Ambassadors Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_staff) {!! Html::image('images/employee.png', 'Staff Group',array('title'=>"Employees Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_steward) {!! Html::image('images/steward.png', 'Steward Group',array('title'=>"Stewards Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_volunteer) {!! Html::image('images/volunteer.png', 'Volunteers Group',array('title'=>"Volunteers Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_retreat_director) {!! Html::image('images/director.png', 'Retreat Directors Group',array('title'=>"Directors Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_retreat_innkeeper) {!! Html::image('images/innkeeper.png', 'Retreat Innkeepers Group',array('title'=>"Innkeepers Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_retreat_assistant) {!! Html::image('images/assistant.png', 'Retreat Assistants Group',array('title'=>"Assistants Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_bishop) {!! Html::image('images/bishop.png', 'Bishops Group',array('title'=>"Bishop Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_pastor) {!! Html::image('images/pastor.png', 'Pastors Group',array('title'=>"Pastors Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_priest) {!! Html::image('images/priest.png', 'Priests Group',array('title'=>"Priests Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_deacon) {!! Html::image('images/deacon.png', 'Deacons Group',array('title'=>"Deacons Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_provincial) {!! Html::image('images/provincial.png', 'Provincials Group',array('title'=>"Provincials Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_superior) {!! Html::image('images/superior.png', 'Superiors Group',array('title'=>"Superiors Group",'class' => 'btn btn-outline-dark')) !!} @endIf - @if ($person->is_jesuit) {!! Html::image('images/jesuit.png', 'Jesuits Group',array('title'=>"Jesuits Group",'class' => 'btn btn-outline-dark')) !!} @endIf + @if ($person->is_board_member) {{ html()->img('images/board.png', 'Board Members Group')->attribute('title', "Board Members Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_ambassador) {{ html()->img('images/ambassador.png', 'Ambassador Group')->attribute('title', "Ambassadors Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_staff) {{ html()->img('images/employee.png', 'Staff Group')->attribute('title', "Employees Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_steward) {{ html()->img('images/steward.png', 'Steward Group')->attribute('title', "Stewards Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_volunteer) {{ html()->img('images/volunteer.png', 'Volunteers Group')->attribute('title', "Volunteers Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_retreat_director) {{ html()->img('images/director.png', 'Retreat Directors Group')->attribute('title', "Directors Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_retreat_innkeeper) {{ html()->img('images/innkeeper.png', 'Retreat Innkeepers Group')->attribute('title', "Innkeepers Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_retreat_assistant) {{ html()->img('images/assistant.png', 'Retreat Assistants Group')->attribute('title', "Assistants Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_bishop) {{ html()->img('images/bishop.png', 'Bishops Group')->attribute('title', "Bishop Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_pastor) {{ html()->img('images/pastor.png', 'Pastors Group')->attribute('title', "Pastors Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_priest) {{ html()->img('images/priest.png', 'Priests Group')->attribute('title', "Priests Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_deacon) {{ html()->img('images/deacon.png', 'Deacons Group')->attribute('title', "Deacons Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_provincial) {{ html()->img('images/provincial.png', 'Provincials Group')->attribute('title', "Provincials Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_superior) {{ html()->img('images/superior.png', 'Superiors Group')->attribute('title', "Superiors Group")->class('btn btn-outline-dark') }} @endIf + @if ($person->is_jesuit) {{ html()->img('images/jesuit.png', 'Jesuits Group')->attribute('title', "Jesuits Group")->class('btn btn-outline-dark') }} @endIf
    - {!! Form::open(['method' => 'PUT', 'files'=>'true', 'route' => ['person.update', $person->id]]) !!} - {!! Form::hidden('id', $person->id) !!} + {{ html()->form('PUT', route('person.update', [$person->id]))->acceptsFiles()->open() }} + {{ html()->hidden('id', $person->id) }}
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
    - {!! Html::link('#emergency_contact','Emergency contact',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#addresses','Addresses',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#phones','Phones',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#emails','Emails',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#websites','Websites',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#demographics','Demographics',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#languages','Languages',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#notes','Notes',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#attachments','Attachments',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#groups','Groups',array('class' => 'btn btn-outline-dark')) !!} + {{ html()->a(url('#emergency_contact'), 'Emergency contact')->class('btn btn-outline-dark') }} + {{ html()->a(url('#addresses'), 'Addresses')->class('btn btn-outline-dark') }} + {{ html()->a(url('#phones'), 'Phones')->class('btn btn-outline-dark') }} + {{ html()->a(url('#emails'), 'Emails')->class('btn btn-outline-dark') }} + {{ html()->a(url('#websites'), 'Websites')->class('btn btn-outline-dark') }} + {{ html()->a(url('#demographics'), 'Demographics')->class('btn btn-outline-dark') }} + {{ html()->a(url('#languages'), 'Languages')->class('btn btn-outline-dark') }} + {{ html()->a(url('#notes'), 'Notes')->class('btn btn-outline-dark') }} + {{ html()->a(url('#attachments'), 'Attachments')->class('btn btn-outline-dark') }} + {{ html()->a(url('#groups'), 'Groups')->class('btn btn-outline-dark') }}
    @@ -52,52 +52,52 @@
    - {!! Form::label('prefix_id', 'Title:') !!} - {!! Form::select('prefix_id', $prefixes, $person->prefix_id, ['class' => 'form-control']) !!} + {{ html()->label('Title:', 'prefix_id') }} + {{ html()->select('prefix_id', $prefixes, $person->prefix_id)->class('form-control') }}
    - {!! Form::label('first_name', 'First:') !!} - {!! Form::text('first_name', $person->first_name, ['class' => 'form-control']) !!} + {{ html()->label('First:', 'first_name') }} + {{ html()->text('first_name', $person->first_name)->class('form-control') }}
    - {!! Form::label('middle_name', 'Middle:') !!} - {!! Form::text('middle_name', $person->middle_name, ['class' => 'form-control']) !!} + {{ html()->label('Middle:', 'middle_name') }} + {{ html()->text('middle_name', $person->middle_name)->class('form-control') }}
    - {!! Form::label('last_name', 'Last:') !!} - {!! Form::text('last_name', $person->last_name, ['class' => 'form-control']) !!} + {{ html()->label('Last:', 'last_name') }} + {{ html()->text('last_name', $person->last_name)->class('form-control') }}
    - {!! Form::label('suffix_id', 'Suffix:') !!} - {!! Form::select('suffix_id', $suffixes, $person->suffix_id, ['class' => 'form-control']) !!} + {{ html()->label('Suffix:', 'suffix_id') }} + {{ html()->select('suffix_id', $suffixes, $person->suffix_id)->class('form-control') }}
    - {!! Form::label('display_name', 'Display name: ') !!} - {!! Form::text('display_name', $person->display_name, ['class' => 'form-control']) !!} + {{ html()->label('Display name: ', 'display_name') }} + {{ html()->text('display_name', $person->display_name)->class('form-control') }}
    - {!! Form::label('sort_name', 'Sort name: ') !!} - {!! Form::text('sort_name', $person->sort_name, ['class' => 'form-control']) !!} + {{ html()->label('Sort name: ', 'sort_name') }} + {{ html()->text('sort_name', $person->sort_name)->class('form-control') }}
    - {!! Form::label('agc_household_name', 'AGC Household: ') !!} - {!! Form::text('agc_household_name', $person->agc_household_name, ['class' => 'form-control']) !!} + {{ html()->label('AGC Household: ', 'agc_household_name') }} + {{ html()->text('agc_household_name', $person->agc_household_name)->class('form-control') }}
    - {!! Form::label('nick_name', 'Nickname: ') !!} - {!! Form::text('nick_name', $person->nick_name, ['class' => 'form-control']) !!} + {{ html()->label('Nickname: ', 'nick_name') }} + {{ html()->text('nick_name', $person->nick_name)->class('form-control') }}
    - {!! Form::label('contact_type', 'Contact type: ') !!} - {!! Form::select('contact_type', $contact_types, $person->contact_type, ['class' => 'form-control']) !!} + {{ html()->label('Contact type: ', 'contact_type') }} + {{ html()->select('contact_type', $contact_types, $person->contact_type)->class('form-control') }}
    - {!! Form::label('subcontact_type', 'Subcontact type: ') !!} - {!! Form::select('subcontact_type', $subcontact_types, $person->subcontact_type, ['class' => 'form-control']) !!} + {{ html()->label('Subcontact type: ', 'subcontact_type') }} + {{ html()->select('subcontact_type', $subcontact_types, $person->subcontact_type)->class('form-control') }}
    @@ -106,8 +106,8 @@ @can('create-avatar')
    - {!! Form::label('avatar', 'Upload Avatar:') !!} - {!! Form::file('avatar',['class' => 'form-control-file']) !!} + {{ html()->label('Upload Avatar:', 'avatar') }} + {{ html()->file('avatar')->class('form-control-file') }}

    @@ -119,20 +119,20 @@
    - {!! Form::label('emergency_contact_name', 'Name: ') !!} - {!! Form::text('emergency_contact_name', $person->emergency_contact_name, ['class' => 'form-control']) !!} + {{ html()->label('Name: ', 'emergency_contact_name') }} + {{ html()->text('emergency_contact_name', $person->emergency_contact_name)->class('form-control') }}
    - {!! Form::label('emergency_contact_relationship', 'Relationship: ') !!} - {!! Form::text('emergency_contact_relationship', $person->emergency_contact_relationship, ['class' => 'form-control']) !!} + {{ html()->label('Relationship: ', 'emergency_contact_relationship') }} + {{ html()->text('emergency_contact_relationship', $person->emergency_contact_relationship)->class('form-control') }}
    - {!! Form::label('emergency_contact_phone', 'Phone: ') !!} - {!! Form::text('emergency_contact_phone', $person->emergency_contact_phone, ['class' => 'form-control']) !!} + {{ html()->label('Phone: ', 'emergency_contact_phone') }} + {{ html()->text('emergency_contact_phone', $person->emergency_contact_phone)->class('form-control') }}
    - {!! Form::label('emergency_contact_phone_alternate', 'Alt. Phone: ') !!} - {!! Form::text('emergency_contact_phone_alternate', $person->emergency_contact_phone_alternate, ['class' => 'form-control']) !!} + {{ html()->label('Alt. Phone: ', 'emergency_contact_phone_alternate') }} + {{ html()->text('emergency_contact_phone_alternate', $person->emergency_contact_phone_alternate)->class('form-control') }}
    @@ -145,8 +145,8 @@

    Contact Information

    - {!! Form::label('preferred_communication_method_id', 'Preferred communication method:') !!} - {!! Form::select('preferred_communication_method_id', $preferred_communication_methods, $person->preferred_communication_method, ['class' => 'form-control']) !!} + {{ html()->label('Preferred communication method:', 'preferred_communication_method_id') }} + {{ html()->select('preferred_communication_method_id', $preferred_communication_methods, $person->preferred_communication_method)->class('form-control') }}
    @@ -205,24 +205,22 @@
    - {!! Form::label('gender_id', 'Gender:') !!} - {!! Form::select('gender_id', $genders, $person->gender_id, ['class' => 'form-control']) !!} + {{ html()->label('Gender:', 'gender_id') }} + {{ html()->select('gender_id', $genders, $person->gender_id)->class('form-control') }}
    - {!! Form::label('birth_date', 'Birth Date:') !!} - {!! Form::date('birth_date', $person->birth_date, ['class'=>'form-control bg-white flatpickr-date']) !!} + {{ html()->label('Birth Date:', 'birth_date') }} + {{ html()->date('birth_date', $person->birth_date)->class('form-control bg-white flatpickr-date') }}
    - {!! Form::label('deceased_date', 'Deceased Date:') !!} - {!! Form::date('deceased_date', $person->deceased_date, ['class'=>'form-control bg-white flatpickr-date']) !!} + {{ html()->label('Deceased Date:', 'deceased_date') }} + {{ html()->date('deceased_date', $person->deceased_date)->class('form-control bg-white flatpickr-date') }}
    - {!! Form::checkbox('is_deceased', 1, $person->is_deceased,['class' => 'form-check-input', 'id' => - 'is_deceased']) !!} - {!! Form::label('is_deceased', 'Is Deceased', ['class' => 'form-check-label', 'for' => - 'is_deceased']) !!} + {{ html()->checkbox('is_deceased', $person->is_deceased, 1)->class('form-check-input')->id('is_deceased') }} + {{ html()->label('Is Deceased', 'is_deceased')->class('form-check-label')->for('is_deceased') }}
    @@ -231,20 +229,20 @@
    - {!! Form::label('ethnicity_id', 'Ethnicity:') !!} - {!! Form::select('ethnicity_id', $ethnicities, $person->ethnicity_id, ['class' => 'form-control']) !!} + {{ html()->label('Ethnicity:', 'ethnicity_id') }} + {{ html()->select('ethnicity_id', $ethnicities, $person->ethnicity_id)->class('form-control') }}
    - {!! Form::label('religion_id', 'Religion:') !!} - {!! Form::select('religion_id', $religions, $person->religion_id, ['class' => 'form-control']) !!} + {{ html()->label('Religion:', 'religion_id') }} + {{ html()->select('religion_id', $religions, $person->religion_id)->class('form-control') }}
    - {!! Form::label('parish_id', 'Parish:') !!} - {!! Form::select('parish_id', $parish_list, $person->parish_id, ['class' => 'form-control']) !!} + {{ html()->label('Parish:', 'parish_id') }} + {{ html()->select('parish_id', $parish_list, $person->parish_id)->class('form-control') }}
    - {!! Form::label('occupation_id', 'Occupation:') !!} - {!! Form::select('occupation_id', $occupations, $person->occupation_id, ['class' => 'form-control']) !!} + {{ html()->label('Occupation:', 'occupation_id') }} + {{ html()->select('occupation_id', $occupations, $person->occupation_id)->class('form-control') }}
    @@ -252,15 +250,15 @@
    - {!! Form::label('languages', 'Languages:') !!} - {!! Form::select('languages[]', $languages, $person->languages->pluck('id')->toArray(), ['id'=>'languages', 'class' => 'form-control select2', 'multiple' => 'multiple']) !!} + {{ html()->label('Languages:', 'languages') }} + {{ html()->multiselect('languages[]', $languages, $person->languages->pluck('id')->toArray())->id('languages')->class('form-control select2') }}
    - {!! Form::label('preferred_language_id', 'Preferred Language:') !!} + {{ html()->label('Preferred Language:', 'preferred_language_id') }} @if (empty($person->preferred_language_id)) - {!! Form::select('preferred_language_id', $languages, 0, ['class' => 'form-control']) !!} + {{ html()->select('preferred_language_id', $languages, 0)->class('form-control') }} @else - {!! Form::select('preferred_language_id', $languages, $person->preferred_language_id, ['class' => 'form-control']) !!} + {{ html()->select('preferred_language_id', $languages, $person->preferred_language_id)->class('form-control') }} @endif
    @@ -275,26 +273,26 @@

    Notes

    - {!! Form::label('note_health', 'Health Notes:') !!} - {!! Form::textarea('note_health', $person->note_health, ['class' => 'form-control','rows'=>'3']) !!} + {{ html()->label('Health Notes:', 'note_health') }} + {{ html()->textarea('note_health', $person->note_health)->class('form-control')->rows('3') }}
    - {!! Form::label('note_dietary', 'Dietary Notes:') !!} - {!! Form::textarea('note_dietary', $person->note_dietary, ['class' => 'form-control','rows'=>'3']) !!} + {{ html()->label('Dietary Notes:', 'note_dietary') }} + {{ html()->textarea('note_dietary', $person->note_dietary)->class('form-control')->rows('3') }}
    - {!! Form::label('note_contact', 'General Notes:') !!} - {!! Form::textarea('note_contact', $person->note_contact, ['class' => 'form-control','rows'=>'3']) !!} + {{ html()->label('General Notes:', 'note_contact') }} + {{ html()->textarea('note_contact', $person->note_contact)->class('form-control')->rows('3') }}
    - {!! Form::label('note_room_preference', 'Room Preference:') !!} - {!! Form::textarea('note_room_preference', $person->note_room_preference, ['class' => 'form-control','rows'=>'3']) !!} + {{ html()->label('Room Preference:', 'note_room_preference') }} + {{ html()->textarea('note_room_preference', $person->note_room_preference)->class('form-control')->rows('3') }}
    - {!! Form::label('referrals', 'Referral sources:') !!} - {!! Form::select('referrals[]', $referrals, $person->referrals->pluck('id')->toArray(), ['id'=>'referrals', 'class' => 'form-control select2','multiple' => 'multiple']) !!} + {{ html()->label('Referral sources:', 'referrals') }} + {{ html()->multiselect('referrals[]', $referrals, $person->referrals->pluck('id')->toArray())->id('referrals')->class('form-control select2') }}
    @@ -311,12 +309,12 @@
    - {!! Form::label('attachment', 'Attachment (max 10M): ') !!} - {!! Form::file('attachment',['class' => 'form-control']); !!} + {{ html()->label('Attachment (max 10M): ', 'attachment') }} + {{ html()->file('attachment')->class('form-control') }}
    - {!! Form::label('attachment_description', 'Description: (max 200)') !!} - {!! Form::text('attachment_description', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Description: (max 200)', 'attachment_description') }} + {{ html()->text('attachment_description')->class('form-control') }}
    @@ -336,112 +334,112 @@
    - {!! Form::checkbox('is_retreatant', 1, $person->is_retreatant,['class' => 'form-check-input']) !!} - {!! Form::label('is_retreatant', 'Retreatant', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_retreatant', $person->is_retreatant, 1)->class('form-check-input') }} + {{ html()->label('Retreatant', 'is_retreatant')->class('form-check-label') }}
    - {!! Form::checkbox('is_donor', 1, $person->is_donor, ['class' => 'form-check-input']) !!} - {!! Form::label('is_donor', 'Donor', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_donor', $person->is_donor, 1)->class('form-check-input') }} + {{ html()->label('Donor', 'is_donor')->class('form-check-label') }}
    - {!! Form::checkbox('is_steward', 1, $person->is_steward, ['class' => 'form-check-input']) !!} - {!! Form::label('is_steward', 'Steward', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_steward', $person->is_steward, 1)->class('form-check-input') }} + {{ html()->label('Steward', 'is_steward')->class('form-check-label') }}
    - {!! Form::checkbox('is_ambassador', 1, $person->is_ambassador,['class' => 'form-check-input']) !!} - {!! Form::label('is_ambassador', 'Ambassador', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_ambassador', $person->is_ambassador, 1)->class('form-check-input') }} + {{ html()->label('Ambassador', 'is_ambassador')->class('form-check-label') }}
    - {!! Form::checkbox('is_volunteer', 1, $person->is_volunteer,['class' => 'form-check-input']) !!} - {!! Form::label('is_volunteer', 'Volunteer', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_volunteer', $person->is_volunteer, 1)->class('form-check-input') }} + {{ html()->label('Volunteer', 'is_volunteer')->class('form-check-label') }}
    - {!! Form::checkbox('is_board', 1, $person->is_board_member,['class' => 'form-check-input']) !!} - {!! Form::label('is_board', 'Board Member', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_board', $person->is_board_member, 1)->class('form-check-input') }} + {{ html()->label('Board Member', 'is_board')->class('form-check-label') }}
    - {!! Form::checkbox('is_bishop', 1, $person->is_bishop,['class' => 'form-check-input']) !!} - {!! Form::label('is_bishop', 'Bishop', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_bishop', $person->is_bishop, 1)->class('form-check-input') }} + {{ html()->label('Bishop', 'is_bishop')->class('form-check-label') }}
    - {!! Form::checkbox('is_pastor', 1, $person->is_pastor,['class' => 'form-check-input']) !!} - {!! Form::label('is_pastor', 'Pastor', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_pastor', $person->is_pastor, 1)->class('form-check-input') }} + {{ html()->label('Pastor', 'is_pastor')->class('form-check-label') }}
    - {!! Form::checkbox('is_priest', 1, $person->is_priest,['class' => 'form-check-input']) !!} - {!! Form::label('is_priest', 'Priest', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_priest', $person->is_priest, 1)->class('form-check-input') }} + {{ html()->label('Priest', 'is_priest')->class('form-check-label') }}
    - {!! Form::checkbox('is_deacon', 1, $person->is_deacon,['class' => 'form-check-input']) !!} - {!! Form::label('is_deacon', 'Deacon', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_deacon', $person->is_deacon, 1)->class('form-check-input') }} + {{ html()->label('Deacon', 'is_deacon')->class('form-check-label') }}
    - {!! Form::checkbox('is_jesuit', 1, $person->is_jesuit,['class' => 'form-check-input']) !!} - {!! Form::label('is_jesuit', 'Jesuit', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_jesuit', $person->is_jesuit, 1)->class('form-check-input') }} + {{ html()->label('Jesuit', 'is_jesuit')->class('form-check-label') }}
    - {!! Form::checkbox('is_provincial', 1, $person->is_provincial,['class' => 'form-check-input']) !!} - {!! Form::label('is_provincial', 'Provincial', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_provincial', $person->is_provincial, 1)->class('form-check-input') }} + {{ html()->label('Provincial', 'is_provincial')->class('form-check-label') }}
    - {!! Form::checkbox('is_superior', 1, $person->is_superior,['class' => 'form-check-input']) !!} - {!! Form::label('is_superior', 'Superior', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_superior', $person->is_superior, 1)->class('form-check-input') }} + {{ html()->label('Superior', 'is_superior')->class('form-check-label') }}
    - {!! Form::checkbox('is_staff', 1, $person->is_staff,['class' => 'form-check-input']) !!} - {!! Form::label('is_staff', 'Staff', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_staff', $person->is_staff, 1)->class('form-check-input') }} + {{ html()->label('Staff', 'is_staff')->class('form-check-label') }}
    - {!! Form::checkbox('is_director', 1, $person->is_retreat_director,['class' => 'form-check-input']) !!} - {!! Form::label('is_director', 'Retreat Director', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_director', $person->is_retreat_director, 1)->class('form-check-input') }} + {{ html()->label('Retreat Director', 'is_director')->class('form-check-label') }}
    - {!! Form::checkbox('is_innkeeper', 1, $person->is_retreat_innkeeper,['class' => 'form-check-input']) !!} - {!! Form::label('is_innkeeper', 'Retreat Innkeeper', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_innkeeper', $person->is_retreat_innkeeper, 1)->class('form-check-input') }} + {{ html()->label('Retreat Innkeeper', 'is_innkeeper')->class('form-check-label') }}
    - {!! Form::checkbox('is_assistant', 1, $person->is_retreat_assistant,['class' => 'form-check-input']) !!} - {!! Form::label('is_assistant', 'Retreat Assistant', ['class' => 'form-check-label']) !!} + {{ html()->checkbox('is_assistant', $person->is_retreat_assistant, 1)->class('form-check-input') }} + {{ html()->label('Retreat Assistant', 'is_assistant')->class('form-check-label') }}
    @@ -449,10 +447,10 @@
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/persons/index.blade.php b/resources/views/persons/index.blade.php index 10a7c1f70..7295c8764 100644 --- a/resources/views/persons/index.blade.php +++ b/resources/views/persons/index.blade.php @@ -8,7 +8,7 @@ @can('create-contact') - {!! Html::image('images/create.png', 'Create Person',array('title'=>"Create Person",'class' => 'btn btn-light')) !!} + {{ html()->img('images/create.png', 'Create Person')->attribute('title', "Create Person")->class('btn btn-light') }} @endCan diff --git a/resources/views/persons/role.blade.php b/resources/views/persons/role.blade.php index 852aefcf0..47447347d 100644 --- a/resources/views/persons/role.blade.php +++ b/resources/views/persons/role.blade.php @@ -20,7 +20,7 @@ @can('show-contact') - {!! Html::image('images/person.png', 'Show Persons',array('title'=>"Show Persons")) !!} + {{ html()->img('images/person.png', 'Show Persons')->attribute('title', "Show Persons") }} @if(isset($role['email_link'])) diff --git a/resources/views/persons/show.blade.php b/resources/views/persons/show.blade.php index 6ce29ff64..fdd60ab33 100644 --- a/resources/views/persons/show.blade.php +++ b/resources/views/persons/show.blade.php @@ -21,33 +21,33 @@
    - {!! Html::link('#contact_info','Contact',array('class' => 'm-1 btn btn-outline-dark')) !!} - {!! Html::link('#demographics','Demographics',array('class' => 'm-1 btn btn-outline-dark')) !!} - {!! Html::link('#groups','Groups',array('class' => 'm-1 btn btn-outline-dark')) !!} - {!! Html::link('#notes','Notes',array('class' => 'm-1 btn btn-outline-dark')) !!} - @can('show-relationship'){!! Html::link('#relationships','Relationships',array('class' => 'm-1 btn btn-outline-dark')) !!} @endCan - @can('show-registration'){!! Html::link('#registrations','Registrations',array('class' => 'm-1 btn btn-outline-dark')) !!} @endCan - @can('show-touchpoint'){!! Html::link('#touchpoints','Touchpoints',array('class' => 'm-1 btn btn-outline-dark')) !!} @endCan - @can('show-attachment'){!! Html::link('#attachments','Attachments',array('class' => 'm-1 btn btn-outline-dark')) !!} @endCan - @can('show-donation') {!! Html::link('#donations','Donations',array('class' => 'm-1 btn btn-outline-dark')) !!} @endCan + {{ html()->a(url('#contact_info'), 'Contact')->class('m-1 btn btn-outline-dark') }} + {{ html()->a(url('#demographics'), 'Demographics')->class('m-1 btn btn-outline-dark') }} + {{ html()->a(url('#groups'), 'Groups')->class('m-1 btn btn-outline-dark') }} + {{ html()->a(url('#notes'), 'Notes')->class('m-1 btn btn-outline-dark') }} + @can('show-relationship'){{ html()->a(url('#relationships'), 'Relationships')->class('m-1 btn btn-outline-dark') }} @endCan + @can('show-registration'){{ html()->a(url('#registrations'), 'Registrations')->class('m-1 btn btn-outline-dark') }} @endCan + @can('show-touchpoint'){{ html()->a(url('#touchpoints'), 'Touchpoints')->class('m-1 btn btn-outline-dark') }} @endCan + @can('show-attachment'){{ html()->a(url('#attachments'), 'Attachments')->class('m-1 btn btn-outline-dark') }} @endCan + @can('show-donation') {{ html()->a(url('#donations'), 'Donations')->class('m-1 btn btn-outline-dark') }} @endCan
    @can('show-group') - @if ($person->is_board_member) {!! Html::image('images/board.png', 'Board Members Group',array('title'=>"Board Members Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_ambassador) {!! Html::image('images/ambassador.png', 'Ambassador Group',array('title'=>"Ambassadors Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_staff) {!! Html::image('images/employee.png', 'Staff Group',array('title'=>"Employees Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_steward) {!! Html::image('images/steward.png', 'Steward Group',array('title'=>"Stewards Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_volunteer) {!! Html::image('images/volunteer.png', 'Volunteers Group',array('title'=>"Volunteers Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_retreat_director) {!! Html::image('images/director.png', 'Retreat Directors Group',array('title'=>"Directors Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_retreat_innkeeper) {!! Html::image('images/innkeeper.png', 'Retreat Innkeepers Group',array('title'=>"Innkeepers Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_retreat_assistant) {!! Html::image('images/assistant.png', 'Retreat Assistants Group',array('title'=>"Assistants Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_bishop) {!! Html::image('images/bishop.png', 'Bishops Group',array('title'=>"Bishop Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_pastor) {!! Html::image('images/pastor.png', 'Pastors Group',array('title'=>"Pastors Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_priest) {!! Html::image('images/priest.png', 'Priests Group',array('title'=>"Priests Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_deacon) {!! Html::image('images/deacon.png', 'Deacons Group',array('title'=>"Deacons Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_provincial) {!! Html::image('images/provincial.png', 'Provincials Group',array('title'=>"Provincials Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_superior) {!! Html::image('images/superior.png', 'Superiors Group',array('title'=>"Superiors Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf - @if ($person->is_jesuit) {!! Html::image('images/jesuit.png', 'Jesuits Group',array('title'=>"Jesuits Group",'class' => 'm-1 btn btn-outline-dark')) !!} @endIf + @if ($person->is_board_member) {{ html()->img('images/board.png', 'Board Members Group')->attribute('title', "Board Members Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_ambassador) {{ html()->img('images/ambassador.png', 'Ambassador Group')->attribute('title', "Ambassadors Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_staff) {{ html()->img('images/employee.png', 'Staff Group')->attribute('title', "Employees Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_steward) {{ html()->img('images/steward.png', 'Steward Group')->attribute('title', "Stewards Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_volunteer) {{ html()->img('images/volunteer.png', 'Volunteers Group')->attribute('title', "Volunteers Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_retreat_director) {{ html()->img('images/director.png', 'Retreat Directors Group')->attribute('title', "Directors Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_retreat_innkeeper) {{ html()->img('images/innkeeper.png', 'Retreat Innkeepers Group')->attribute('title', "Innkeepers Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_retreat_assistant) {{ html()->img('images/assistant.png', 'Retreat Assistants Group')->attribute('title', "Assistants Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_bishop) {{ html()->img('images/bishop.png', 'Bishops Group')->attribute('title', "Bishop Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_pastor) {{ html()->img('images/pastor.png', 'Pastors Group')->attribute('title', "Pastors Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_priest) {{ html()->img('images/priest.png', 'Priests Group')->attribute('title', "Priests Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_deacon) {{ html()->img('images/deacon.png', 'Deacons Group')->attribute('title', "Deacons Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_provincial) {{ html()->img('images/provincial.png', 'Provincials Group')->attribute('title', "Provincials Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_superior) {{ html()->img('images/superior.png', 'Superiors Group')->attribute('title', "Superiors Group")->class('m-1 btn btn-outline-dark') }} @endIf + @if ($person->is_jesuit) {{ html()->img('images/jesuit.png', 'Jesuits Group')->attribute('title', "Jesuits Group")->class('m-1 btn btn-outline-dark') }} @endIf @endCan
    @@ -141,9 +141,9 @@ {{$address->location->display_name}}:
    {!!$address->google_map!!}
    @can('delete-address') - {!! Form::open(['method' => 'DELETE', 'route' => ['address.destroy', $address->id],'onsubmit'=>'return ConfirmDelete()', 'class' => 'd-inline']) !!} + {{ html()->form('DELETE', route('address.destroy', [$address->id]))->attribute('onsubmit', 'return ConfirmDelete()')->class('d-inline')->open() }} - {!! Form::close() !!} + {{ html()->form()->close() }} @endCan
    @endif @@ -255,10 +255,10 @@ @foreach($person->a_relationships as $a_relationship)
  • @can('delete-relationship') - {!! Form::open(['method' => 'DELETE', 'route' => ['relationship.destroy', $a_relationship->id],'onsubmit'=>'return ConfirmDelete()']) !!} + {{ html()->form('DELETE', route('relationship.destroy', [$a_relationship->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} {!!$person->contact_link_full_name!!} is {{ $a_relationship->is_former }} {{ $a_relationship->relationship_type->label_a_b }} {!! $a_relationship->contact_b->contact_link_full_name !!} - {!! Form::close() !!} + {{ html()->form()->close() }} @else {!!$person->contact_link_full_name!!} is {{ $a_relationship->relationship_type->label_a_b }} {!! $a_relationship->contact_b->contact_link_full_name !!} @endCan @@ -268,10 +268,10 @@ @foreach($person->b_relationships as $b_relationship)
  • @can('delete-relationship') - {!! Form::open(['method' => 'DELETE', 'route' => ['relationship.destroy', $b_relationship->id],'onsubmit'=>'return ConfirmDelete()']) !!} + {{ html()->form('DELETE', route('relationship.destroy', [$b_relationship->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} {!!$person->contact_link_full_name!!} is {{ $b_relationship->is_former }} {{ $b_relationship->relationship_type->label_b_a }} {!! $b_relationship->contact_a->contact_link_full_name!!} - {!! Form::close() !!} + {{ html()->form()->close() }} @else {!!$person->contact_link_full_name!!} is {{ $b_relationship->relationship_type->label_b_a }} {!! $b_relationship->contact_a->contact_link_full_name!!} @endCan @@ -280,24 +280,24 @@ @can('create-relationship')
    - {!! Form::open(['method' => 'POST', 'route' => ['relationship_type.addme']]) !!} + {{ html()->form('POST', route('relationship_type.addme', ))->open() }}
    Create a New Relationship
    - {!! Form::label('relationship_type_name', 'Relationship: ', ['class' => 'font-weight-bold']) !!} - {!! Form::select('relationship_type_name', $relationship_types, NULL, ['class' => 'form-control']) !!} - {!! Form::hidden('contact_id',$person->id)!!} + {{ html()->label('Relationship: ', 'relationship_type_name')->class('font-weight-bold') }} + {{ html()->select('relationship_type_name', $relationship_types)->class('form-control') }} + {{ html()->hidden('contact_id', $person->id) }}
    - {!! Form::label('relationship_filter_alternate_name', 'Alternate name: ', ['class' => 'font-weight-bold']) !!} - {!! Form::text('relationship_filter_alternate_name', null, ['class' => 'form-control']) !!} + {{ html()->label('Alternate name: ', 'relationship_filter_alternate_name')->class('font-weight-bold') }} + {{ html()->text('relationship_filter_alternate_name')->class('form-control') }}
    - {!! Form::submit('Create', ['class' => 'm-1 btn btn-primary']) !!} - {!! Form::close() !!} + {{ html()->submit('Create')->class('m-1 btn btn-primary') }} + {{ html()->form()->close() }}
    @@ -392,9 +392,9 @@ @endif @can('create-donation') - {!! Html::link(route('donation.add',[$person->id]),'Add donation',array('class' => 'm-1 btn btn-outline-dark'))!!} + {{ html()->a(url(route('donation.add', [$person->id])), 'Add donation')->class('m-1 btn btn-outline-dark') }} @endCan - {!! Html::link(action([\App\Http\Controllers\PageController::class, 'eoy_acknowledgment'],$person->id),'EOY Acknowledgment',array('class' => 'm-1 btn btn-outline-dark'))!!} + {{ html()->a(url(action([\App\Http\Controllers\PageController::class, 'eoy_acknowledgment'], $person->id)), 'EOY Acknowledgment')->class('m-1 btn btn-outline-dark') }} @if ($donations->isEmpty())

    No donations for this person!

    @@ -445,14 +445,14 @@
    @can('update-contact') - {!! Html::image('images/edit.png', 'Edit',array('title'=>"Edit")) !!} + {{ html()->img('images/edit.png', 'Edit')->attribute('title', "Edit") }} @endCan @can('delete-contact') - {!! Form::open(['method' => 'DELETE', 'route' => ['person.destroy', $person->id],'onsubmit'=>'return ConfirmDelete()','class' => 'd-inline']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'm-1 btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('person.destroy', [$person->id]))->attribute('onsubmit', 'return ConfirmDelete()')->class('d-inline')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'm-1 btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
    diff --git a/resources/views/persons/update/addresses.blade.php b/resources/views/persons/update/addresses.blade.php index fce2a5daa..97288781a 100644 --- a/resources/views/persons/update/addresses.blade.php +++ b/resources/views/persons/update/addresses.blade.php @@ -1,11 +1,11 @@
    - {!! Form::label('primary_address_location_id', 'Primary address:') !!} + {{ html()->label('Primary address:', 'primary_address_location_id') }} @if ($person->primary_email_location_type_id == 0) - {!! Form::select('primary_address_location_id', $primary_address_locations, config('polanco.location_type.home'), ['class' => 'form-control']) !!} + {{ html()->select('primary_address_location_id', $primary_address_locations, config('polanco.location_type.home'))->class('form-control') }} @else - {!! Form::select('primary_address_location_id', $primary_address_locations, $person->primary_address_location_type_id, ['class' => 'form-control']) !!} + {{ html()->select('primary_address_location_id', $primary_address_locations, $person->primary_address_location_type_id)->class('form-control') }} @endIf
    @@ -53,30 +53,30 @@
    - {!! Form::label("address_home_address1", "Address Line 1:") !!} - {!! Form::text("address_home_address1", $defaults['Home']['street_address'], ["class" => "form-control"]) !!} + {{ html()->label("Address Line 1:", "address_home_address1") }} + {{ html()->text("address_home_address1", $defaults['Home']['street_address'])->class("form-control") }}
    - {!! Form::label("address_home_address2", "Address Line 2:") !!} - {!! Form::text("address_home_address2", $defaults['Home']['supplemental_address_1'], ["class" => "form-control"]) !!} + {{ html()->label("Address Line 2:", "address_home_address2") }} + {{ html()->text("address_home_address2", $defaults['Home']['supplemental_address_1'])->class("form-control") }}
    - {!! Form::label("address_home_city", "City:") !!} - {!! Form::text("address_home_city", $defaults['Home']['city'], ["class" => "form-control"]) !!} + {{ html()->label("City:", "address_home_city") }} + {{ html()->text("address_home_city", $defaults['Home']['city'])->class("form-control") }}
    - {!! Form::label("address_home_state", "State:") !!} - {!! Form::select("address_home_state", $states, $defaults['Home']['state_province_id'], ["class" => "form-control"]) !!} + {{ html()->label("State:", "address_home_state") }} + {{ html()->select("address_home_state", $states, $defaults['Home']['state_province_id'])->class("form-control") }}
    - {!! Form::label("address_home_zip", "Zip:") !!} - {!! Form::text("address_home_zip", $defaults['Home']['postal_code'], ["class" => "form-control"]) !!} + {{ html()->label("Zip:", "address_home_zip") }} + {{ html()->text("address_home_zip", $defaults['Home']['postal_code'])->class("form-control") }}
    - {!! Form::label("address_home_country", "Country:") !!} - {!! Form::select("address_home_country", $countries, $defaults['Home']['country_id'], ["class" => "form-control"]) !!} + {{ html()->label("Country:", "address_home_country") }} + {{ html()->select("address_home_country", $countries, $defaults['Home']['country_id'])->class("form-control") }}
    @@ -90,30 +90,30 @@
    - {!! Form::label("address_work_address1", "Address Line 1:") !!} - {!! Form::text("address_work_address1", $defaults['Work']['street_address'], ["class" => "form-control"]) !!} + {{ html()->label("Address Line 1:", "address_work_address1") }} + {{ html()->text("address_work_address1", $defaults['Work']['street_address'])->class("form-control") }}
    - {!! Form::label("address_work_address2", "Address Line 2:") !!} - {!! Form::text("address_work_address2", $defaults['Work']['supplemental_address_1'], ["class" => "form-control"]) !!} + {{ html()->label("Address Line 2:", "address_work_address2") }} + {{ html()->text("address_work_address2", $defaults['Work']['supplemental_address_1'])->class("form-control") }}
    - {!! Form::label("address_work_city", "City:") !!} - {!! Form::text("address_work_city", $defaults['Work']['city'], ["class" => "form-control"]) !!} + {{ html()->label("City:", "address_work_city") }} + {{ html()->text("address_work_city", $defaults['Work']['city'])->class("form-control") }}
    - {!! Form::label("address_work_state", "State:") !!} - {!! Form::select("address_work_state", $states, $defaults['Work']['state_province_id'], ["class" => "form-control"]) !!} + {{ html()->label("State:", "address_work_state") }} + {{ html()->select("address_work_state", $states, $defaults['Work']['state_province_id'])->class("form-control") }}
    - {!! Form::label("address_work_zip", "Zip:") !!} - {!! Form::text("address_work_zip", $defaults['Work']['postal_code'], ["class" => "form-control"]) !!} + {{ html()->label("Zip:", "address_work_zip") }} + {{ html()->text("address_work_zip", $defaults['Work']['postal_code'])->class("form-control") }}
    - {!! Form::label("address_work_country", "Country:") !!} - {!! Form::select("address_work_country", $countries, $defaults['Work']['country_id'], ["class" => "form-control"]) !!} + {{ html()->label("Country:", "address_work_country") }} + {{ html()->select("address_work_country", $countries, $defaults['Work']['country_id'])->class("form-control") }}
  • @@ -127,30 +127,30 @@
    - {!! Form::label("address_other_address1", "Address Line 1:") !!} - {!! Form::text("address_other_address1", $defaults['Other']['street_address'], ["class" => "form-control"]) !!} + {{ html()->label("Address Line 1:", "address_other_address1") }} + {{ html()->text("address_other_address1", $defaults['Other']['street_address'])->class("form-control") }}
    - {!! Form::label("address_other_address2", "Address Line 2:") !!} - {!! Form::text("address_other_address2", $defaults['Other']['supplemental_address_1'], ["class" => "form-control"]) !!} + {{ html()->label("Address Line 2:", "address_other_address2") }} + {{ html()->text("address_other_address2", $defaults['Other']['supplemental_address_1'])->class("form-control") }}
    - {!! Form::label("address_other_city", "City:") !!} - {!! Form::text("address_other_city", $defaults['Other']['city'], ["class" => "form-control"]) !!} + {{ html()->label("City:", "address_other_city") }} + {{ html()->text("address_other_city", $defaults['Other']['city'])->class("form-control") }}
    - {!! Form::label("address_other_state", "State:") !!} - {!! Form::select("address_other_state", $states, $defaults['Other']['state_province_id'], ["class" => "form-control"]) !!} + {{ html()->label("State:", "address_other_state") }} + {{ html()->select("address_other_state", $states, $defaults['Other']['state_province_id'])->class("form-control") }}
    - {!! Form::label("address_other_zip", "Zip:") !!} - {!! Form::text("address_other_zip", $defaults['Other']['postal_code'], ["class" => "form-control"]) !!} + {{ html()->label("Zip:", "address_other_zip") }} + {{ html()->text("address_other_zip", $defaults['Other']['postal_code'])->class("form-control") }}
    - {!! Form::label("address_other_country", "Country:") !!} - {!! Form::select("address_other_country", $countries, $defaults['Other']['country_id'], ["class" => "form-control"]) !!} + {{ html()->label("Country:", "address_other_country") }} + {{ html()->select("address_other_country", $countries, $defaults['Other']['country_id'])->class("form-control") }}
    @@ -159,8 +159,8 @@
    - {!! Form::checkbox("do_not_mail", 1, $person->do_not_mail,["class" => "form-check-input", "id" => "do_not_mail"]) !!} - {!! Form::label("do_not_mail", "Do not mail", ["class" => "form-check-label", "id" => "do_not_mail"]) !!} + {{ html()->checkbox("do_not_mail", $person->do_not_mail, 1)->class("form-check-input")->id("do_not_mail") }} + {{ html()->label("Do not mail", "do_not_mail")->class("form-check-label")->id("do_not_mail") }}
    diff --git a/resources/views/persons/update/emails.blade.php b/resources/views/persons/update/emails.blade.php index 8d339e4d6..68fa341ed 100644 --- a/resources/views/persons/update/emails.blade.php +++ b/resources/views/persons/update/emails.blade.php @@ -1,11 +1,11 @@
    - {!! Form::label('primary_email_location_id', 'Primary email:') !!} + {{ html()->label('Primary email:', 'primary_email_location_id') }} @if ($person->primary_email_location_type_id == 0) - {!! Form::select('primary_email_location_id', $primary_email_locations, config('polanco.location_type.home'), ['class' => 'form-control']) !!} + {{ html()->select('primary_email_location_id', $primary_email_locations, config('polanco.location_type.home'))->class('form-control') }} @else - {!! Form::select('primary_email_location_id', $primary_email_locations, $person->primary_email_location_type_id, ['class' => 'form-control']) !!} + {{ html()->select('primary_email_location_id', $primary_email_locations, $person->primary_email_location_type_id)->class('form-control') }} @endIf
    @@ -52,8 +52,8 @@

    Home email

    - {!! Form::label('email_home', 'Email:') !!} - {!! Form::text('email_home', $defaults['Home']['email'], ['class' => 'form-control']) !!} + {{ html()->label('Email:', 'email_home') }} + {{ html()->text('email_home', $defaults['Home']['email'])->class('form-control') }}
    @@ -65,8 +65,8 @@

    Work email

    - {!! Form::label('email_work', 'Email:') !!} - {!! Form::text('email_work', $defaults['Work']['email'], ['class' => 'form-control']) !!} + {{ html()->label('Email:', 'email_work') }} + {{ html()->text('email_work', $defaults['Work']['email'])->class('form-control') }}
    @@ -78,14 +78,14 @@

    Other email

    - {!! Form::label('email_other', 'Email:') !!} - {!! Form::text('email_other', $defaults['Other']['email'], ['class' => 'form-control']) !!} + {{ html()->label('Email:', 'email_other') }} + {{ html()->text('email_other', $defaults['Other']['email'])->class('form-control') }}
    - {!! Form::checkbox('do_not_email', 1, $person->do_not_email,['class' => 'form-check-input', 'id' => 'do_not_email']) !!} - {!! Form::label('do_not_email', 'Do not email', ['class' => 'form-check-label', 'id' => 'do_not_email']) !!} + {{ html()->checkbox('do_not_email', $person->do_not_email, 1)->class('form-check-input')->id('do_not_email') }} + {{ html()->label('Do not email', 'do_not_email')->class('form-check-label')->id('do_not_email') }}
    diff --git a/resources/views/persons/update/phones.blade.php b/resources/views/persons/update/phones.blade.php index 5ed88e34d..2e4b7f07d 100644 --- a/resources/views/persons/update/phones.blade.php +++ b/resources/views/persons/update/phones.blade.php @@ -1,11 +1,11 @@
    - {!! Form::label('primary_phone_location_id', 'Primary phone:') !!} + {{ html()->label('Primary phone:', 'primary_phone_location_id') }} @if ($person->primary_phone_location_type_id == 0) - {!! Form::select('primary_phone_location_id', $primary_phones, config('polanco.location_type.home').":Phone", ['class' => 'form-control']) !!} + {{ html()->select('primary_phone_location_id', $primary_phones, config('polanco.location_type.home') . ":Phone")->class('form-control') }} @else - {!! Form::select('primary_phone_location_id', $primary_phones, $person->primary_phone_location_type_id.":".$person->primary_phone_type, ['class' => 'form-control']) !!} + {{ html()->select('primary_phone_location_id', $primary_phones, $person->primary_phone_location_type_id . ":" . $person->primary_phone_type)->class('form-control') }} @endIf
    @@ -52,16 +52,16 @@
    - {!! Form::label('phone_home_phone', 'Main:') !!} - {!! Form::text('phone_home_phone', $defaults['Home']['Phone'], ['class' => 'form-control']) !!} + {{ html()->label('Main:', 'phone_home_phone') }} + {{ html()->text('phone_home_phone', $defaults['Home']['Phone'])->class('form-control') }}
    - {!! Form::label('phone_home_mobile', 'Mobile:') !!} - {!! Form::text('phone_home_mobile', $defaults['Home']['Mobile'], ['class' => 'form-control']) !!} + {{ html()->label('Mobile:', 'phone_home_mobile') }} + {{ html()->text('phone_home_mobile', $defaults['Home']['Mobile'])->class('form-control') }}
    - {!! Form::label('phone_home_fax', 'Fax:') !!} - {!! Form::text('phone_home_fax', $defaults['Home']['Fax'], ['class' => 'form-control']) !!} + {{ html()->label('Fax:', 'phone_home_fax') }} + {{ html()->text('phone_home_fax', $defaults['Home']['Fax'])->class('form-control') }}
    @@ -74,16 +74,16 @@
    - {!! Form::label('phone_work_phone', 'Main:') !!} - {!! Form::text('phone_work_phone', $defaults['Work']['Phone'], ['class' => 'form-control']) !!} + {{ html()->label('Main:', 'phone_work_phone') }} + {{ html()->text('phone_work_phone', $defaults['Work']['Phone'])->class('form-control') }}
    - {!! Form::label('phone_work_mobile', 'Mobile:') !!} - {!! Form::text('phone_work_mobile', $defaults['Work']['Mobile'], ['class' => 'form-control']) !!} + {{ html()->label('Mobile:', 'phone_work_mobile') }} + {{ html()->text('phone_work_mobile', $defaults['Work']['Mobile'])->class('form-control') }}
    - {!! Form::label('phone_work_fax', 'Fax:') !!} - {!! Form::text('phone_work_fax', $defaults['Work']['Fax'], ['class' => 'form-control']) !!} + {{ html()->label('Fax:', 'phone_work_fax') }} + {{ html()->text('phone_work_fax', $defaults['Work']['Fax'])->class('form-control') }}
    @@ -96,26 +96,26 @@
    - {!! Form::label('phone_other_phone', 'Main:') !!} - {!! Form::text('phone_other_phone', $defaults['Other']['Phone'], ['class' => 'form-control']) !!} + {{ html()->label('Main:', 'phone_other_phone') }} + {{ html()->text('phone_other_phone', $defaults['Other']['Phone'])->class('form-control') }}
    - {!! Form::label('phone_other_mobile', 'Mobile:') !!} - {!! Form::text('phone_other_mobile', $defaults['Other']['Mobile'], ['class' => 'form-control']) !!} + {{ html()->label('Mobile:', 'phone_other_mobile') }} + {{ html()->text('phone_other_mobile', $defaults['Other']['Mobile'])->class('form-control') }}
    - {!! Form::label('phone_other_fax', 'Fax:') !!} - {!! Form::text('phone_other_fax', $defaults['Other']['Fax'], ['class' => 'form-control']) !!} + {{ html()->label('Fax:', 'phone_other_fax') }} + {{ html()->text('phone_other_fax', $defaults['Other']['Fax'])->class('form-control') }}
    - {!! Form::checkbox('do_not_phone', 1, $person->do_not_phone,['class' => 'form-check-input', 'id' => 'do_not_phone']) !!} - {!! Form::label('do_not_phone', 'Do not call', ['class' => 'form-check-label', 'id' => 'do_not_phone']) !!} + {{ html()->checkbox('do_not_phone', $person->do_not_phone, 1)->class('form-check-input')->id('do_not_phone') }} + {{ html()->label('Do not call', 'do_not_phone')->class('form-check-label')->id('do_not_phone') }}
    - {!! Form::checkbox('do_not_sms', 1, $person->do_not_sms,['class' => 'form-check-input', 'id' => 'do_not_sms']) !!} - {!! Form::label('do_not_sms', 'Do not text', ['class' => 'form-check-label', 'id' => 'do_not_sms']) !!} + {{ html()->checkbox('do_not_sms', $person->do_not_sms, 1)->class('form-check-input')->id('do_not_sms') }} + {{ html()->label('Do not text', 'do_not_sms')->class('form-check-label')->id('do_not_sms') }}
    diff --git a/resources/views/persons/update/urls.blade.php b/resources/views/persons/update/urls.blade.php index af4d139ef..1ebaeb519 100644 --- a/resources/views/persons/update/urls.blade.php +++ b/resources/views/persons/update/urls.blade.php @@ -41,48 +41,48 @@
    - {!! Form::label('url_main', 'Personal (main):') !!} - {!! Form::text('url_main', $defaults['Main']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Personal (main):', 'url_main') }} + {{ html()->text('url_main', $defaults['Main']['url'])->class('form-control') }}
    - {!! Form::label('url_work', 'Work:') !!} - {!! Form::text('url_work', $defaults['Work']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Work:', 'url_work') }} + {{ html()->text('url_work', $defaults['Work']['url'])->class('form-control') }}
    - {!! Form::label('url_facebook', 'Facebook:') !!} - {!! Form::text('url_facebook', $defaults['Facebook']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Facebook:', 'url_facebook') }} + {{ html()->text('url_facebook', $defaults['Facebook']['url'])->class('form-control') }}
    - {!! Form::label('url_instagram', 'Instagram:') !!} - {!! Form::text('url_instagram', $defaults['Instagram']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Instagram:', 'url_instagram') }} + {{ html()->text('url_instagram', $defaults['Instagram']['url'])->class('form-control') }}
    - {!! Form::label('url_linkedin', 'LinkedIn:') !!} - {!! Form::text('url_linkedin', $defaults['LinkedIn']['url'], ['class' => 'form-control']) !!} + {{ html()->label('LinkedIn:', 'url_linkedin') }} + {{ html()->text('url_linkedin', $defaults['LinkedIn']['url'])->class('form-control') }}
    - {!! Form::label('url_twitter', 'Twitter:') !!} - {!! Form::text('url_twitter', $defaults['Twitter']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Twitter:', 'url_twitter') }} + {{ html()->text('url_twitter', $defaults['Twitter']['url'])->class('form-control') }}
    diff --git a/resources/views/registrations/add_group.blade.php b/resources/views/registrations/add_group.blade.php index 35f01661c..70b015dba 100644 --- a/resources/views/registrations/add_group.blade.php +++ b/resources/views/registrations/add_group.blade.php @@ -6,75 +6,75 @@

    Add A Registration

    - {!! Form::open(['url' => 'registration/add_group', 'method' => 'post']) !!} + {{ html()->form('POST', 'registration/add_group')->open() }}
    - {!! Form::label('event_id', 'Retreat:') !!} - {!! Form::select('event_id', $retreats, $defaults['retreat_id'], ['class'=>'form-control']) !!} + {{ html()->label('Retreat:', 'event_id') }} + {{ html()->select('event_id', $retreats, $defaults['retreat_id'])->class('form-control') }}
    - {!! Form::label('group_id', 'Group:') !!} - {!! Form::select('group_id', $groups, $defaults['group_id'], ['class'=>'form-control']) !!} + {{ html()->label('Group:', 'group_id') }} + {{ html()->select('group_id', $groups, $defaults['group_id'])->class('form-control') }}
    - {!! Form::label('register_date', 'Registered:') !!} - {!! Form::text('register_date', $defaults['today'], ['class'=>'form-control flatpickr-date-time']) !!} + {{ html()->label('Registered:', 'register_date') }} + {{ html()->text('register_date', $defaults['today'])->class('form-control flatpickr-date-time') }}
    - {!! Form::label('source', 'Registration from:') !!} - {!! Form::select('source', $defaults['registration_source'], 'N/A', ['class'=>'form-control']) !!} + {{ html()->label('Registration from:', 'source') }} + {{ html()->select('source', $defaults['registration_source'], 'N/A')->class('form-control') }}
    - {!! Form::label('status_id', 'Status:') !!} - {!! Form::select('status_id', $defaults['participant_status_type'], NULL, ['class' => 'form-control']) !!} + {{ html()->label('Status:', 'status_id') }} + {{ html()->select('status_id', $defaults['participant_status_type'])->class('form-control') }}
    - {!! Form::label('registration_confirm_date', 'Registration Confirmed:') !!} - {!! Form::text('registration_confirm_date', null, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Registration Confirmed:', 'registration_confirm_date') }} + {{ html()->text('registration_confirm_date')->class('form-control flatpickr-date') }}
    - {!! Form::label('confirmed_by', 'Confirmed By:') !!} - {!! Form::text('confirmed_by', null, ['class'=>'form-control']) !!} + {{ html()->label('Confirmed By:', 'confirmed_by') }} + {{ html()->text('confirmed_by')->class('form-control') }}
    - {!! Form::label('arrived_at', 'Arrived at:') !!} - {!! Form::text('arrived_at', null, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Arrived at:', 'arrived_at') }} + {{ html()->text('arrived_at')->class('form-control flatpickr-date') }}
    - {!! Form::label('departed_at', 'Departed at:') !!} - {!! Form::text('departed_at', null, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Departed at:', 'departed_at') }} + {{ html()->text('departed_at')->class('form-control flatpickr-date') }}
    - {!! Form::label('canceled_at', 'Canceled at:') !!} - {!! Form::text('canceled_at', null, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Canceled at:', 'canceled_at') }} + {{ html()->text('canceled_at')->class('form-control flatpickr-date') }}
    - {!! Form::label('deposit', 'Deposit:') !!} - {!! Form::text('deposit', '0.00', ['class'=>'form-control']) !!} + {{ html()->label('Deposit:', 'deposit') }} + {{ html()->text('deposit', '0.00')->class('form-control') }}
    - {!! Form::label('notes', 'Notes:') !!} - {!! Form::textarea('notes', null, ['class'=>'form-control', 'rows'=>'3']) !!} + {{ html()->label('Notes:', 'notes') }} + {{ html()->textarea('notes')->class('form-control')->rows('3') }}
    - {!! Form::submit('Add Group Registration', ['class'=>'btn btn-light']) !!} + {{ html()->submit('Add Group Registration')->class('btn btn-light') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/registrations/create.blade.php b/resources/views/registrations/create.blade.php index 8307e93ec..81a2bfa97 100644 --- a/resources/views/registrations/create.blade.php +++ b/resources/views/registrations/create.blade.php @@ -6,92 +6,92 @@

    Add A Registration

    - {!! Form::open(['url' => 'registration', 'method' => 'post']) !!} + {{ html()->form('POST', 'registration')->open() }}
    - {!! Form::label('event_id', 'Retreat:') !!} - {!! Form::select('event_id', $retreats, $defaults['retreat_id'], ['class'=>'form-control']) !!} + {{ html()->label('Retreat:', 'event_id') }} + {{ html()->select('event_id', $retreats, $defaults['retreat_id'])->class('form-control') }}
    - {!! Form::label('contact_id', 'Retreatant:') !!} + {{ html()->label('Retreatant:', 'contact_id') }} @if (isset($defaults['contact_id'])) - {!! Form::select('contact_id', $retreatants, $defaults['contact_id'], ['class'=>'form-control']) !!} + {{ html()->select('contact_id', $retreatants, $defaults['contact_id'])->class('form-control') }} @else - {!! Form::select('contact_id', $retreatants, 0, ['class'=>'form-control']) !!} + {{ html()->select('contact_id', $retreatants, 0)->class('form-control') }} @endif
    - {!! Form::label('register_date', 'Registered:') !!} - {!! Form::text('register_date', now(), ['class'=>'form-control flatpickr-date-time']) !!} + {{ html()->label('Registered:', 'register_date') }} + {{ html()->text('register_date', now())->class('form-control flatpickr-date-time') }}
    - {!! Form::label('source', 'Registration from:') !!} - {!! Form::select('source', $defaults['registration_source'], 'N/A', ['class'=>'form-control']) !!} + {{ html()->label('Registration from:', 'source') }} + {{ html()->select('source', $defaults['registration_source'], 'N/A')->class('form-control') }}
    - {!! Form::label('status_id', 'Status:') !!} - {!! Form::select('status_id', $defaults['participant_status_type'], 1, ['class'=>'form-control']) !!} + {{ html()->label('Status:', 'status_id') }} + {{ html()->select('status_id', $defaults['participant_status_type'], 1)->class('form-control') }}
    - {!! Form::label('registration_confirm_date', 'Registration Confirmed:') !!} - {!! Form::text('registration_confirm_date', null, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Registration Confirmed:', 'registration_confirm_date') }} + {{ html()->text('registration_confirm_date')->class('form-control flatpickr-date') }}
    - {!! Form::label('confirmed_by', 'Confirmed By:') !!} - {!! Form::text('confirmed_by', null, ['class'=>'form-control']) !!} + {{ html()->label('Confirmed By:', 'confirmed_by') }} + {{ html()->text('confirmed_by')->class('form-control') }}
    - {!! Form::label('arrived_at', 'Arrived at:') !!} - {!! Form::text('arrived_at', null, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Arrived at:', 'arrived_at') }} + {{ html()->text('arrived_at')->class('form-control flatpickr-date') }}
    - {!! Form::label('departed_at', 'Departed at:') !!} - {!! Form::text('departed_at', null, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Departed at:', 'departed_at') }} + {{ html()->text('departed_at')->class('form-control flatpickr-date') }}
    - {!! Form::label('canceled_at', 'Canceled at:') !!} - {!! Form::text('canceled_at', null, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Canceled at:', 'canceled_at') }} + {{ html()->text('canceled_at')->class('form-control flatpickr-date') }}
    - {!! Form::label('rooms', 'Room(s):') !!} - {!! Form::select('rooms[]', $rooms, 0, ['class' => 'form-control','multiple' => 'multiple']) !!} + {{ html()->label('Room(s):', 'rooms') }} + {{ html()->multiselect('rooms[]', $rooms, 0)->class('form-control') }}
    @if ($defaults['is_multi_registration']) - {!! Form::label('num_registrants', 'Number of participants:') !!} - {!! Form::selectRange('num_registrants', 0, 99, NULL, ['class'=>'form-control']) !!} + {{ html()->label('Number of participants:', 'num_registrants') }} + {{ html()->selectrange('num_registrants', 0, 99)->class('form-control') }} @endIf
    - {!! Form::label('deposit', 'Deposit:') !!} - {!! Form::text('deposit', '50.00', ['class'=>'form-control']) !!} + {{ html()->label('Deposit:', 'deposit') }} + {{ html()->text('deposit', '50.00')->class('form-control') }}
    - {!! Form::label('notes', 'Notes:') !!} - {!! Form::textarea('notes', null, ['class'=>'form-control', 'rows'=>'3']) !!} + {{ html()->label('Notes:', 'notes') }} + {{ html()->textarea('notes')->class('form-control')->rows('3') }}
    - {!! Form::submit('Add Registration', ['class'=>'btn btn-light']) !!} + {{ html()->submit('Add Registration')->class('btn btn-light') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }} @stop diff --git a/resources/views/registrations/edit.blade.php b/resources/views/registrations/edit.blade.php index 8cad94db5..8a8a01301 100644 --- a/resources/views/registrations/edit.blade.php +++ b/resources/views/registrations/edit.blade.php @@ -8,85 +8,85 @@
    - {!! Form::open(['method' => 'PUT', 'route' => ['registration.update', $registration->id]]) !!} - {!! Form::hidden('id', $registration->id) !!} + {{ html()->form('PUT', route('registration.update', [$registration->id]))->open() }} + {{ html()->hidden('id', $registration->id) }}
    - {!! Form::label('event_id', 'Retreat') !!} - {!! Form::select('event_id', $retreats, $registration->event_id, ['class' => 'form-control']) !!} - {!! Form::label('start', 'Retreat Dates: '.date('M j, Y', strtotime($registration->retreat->start_date)).' - '.date('M j, Y', strtotime($registration->retreat->end_date))) !!} + {{ html()->label('Retreat', 'event_id') }} + {{ html()->select('event_id', $retreats, $registration->event_id)->class('form-control') }} + {{ html()->label('Retreat Dates: ' . date('M j, Y', strtotime($registration->retreat->start_date)) . ' - ' . date('M j, Y', strtotime($registration->retreat->end_date)), 'start') }}
    - {!! Form::label('register_date', 'Registered') !!} - {!! Form::date('register_date', isset($registration->register_date) ? $registration->register_date : now() , ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Registered', 'register_date') }} + {{ html()->date('register_date', isset($registration->register_date) ? $registration->register_date : now())->class('form-control flatpickr-date') }}
    - {!! Form::label('source', 'Registration from:') !!} - {!! Form::select('source', $defaults['registration_source'], $registration->source, ['class' => 'form-control']) !!} + {{ html()->label('Registration from:', 'source') }} + {{ html()->select('source', $defaults['registration_source'], $registration->source)->class('form-control') }}
    - {!! Form::label('status_id', 'Status:') !!} - {!! Form::select('status_id', $defaults['participant_status_type'], $registration->status_id, ['class' => 'form-control']) !!} + {{ html()->label('Status:', 'status_id') }} + {{ html()->select('status_id', $defaults['participant_status_type'], $registration->status_id)->class('form-control') }}
    - {!! Form::label('registration_confirm_date', 'Registration Confirmed:') !!} + {{ html()->label('Registration Confirmed:', 'registration_confirm_date') }} @if ($registration->registration_confirm_date == NULL) - {!! Form::date('registration_confirm_date', NULL, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->date('registration_confirm_date')->class('form-control flatpickr-date') }} @else - {!! Form::date('registration_confirm_date', $registration->registration_confirm_date, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->date('registration_confirm_date', $registration->registration_confirm_date)->class('form-control flatpickr-date') }} @endif
    - {!! Form::label('confirmed_by', 'Confirmed by:') !!} - {!! Form::text('confirmed_by', $registration->confirmed_by, ['class'=>'form-control']) !!} + {{ html()->label('Confirmed by:', 'confirmed_by') }} + {{ html()->text('confirmed_by', $registration->confirmed_by)->class('form-control') }}
    - {!! Form::label('arrived_at', 'Arrived at:') !!} - {!! Form::datetime('arrived_at', $registration->arrived_at, ['class'=>'form-control flatpickr-date-time']) !!} + {{ html()->label('Arrived at:', 'arrived_at') }} + {{ html()->datetime('arrived_at', $registration->arrived_at)->class('form-control flatpickr-date-time') }}
    - {!! Form::label('departed_at', 'Departed at:') !!} - {!! Form::datetime('departed_at', $registration->departed_at, ['class'=>'form-control flatpickr-date-time']) !!} + {{ html()->label('Departed at:', 'departed_at') }} + {{ html()->datetime('departed_at', $registration->departed_at)->class('form-control flatpickr-date-time') }}
    - {!! Form::label('canceled_at', 'Canceled at:') !!} - {!! Form::date('canceled_at', $registration->canceled_at, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->label('Canceled at:', 'canceled_at') }} + {{ html()->date('canceled_at', $registration->canceled_at)->class('form-control flatpickr-date') }}
    - {!! Form::label('room_id', 'Room:') !!} - {!! Form::select('room_id', $rooms, $registration->room_id, ['class' => 'form-control']) !!} + {{ html()->label('Room:', 'room_id') }} + {{ html()->select('room_id', $rooms, $registration->room_id)->class('form-control') }}
    - {!! Form::label('deposit', 'Deposit:') !!} - {!! Form::text('deposit', $registration->deposit, ['class'=>'form-control']) !!} + {{ html()->label('Deposit:', 'deposit') }} + {{ html()->text('deposit', $registration->deposit)->class('form-control') }}
    - {!! Form::label('notes', 'Notes:') !!} - {!! Form::textarea('notes', $registration->notes, ['class'=>'form-control', 'rows'=>'3']) !!} + {{ html()->label('Notes:', 'notes') }} + {{ html()->textarea('notes', $registration->notes)->class('form-control')->rows('3') }}
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-light']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-light']) }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/registrations/index.blade.php b/resources/views/registrations/index.blade.php index 11f2105ed..20530a84f 100644 --- a/resources/views/registrations/index.blade.php +++ b/resources/views/registrations/index.blade.php @@ -7,7 +7,7 @@ Registrations @can('create-registration') - {!! Html::image('images/create.png', 'Create a Registration',array('title'=>"Create a Registration",'class' => 'btn btn-light')) !!} + {{ html()->img('images/create.png', 'Create a Registration')->attribute('title', "Create a Registration")->class('btn btn-light') }} @endCan diff --git a/resources/views/registrations/show.blade.php b/resources/views/registrations/show.blade.php index 122d29aa5..fc75882f4 100644 --- a/resources/views/registrations/show.blade.php +++ b/resources/views/registrations/show.blade.php @@ -12,7 +12,7 @@ Registration #{{ $registration->id }} @endCan - {!! Html::image('images/registration.png', 'Registration Index',array('title'=>"Registration Index",'class' => 'btn btn-light')) !!} + {{ html()->img('images/registration.png', 'Registration Index')->attribute('title', "Registration Index")->class('btn btn-light') }} @can('update-registration') @if (empty($registration->registration_confirm_date)) @@ -115,14 +115,14 @@
    @can('delete-registration') - {!! Form::open(['method' => 'DELETE', 'route' => ['registration.destroy', $registration->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('registration.destroy', [$registration->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
    diff --git a/resources/views/relationships/index.blade.php b/resources/views/relationships/index.blade.php index 7558d9c0e..6befacc6c 100644 --- a/resources/views/relationships/index.blade.php +++ b/resources/views/relationships/index.blade.php @@ -7,7 +7,7 @@ @if ($relationships->isEmpty()) diff --git a/resources/views/relationships/show.blade.php b/resources/views/relationships/show.blade.php index e3f1a0413..9ecc1766c 100644 --- a/resources/views/relationships/show.blade.php +++ b/resources/views/relationships/show.blade.php @@ -10,7 +10,7 @@ @else Relationship #{{ $relationship->id }} @endCan - {!! Html::image('images/relationship.png', 'relationship Index',array('title'=>"relationship Index",'class' => 'btn btn-light')) !!} + {{ html()->img('images/relationship.png', 'relationship Index')->attribute('title', "relationship Index")->class('btn btn-light') }}
    @@ -45,14 +45,14 @@
    @can('delete-relationship') - {!! Form::open(['method' => 'DELETE', 'route' => ['relationship.destroy', $relationship->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('relationship.destroy', [$relationship->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
    diff --git a/resources/views/relationships/types/add.blade.php b/resources/views/relationships/types/add.blade.php index 7e7fef8a3..d1f8a4ba2 100644 --- a/resources/views/relationships/types/add.blade.php +++ b/resources/views/relationships/types/add.blade.php @@ -3,31 +3,31 @@
    - {!! Form::open(['url' => 'relationship/add', 'method' => 'post', 'class' => 'form-horizontal panel']) !!} - {{ Form::hidden('relationship_type_id', $relationship_type->id) }} - {{ Form::hidden('direction', $direction) }} + {{ html()->form('POST', 'relationship/add')->class('form-horizontal panel')->open() }} + {{ html()->hidden('relationship_type_id', $relationship_type->id) }} + {{ html()->hidden('direction', $direction) }} @if ($direction == 'a')

    {{$primary_contact->full_name}} is {{$relationship_type->label_a_b}}:


    - {!! Form::label('contact_b_id', $relationship_type->name_b_a, ['class' => 'col-md-2 font-weight-bold']) !!} - {!! Form::select('contact_b_id', $contact_list, null, ['class' => 'col-md-3', 'autofocus'=>'autofocus']) !!} - {{ Form::hidden('contact_a_id', $primary_contact->id) }} + {{ html()->label($relationship_type->name_b_a, 'contact_b_id')->class('col-md-2 font-weight-bold') }} + {{ html()->select('contact_b_id', $contact_list)->class('col-md-3')->autofocus('autofocus') }} + {{ html()->hidden('contact_a_id', $primary_contact->id) }}
    @else

    {{$primary_contact->full_name}} is {{$relationship_type->label_b_a}}:


    - {!! Form::label('contact_a_id', $relationship_type->name_a_b, ['class' => 'col-md-2 font-weight-bold']) !!} - {!! Form::select('contact_a_id', $contact_list, null, ['class' => 'col-md-3', 'autofocus'=>'autofocus']) !!} - {{ Form::hidden('contact_b_id', $primary_contact->id) }} + {{ html()->label($relationship_type->name_a_b, 'contact_a_id')->class('col-md-2 font-weight-bold') }} + {{ html()->select('contact_a_id', $contact_list)->class('col-md-3')->autofocus('autofocus') }} + {{ html()->hidden('contact_b_id', $primary_contact->id) }}
    @endIf

    - {!! Form::submit('Add '.$relationship_type->description.' Relationship', ['class'=>'btn btn-primary']) !!} + {{ html()->submit('Add ' . $relationship_type->description . ' Relationship')->class('btn btn-primary') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    diff --git a/resources/views/relationships/types/create.blade.php b/resources/views/relationships/types/create.blade.php index 71d813598..07720ad7e 100644 --- a/resources/views/relationships/types/create.blade.php +++ b/resources/views/relationships/types/create.blade.php @@ -4,44 +4,44 @@

    Create Relationship Type

    - {!! Form::open(['url' => 'relationship_type', 'method' => 'post', 'class' => 'form-horizontal panel']) !!} + {{ html()->form('POST', 'relationship_type')->class('form-horizontal panel')->open() }}
    - {!! Form::label('name_a_b', 'Name A-B:', ['class' => 'col-md-1']) !!} - {!! Form::text('name_a_b', null, ['class' => 'col-md-3']) !!} + {{ html()->label('Name A-B:', 'name_a_b')->class('col-md-1') }} + {{ html()->text('name_a_b')->class('col-md-3') }} - {!! Form::label('label_a_b', 'Label A-B:', ['class' => 'col-md-1']) !!} - {!! Form::text('label_a_b', null, ['class' => 'col-md-3']) !!} + {{ html()->label('Label A-B:', 'label_a_b')->class('col-md-1') }} + {{ html()->text('label_a_b')->class('col-md-3') }} - {!! Form::label('contact_type_a', 'Contact Type A:', ['class' => 'col-md-2']) !!} - {!! Form::select('contact_type_a', $contact_types, 'Individual', ['class' => 'col-md-1']) !!} + {{ html()->label('Contact Type A:', 'contact_type_a')->class('col-md-2') }} + {{ html()->select('contact_type_a', $contact_types, 'Individual')->class('col-md-1') }}
    - {!! Form::label('name_b_a', 'Name B-A:', ['class' => 'col-md-1']) !!} - {!! Form::text('name_b_a', null, ['class' => 'col-md-3']) !!} + {{ html()->label('Name B-A:', 'name_b_a')->class('col-md-1') }} + {{ html()->text('name_b_a')->class('col-md-3') }} - {!! Form::label('label_b_a', 'Label B-A:', ['class' => 'col-md-1']) !!} - {!! Form::text('label_b_a', null, ['class' => 'col-md-3']) !!} + {{ html()->label('Label B-A:', 'label_b_a')->class('col-md-1') }} + {{ html()->text('label_b_a')->class('col-md-3') }} - {!! Form::label('contact_type_b', 'Contact Type B:', ['class' => 'col-md-2']) !!} - {!! Form::select('contact_type_b', $contact_types, 'Individual', ['class' => 'col-md-1']) !!} + {{ html()->label('Contact Type B:', 'contact_type_b')->class('col-md-2') }} + {{ html()->select('contact_type_b', $contact_types, 'Individual')->class('col-md-1') }}
    - {!! Form::label('description', 'Description:', ['class' => 'col-md-1']) !!} - {!! Form::textarea('description', NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Description:', 'description')->class('col-md-1') }} + {{ html()->textarea('description')->class('col-md-3') }}
    - {!! Form::label('is_active', 'Active:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_active', 1, false,['class' => 'col-md-1']) !!} - {!! Form::label('is_reserved', 'Reserved:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_reserved', 0, false,['class' => 'col-md-1']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-1') }} + {{ html()->checkbox('is_active', false, 1)->class('col-md-1') }} + {{ html()->label('Reserved:', 'is_reserved')->class('col-md-1') }} + {{ html()->checkbox('is_reserved', false, 0)->class('col-md-1') }}
    - {!! Form::submit('Add Relationship Type', ['class'=>'btn btn-primary']) !!} + {{ html()->submit('Add Relationship Type')->class('btn btn-primary') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    diff --git a/resources/views/relationships/types/edit.blade.php b/resources/views/relationships/types/edit.blade.php index 1a3900efe..3e71694ed 100644 --- a/resources/views/relationships/types/edit.blade.php +++ b/resources/views/relationships/types/edit.blade.php @@ -5,36 +5,36 @@

    Edit Relationship Type

    - {!! Form::open(['method' => 'PUT', 'route' => ['relationship_type.update', $relationship_type->id]]) !!} - {!! Form::hidden('id', $relationship_type->id) !!} + {{ html()->form('PUT', route('relationship_type.update', [$relationship_type->id]))->open() }} + {{ html()->hidden('id', $relationship_type->id) }}

    Relationship Type Details

    - {!! Form::label('name_a_b', 'Name A-B:', ['class' => 'col-md-1']) !!} + {{ html()->label('Name A-B:', 'name_a_b')->class('col-md-1') }} - {!! Form::text('name_a_b', $relationship_type->name_a_b, ['class' => 'col-md-3']) !!} - {!! Form::label('label_a_b', 'Label A-B:', ['class' => 'col-md-1']) !!} + {{ html()->text('name_a_b', $relationship_type->name_a_b)->class('col-md-3') }} + {{ html()->label('Label A-B:', 'label_a_b')->class('col-md-1') }} - {!! Form::text('label_a_b', $relationship_type->label_a_b, ['class' => 'col-md-3']) !!} + {{ html()->text('label_a_b', $relationship_type->label_a_b)->class('col-md-3') }}
    - {!! Form::label('name_b_a', 'Name B-A:', ['class' => 'col-md-1']) !!} + {{ html()->label('Name B-A:', 'name_b_a')->class('col-md-1') }} - {!! Form::text('name_b_a', $relationship_type->name_b_a, ['class' => 'col-md-3']) !!} - {!! Form::label('label_b_a', 'Label B-A:', ['class' => 'col-md-1']) !!} + {{ html()->text('name_b_a', $relationship_type->name_b_a)->class('col-md-3') }} + {{ html()->label('Label B-A:', 'label_b_a')->class('col-md-1') }} - {!! Form::text('label_b_a', $relationship_type->label_b_a, ['class' => 'col-md-3']) !!} + {{ html()->text('label_b_a', $relationship_type->label_b_a)->class('col-md-3') }}
    - {!! Form::label('description', 'Description:', ['class' => 'col-md-1']) !!} - {!! Form::textarea('description', $relationship_type->description, ['class' => 'col-md-3']) !!} + {{ html()->label('Description:', 'description')->class('col-md-1') }} + {{ html()->textarea('description', $relationship_type->description)->class('col-md-3') }}
    - {!! Form::label('is_active', 'Active:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_active', true, $relationship_type->is_active,['class' => 'col-md-1']) !!} - {!! Form::label('is_reserved', 'Reserved:', ['class' => 'col-md-1']) !!} - {!! Form::checkbox('is_reserved', false, $relationship_type->is_reserved, ['class' => 'col-md-1']) !!} + {{ html()->label('Active:', 'is_active')->class('col-md-1') }} + {{ html()->checkbox('is_active', $relationship_type->is_active, true)->class('col-md-1') }} + {{ html()->label('Reserved:', 'is_reserved')->class('col-md-1') }} + {{ html()->checkbox('is_reserved', $relationship_type->is_reserved, false)->class('col-md-1') }}
    @@ -43,8 +43,8 @@
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-primary']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-primary']) }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop \ No newline at end of file diff --git a/resources/views/relationships/types/index.blade.php b/resources/views/relationships/types/index.blade.php index 3aca75f3f..e339f6e40 100644 --- a/resources/views/relationships/types/index.blade.php +++ b/resources/views/relationships/types/index.blade.php @@ -7,7 +7,7 @@ @if ($relationship_types->isEmpty()) diff --git a/resources/views/relationships/types/show.blade.php b/resources/views/relationships/types/show.blade.php index 5701797ab..5a3fcc058 100644 --- a/resources/views/relationships/types/show.blade.php +++ b/resources/views/relationships/types/show.blade.php @@ -58,10 +58,10 @@
    - -
    {!! Form::open(['method' => 'DELETE', 'route' => ['relationship_type.destroy', $relationship_type->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!}
    + +
    {{ html()->form('DELETE', route('relationship_type.destroy', [$relationship_type->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }}
    diff --git a/resources/views/reports/contact_info.blade.php b/resources/views/reports/contact_info.blade.php index 90afc2357..b6d0edd42 100644 --- a/resources/views/reports/contact_info.blade.php +++ b/resources/views/reports/contact_info.blade.php @@ -144,7 +144,7 @@ diff --git a/resources/views/reports/finance/reconcile_deposits.blade.php b/resources/views/reports/finance/reconcile_deposits.blade.php index 18e19a7c5..9d33aba81 100644 --- a/resources/views/reports/finance/reconcile_deposits.blade.php +++ b/resources/views/reports/finance/reconcile_deposits.blade.php @@ -53,7 +53,7 @@ diff --git a/resources/views/reports/retreatantinfo2.blade.php b/resources/views/reports/retreatantinfo2.blade.php index d33ad8431..5a10f4260 100644 --- a/resources/views/reports/retreatantinfo2.blade.php +++ b/resources/views/reports/retreatantinfo2.blade.php @@ -147,7 +147,7 @@ diff --git a/resources/views/reports/retreatlisting.blade.php b/resources/views/reports/retreatlisting.blade.php index 623da980d..b612a1fb1 100644 --- a/resources/views/reports/retreatlisting.blade.php +++ b/resources/views/reports/retreatlisting.blade.php @@ -37,7 +37,7 @@ {{$registrations->count()}} Registered Retreatant(s) as of {{date('l, F j, Y')}}
    diff --git a/resources/views/reports/retreatregistrations.blade.php b/resources/views/reports/retreatregistrations.blade.php index a1167882f..31268ab9e 100644 --- a/resources/views/reports/retreatregistrations.blade.php +++ b/resources/views/reports/retreatregistrations.blade.php @@ -29,7 +29,7 @@ diff --git a/resources/views/reports/retreatroster.blade.php b/resources/views/reports/retreatroster.blade.php index 3f30f5a8e..fb8c0885a 100644 --- a/resources/views/reports/retreatroster.blade.php +++ b/resources/views/reports/retreatroster.blade.php @@ -38,7 +38,7 @@ diff --git a/resources/views/retreats/assign_rooms.blade.php b/resources/views/retreats/assign_rooms.blade.php index 6ee459d1c..86ca0e72c 100644 --- a/resources/views/retreats/assign_rooms.blade.php +++ b/resources/views/retreats/assign_rooms.blade.php @@ -3,12 +3,12 @@
    - {!! Form::open(['url' => 'retreat/room_update', 'method' => 'POST', 'route' => ['retreat.room_update', $retreat->id]]) !!} + {{ html()->form('POST', 'retreat/room_update')->open() }}

    Retreat #{{ $retreat->idnumber }} - {{ $retreat->title }} - {!! Html::image('images/retreat.png', 'Retreat Index',array('title'=>"Retreat Index",'class' => 'btn btn-outline-dark')) !!}

    + {{ html()->img('images/retreat.png', 'Retreat Index')->attribute('title', "Retreat Index")->class('btn btn-outline-dark') }}
    Starts: {{date('F j, Y g:i A', strtotime($retreat->start_date))}}
    Ends: {{date('F j, Y g:i A', strtotime($retreat->end_date))}}
    @@ -74,7 +74,7 @@

    Registered Retreatants

    - Save Room Assignments {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + Save Room Assignments {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
    @@ -99,13 +99,13 @@ {{$registration->retreatant->note_room_preference_text}} @if($registration->canceled_at === NULL) - {!! Form::select('registrations['.$registration->id.']', $rooms, $registration->room_id) !!} + {{ html()->select('registrations[' . $registration->id . ']', $rooms, $registration->room_id) }} @else Canceled @endIf - {!! Form::text('notes['.$registration->id.']', $registration->notes) !!} + {{ html()->text('notes[' . $registration->id . ']', $registration->notes) }} @endforeach diff --git a/resources/views/retreats/create.blade.php b/resources/views/retreats/create.blade.php index 3ffd7b5f8..def2108b2 100644 --- a/resources/views/retreats/create.blade.php +++ b/resources/views/retreats/create.blade.php @@ -6,72 +6,72 @@

    Create Retreat

    - {!! Form::open(['url' => 'retreat', 'method' => 'post']) !!} + {{ html()->form('POST', 'retreat')->open() }}
    - {!! Form::label('idnumber', 'ID#:') !!} - {!! Form::text('idnumber', null, ['class' => 'form-control']) !!} + {{ html()->label('ID#:', 'idnumber') }} + {{ html()->text('idnumber')->class('form-control') }}
    - {!! Form::label('title', 'Title: ') !!} - {!! Form::text('title', null, ['class'=>'form-control']) !!} + {{ html()->label('Title: ', 'title') }} + {{ html()->text('title')->class('form-control') }}
    - {!! Form::label('event_type', 'Type:') !!} - {!! Form::select('event_type', $event_types, config('polanco.event_type.ignatian'), ['class' => 'form-control']) !!} + {{ html()->label('Type:', 'event_type') }} + {{ html()->select('event_type', $event_types, config('polanco.event_type.ignatian'))->class('form-control') }}
    - {!! Form::label('start_date', 'Starts: ') !!} - {!! Form::text('start_date', null, ['id' => 'start_date', 'class' => 'form-control flatpickr-date-time bg-white']) !!} + {{ html()->label('Starts: ', 'start_date') }} + {{ html()->text('start_date')->id('start_date')->class('form-control flatpickr-date-time bg-white') }}
    - {!! Form::label('end_date', 'Ends: ') !!} - {!! Form::text('end_date', null, ['id' => 'end_date', 'class' => 'form-control flatpickr-date-time bg-white']) !!} + {{ html()->label('Ends: ', 'end_date') }} + {{ html()->text('end_date')->id('end_date')->class('form-control flatpickr-date-time bg-white') }}
    - {!! Form::label('is_active', 'Canceled?:') !!} - {!! Form::select('is_active', $is_active, 1, ['class' => 'form-control']) !!} + {{ html()->label('Canceled?:', 'is_active') }} + {{ html()->select('is_active', $is_active, 1)->class('form-control') }}
    - {!! Form::label('max_participants', 'Maximum participants') !!} - {!! Form::text('max_participants', 60, ['class' => 'form-control']) !!} + {{ html()->label('Maximum participants', 'max_participants') }} + {{ html()->text('max_participants', 60)->class('form-control') }}
    - {!! Form::label('description', 'Description:') !!} - {!! Form::textarea('description', null, ['class'=>'form-control', 'rows'=>'3']) !!} + {{ html()->label('Description:', 'description') }} + {{ html()->textarea('description')->class('form-control')->rows('3') }}
    - {!! Form::label('directors', 'Director(s):') !!} - {!! Form::select('directors[]', $d, 0, ['id'=>'directors','class' => 'form-control select2','multiple' => 'multiple']) !!} + {{ html()->label('Director(s):', 'directors') }} + {{ html()->multiselect('directors[]', $d, 0)->id('directors')->class('form-control select2') }}
    - {!! Form::label('innkeeper_ids', 'Innkeeper(s):') !!} - {!! Form::select('innkeepers[]', $i, 0, ['id'=>'innkeepers','class' => 'form-control select2','multiple' => 'multiple']) !!} + {{ html()->label('Innkeeper(s):', 'innkeeper_ids') }} + {{ html()->multiselect('innkeepers[]', $i, 0)->id('innkeepers')->class('form-control select2') }}
    - {!! Form::label('assistant_ids', 'Assistant(s):') !!} - {!! Form::select('assistants[]', $a, 0, ['id'=>'assistants','class' => 'form-control select2','multiple' => 'multiple']) !!} + {{ html()->label('Assistant(s):', 'assistant_ids') }} + {{ html()->multiselect('assistants[]', $a, 0)->id('assistants')->class('form-control select2') }}
    - {!! Form::label('ambassadors', 'Ambassador(s):') !!} - {!! Form::select('ambassadors[]', $c, 0, ['id'=>'ambassadors','class' => 'form-control select2','multiple' => 'multiple']) !!} + {{ html()->label('Ambassador(s):', 'ambassadors') }} + {{ html()->multiselect('ambassadors[]', $c, 0)->id('ambassadors')->class('form-control select2') }}
    - {!! Form::submit('Add Retreat', ['class'=>'btn btn-light']) !!} + {{ html()->submit('Add Retreat')->class('btn btn-light') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/retreats/edit.blade.php b/resources/views/retreats/edit.blade.php index 369f2094e..deb51770b 100644 --- a/resources/views/retreats/edit.blade.php +++ b/resources/views/retreats/edit.blade.php @@ -6,11 +6,11 @@

    Edit: Event (#{{ $retreat->idnumber }})

    - {!! Form::open(['method' => 'PUT', 'files'=>'true','route' => ['retreat.update', $retreat->id]]) !!} - {!! Form::hidden('id', $retreat->id) !!} + {{ html()->form('PUT', route('retreat.update', [$retreat->id]))->acceptsFiles()->open() }} + {{ html()->hidden('id', $retreat->id) }}
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
    @@ -18,93 +18,93 @@
    - {!! Form::label('idnumber', 'ID#:') !!} - {!! Form::text('idnumber', $retreat->idnumber, ['class' => 'form-control']) !!} + {{ html()->label('ID#:', 'idnumber') }} + {{ html()->text('idnumber', $retreat->idnumber)->class('form-control') }}
    - {!! Form::label('title', 'Title:') !!} - {!! Form::text('title', $retreat->title, ['class' => 'form-control']) !!} + {{ html()->label('Title:', 'title') }} + {{ html()->text('title', $retreat->title)->class('form-control') }}
    - {!! Form::label('event_type', 'Type: ') !!} - {!! Form::select('event_type', $event_types, $retreat->event_type_id, ['class' => 'form-control']) !!} + {{ html()->label('Type: ', 'event_type') }} + {{ html()->select('event_type', $event_types, $retreat->event_type_id)->class('form-control') }}
    - {!! Form::label('start_date', 'Starts:') !!} - {!! Form::datetime('start_date', $retreat->start_date, ['class'=>'form-control flatpickr-date-time','id' => 'start_date']) !!} + {{ html()->label('Starts:', 'start_date') }} + {{ html()->datetime('start_date', $retreat->start_date)->class('form-control flatpickr-date-time')->id('start_date') }}
    - {!! Form::label('end_date', 'Ends:') !!} - {!! Form::datetime('end_date', $retreat->end_date, ['class' => 'form-control flatpickr-date-time','id' => 'end_date']) !!} + {{ html()->label('Ends:', 'end_date') }} + {{ html()->datetime('end_date', $retreat->end_date)->class('form-control flatpickr-date-time')->id('end_date') }}
    - {!! Form::label('is_active', 'Canceled?:') !!} - {!! Form::select('is_active', $is_active, $retreat->is_active, ['class' => 'form-control']) !!} + {{ html()->label('Canceled?:', 'is_active') }} + {{ html()->select('is_active', $is_active, $retreat->is_active)->class('form-control') }}
    - {!! Form::label('max_participants', 'Maximum participants') !!} - {!! Form::text('max_participants', $retreat->max_participants, ['class' => 'form-control']) !!} + {{ html()->label('Maximum participants', 'max_participants') }} + {{ html()->text('max_participants', $retreat->max_participants)->class('form-control') }}
    - {!! Form::label('calendar_id', 'Google Calendar ID:') !!} - {!! Form::text('calendar_id', $retreat->calendar_id, ['class' => 'form-control','readonly']) !!} + {{ html()->label('Google Calendar ID:', 'calendar_id') }} + {{ html()->text('calendar_id', $retreat->calendar_id)->class('form-control')->isReadonly() }}
    - {!! Form::label('directors','Director(s):') !!} - {!! Form::select('directors[]', $options['directors'], $retreat->retreatmasters->pluck('contact.id'), ['id'=>'directors','class' => 'form-control select2','multiple' => 'multiple']) !!} + {{ html()->label('Director(s):', 'directors') }} + {{ html()->multiselect('directors[]', $options['directors'], $retreat->retreatmasters->pluck('contact.id'))->id('directors')->class('form-control select2') }}
    - {!! Form::label('innkeepers', 'Innkeeper:') !!} - {!! Form::select('innkeepers[]', $options['innkeepers'], $retreat->innkeepers->pluck('contact.id'), ['id'=>'innkeepers','class' => 'form-control select2','multiple' => 'multiple']) !!} + {{ html()->label('Innkeeper:', 'innkeepers') }} + {{ html()->multiselect('innkeepers[]', $options['innkeepers'], $retreat->innkeepers->pluck('contact.id'))->id('innkeepers')->class('form-control select2') }}
    - {!! Form::label('assistants', 'Assistant:') !!} - {!! Form::select('assistants[]', $options['assistants'], $retreat->assistants->pluck('contact.id'), ['id'=>'assistants','class' => 'form-control select2','multiple' => 'multiple']) !!} + {{ html()->label('Assistant:', 'assistants') }} + {{ html()->multiselect('assistants[]', $options['assistants'], $retreat->assistants->pluck('contact.id'))->id('assistants')->class('form-control select2') }}
    - {!! Form::label('ambassadors', 'Ambassador(s):') !!} - {!! Form::select('ambassadors[]', $options['ambassadors'], $retreat->ambassadors->pluck('contact.id'), ['id'=>'ambassadors','class' => 'form-control select2','multiple' => 'multiple']) !!} + {{ html()->label('Ambassador(s):', 'ambassadors') }} + {{ html()->multiselect('ambassadors[]', $options['ambassadors'], $retreat->ambassadors->pluck('contact.id'))->id('ambassadors')->class('form-control select2') }}
    - {!! Form::label('description', 'Description:') !!} - {!! Form::textarea('description', $retreat->description, ['class' => 'form-control', 'rows'=>'3']) !!} + {{ html()->label('Description:', 'description') }} + {{ html()->textarea('description', $retreat->description)->class('form-control')->rows('3') }}
    - {!! Form::label('contract', 'Contract (max 5M|pdf): ') !!} - {!! Form::file('contract',['class' => 'form-control']) !!} + {{ html()->label('Contract (max 5M|pdf): ', 'contract') }} + {{ html()->file('contract')->class('form-control') }}
    - {!! Form::label('schedule', 'Schedule (max 5M|pdf):') !!} - {!! Form::file('schedule',['class' => 'form-control']); !!} + {{ html()->label('Schedule (max 5M|pdf):', 'schedule') }} + {{ html()->file('schedule')->class('form-control') }}
    - {!! Form::label('evaluations', 'Evaluations (max 10M|pdf):') !!} - {!! Form::file('evaluations',['class' => 'form-control']); !!} + {{ html()->label('Evaluations (max 10M|pdf):', 'evaluations') }} + {{ html()->file('evaluations')->class('form-control') }}
    - {!! Form::label('group_photo', 'Group photo (max 10M):') !!} - {!! Form::file('group_photo',['class' => 'form-control']); !!} + {{ html()->label('Group photo (max 10M):', 'group_photo') }} + {{ html()->file('group_photo')->class('form-control') }}
    @can('create-event-attachment')
    - {!! Form::label('event_attachment', 'Attachment (max 10M): ') !!} - {!! Form::file('event_attachment',['class' => 'form-control']); !!} + {{ html()->label('Attachment (max 10M): ', 'event_attachment') }} + {{ html()->file('event_attachment')->class('form-control') }}
    - {!! Form::label('event_attachment_description', 'Description: (max 200)') !!} - {!! Form::text('event_attachment_description', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Description: (max 200)', 'event_attachment_description') }} + {{ html()->text('event_attachment_description')->class('form-control') }}
    @endCan
    @@ -113,10 +113,10 @@
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    diff --git a/resources/views/retreats/index.blade.php b/resources/views/retreats/index.blade.php index b24f21cd1..eab908b2a 100644 --- a/resources/views/retreats/index.blade.php +++ b/resources/views/retreats/index.blade.php @@ -8,14 +8,14 @@ @can('create-retreat') - {!! Html::image('images/create.png', 'Create a Retreat',array('title'=>"Create Retreat",'class' => 'btn btn-light')) !!} + {{ html()->img('images/create.png', 'Create a Retreat')->attribute('title', "Create Retreat")->class('btn btn-light') }} @endCan - {!! Html::image('images/search.png', 'Search retreats',array('title'=>"Search retreats",'class' => 'btn btn-link')) !!} + {{ html()->img('images/search.png', 'Search retreats')->attribute('title', "Search retreats")->class('btn btn-link') }} diff --git a/resources/views/retreats/payments/edit.blade.php b/resources/views/retreats/payments/edit.blade.php index cbb0a06fe..105b488b9 100644 --- a/resources/views/retreats/payments/edit.blade.php +++ b/resources/views/retreats/payments/edit.blade.php @@ -3,8 +3,8 @@
    - {!! Form::open(['url' => 'retreat/payments/update', 'method' => 'POST', 'route' => ['retreat.payments.update']]) !!} - {!! Form::hidden('event_id', $retreat->id) !!} + {{ html()->form('POST', 'retreat/payments/update')->open() }} + {{ html()->hidden('event_id', $retreat->id) }}

    Retreat Offerings for {{$retreat->title}}

    @if ($registrations->isEmpty()) @@ -25,15 +25,15 @@ @foreach($registrations ->sortBy('retreatant.sort_name') as $registration) - {!! Form::hidden('event_id', $retreat->id) !!} - {!! Form::hidden('donations['.$registration->id.'][id]', $registration->id) !!} + {{ html()->hidden('event_id', $retreat->id) }} + {{ html()->hidden('donations[' . $registration->id . '][id]', $registration->id) }} {{ $registration->retreatant->sort_name}} {{$registration->deposit}} - {!! Form::number('donations['.$registration->id.'][pledge]', is_null($registration->donation) ? 0 : $registration->donation->donation_amount, ['id' => 'pledge['.$registration->id.']','step'=>'0.01']) !!} - {!! Form::number('donations['.$registration->id.'][paid]', is_null($registration->donation) ? 0 : $registration->donation->retreat_offering->payment_amount, ['id' => 'paid['.$registration->id.']','step'=>'0.01']) !!} - {!! Form::select('donations['.$registration->id.'][method]', $payment_description, is_null($registration->donation) ? 'Unassigned' : $registration->donation->retreat_offering->payment_description, ['id' => 'method['.$registration->id.']']) !!} - {!! Form::number('donations['.$registration->id.'][idnumber]', is_null($registration->donation) ? 0 : $registration->donation->retreat_offering->payment_number, ['id' => 'idnumber['.$registration->id.']']) !!} - {!! Form::text('donations['.$registration->id.'][terms]', is_null($registration->donation) ? NULL : $registration->donation->terms, ['id' => 'terms['.$registration->id.']']) !!} + {{ html()->number('donations[' . $registration->id . '][pledge]', is_null($registration->donation) ? 0 : $registration->donation->donation_amount)->id('pledge[' . $registration->id . ']')->attribute('step', '0.01') }} + {{ html()->number('donations[' . $registration->id . '][paid]', is_null($registration->donation) ? 0 : $registration->donation->retreat_offering->payment_amount)->id('paid[' . $registration->id . ']')->attribute('step', '0.01') }} + {{ html()->select('donations[' . $registration->id . '][method]', $payment_description, is_null($registration->donation) ? 'Unassigned' : $registration->donation->retreat_offering->payment_description)->id('method[' . $registration->id . ']') }} + {{ html()->number('donations[' . $registration->id . '][idnumber]', is_null($registration->donation) ? 0 : $registration->donation->retreat_offering->payment_number)->id('idnumber[' . $registration->id . ']') }} + {{ html()->text('donations[' . $registration->id . '][terms]', is_null($registration->donation) ? NULL : $registration->donation->terms)->id('terms[' . $registration->id . ']') }} @endforeach @@ -55,9 +55,9 @@
    - {!! Form::submit('Submit retreat payments', ['class'=>'btn btn-primary']) !!} + {{ html()->submit('Submit retreat payments')->class('btn btn-primary') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    diff --git a/resources/views/retreats/results.blade.php b/resources/views/retreats/results.blade.php index 8c6ad765d..e3e811b3f 100644 --- a/resources/views/retreats/results.blade.php +++ b/resources/views/retreats/results.blade.php @@ -7,7 +7,7 @@ @if ($events->isEmpty())

    Oops, no known events with the given search criteria

    diff --git a/resources/views/retreats/search.blade.php b/resources/views/retreats/search.blade.php index bf2af3eaf..7c2c0f1fb 100644 --- a/resources/views/retreats/search.blade.php +++ b/resources/views/retreats/search.blade.php @@ -8,51 +8,51 @@

    Search Events

    - {!! Form::open(['method' => 'GET', 'class' => 'form-horizontal', 'route' => ['retreats.results']]) !!} + {{ html()->form('GET', route('retreats.results', ))->class('form-horizontal')->open() }}

    - {!! Form::image('images/submit.png','btnSave',['class' => 'btn btn-outline-dark pull-right']) !!} + {{ html()->image('images/submit.png', 'btnSave', ['class' => 'btn btn-outline-dark pull-right']) }}

    - {!! Form::label('begin_date', 'Begin Date:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Begin Date:', 'begin_date')->class('control-label col-sm-3') }}
    - {!! Form::text('begin_date', NULL, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->text('begin_date')->class('form-control flatpickr-date') }}
    - {!! Form::label('end_date', 'End Date:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('End Date:', 'end_date')->class('control-label col-sm-3') }}
    - {!! Form::text('end_date', NULL, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->text('end_date')->class('form-control flatpickr-date') }}
    - {!! Form::label('title', 'Title:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Title:', 'title')->class('control-label col-sm-3') }}
    - {!! Form::text('title', NULL, ['class' => 'form-control']) !!} + {{ html()->text('title')->class('form-control') }}
    - {!! Form::label('idnumber', 'ID number:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('ID number:', 'idnumber')->class('control-label col-sm-3') }}
    - {!! Form::text('idnumber', NULL, ['class' => 'form-control']) !!} + {{ html()->text('idnumber')->class('form-control') }}
    - {!! Form::label('event_type_id', 'Event type:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Event type:', 'event_type_id')->class('control-label col-sm-3') }}
    - {!! Form::select('event_type_id', $event_types, NULL, ['class' => 'form-control']) !!} + {{ html()->select('event_type_id', $event_types)->class('form-control') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }} diff --git a/resources/views/retreats/show.blade.php b/resources/views/retreats/show.blade.php index f1d39733a..33d1d3dde 100644 --- a/resources/views/retreats/show.blade.php +++ b/resources/views/retreats/show.blade.php @@ -5,16 +5,16 @@

    @can('update-retreat') - Retreat {!!Html::link(url('retreat/'.$retreat->id.'/edit'),$retreat->title.' ('.$retreat->idnumber.')')!!} + Retreat {{ html()->a(url(url('retreat/' . $retreat->id . '/edit')), $retreat->title . ' (' . $retreat->idnumber . ')') }} @else Retreat {{$retreat->title.' ('.$retreat->idnumber.')'}} @endCan

    - {!! Html::link('#registrations','Registrations',array('class' => 'btn btn-outline-dark')) !!} + {{ html()->a(url('#registrations'), 'Registrations')->class('btn btn-outline-dark') }} @can('create-touchpoint') - {!! Html::link(action([\App\Http\Controllers\TouchpointController::class, 'add_retreat'],$retreat->id),'Retreat touchpoint',array('class' => 'btn btn-outline-dark'))!!} + {{ html()->a(url(action([\App\Http\Controllers\TouchpointController::class, 'add_retreat'], $retreat->id)), 'Retreat touchpoint')->class('btn btn-outline-dark') }} @endCan @can('show-registration') diff --git a/resources/views/retreats/waitlist.blade.php b/resources/views/retreats/waitlist.blade.php index a1c3da33a..245d9d44f 100644 --- a/resources/views/retreats/waitlist.blade.php +++ b/resources/views/retreats/waitlist.blade.php @@ -7,13 +7,13 @@

    @can('update-retreat') - Retreat {!!Html::link(url('retreat/'.$retreat->id.'/edit'),$retreat->idnumber.' - '.$retreat->title.' Waitlist')!!} + Retreat {{ html()->a(url(url('retreat/' . $retreat->id . '/edit')), $retreat->idnumber . ' - ' . $retreat->title . ' Waitlist') }} @else Retreat {{$retreat->idnumber.' - '.$retreat->title}} Waitlist @endCan

    - {!! Html::link('#registrations','Waitlist Registrations',array('class' => 'btn btn-primary')) !!} - {!! Html::link(url('retreat'),'Retreat index',array('class' => 'btn btn-primary')) !!} + {{ html()->a(url('#registrations'), 'Waitlist Registrations')->class('btn btn-primary') }} + {{ html()->a(url(url('retreat')), 'Retreat index')->class('btn btn-primary') }}
    @@ -127,26 +127,26 @@
    @can('update-retreat') @endCan @can('delete-retreat') -
    {!! Form::open(['method' => 'DELETE', 'route' => ['retreat.destroy', $retreat->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} +
    {{ html()->form('DELETE', route('retreat.destroy', [$retreat->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }}
    @endCan

    -

    Waitlist for {!!Html::link(url('retreat/'.$retreat->id),$retreat->idnumber.' - '.$retreat->title)!!}

    +

    Waitlist for {{ html()->a(url(url('retreat/' . $retreat->id)), $retreat->idnumber . ' - ' . $retreat->title) }}

    @can('show-contact') - {!! Html::link($retreat->email_waitlist_retreatants,'Email retreatants on waitlist',array('class' => 'btn btn-outline-dark'))!!} + {{ html()->a(url($retreat->email_waitlist_retreatants), 'Email retreatants on waitlist')->class('btn btn-outline-dark') }} @endCan @can('create-touchpoint') - {!! Html::link(action([\App\Http\Controllers\TouchpointController::class, 'add_retreat_waitlist'],$retreat->id),'Waitlist touchpoint',array('class' => 'btn btn-outline-dark'))!!} + {{ html()->a(url(action([\App\Http\Controllers\TouchpointController::class, 'add_retreat_waitlist'], $retreat->id)), 'Waitlist touchpoint')->class('btn btn-outline-dark') }} @endCan
    @if ($registrations->isEmpty()) @@ -200,7 +200,7 @@ @can('update-registration') - {!!Html::link(url('registration/'.$registration->id.'/offwaitlist'),'Register')!!} + {{ html()->a(url(url('registration/' . $registration->id . '/offwaitlist')), 'Register') }} @else {{ $registration->status_name }} diff --git a/resources/views/rooms/create.blade.php b/resources/views/rooms/create.blade.php index 3e766fe71..5aa4dfae6 100644 --- a/resources/views/rooms/create.blade.php +++ b/resources/views/rooms/create.blade.php @@ -4,50 +4,50 @@

    Add A Room

    - {!! Form::open(['url' => 'room', 'method' => 'post', 'class' => 'form-horizontal panel']) !!} + {{ html()->form('POST', 'room')->class('form-horizontal panel')->open() }}
    - {!! Form::label('location_id', 'Location:', ['class' => 'col-md-1']) !!} - {!! Form::select('location_id', $locations, 0, ['class' => 'col-md-2']) !!} + {{ html()->label('Location:', 'location_id')->class('col-md-1') }} + {{ html()->select('location_id', $locations, 0)->class('col-md-2') }}
    - {!! Form::label('name', 'Name:', ['class' => 'col-md-1']) !!} - {!! Form::text('name', null, ['class'=>'col-md-2']) !!} + {{ html()->label('Name:', 'name')->class('col-md-1') }} + {{ html()->text('name')->class('col-md-2') }}
    - {!! Form::label('description', 'Description:', ['class' => 'col-md-1']) !!} - {!! Form::textarea('description', null, ['class'=>'col-md-5', 'rows'=>'3']) !!} + {{ html()->label('Description:', 'description')->class('col-md-1') }} + {{ html()->textarea('description')->class('col-md-5')->rows('3') }}
    - {!! Form::label('notes', 'Notes:', ['class' => 'col-md-1']) !!} - {!! Form::textarea('notes', null, ['class'=>'col-md-5', 'rows'=>'3']) !!} + {{ html()->label('Notes:', 'notes')->class('col-md-1') }} + {{ html()->textarea('notes')->class('col-md-5')->rows('3') }}
    - {!! Form::label('floor', 'Floor:', ['class' => 'col-md-1']) !!} - {!! Form::select('floor', $floors, 0, ['class' => 'col-md-2']) !!} - {!! Form::label('access', 'Access:', ['class' => 'col-md-1']) !!} - {!! Form::text('access', null, ['class'=>'col-md-2']) !!} - {!! Form::label('type', 'Type:', ['class' => 'col-md-1']) !!} - {!! Form::text('type', null, ['class'=>'col-md-2']) !!} - {!! Form::label('occupancy', 'Occupancy:', ['class' => 'col-md-1']) !!} - {!! Form::text('occupancy', 1, ['class' => 'col-md-1']) !!} - {!! Form::label('status', 'Status:', ['class' => 'col-md-1']) !!} - {!! Form::text('status', null, ['class'=>'col-md-1']) !!} + {{ html()->label('Floor:', 'floor')->class('col-md-1') }} + {{ html()->select('floor', $floors, 0)->class('col-md-2') }} + {{ html()->label('Access:', 'access')->class('col-md-1') }} + {{ html()->text('access')->class('col-md-2') }} + {{ html()->label('Type:', 'type')->class('col-md-1') }} + {{ html()->text('type')->class('col-md-2') }} + {{ html()->label('Occupancy:', 'occupancy')->class('col-md-1') }} + {{ html()->text('occupancy', 1)->class('col-md-1') }} + {{ html()->label('Status:', 'status')->class('col-md-1') }} + {{ html()->text('status')->class('col-md-1') }}
    - {!! Form::submit('Add Room', ['class'=>'btn btn-primary']) !!} + {{ html()->submit('Add Room')->class('btn btn-primary') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    diff --git a/resources/views/rooms/edit.blade.php b/resources/views/rooms/edit.blade.php index 92b6b6c05..39d71bea8 100644 --- a/resources/views/rooms/edit.blade.php +++ b/resources/views/rooms/edit.blade.php @@ -3,48 +3,48 @@

    Edit Room {!! $room->id !!}

    - {!! Form::open(['method' => 'PUT', 'route' => ['room.update', $room->id]]) !!} - {!! Form::hidden('id', $room->id) !!} + {{ html()->form('PUT', route('room.update', [$room->id]))->open() }} + {{ html()->hidden('id', $room->id) }}
    - {!! Form::label('location_id', 'Building ID:', ['class' => 'col-md-1']) !!} - {!! Form::select('location_id', $locations, $room->location_id, ['class' => 'col-md-2']) !!} + {{ html()->label('Building ID:', 'location_id')->class('col-md-1') }} + {{ html()->select('location_id', $locations, $room->location_id)->class('col-md-2') }}
    - {!! Form::label('name', 'Name:', ['class' => 'col-md-1']) !!} - {!! Form::text('name', $room->name, ['class' => 'col-md-2']) !!} + {{ html()->label('Name:', 'name')->class('col-md-1') }} + {{ html()->text('name', $room->name)->class('col-md-2') }}
    - {!! Form::label('description', 'Description:', ['class' => 'col-md-1']) !!} - {!! Form::textarea('description', $room->description, ['class' => 'col-md-5', 'rows'=>'3']) !!} + {{ html()->label('Description:', 'description')->class('col-md-1') }} + {{ html()->textarea('description', $room->description)->class('col-md-5')->rows('3') }}
    - {!! Form::label('notes', 'Notes:', ['class' => 'col-md-1']) !!} - {!! Form::textarea('notes', $room->notes, ['class' => 'col-md-5', 'rows'=>'3']) !!} + {{ html()->label('Notes:', 'notes')->class('col-md-1') }} + {{ html()->textarea('notes', $room->notes)->class('col-md-5')->rows('3') }}
    - {!! Form::label('floor', 'Floor:', ['class' => 'col-md-1']) !!} - {!! Form::select('floor', $floors, $room->floor, ['class' => 'col-md-2']) !!} + {{ html()->label('Floor:', 'floor')->class('col-md-1') }} + {{ html()->select('floor', $floors, $room->floor)->class('col-md-2') }} - {!! Form::label('access', 'Access:', ['class' => 'col-md-1']) !!} - {!! Form::text('access', $room->access, ['class' => 'col-md-1']) !!} + {{ html()->label('Access:', 'access')->class('col-md-1') }} + {{ html()->text('access', $room->access)->class('col-md-1') }} - {!! Form::label('type', 'Type:', ['class' => 'col-md-1']) !!} - {!! Form::text('type', $room->type, ['class' => 'col-md-1']) !!} + {{ html()->label('Type:', 'type')->class('col-md-1') }} + {{ html()->text('type', $room->type)->class('col-md-1') }} - {!! Form::label('occupancy', 'Occupancy:', ['class' => 'col-md-1']) !!} - {!! Form::text('occupancy', $room->occupancy, ['class' => 'col-md-1']) !!} + {{ html()->label('Occupancy:', 'occupancy')->class('col-md-1') }} + {{ html()->text('occupancy', $room->occupancy)->class('col-md-1') }} - {!! Form::label('status', 'Status:', ['class' => 'col-md-1']) !!} - {!! Form::text('status', $room->status, ['class' => 'col-md-1']) !!} + {{ html()->label('Status:', 'status')->class('col-md-1') }} + {{ html()->text('status', $room->status)->class('col-md-1') }}
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-primary']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-primary']) }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/rooms/index.blade.php b/resources/views/rooms/index.blade.php index 952ba76d0..e0e5b4d8f 100644 --- a/resources/views/rooms/index.blade.php +++ b/resources/views/rooms/index.blade.php @@ -11,7 +11,7 @@ Room Index @can('room-create') - {!! Html::image('images/create.png', 'Create a Room',array('title'=>"Create Room",'class' => 'btn btn-primary')) !!} + {{ html()->img('images/create.png', 'Create a Room')->attribute('title', "Create Room")->class('btn btn-primary') }} @endCan diff --git a/resources/views/rooms/sched2.blade.php b/resources/views/rooms/sched2.blade.php index d7828f443..2dfb58109 100644 --- a/resources/views/rooms/sched2.blade.php +++ b/resources/views/rooms/sched2.blade.php @@ -48,7 +48,7 @@ @foreach($dts as $dt) @if (($m[$room->id][$dt->toDateString()]['status'] == 'R') OR ($m[$room->id][$dt->toDateString()]['status'] == 'O')) - {!! Html::link('registration/'.$m[$room->id][$dt->toDateString()]['registration_id'], $m[$room->id][$dt->toDateString()]['status'] , array('title'=>$m[$room->id][$dt->toDateString()]['retreat_name'].' ('.$m[$room->id][$dt->toDateString()]['retreatant_name'].')')) !!} + {{ html()->a(url('registration/' . $m[$room->id][$dt->toDateString()]['registration_id']), $m[$room->id][$dt->toDateString()]['status'])->attribute('title', $m[$room->id][$dt->toDateString()]['retreat_name'] . ' (' . $m[$room->id][$dt->toDateString()]['retreatant_name'] . ')') }} @else A diff --git a/resources/views/rooms/show.blade.php b/resources/views/rooms/show.blade.php index 461bd7964..d4f42323c 100644 --- a/resources/views/rooms/show.blade.php +++ b/resources/views/rooms/show.blade.php @@ -14,7 +14,7 @@ @endCan - {!! Html::image('images/room.png', 'Room Index',array('title'=>"Room Index",'class' => 'btn btn-primary')) !!} + {{ html()->img('images/room.png', 'Room Index')->attribute('title', "Room Index")->class('btn btn-primary') }}
    Building: {{ $room->building}}
    @@ -38,14 +38,14 @@
    @can('update-room') @endCan @can('delete-room')
    - {!! Form::open(['method' => 'DELETE', 'route' => ['room.destroy', $room->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('room.destroy', [$room->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }}
    @endCan
    diff --git a/resources/views/search/results.blade.php b/resources/views/search/results.blade.php index b80897210..036d855a3 100644 --- a/resources/views/search/results.blade.php +++ b/resources/views/search/results.blade.php @@ -7,7 +7,7 @@ @if ($persons->isEmpty())

    Oops, no known contacts with the given search criteria

    diff --git a/resources/views/search/search.blade.php b/resources/views/search/search.blade.php index e64fef53a..990236edf 100644 --- a/resources/views/search/search.blade.php +++ b/resources/views/search/search.blade.php @@ -9,319 +9,319 @@

    Search Contacts

    - {!! Form::open(['url'=>'results', 'method'=>'get']) !!} + {{ html()->form('GET', 'results')->open() }}

    Name - {!! Form::image('images/submit.png','search',['class' => 'btn btn-outline-dark pull-right']) !!} + {{ html()->image('images/submit.png', 'search', ['class' => 'btn btn-outline-dark pull-right']) }}

    - {!! Form::label('prefix_id', 'Title:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Title:', 'prefix_id')->class('control-label col-sm-3') }}
    - {!! Form::select('prefix_id', $prefixes, NULL, ['class' => 'form-control']) !!} + {{ html()->select('prefix_id', $prefixes)->class('form-control') }}
    - {!! Form::label('first_name', 'First:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('First:', 'first_name')->class('control-label col-sm-3') }}
    - {!! Form::text('first_name', NULL, ['class' => 'form-control']) !!} + {{ html()->text('first_name')->class('form-control') }}
    - {!! Form::label('middle_name', 'Middle:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Middle:', 'middle_name')->class('control-label col-sm-3') }}
    - {!! Form::text('middle_name', NULL, ['class' => 'form-control']) !!} + {{ html()->text('middle_name')->class('form-control') }}
    - {!! Form::label('last_name', 'Last:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Last:', 'last_name')->class('control-label col-sm-3') }}
    - {!! Form::text('last_name', NULL, ['class' => 'form-control']) !!} + {{ html()->text('last_name')->class('form-control') }}
    - {!! Form::label('suffix_id', 'Suffix:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Suffix:', 'suffix_id')->class('control-label col-sm-3') }}
    - {!! Form::select('suffix_id', $suffixes, NULL, ['class' => 'form-control']) !!} + {{ html()->select('suffix_id', $suffixes)->class('form-control') }}
    - {!! Form::label('nick_name', 'Nickname: ', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Nickname: ', 'nick_name')->class('control-label col-sm-3') }}
    - {!! Form::text('nick_name', NULL, ['class' => 'form-control']) !!} + {{ html()->text('nick_name')->class('form-control') }}
    - {!! Form::label('display_name', 'Display name: ', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Display name: ', 'display_name')->class('control-label col-sm-3') }}
    - {!! Form::text('display_name', NULL, ['class' => 'form-control']) !!} + {{ html()->text('display_name')->class('form-control') }}
    - {!! Form::label('sort_name', 'Sort name: ', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Sort name: ', 'sort_name')->class('control-label col-sm-3') }}
    - {!! Form::text('sort_name', NULL, ['class' => 'form-control']) !!} + {{ html()->text('sort_name')->class('form-control') }}
    - {!! Form::label('contact_type', 'Contact type: ', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Contact type: ', 'contact_type')->class('control-label col-sm-3') }}
    - {!! Form::select('contact_type', $contact_types, 0, ['class' => 'form-control']) !!} + {{ html()->select('contact_type', $contact_types, 0)->class('form-control') }}
    - {!! Form::label('subcontact_type', 'Subcontact type: ', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Subcontact type: ', 'subcontact_type')->class('control-label col-sm-3') }}
    - {!! Form::select('subcontact_type', $subcontact_types, 0, ['class' => 'form-control']) !!} + {{ html()->select('subcontact_type', $subcontact_types, 0)->class('form-control') }}
    - {!! Form::label('has_avatar', 'Has avatar?:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Has avatar?:', 'has_avatar')->class('control-label col-sm-3') }}
    - {!! Form::checkbox('has_avatar', 1, 0,['class' => '']) !!} + {{ html()->checkbox('has_avatar', 0, 1)->class('') }}
    - {!! Form::label('has_attachment', 'Has attachment(s)?:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Has attachment(s)?:', 'has_attachment')->class('control-label col-sm-3') }}
    - {!! Form::checkbox('has_attachment', 1, 0,['class' => '']) !!} + {{ html()->checkbox('has_attachment', 0, 1)->class('') }}
    - {!! Form::label('attachment_description', 'Description: (max 200)', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Description: (max 200)', 'attachment_description')->class('control-label col-sm-3') }}
    - {!! Form::text('attachment_description', NULL, ['class' => 'form-control']) !!} + {{ html()->text('attachment_description')->class('form-control') }}
    - {!! Form::label('phone', 'Phone:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Phone:', 'phone')->class('control-label col-sm-3') }}
    - {!! Form::text('phone', NULL, ['class' => 'form-control']) !!} + {{ html()->text('phone')->class('form-control') }}
    - {!! Form::label('do_not_phone', 'Do not phone:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Do not phone:', 'do_not_phone')->class('control-label col-sm-3') }}
    - {!! Form::select('do_not_phone', array(null => 'N/A', '1' => 'Yes', '0' => 'No')) !!} + {{ html()->select('do_not_phone', array(null => 'N/A', '1' => 'Yes', '0' => 'No')) }}
    - {!! Form::label('do_not_sms', 'Do not SMS:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Do not SMS:', 'do_not_sms')->class('control-label col-sm-3') }}
    - {!! Form::select('do_not_sms', array(null => 'N/A', '1' => 'Yes', '0' => 'No')) !!} + {{ html()->select('do_not_sms', array(null => 'N/A', '1' => 'Yes', '0' => 'No')) }}
    - {!! Form::label('email', 'Email:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Email:', 'email')->class('control-label col-sm-3') }}
    - {!! Form::text('email', NULL, ['class' => 'form-control']) !!} + {{ html()->text('email')->class('form-control') }}
    - {!! Form::label('do_not_email', 'Do not email:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Do not email:', 'do_not_email')->class('control-label col-sm-3') }}
    - {!! Form::select('do_not_email', array(null => 'N/A', '1' => 'Yes', '0' => 'No')) !!} + {{ html()->select('do_not_email', array(null => 'N/A', '1' => 'Yes', '0' => 'No')) }}
    - {!! Form::label('street_address', 'Address:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Address:', 'street_address')->class('control-label col-sm-3') }}
    - {!! Form::text('street_address', NULL, ['class' => 'form-control']) !!} + {{ html()->text('street_address')->class('form-control') }}
    - {!! Form::label('city', 'City:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('City:', 'city')->class('control-label col-sm-3') }}
    - {!! Form::text('city', NULL, ['class' => 'form-control']) !!} + {{ html()->text('city')->class('form-control') }}
    - {!! Form::label('state_province_id', 'State:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('State:', 'state_province_id')->class('control-label col-sm-3') }}
    - {!! Form::select('state_province_id', $states, NULL, ['class' => 'form-control']) !!} + {{ html()->select('state_province_id', $states)->class('form-control') }}
    - {!! Form::label('postal_code', 'Zip:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Zip:', 'postal_code')->class('control-label col-sm-3') }}
    - {!! Form::text('postal_code', NULL, ['class' => 'form-control']) !!} + {{ html()->text('postal_code')->class('form-control') }}
    - {!! Form::label('country_id', 'Country:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Country:', 'country_id')->class('control-label col-sm-3') }}
    - {!! Form::select('country_id', $countries, NULL, ['class' => 'form-control']) !!} + {{ html()->select('country_id', $countries)->class('form-control') }}
    - {!! Form::label('do_not_mail', 'Do not mail:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Do not mail:', 'do_not_mail')->class('control-label col-sm-3') }}
    - {!! Form::select('do_not_mail', array(null => 'N/A', '1' => 'Yes', '0' => 'No')) !!} + {{ html()->select('do_not_mail', array(null => 'N/A', '1' => 'Yes', '0' => 'No')) }}
    - {!! Form::label('url', 'Website:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Website:', 'url')->class('control-label col-sm-3') }}
    - {!! Form::text('url', NULL, ['class' => 'form-control']) !!} + {{ html()->text('url')->class('form-control') }}

    Emergency Contact Information

    - {!! Form::label('emergency_contact_name', 'Name: ', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Name: ', 'emergency_contact_name')->class('control-label col-sm-3') }}
    - {!! Form::text('emergency_contact_name', NULL, ['class' => 'form-control']) !!} + {{ html()->text('emergency_contact_name')->class('form-control') }}
    - {!! Form::label('emergency_contact_relationship', 'Relationship: ', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Relationship: ', 'emergency_contact_relationship')->class('control-label col-sm-3') }}
    - {!! Form::text('emergency_contact_relationship', NULL, ['class' => 'form-control']) !!} + {{ html()->text('emergency_contact_relationship')->class('form-control') }}
    - {!! Form::label('emergency_contact_phone', 'Phone: ', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Phone: ', 'emergency_contact_phone')->class('control-label col-sm-3') }}
    - {!! Form::text('emergency_contact_phone', NULL, ['class' => 'form-control']) !!} + {{ html()->text('emergency_contact_phone')->class('form-control') }}

    Demographics

    - {!! Form::label('gender_id', 'Gender:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Gender:', 'gender_id')->class('control-label col-sm-3') }}
    - {!! Form::select('gender_id', $genders, 0, ['class' => 'form-control']) !!} + {{ html()->select('gender_id', $genders, 0)->class('form-control') }}
    - {!! Form::label('birth_date', 'Birth Date:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Birth Date:', 'birth_date')->class('control-label col-sm-3') }}
    - {!! Form::text('birth_date', NULL, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->text('birth_date')->class('form-control flatpickr-date') }}
    - {!! Form::label('religion_id', 'Religion:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Religion:', 'religion_id')->class('control-label col-sm-3') }}
    - {!! Form::select('religion_id', $religions, 0, ['class' => 'form-control']) !!} + {{ html()->select('religion_id', $religions, 0)->class('form-control') }}
    - {!! Form::label('occupation_id', 'Occupation:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Occupation:', 'occupation_id')->class('control-label col-sm-3') }}
    - {!! Form::select('occupation_id', $occupations, 0, ['class' => 'form-control']) !!} + {{ html()->select('occupation_id', $occupations, 0)->class('form-control') }}
    - {!! Form::label('parish_id', 'Parish:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Parish:', 'parish_id')->class('control-label col-sm-3') }}
    - {!! Form::select('parish_id', $parish_list, 0, ['class' => 'form-control']) !!} + {{ html()->select('parish_id', $parish_list, 0)->class('form-control') }}
    - {!! Form::label('ethnicity_id', 'Ethnicity:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Ethnicity:', 'ethnicity_id')->class('control-label col-sm-3') }}
    - {!! Form::select('ethnicity_id', $ethnicities, 0, ['class' => 'form-control']) !!} + {{ html()->select('ethnicity_id', $ethnicities, 0)->class('form-control') }}
    - {!! Form::label('languages', 'Languages:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Languages:', 'languages')->class('control-label col-sm-3') }}
    - {!! Form::select('languages[]', $languages, NULL, ['id'=>'languages','class' => 'form-control','multiple' => 'multiple','style'=>'width: auto; font-size: inherit;']) !!} + {{ html()->multiselect('languages[]', $languages)->id('languages')->class('form-control')->style('width: auto; font-size: inherit;') }}
    - {!! Form::label('preferred_language_id', 'Preferred Language:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Preferred Language:', 'preferred_language_id')->class('control-label col-sm-3') }}
    - {!! Form::select('preferred_language_id', $languages, 0, ['class' => 'form-control']) !!} + {{ html()->select('preferred_language_id', $languages, 0)->class('form-control') }}
    - {!! Form::label('referrals', 'Referral source(s):', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Referral source(s):', 'referrals')->class('control-label col-sm-3') }}
    - {!! Form::select('referrals[]', $referrals, NULL, ['id'=>'referrals','class' => 'form-control','multiple' => 'multiple','style'=>'width: auto; font-size: inherit;']) !!} + {{ html()->multiselect('referrals[]', $referrals)->id('referrals')->class('form-control')->style('width: auto; font-size: inherit;') }}
    - {!! Form::label('deceased_date', 'Deceased Date:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Deceased Date:', 'deceased_date')->class('control-label col-sm-3') }}
    - {!! Form::text('deceased_date', NULL, ['class'=>'form-control flatpickr-date']) !!} + {{ html()->text('deceased_date')->class('form-control flatpickr-date') }}
    - {!! Form::label('is_deceased', 'Is Deceased:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Is Deceased:', 'is_deceased')->class('control-label col-sm-3') }}
    - {!! Form::checkbox('is_deceased', 1, NULL, ['class' => '']) !!} + {{ html()->checkbox('is_deceased', NULL, 1)->class('') }}

    Health Notes

    - {!! Form::label('note_health', 'Health Notes:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Health Notes:', 'note_health')->class('control-label col-sm-3') }}
    - {!! Form::text('note_health', NULL, ['class' => 'form-control']) !!} + {{ html()->text('note_health')->class('form-control') }}
    - {!! Form::label('note_dietary', 'Dietary Notes:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Dietary Notes:', 'note_dietary')->class('control-label col-sm-3') }}
    - {!! Form::text('note_dietary', NULL, ['class' => 'form-control']) !!} + {{ html()->text('note_dietary')->class('form-control') }}

    General Notes

    - {!! Form::label('note_general', 'General Notes:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('General Notes:', 'note_general')->class('control-label col-sm-3') }}
    - {!! Form::text('note_general', NULL, ['class' => 'form-control']) !!} + {{ html()->text('note_general')->class('form-control') }}
    - {!! Form::label('note_room_preference', 'Room Preference:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Room Preference:', 'note_room_preference')->class('control-label col-sm-3') }}
    - {!! Form::text('note_room_preference', NULL, ['class' => 'form-control']) !!} + {{ html()->text('note_room_preference')->class('form-control') }}

    Touchpoints

    - {!! Form::label('touchpoint_notes', 'Note: ', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Note: ', 'touchpoint_notes')->class('control-label col-sm-3') }}
    - {!! Form::text('touchpoint_notes', NULL, ['class' => 'form-control']) !!} + {{ html()->text('touchpoint_notes')->class('form-control') }}
    - {!! Form::label('touched_at', 'Touched at: ', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Touched at: ', 'touched_at')->class('control-label col-sm-3') }}
    - {!! Form::text('touched_at', NULL, ['class' => 'form-control flatpickr-date bg-white']) !!} + {{ html()->text('touched_at')->class('form-control flatpickr-date bg-white') }}

    Groups and Relationships

    - {!! Form::label('groups', 'Groups:', ['class' => 'control-label col-sm-3']) !!} + {{ html()->label('Groups:', 'groups')->class('control-label col-sm-3') }}
    - {!! Form::select('groups[]', $groups, NULL, ['id'=>'groups','class' => 'form-control','multiple' => 'multiple','style'=>'width: auto; font-size: inherit;']) !!} + {{ html()->multiselect('groups[]', $groups)->id('groups')->class('form-control')->style('width: auto; font-size: inherit;') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    diff --git a/resources/views/squarespace/contribution/edit.blade.php b/resources/views/squarespace/contribution/edit.blade.php index f3e4f01f9..8351f6d30 100644 --- a/resources/views/squarespace/contribution/edit.blade.php +++ b/resources/views/squarespace/contribution/edit.blade.php @@ -35,20 +35,20 @@
    - {!! Form::open(['method' => 'PUT', 'route' => ['squarespace.contribution.update', $ss_contribution->id]]) !!} - {!! Form::hidden('id', $ss_contribution->id) !!} + {{ html()->form('PUT', route('squarespace.contribution.update', [$ss_contribution->id]))->open() }} + {{ html()->hidden('id', $ss_contribution->id) }}
    - {!! Form::label('contact_id', 'Donor: ' .$ss_contribution->name) !!} - {!! Form::select('contact_id', $matching_contacts, $ss_contribution->contact_id, ['class' => 'form-control']) !!} + {{ html()->label('Donor: ' . $ss_contribution->name, 'contact_id') }} + {{ html()->select('contact_id', $matching_contacts, $ss_contribution->contact_id)->class('form-control') }}
    - {!! Form::label('event_id', 'Retreat ID: #'. $ss_contribution->idnumber) !!} - {!! Form::select('event_id', $retreats, (isset($ss_contribution->event_id)) ? $ss_contribution->event_id : $ids['retreat_id'], ['class' => 'form-control']) !!} + {{ html()->label('Retreat ID: #' . $ss_contribution->idnumber, 'event_id') }} + {{ html()->select('event_id', $retreats, isset($ss_contribution->event_id) ? $ss_contribution->event_id : $ids['retreat_id'])->class('form-control') }} @if (isset($ss_contribution->retreat_description)) {{ $ss_contribution->retreat_description }} {{ $ids['retreat_id'] }} @endIf @@ -56,7 +56,7 @@
    - {!! Form::label('donation_description', 'Fund:') !!} + {{ html()->label('Fund:', 'donation_description') }} @if (isset($ss_contribution->offering_type)) {{ $ss_contribution->offering_type }} @@ -64,7 +64,7 @@ @if (isset($ss_contribution->fund)) {{ $ss_contribution->fund }} @endIf - {!! Form::select('donation_description', array_flip(config('polanco.donation_descriptions')), (isset($ss_contribution->fund)) ? config('polanco.donation_descriptions.'.$ss_contribution->fund) : config('polanco.donation_descriptions.'.$ss_contribution->offering_type), ['class' => 'form-control']) !!} + {{ html()->select('donation_description', array_flip(config('polanco.donation_descriptions')), isset($ss_contribution->fund) ? config('polanco.donation_descriptions.' . $ss_contribution->fund) : config('polanco.donation_descriptions.' . $ss_contribution->offering_type))->class('form-control') }} {{ $ss_contribution->donation?->donation_description }}
    @@ -74,17 +74,17 @@
    @endIf - {!! Form::label('amount', 'Amount:') !!} + {{ html()->label('Amount:', 'amount') }} - {!! Form::number('amount', $ss_contribution->amount, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->number('amount', $ss_contribution->amount)->class('form-control')->attribute('step', '0.01') }} {{ $ss_contribution->donation?->donation_amount }}
    - {!! Form::label('comments', 'Comments:') !!} + {{ html()->label('Comments:', 'comments') }} - {!! Form::text('comments', $ss_contribution->comments, ['class' => 'form-control']) !!} + {{ html()->text('comments', $ss_contribution->comments)->class('form-control') }}
    @@ -94,10 +94,10 @@
    @if (!$ss_contribution->is_processed) @if ($ss_contribution->contact_id > 0 ) - {!! Form::submit('Proceed with Contribution',['class' => 'btn btn-dark']) !!} + {{ html()->submit('Proceed with Contribution')->class('btn btn-dark') }} Reset Contact for Contribution #{{ $ss_contribution->id }} @else - {!! Form::submit('Retrieve Contact Info',['class' => 'btn btn-info']) !!} + {{ html()->submit('Retrieve Contact Info')->class('btn btn-info') }} @endif @else @@ -124,7 +124,7 @@ - {!! Form::text('name', ucwords(strtolower($ss_contribution->name)), ['class' => 'form-control']) !!} + {{ html()->text('name', ucwords(strtolower($ss_contribution->name)))->class('form-control') }} @if (isset($ss_contribution->donor?->id)) {!! $ss_contribution->donor->contact_link_full_name !!} @@ -139,7 +139,7 @@ @else @endif - {!! Form::text('first_name', ucwords(strtolower(trim(substr($ss_contribution->name,0,strpos($ss_contribution->name,' '))))), ['class' => 'form-control']) !!} + {{ html()->text('first_name', ucwords(strtolower(trim(substr($ss_contribution->name, 0, strpos($ss_contribution->name, ' '))))))->class('form-control') }} {{ $ss_contribution->donor?->first_name }} @@ -151,7 +151,7 @@ @else @endif - {!! Form::text('last_name', ucwords(strtolower(trim(substr($ss_contribution->name,strrpos($ss_contribution->name,' '))))), ['class' => 'form-control']) !!} + {{ html()->text('last_name', ucwords(strtolower(trim(substr($ss_contribution->name, strrpos($ss_contribution->name, ' '))))))->class('form-control') }} {{ $ss_contribution->donor?->last_name }} @@ -163,7 +163,7 @@ @else @endif - {!! Form::text('email', trim($ss_contribution->email), ['class' => 'form-control']) !!} + {{ html()->text('email', trim($ss_contribution->email))->class('form-control') }} {{ $ss_contribution->donor?->email_primary_text }} @@ -176,7 +176,7 @@ @else @endif - {!! Form::text('phone', $ss_contribution->phone, ['class' => 'form-control']) !!} + {{ html()->text('phone', $ss_contribution->phone)->class('form-control') }} {{ $ss_contribution->donor?->primary_phone_number }} @@ -189,7 +189,7 @@ @else @endIf - {!! Form::text('address_street', ucwords(strtolower($ss_contribution->address_street)), ['class' => 'form-control']) !!} + {{ html()->text('address_street', ucwords(strtolower($ss_contribution->address_street)))->class('form-control') }} {{ $ss_contribution->donor?->address_primary_street }} @@ -202,7 +202,7 @@ @else @endIf - {!! Form::text('address_supplemental', $ss_contribution->address_supplemental, ['class' => 'form-control']) !!} + {{ html()->text('address_supplemental', $ss_contribution->address_supplemental)->class('form-control') }} {{ $ss_contribution->donor?->address_primary_supplemental_address }} @endIf @@ -214,7 +214,7 @@ @else @endif - {!! Form::text('address_city', ucwords(strtolower($ss_contribution->address_city)), ['class' => 'form-control']) !!} + {{ html()->text('address_city', ucwords(strtolower($ss_contribution->address_city)))->class('form-control') }} {{ $ss_contribution->donor?->address_primary_city }} @@ -229,7 +229,7 @@ @if (!isset($ids['address_state'])) {{ strtoupper($ss_contribution->address_state)}} @endIf - {!! Form::select('address_state_id', $states, $ids['address_state'], ['class' => 'form-control']) !!} + {{ html()->select('address_state_id', $states, $ids['address_state'])->class('form-control') }} {{ $ss_contribution->donor?->address_primary_state }} @@ -241,7 +241,7 @@ @else @endIf - {!! Form::text('address_zip', $ss_contribution->address_zip, ['class' => 'form-control']) !!} + {{ html()->text('address_zip', $ss_contribution->address_zip)->class('form-control') }} {{ $ss_contribution->donor?->address_primary_postal_code }} @@ -253,8 +253,8 @@ @else @endif - {!! Form::label('address_country_id', $ss_contribution->address_country) !!} - {!! Form::select('address_country_id', $countries, $ids['address_country'], ['class' => 'form-control']) !!} + {{ html()->label($ss_contribution->address_country, 'address_country_id') }} + {{ html()->select('address_country_id', $countries, $ids['address_country'])->class('form-control') }} {{ $ss_contribution->donor?->address_primary_country_abbreviation }} @@ -267,9 +267,9 @@
    @if (!$ss_contribution->is_processed) @if ($ss_contribution->contact_id > 0 ) - {!! Form::submit('Proceed with Contribution',['class' => 'btn btn-dark']) !!} + {{ html()->submit('Proceed with Contribution')->class('btn btn-dark') }} @else - {!! Form::submit('Retrieve Contact Info',['class' => 'btn btn-info']) !!} + {{ html()->submit('Retrieve Contact Info')->class('btn btn-info') }} @endif @else Squarespace Contribution #{{ $ss_contribution->id }} has already been processed @@ -296,7 +296,7 @@ Processed: {{ ($ss_contribution->is_processed) ? 'Yes' : 'No' }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/squarespace/contribution/show.blade.php b/resources/views/squarespace/contribution/show.blade.php index 6de723b36..588f9b8a0 100644 --- a/resources/views/squarespace/contribution/show.blade.php +++ b/resources/views/squarespace/contribution/show.blade.php @@ -16,7 +16,7 @@
    @@ -107,14 +107,14 @@
    @can('update-squarespace-contribution') @endCan @can('delete-squarespace-contribution')
    - {!! Form::open(['method' => 'DELETE', 'route' => ['squarespace.contribution.destroy', $ss_contribution->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('squarespace.contribution.destroy', [$ss_contribution->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }}
    @endCan
    diff --git a/resources/views/squarespace/order/edit.blade.php b/resources/views/squarespace/order/edit.blade.php index df39be261..2deb289ef 100644 --- a/resources/views/squarespace/order/edit.blade.php +++ b/resources/views/squarespace/order/edit.blade.php @@ -51,21 +51,21 @@
    - {!! Form::open(['method' => 'PUT', 'route' => ['squarespace.order.update', $order->id]]) !!} - {!! Form::hidden('id', $order->id) !!} + {{ html()->form('PUT', route('squarespace.order.update', [$order->id]))->open() }} + {{ html()->hidden('id', $order->id) }}
    -

    {!! Form::label('contact_id', ($order->is_gift_certificate ? 'Purchaser: ' : 'Retreatant: ') .$order->name) !!}

    - {!! Form::select('contact_id', $matching_contacts, (isset($order->contact_id)) ? $order->contact_id : 0, ['class' => 'form-control']) !!} +

    {{ html()->label(($order->is_gift_certificate ? 'Purchaser: ' : 'Retreatant: ') . $order->name, 'contact_id') }}

    + {{ html()->select('contact_id', $matching_contacts, isset($order->contact_id) ? $order->contact_id : 0)->class('form-control') }}
    @if ($order->is_gift_certificate)

    Category: {{ $order->retreat_category }}

    @else -

    {!! Form::label('event_id', 'Retreat Id#: '. $order->retreat_idnumber) !!}

    - {!! Form::select('event_id', $retreats, (isset($order->event_id)) ? $order->event_id : $ids['retreat_id'], ['class' => 'form-control']) !!} +

    {{ html()->label('Retreat Id#: ' . $order->retreat_idnumber, 'event_id') }}

    + {{ html()->select('event_id', $retreats, isset($order->event_id) ? $order->event_id : $ids['retreat_id'])->class('form-control') }} Retreat: {{ $order->retreat_description }}
    Dates: {{ $order->retreat_dates}}
    Category: {{ !empty($order->retreat_category) ? $order->retreat_category : $order->event?->retreat_type }}
    @@ -90,27 +90,27 @@ Expiration date: {{$gift_certificate->expiration_date->format('m-d-Y')}}
    @endIf @endif - {!! Form::label('gift_certificate_year_issued', 'Gift Certificate Year Issued:', ['class' => 'font-weight-bold']) !!} - {!! Form::number('gift_certificate_year_issued', $order->gift_certificate_year_issued, ['class' => 'form-control']) !!} - {!! Form::label('gift_certificate_number', 'Gift Certificate #:', ['class' => 'font-weight-bold']) !!} - {!! Form::number('gift_certificate_number', $order->gift_certificate_number, ['class' => 'form-control']) !!} + {{ html()->label('Gift Certificate Year Issued:', 'gift_certificate_year_issued')->class('font-weight-bold') }} + {{ html()->number('gift_certificate_year_issued', $order->gift_certificate_year_issued)->class('form-control') }} + {{ html()->label('Gift Certificate #:', 'gift_certificate_number')->class('font-weight-bold') }} + {{ html()->number('gift_certificate_number', $order->gift_certificate_number)->class('form-control') }} @endif @if (isset($order->comments))

    - {!! Form::label('comments', 'Comments: ') !!} + {{ html()->label('Comments: ', 'comments') }}

    - {!! Form::text('comments', $order->comments, ['class' => 'form-control']) !!} + {{ html()->text('comments', $order->comments)->class('form-control') }} @endIf @if (isset($order->retreat_quantity) && $order->retreat_quantity > 1)
    -

    {!! Form::label('retreat_quantity', 'Quantity: ') !!} *

    - {!! Form::number('retreat_quantity', $order->retreat_quantity, ['class' => 'form-control','step'=>'1']) !!} +

    {{ html()->label('Quantity: ', 'retreat_quantity') }} *

    + {{ html()->number('retreat_quantity', $order->retreat_quantity)->class('form-control')->attribute('step', '1') }}
    @endIf @if (isset($order->additional_names_and_phone_numbers))

    Additional Names and Phone Numbers *:

    - {!! Form::text('additional_names_and_phone_numbers', $order->additional_names_and_phone_numbers, ['class' => 'form-control']) !!} + {{ html()->text('additional_names_and_phone_numbers', $order->additional_names_and_phone_numbers)->class('form-control') }}
    @endIf
    @@ -119,8 +119,8 @@ @if ($order->is_couple)
    -

    {!! Form::label('couple_contact_id', ($order->is_gift_certificate ? 'Recipient: ' : 'Couple: ') .$order->couple_name) !!}

    - {!! Form::select('couple_contact_id', $couple_matching_contacts, (isset($order->couple_contact_id)) ? $order->couple_contact_id : 0, ['class' => 'form-control']) !!} +

    {{ html()->label(($order->is_gift_certificate ? 'Recipient: ' : 'Couple: ') . $order->couple_name, 'couple_contact_id') }}

    + {{ html()->select('couple_contact_id', $couple_matching_contacts, isset($order->couple_contact_id) ? $order->couple_contact_id : 0)->class('form-control') }}
    @endIf @@ -131,7 +131,7 @@ @if (($order->contact_id > 0 && !$order->is_couple) || (($order->is_couple) && $order->couple_contact_id > 0 && $order->contact_id>0)) Reset Contact for Order #{{ $order->id }} @else - {!! Form::submit('Retrieve Contact Info',['class' => 'btn btn-info']) !!} + {{ html()->submit('Retrieve Contact Info')->class('btn btn-info') }} @endif @else Order #{{ $order->order_number }} has already been processed @@ -167,7 +167,7 @@

    - {!! Form::text('name', ucwords(strtolower($order->name)), ['class' => 'form-control']) !!} + {{ html()->text('name', ucwords(strtolower($order->name)))->class('form-control') }}

    @if (isset($order->retreatant?->id)) {!! $order->retreatant->contact_link_full_name !!} @@ -195,7 +195,7 @@ @if ($order->is_couple)

    - {!! Form::text('couple_name', ucwords(strtolower($order->couple_name)), ['class' => 'form-control']) !!} + {{ html()->text('couple_name', ucwords(strtolower($order->couple_name)))->class('form-control') }}


    @if (isset($order->couple?->id)) {!! $order->couple->contact_link_full_name !!} @@ -210,7 +210,7 @@ @else @endIf - {!! Form::select('title_id', $prefixes, $ids['title'], ['class' => 'form-control']) !!} + {{ html()->select('title_id', $prefixes, $ids['title'])->class('form-control') }} {{ $order->retreatant?->prefix_name }} @if ($order->is_couple) @@ -219,7 +219,7 @@ @else @endIf - {!! Form::select('couple_title_id', $prefixes, $ids['couple_title'], ['class' => 'form-control']) !!} + {{ html()->select('couple_title_id', $prefixes, $ids['couple_title'])->class('form-control') }} {{ $order->couple?->prefix_name }} @endIf @@ -231,7 +231,7 @@ @else @endif - {!! Form::text('first_name', ucwords(strtolower(trim(substr($order->name,0,strpos($order->name,' '))))), ['class' => 'form-control']) !!} + {{ html()->text('first_name', ucwords(strtolower(trim(substr($order->name, 0, strpos($order->name, ' '))))))->class('form-control') }} {{ $order->retreatant?->first_name }} @if ($order->is_couple) @@ -240,7 +240,7 @@ @else @endif - {!! Form::text('couple_first_name', ucwords(strtolower(trim(substr($order->couple_name,0,strpos($order->couple_name,' '))))), ['class' => 'form-control']) !!} + {{ html()->text('couple_first_name', ucwords(strtolower(trim(substr($order->couple_name, 0, strpos($order->couple_name, ' '))))))->class('form-control') }} {{ $order->couple?->first_name }} @endIf @@ -251,12 +251,12 @@ Middle Name * - {!! Form::text('middle_name', null, ['class' => 'form-control']) !!} + {{ html()->text('middle_name')->class('form-control') }} {{ $order->retreatant?->middle_name }} @if ($order->is_couple) - {!! Form::text('couple_middle_name', null, ['class' => 'form-control']) !!} + {{ html()->text('couple_middle_name')->class('form-control') }} {{ $order->couple?->middle_name }} @endIf @@ -269,7 +269,7 @@ @else @endif - {!! Form::text('last_name', ucwords(strtolower(trim(substr($order->name,strrpos($order->name,' '))))), ['class' => 'form-control']) !!} + {{ html()->text('last_name', ucwords(strtolower(trim(substr($order->name, strrpos($order->name, ' '))))))->class('form-control') }} {{ $order->retreatant?->last_name }} @if ($order->is_couple) @@ -278,7 +278,7 @@ @else @endif - {!! Form::text('couple_last_name', ucwords(strtolower(trim(substr($order->couple_name,strpos($order->couple_name,' '))))), ['class' => 'form-control']) !!} + {{ html()->text('couple_last_name', ucwords(strtolower(trim(substr($order->couple_name, strpos($order->couple_name, ' '))))))->class('form-control') }} {{ $order->couple?->last_name }} @endIf @@ -289,12 +289,12 @@ Nickname * - {!! Form::text('nick_name', null, ['class' => 'form-control']) !!} + {{ html()->text('nick_name')->class('form-control') }} {{ $order->retreatant?->nick_name }}
    @if ($order->is_couple) - {!! Form::text('couple_nick_name', null, ['class' => 'form-control']) !!} + {{ html()->text('couple_nick_name')->class('form-control') }} {{ $order->couple?->nick_name }}
    @endIf @@ -307,7 +307,7 @@ @else @endif - {!! Form::text('email', trim($order->email), ['class' => 'form-control']) !!} + {{ html()->text('email', trim($order->email))->class('form-control') }} {{ $order->retreatant?->email_primary_text }} @if ($order->is_couple) @@ -316,7 +316,7 @@ @else @endif - {!! Form::text('couple_email', $order->couple_email, ['class' => 'form-control']) !!} + {{ html()->text('couple_email', $order->couple_email)->class('form-control') }} {{ $order->couple?->email_primary_text }} @endIf @@ -330,7 +330,7 @@ @else @endif - {!! Form::text('mobile_phone', $order->mobile_phone, ['class' => 'form-control']) !!} + {{ html()->text('mobile_phone', $order->mobile_phone)->class('form-control') }} {{ $order->retreatant?->phone_home_mobile_number }} @if ($order->is_couple) @@ -339,7 +339,7 @@ @else @endif - {!! Form::text('couple_mobile_phone', $order->couple_mobile_phone, ['class' => 'form-control']) !!} + {{ html()->text('couple_mobile_phone', $order->couple_mobile_phone)->class('form-control') }} {{ $order->couple?->phone_home_mobile_number }} @endIf @@ -354,7 +354,7 @@ @else @endif - {!! Form::text('home_phone', $order->home_phone, ['class' => 'form-control']) !!} + {{ html()->text('home_phone', $order->home_phone)->class('form-control') }} {{ $order->retreatant?->phone_home_phone_number }} @if ($order->is_couple) @@ -371,7 +371,7 @@ @else @endif - {!! Form::text('work_phone', $order->work_phone, ['class' => 'form-control']) !!} + {{ html()->text('work_phone', $order->work_phone)->class('form-control') }} {{ $order->retreatant?->phone_work_phone_number }} @if ($order->is_couple) @@ -402,7 +402,7 @@ @else @endIf - {!! Form::text('address_street', ucwords(strtolower($order->address_street)), ['class' => 'form-control']) !!} + {{ html()->text('address_street', ucwords(strtolower($order->address_street)))->class('form-control') }} {{ $order->retreatant?->address_primary_street }} @if ($order->is_couple) @@ -419,7 +419,7 @@ @else @endIf - {!! Form::text('address_supplemental', $order->address_supplemental, ['class' => 'form-control']) !!} + {{ html()->text('address_supplemental', $order->address_supplemental)->class('form-control') }} {{ $order->retreatant?->address_primary_supplemental }} @if ($order->is_couple) @@ -435,7 +435,7 @@ @else @endif - {!! Form::text('address_city', ucwords(strtolower($order->address_city)), ['class' => 'form-control']) !!} + {{ html()->text('address_city', ucwords(strtolower($order->address_city)))->class('form-control') }} {{ $order->retreatant?->address_primary_city }} @if ($order->is_couple) @@ -455,7 +455,7 @@ @if (!isset($ids['address_state'])) {{ strtoupper($order->address_state)}} @endIf - {!! Form::select('address_state_id', $states, $ids['address_state'], ['class' => 'form-control']) !!} + {{ html()->select('address_state_id', $states, $ids['address_state'])->class('form-control') }} {{ $order->retreatant?->address_primary_state }} @if ($order->is_couple) @@ -472,7 +472,7 @@ @else @endIf - {!! Form::text('address_zip', $order->address_zip, ['class' => 'form-control']) !!} + {{ html()->text('address_zip', $order->address_zip)->class('form-control') }} {{ $order->retreatant?->address_primary_postal_code }} @if ($order->is_couple) @@ -489,8 +489,8 @@ @else @endif - {!! Form::label('address_country_id', $order->address_country) !!} - {!! Form::select('address_country_id', $countries, $ids['address_country'], ['class' => 'form-control']) !!} + {{ html()->label($order->address_country, 'address_country_id') }} + {{ html()->select('address_country_id', $countries, $ids['address_country'])->class('form-control') }} {{ $order->retreatant?->address_primary_country_abbreviation }} @if ($order->is_couple) @@ -507,7 +507,7 @@ @else @endIf - {!! Form::text('dietary', $order->dietary, ['class' => 'form-control']) !!} + {{ html()->text('dietary', $order->dietary)->class('form-control') }} {{ $order->retreatant?->note_dietary_text }} @if ($order->is_couple) @@ -516,7 +516,7 @@ @else @endIf - {!! Form::text('couple_dietary', $order->couple_dietary, ['class' => 'form-control']) !!} + {{ html()->text('couple_dietary', $order->couple_dietary)->class('form-control') }} {{ $order->couple?->note_dietary_text }} @endIf @@ -526,12 +526,12 @@ Health Note - {!! Form::text('health', null, ['class' => 'form-control']) !!} + {{ html()->text('health')->class('form-control') }} {{ $order->retreatant?->note_health_text }} @if ($order->is_couple) - {!! Form::text('couple_health', null, ['class' => 'form-control']) !!} + {{ html()->text('couple_health')->class('form-control') }} {{ $order->couple?->note_health_text }} @endIf @@ -540,11 +540,11 @@ Gender - {!! Form::select('gender_id', $genders, null, ['class' => 'form-control']) !!} + {{ html()->select('gender_id', $genders)->class('form-control') }} @if ($order->is_couple) - {!! Form::select('couple_gender_id', $genders, null, ['class' => 'form-control']) !!} + {{ html()->select('couple_gender_id', $genders)->class('form-control') }} @endIf @@ -557,7 +557,7 @@ @else @endIf - {!! Form::text('date_of_birth', $order->date_of_birth, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->text('date_of_birth', $order->date_of_birth)->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }} {{ (isset($order->retreatant?->birth_date)) ? date('F d, Y', strtotime($order->retreatant?->birth_date)) : null }} @if ($order->is_couple) @@ -566,7 +566,7 @@ @else @endIf - {!! Form::text('couple_date_of birth', $order->couple_date_of_birth, ['class'=>'form-control flatpickr-date', 'autocomplete'=> 'off']) !!} + {{ html()->text('couple_date_of birth', $order->couple_date_of_birth)->class('form-control flatpickr-date')->attribute('autocomplete', 'off') }} {{ (isset($order->couple?->birth_date)) ? date('F d, Y', strtotime($order->couple?->birth_date)) : null }} @endIf @@ -576,11 +576,11 @@ Religion - {!! Form::select('religion_id', $religions, null, ['class' => 'form-control']) !!} + {{ html()->select('religion_id', $religions)->class('form-control') }} @if ($order->is_couple) - {!! Form::select('couple_religion_id', $religions, null, ['class' => 'form-control']) !!} + {{ html()->select('couple_religion_id', $religions)->class('form-control') }} @endIf @@ -595,7 +595,7 @@ @else @endIf - {!! Form::text('room_preference', ($order->room_preference == 'Ninguna' || $order->room_preference == 'None') ? null : $order->room_preference, ['class' => 'form-control']) !!} + {{ html()->text('room_preference', $order->room_preference == 'Ninguna' || $order->room_preference == 'None' ? null : $order->room_preference)->class('form-control') }} {{ $order->retreatant?->note_room_preference_text }} @if ($order->is_couple) @@ -608,8 +608,8 @@ Preferred Language - {!! Form::label('preferred_language_id', isset($order->preferred_language) ? $order->preferred_language : 'N/A' ) !!} - {!! Form::select('preferred_language_id', $languages, $ids['preferred_language'], ['class' => 'form-control']) !!} + {{ html()->label(isset($order->preferred_language) ? $order->preferred_language : 'N/A', 'preferred_language_id') }} + {{ html()->select('preferred_language_id', $languages, $ids['preferred_language'])->class('form-control') }} {{ $order->retreatant?->preferred_language_label }} @if ($order->is_couple) @@ -624,9 +624,9 @@ Parish * - {!! Form::label('parish', ucwords(strtolower($order->parish))) !!} - {!! Form::hidden('parish', ucwords(strtolower($order->parish))) !!} - {!! Form::select('parish_id', $parish_list, (null !== $order->retreatant?->parish_id) ? $order->retreatant?->parish_id : null, ['class' => 'form-control']) !!} + {{ html()->label(ucwords(strtolower($order->parish)), 'parish') }} + {{ html()->hidden('parish', ucwords(strtolower($order->parish))) }} + {{ html()->select('parish_id', $parish_list, null !== $order->retreatant?->parish_id ? $order->retreatant?->parish_id : null)->class('form-control') }} {{ $order->retreatant?->parish_name }} @if ($order->is_couple) @@ -643,7 +643,7 @@ @else @endIf - {!! Form::text('emergency_contact', $order->emergency_contact, ['class' => 'form-control']) !!} + {{ html()->text('emergency_contact', $order->emergency_contact)->class('form-control') }} {{ $order->retreatant?->emergency_contact_name }} @if ($order->is_couple) @@ -652,7 +652,7 @@ @else @endIf - {!! Form::text('couple_emergency_contact', $order->couple_emergency_contact, ['class' => 'form-control']) !!} + {{ html()->text('couple_emergency_contact', $order->couple_emergency_contact)->class('form-control') }} {{ $order->couple?->emergency_contact_name }} @endIf @@ -669,7 +669,7 @@ @else @endIf - {!! Form::text('emergency_contact_relationship', $order->emergency_contact_relationship, ['class' => 'form-control']) !!} + {{ html()->text('emergency_contact_relationship', $order->emergency_contact_relationship)->class('form-control') }} {{ $order->retreatant?->emergency_contact_relationship }} @if ($order->is_couple) @@ -678,7 +678,7 @@ @else @endIf - {!! Form::text('couple_emergency_contact_relationship', $order->couple_emergency_contact_relationship, ['class' => 'form-control']) !!} + {{ html()->text('couple_emergency_contact_relationship', $order->couple_emergency_contact_relationship)->class('form-control') }} {{ $order->couple?->emergency_contact_relationship }} @endIf @@ -693,7 +693,7 @@ @else @endIf - {!! Form::text('emergency_contact_phone', $order->emergency_contact_phone, ['class' => 'form-control']) !!} + {{ html()->text('emergency_contact_phone', $order->emergency_contact_phone)->class('form-control') }} {{ $order->retreatant?->emergency_contact_phone }} @if ($order->is_couple) @@ -702,7 +702,7 @@ @else @endIf - {!! Form::text('couple_emergency_contact_phone', $order->couple_emergency_contact_phone, ['class' => 'form-control']) !!} + {{ html()->text('couple_emergency_contact_phone', $order->couple_emergency_contact_phone)->class('form-control') }} {{ $order->couple?->emergency_contact_phone }} @endIf @@ -718,7 +718,7 @@ @else @endIf - {!! Form::number('deposit_amount', $order->deposit_amount, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->number('deposit_amount', $order->deposit_amount)->class('form-control')->attribute('step', '0.01') }} @if ($order->registration?->deposit == ($order->is_couple) ? ($order->deposit_amount/2) : $order->deposit_amount )
    @else @@ -749,7 +749,7 @@ Order # - {!! Form::text('order_number', $order->order_number, ['class' => 'form-control']) !!} + {{ html()->text('order_number', $order->order_number)->class('form-control') }} @if ($order->is_couple) @@ -766,12 +766,12 @@
    @if (!$order->is_processed) @if ($order->contact_id > 0) - {!! Form::submit('Proceed with Order',['class' => 'btn btn-dark']) !!} + {{ html()->submit('Proceed with Order')->class('btn btn-dark') }} @else - {!! Form::submit('Retrieve Contact Info',['class' => 'btn btn-info']) !!} + {{ html()->submit('Retrieve Contact Info')->class('btn btn-info') }} @endif - {!! Form::checkbox('send_fulfillment', 1, $send_fulfillment, ['class' => 'p-2 m-2']) !!} - {!! Form::label('send_fulfillment', 'Send fulfillment email', ['class' => 'p-2 m-2']) !!} + {{ html()->checkbox('send_fulfillment', $send_fulfillment, 1)->class('p-2 m-2') }} + {{ html()->label('Send fulfillment email', 'send_fulfillment')->class('p-2 m-2') }} @else Order #{{ $order->order_number }} has already been processed @@ -819,7 +819,7 @@
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/squarespace/order/show.blade.php b/resources/views/squarespace/order/show.blade.php index 1020b1af8..a1684bf2d 100644 --- a/resources/views/squarespace/order/show.blade.php +++ b/resources/views/squarespace/order/show.blade.php @@ -14,7 +14,7 @@ @endCan - {!! Html::image('images/order.png', 'Squarespace Order Index',array('title'=>"Squarespace Order Index",'class' => 'btn btn-primary')) !!} + {{ html()->img('images/order.png', 'Squarespace Order Index')->attribute('title', "Squarespace Order Index")->class('btn btn-primary') }}
    @if (isset($order->gift_certificate_number))
    @@ -194,14 +194,14 @@
    @can('update-squarespace-order') @endCan @can('delete-squarespace-order')
    - {!! Form::open(['method' => 'DELETE', 'route' => ['squarespace.order.destroy', $order->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('squarespace.order.destroy', [$order->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }}
    @endCan
    diff --git a/resources/views/stripe/balance_transactions/edit.blade.php b/resources/views/stripe/balance_transactions/edit.blade.php index 489bf47a4..90375f562 100644 --- a/resources/views/stripe/balance_transactions/edit.blade.php +++ b/resources/views/stripe/balance_transactions/edit.blade.php @@ -39,9 +39,9 @@
    - {!! Form::open(['method' => 'PUT', 'route' => ['stripe.balance_transaction.update', $balance_transaction->id]]) !!} - {!! Form::hidden('id', $balance_transaction->id) !!} - {!! Form::hidden('payout_id', $balance_transaction->payout_id) !!} + {{ html()->form('PUT', route('stripe.balance_transaction.update', [$balance_transaction->id]))->open() }} + {{ html()->hidden('id', $balance_transaction->id) }} + {{ html()->hidden('payout_id', $balance_transaction->payout_id) }}
    @@ -53,15 +53,15 @@ @if (isset($balance_transaction->contact_id)) Donor: {{$balance_transaction->name}} @else - {!! Form::label('contact_id', 'Donor: ' .$balance_transaction->name) !!} + {{ html()->label('Donor: ' . $balance_transaction->name, 'contact_id') }} @endIf - {!! Form::select('contact_id', $matching_contacts, (isset($balance_transaction->contact_id)) ? $balance_transaction->contact_id : 0, ['class' => 'form-control']) !!} + {{ html()->select('contact_id', $matching_contacts, isset($balance_transaction->contact_id) ? $balance_transaction->contact_id : 0)->class('form-control') }}

    - {!! Form::label('event_id', 'Retreat:') !!} + {{ html()->label('Retreat:', 'event_id') }}

    - {!! Form::select('event_id', $retreats, (isset($balance_transaction->event_id) ? $balance_transaction->event_id : '' ), ['class' => 'form-control']) !!} + {{ html()->select('event_id', $retreats, isset($balance_transaction->event_id) ? $balance_transaction->event_id : '')->class('form-control') }}

    Email: {{ $balance_transaction->email }} @@ -74,16 +74,16 @@ @if (is_array($transaction_types)) @foreach ($transaction_types as $type) - {!! Form::label(str_replace(" ", "_",strtolower($type)), $type) !!} + {{ html()->label($type, str_replace(" ", "_", strtolower($type))) }} @if (count($transaction_types) == 1) - {!! Form::number(str_replace(" ", "_",strtolower($type)), $balance_transaction->total_amount, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->number(str_replace(" ", "_", strtolower($type)), $balance_transaction->total_amount)->class('form-control')->attribute('step', '0.01') }} @else - {!! Form::number(str_replace(" ", "_",strtolower($type)), null, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->number(str_replace(" ", "_", strtolower($type)))->class('form-control')->attribute('step', '0.01') }} @endIf @endForeach @else - {!! Form::label(str_replace(" ","_", strtolower($transaction_types)), $transaction_types) !!} - {!! Form::number(str_replace(" ","_", strtolower($transaction_types)), $balance_transaction->total_amount, ['class' => 'form-control','step'=>'0.01']) !!} + {{ html()->label($transaction_types, str_replace(" ", "_", strtolower($transaction_types))) }} + {{ html()->number(str_replace(" ", "_", strtolower($transaction_types)), $balance_transaction->total_amount)->class('form-control')->attribute('step', '0.01') }} @endIf
    Fee: ${{ number_format($balance_transaction->fee_amount,2) }} @@ -99,8 +99,8 @@ @case ('Donation')

    - {!! Form::label('contribution_id', 'Contribution for: ' .$balance_transaction->name) . ' - $' . number_format($balance_transaction->total_amount,2) . ' - ' . $balance_transaction->payout_date->format('m-d-Y') !!}

    - {!! Form::select('contribution_id', $unprocessed_squarespace_contributions, null, ['class' => 'form-control']) !!} + {{ html()->label('Contribution for: ' . $balance_transaction->name, 'contribution_id') }} + {{ html()->select('contribution_id', $unprocessed_squarespace_contributions)->class('form-control') }}
    @break @@ -110,10 +110,10 @@ @if (isset($balance_transaction->contact_id) && $balance_transaction->contact_id > 0) Donor: {{$balance_transaction->name}} @else - {!! Form::label('contact_id', 'Donor: ' .$balance_transaction->name) !!} + {{ html()->label('Donor: ' . $balance_transaction->name, 'contact_id') }} @endIf - {!! Form::select('contact_id', $matching_contacts, (isset($balance_transaction->contact_id)) ? $balance_transaction->contact_id : 0, ['class' => 'form-control']) !!} + {{ html()->select('contact_id', $matching_contacts, isset($balance_transaction->contact_id) ? $balance_transaction->contact_id : 0)->class('form-control') }}
    Email: {{ $balance_transaction->email }}
    Zip: {{ $balance_transaction->zip }} @@ -122,9 +122,9 @@

    - {!! Form::label('donation_id', 'Donation:') !!} + {{ html()->label('Donation:', 'donation_id') }}

    - {!! Form::select('donation_id', $donations, null, ['class' => 'form-control']) !!} + {{ html()->select('donation_id', $donations)->class('form-control') }}
    @@ -151,20 +151,20 @@ @switch ($balance_transaction->transaction_type) @case ('Manual') @if ($balance_transaction->contact_id > 0) - {!! Form::submit('Process Balance Transaction',['class' => 'btn btn-dark']) !!} + {{ html()->submit('Process Balance Transaction')->class('btn btn-dark') }} @else - {!! Form::submit('Retrieve Contact Info',['class' => 'btn btn-info']) !!} + {{ html()->submit('Retrieve Contact Info')->class('btn btn-info') }} @endif @break @case('Donation') - {!! Form::submit('Process Balance Transaction: Contribution',['class' => 'btn btn-dark']) !!} + {{ html()->submit('Process Balance Transaction: Contribution')->class('btn btn-dark') }} @break @case ('Invoice') @if ($balance_transaction->contact_id > 0) - {!! Form::submit('Process Balance Transaction',['class' => 'btn btn-dark']) !!} + {{ html()->submit('Process Balance Transaction')->class('btn btn-dark') }} Reset Contact for Stripe Balance Transaction #{{ $balance_transaction->id }} @else - {!! Form::submit('Retrieve Donor Information',['class' => 'btn btn-info']) !!} + {{ html()->submit('Retrieve Donor Information')->class('btn btn-info') }} @endif @break @endswitch @@ -186,7 +186,7 @@
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/stripe/payouts/index.blade.php b/resources/views/stripe/payouts/index.blade.php index 06c140936..d5b113f51 100644 --- a/resources/views/stripe/payouts/index.blade.php +++ b/resources/views/stripe/payouts/index.blade.php @@ -9,7 +9,7 @@ {{ $payouts->links() }} - {!! Html::link(action([\App\Http\Controllers\StripePayoutController::class, 'import']),'Import New Stripe Payouts',array('class' => 'btn btn-secondary'))!!} + {{ html()->a(url(action([\App\Http\Controllers\StripePayoutController::class, 'import'])), 'Import New Stripe Payouts')->class('btn btn-secondary') }} @@ -43,7 +43,7 @@ @if (isset($payout->fee_payment_id)) ${{ number_format($payout->total_fee_amount,2) }} @else - {!! Html::link(action([\App\Http\Controllers\StripePayoutController::class, 'process_fees'],$payout->id),'Create Stripe Fee Payment for $'.number_format($payout->total_fee_amount,2),array('class' => 'btn btn-warning'))!!} + {{ html()->a(url(action([\App\Http\Controllers\StripePayoutController::class, 'process_fees'], $payout->id)), 'Create Stripe Fee Payment for $' . number_format($payout->total_fee_amount, 2))->class('btn btn-warning') }} @endIf diff --git a/resources/views/stripe/payouts/show.blade.php b/resources/views/stripe/payouts/show.blade.php index 0d363f692..c543abb69 100644 --- a/resources/views/stripe/payouts/show.blade.php +++ b/resources/views/stripe/payouts/show.blade.php @@ -24,7 +24,7 @@

    Stripe Payouts ({{ $payouts->total() }})

    ${{ number_format($payout->amount + $payout->total_fee_amount,2) }}
    @@ -90,19 +90,19 @@ @else @switch ($balance_transaction->transaction_type) @case('Charge') - {{ Html::link(action([\App\Http\Controllers\StripeBalanceTransactionController::class, 'edit'],$balance_transaction->id),'Create Payment for Order #'.$balance_transaction->squarespace_order?->order_number,array('class' => 'btn btn-primary')) }} + {{ html()->a(url(action([\App\Http\Controllers\StripeBalanceTransactionController::class, 'edit'], $balance_transaction->id)), 'Create Payment for Order #' . $balance_transaction->squarespace_order?->order_number)->class('btn btn-primary') }} @break @case('Donation') - {{ Html::link(action([\App\Http\Controllers\StripeBalanceTransactionController::class, 'edit'],$balance_transaction->id),'Create Payment for Donation'.$balance_transaction->squarespace_order?->order_number,array('class' => 'btn btn-primary')) }} + {{ html()->a(url(action([\App\Http\Controllers\StripeBalanceTransactionController::class, 'edit'], $balance_transaction->id)), 'Create Payment for Donation' . $balance_transaction->squarespace_order?->order_number)->class('btn btn-primary') }} @break @case('Invoice') - {{ Html::link(action([\App\Http\Controllers\StripeBalanceTransactionController::class, 'edit'],$balance_transaction->id),'Create Payment for '.$balance_transaction->description,array('class' => 'btn btn-primary')) }} + {{ html()->a(url(action([\App\Http\Controllers\StripeBalanceTransactionController::class, 'edit'], $balance_transaction->id)), 'Create Payment for ' . $balance_transaction->description)->class('btn btn-primary') }} @break @case('Refund') - {{ Html::link(action([\App\Http\Controllers\StripeBalanceTransactionController::class, 'edit'],$balance_transaction->id),'Create Refund Credit Payment',array('class' => 'btn btn-primary')) }} + {{ html()->a(url(action([\App\Http\Controllers\StripeBalanceTransactionController::class, 'edit'], $balance_transaction->id)), 'Create Refund Credit Payment')->class('btn btn-primary') }} @break @default - {{ Html::link(action([\App\Http\Controllers\StripeBalanceTransactionController::class, 'edit'],$balance_transaction->id),'Process Balance Transaction',array('class' => 'btn btn-primary')) }} + {{ html()->a(url(action([\App\Http\Controllers\StripeBalanceTransactionController::class, 'edit'], $balance_transaction->id)), 'Process Balance Transaction')->class('btn btn-primary') }} @break @endswitch @endif diff --git a/resources/views/template.blade.php b/resources/views/template.blade.php index 6e4d0c2ad..86fab1dd6 100644 --- a/resources/views/template.blade.php +++ b/resources/views/template.blade.php @@ -161,12 +161,12 @@ function ConfirmDelete() { @endCan @can('show-contact') - {{ Form::open(['action' => ['App\Http\Controllers\SearchController@getuser'], 'method' => 'GET', 'class' => 'form-inline my-2 my-lg-0']) }} - {{ Form::text('contactSearch', '', ['id' => 'contactSearch', 'placeholder' => 'Find contact by name','class'=>'form-control mr-sm-2'])}} - {{ Form::hidden('response', '', array('id' =>'response')) }} - {{ Form::submit('Find Person', array('class' => 'btn btn-outline-success my-2 my-sm-0','id'=>'btnSearch','style'=>'display:none')) }} - {!! Html::image('images/search.png', 'Advanced search',array('title'=>"Advanced search",'class' => 'btn btn-link')) !!} - {{ Form::close() }} + {{ html()->form('GET', action('App\\Http\\Controllers\\SearchController@getuser', ))->class('form-inline my-2 my-lg-0')->open() }} + {{ html()->text('contactSearch', '')->id('contactSearch')->placeholder('Find contact by name')->class('form-control mr-sm-2') }} + {{ html()->hidden('response', '')->id('response') }} + {{ html()->submit('Find Person')->class('btn btn-outline-success my-2 my-sm-0')->id('btnSearch')->style('display:none') }} + {{ html()->img('images/search.png', 'Advanced search')->attribute('title', "Advanced search")->class('btn btn-link') }} + {{ html()->form()->close() }} @endcan @auth
    - {!! Form::open(['url' => 'touchpoint/add_retreat', 'method' => 'post', 'class' => 'form-horizontal panel']) !!} + {{ html()->form('POST', 'touchpoint/add_retreat')->class('form-horizontal panel')->open() }}
    - {!! Form::label('touched_at', 'Date of contact:', ['class'=>'col-lg-2']) !!} - {!! Form::text('touched_at', now(), ['class'=>'col-lg-6 form-control flatpickr-date-time required']) !!} + {{ html()->label('Date of contact:', 'touched_at')->class('col-lg-2') }} + {{ html()->text('touched_at', now())->class('col-lg-6 form-control flatpickr-date-time required') }}
    - {!! Form::label('event_id', 'Name of Retreat:', ['class'=>'col-lg-2']) !!} - {!! Form::select('event_id', [$defaults['event_id']=>$defaults['event_description']],$defaults['event_id'], ['class'=>'col-lg-6']) !!} + {{ html()->label('Name of Retreat:', 'event_id')->class('col-lg-2') }} + {{ html()->select('event_id', [$defaults['event_id'] => $defaults['event_description']], $defaults['event_id'])->class('col-lg-6') }}
    - {!! Form::label('staff_id', 'Contacted by:', ['class'=>'col-lg-2']) !!} + {{ html()->label('Contacted by:', 'staff_id')->class('col-lg-2') }} @if (isset($defaults['user_id'])) - {!! Form::select('staff_id', $staff, $defaults['user_id'], ['class'=>'col-lg-6']) !!} + {{ html()->select('staff_id', $staff, $defaults['user_id'])->class('col-lg-6') }} @else - {!! Form::select('staff_id', $staff, NULL, ['class'=>'col-lg-6']) !!} + {{ html()->select('staff_id', $staff)->class('col-lg-6') }} @endif
    - {!! Form::label('type', 'Type of Contact:', ['class'=>'col-lg-2']) !!} - {!! Form::select('type', [ - 'Call' => 'Call', - 'Email' => 'Email', - 'Face' => 'Face to Face', - 'Letter' => 'Letter', - 'Other' => 'Other', - ], NULL) !!} + {{ html()->label('Type of Contact:', 'type')->class('col-lg-2') }} + {{ html()->select('type', ['Call' => 'Call', 'Email' => 'Email', 'Face' => 'Face to Face', 'Letter' => 'Letter', 'Other' => 'Other']) }}
    - {!! Form::label('notes', 'Notes:', ['class'=>'col-lg-2']) !!} - {!! Form::textarea('notes', NULL, ['class'=>'col-lg-6']) !!} + {{ html()->label('Notes:', 'notes')->class('col-lg-2') }} + {{ html()->textarea('notes')->class('col-lg-6') }}
    - {!! Form::submit('Add Retreat Touchpoint', ['class'=>'btn btn-primary']) !!} + {{ html()->submit('Add Retreat Touchpoint')->class('btn btn-primary') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    diff --git a/resources/views/touchpoints/add_retreat_waitlist.blade.php b/resources/views/touchpoints/add_retreat_waitlist.blade.php index 92bc70fab..43ac8f956 100644 --- a/resources/views/touchpoints/add_retreat_waitlist.blade.php +++ b/resources/views/touchpoints/add_retreat_waitlist.blade.php @@ -4,53 +4,47 @@

    Create Retreat Waitlist Touchpoint for {{$retreat->title}}

    - {!! Form::open(['url' => 'touchpoint/add_retreat_waitlist', 'method' => 'post', 'class' => 'form-horizontal panel']) !!} + {{ html()->form('POST', 'touchpoint/add_retreat_waitlist')->class('form-horizontal panel')->open() }}

    A retreat touchpoint will add a touchpoint to each of the retreatants currently on the waitlist.

    - {!! Form::label('touched_at', 'Date of contact:', ['class' => 'col-md-3']) !!} - {!! Form::text('touched_at', now(), ['class'=>'form-control flatpickr-date-time', 'required']) !!} + {{ html()->label('Date of contact:', 'touched_at')->class('col-md-3') }} + {{ html()->text('touched_at', now())->class('form-control flatpickr-date-time')->required() }}
    - {!! Form::label('event_id', 'Name of Retreat:', ['class' => 'col-md-3']) !!} - {!! Form::select('event_id', [$defaults['event_id']=>$defaults['event_description']],$defaults['event_id'], ['class' => 'col-md-3']) !!} + {{ html()->label('Name of Retreat:', 'event_id')->class('col-md-3') }} + {{ html()->select('event_id', [$defaults['event_id'] => $defaults['event_description']], $defaults['event_id'])->class('col-md-3') }}
    - {!! Form::label('staff_id', 'Contacted by:', ['class' => 'col-md-3']) !!} + {{ html()->label('Contacted by:', 'staff_id')->class('col-md-3') }} @if (isset($defaults['user_id'])) - {!! Form::select('staff_id', $staff, $defaults['user_id'], ['class' => 'col-md-3']) !!} + {{ html()->select('staff_id', $staff, $defaults['user_id'])->class('col-md-3') }} @else - {!! Form::select('staff_id', $staff, NULL, ['class' => 'col-md-3']) !!} + {{ html()->select('staff_id', $staff)->class('col-md-3') }} @endif
    - {!! Form::label('type', 'Type of Contact:', ['class' => 'col-md-3']) !!} - {!! Form::select('type', [ - 'Call' => 'Call', - 'Email' => 'Email', - 'Face' => 'Face to Face', - 'Letter' => 'Letter', - 'Other' => 'Other', - ], NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Type of Contact:', 'type')->class('col-md-3') }} + {{ html()->select('type', ['Call' => 'Call', 'Email' => 'Email', 'Face' => 'Face to Face', 'Letter' => 'Letter', 'Other' => 'Other'])->class('col-md-3') }}
    - {!! Form::label('notes', 'Notes:', ['class' => 'col-md-3']) !!} - {!! Form::textarea('notes', NULL, ['class' => 'col-md-3']) !!} + {{ html()->label('Notes:', 'notes')->class('col-md-3') }} + {{ html()->textarea('notes')->class('col-md-3') }}
    - {!! Form::submit('Add Retreat Waitlist Touchpoint', ['class'=>'btn btn-primary']) !!} + {{ html()->submit('Add Retreat Waitlist Touchpoint')->class('btn btn-primary') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    diff --git a/resources/views/touchpoints/create.blade.php b/resources/views/touchpoints/create.blade.php index 86ce6669a..0da075b75 100644 --- a/resources/views/touchpoints/create.blade.php +++ b/resources/views/touchpoints/create.blade.php @@ -5,54 +5,48 @@

    Create Touchpoint

    - {!! Form::open(['url' => 'touchpoint', 'method' => 'post']) !!} + {{ html()->form('POST', 'touchpoint')->open() }}
    - {!! Form::label('touched_at', 'Date of contact: ') !!} - {!! Form::text('touched_at', now(), ['class'=>'form-control flatpickr-date-time', 'required']) !!} + {{ html()->label('Date of contact: ', 'touched_at') }} + {{ html()->text('touched_at', now())->class('form-control flatpickr-date-time')->required() }}
    - {!! Form::label('person_id', 'Name of Contact:') !!} + {{ html()->label('Name of Contact:', 'person_id') }} @if (isset($defaults['contact_id'])) - {!! Form::select('person_id', $persons, $defaults['contact_id'], ['class' => 'form-control', 'required']) !!} + {{ html()->select('person_id', $persons, $defaults['contact_id'])->class('form-control')->required() }} @else - {!! Form::select('person_id', $persons, NULL, ['class' => 'form-control', 'required']) !!} + {{ html()->select('person_id', $persons)->class('form-control')->required() }} @endif
    @if (isset($defaults['user_id'])) - {!! Form::select('staff_id', $staff, $defaults['user_id'], ['class' => 'form-control', 'required']) !!} + {{ html()->select('staff_id', $staff, $defaults['user_id'])->class('form-control')->required() }} @else - {!! Form::select('staff_id', $staff, NULL, ['class' => 'form-control', 'required']) !!} + {{ html()->select('staff_id', $staff)->class('form-control')->required() }} @endif
    - {!! Form::label('type', 'Type of Contact:') !!} - {!! Form::select('type', [ - 'Call' => 'Call', - 'Email' => 'Email', - 'Face' => 'Face to Face', - 'Letter' => 'Letter', - 'Other' => 'Other', - ], NULL, ['class' => 'form-control', 'required']) !!} + {{ html()->label('Type of Contact:', 'type') }} + {{ html()->select('type', ['Call' => 'Call', 'Email' => 'Email', 'Face' => 'Face to Face', 'Letter' => 'Letter', 'Other' => 'Other'])->class('form-control')->required() }}
    - {!! Form::label('notes', 'Notes:') !!} - {!! Form::textarea('notes', NULL, ['class' => 'form-control', 'rows' => '3', 'required']) !!} + {{ html()->label('Notes:', 'notes') }} + {{ html()->textarea('notes')->class('form-control')->rows('3')->required() }}
    - {!! Form::submit('Add Touchpoint', ['class'=>'btn btn-primary']) !!} + {{ html()->submit('Add Touchpoint')->class('btn btn-primary') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    diff --git a/resources/views/touchpoints/edit.blade.php b/resources/views/touchpoints/edit.blade.php index c103ba17d..a3ef8066a 100644 --- a/resources/views/touchpoints/edit.blade.php +++ b/resources/views/touchpoints/edit.blade.php @@ -5,42 +5,42 @@

    Edit Touchpoint:

    - {!! Form::open(['method' => 'PUT', 'route' => ['touchpoint.update', $touchpoint->id]]) !!} - {!! Form::hidden('id', $touchpoint->id) !!} + {{ html()->form('PUT', route('touchpoint.update', [$touchpoint->id]))->open() }} + {{ html()->hidden('id', $touchpoint->id) }}

    Touchpoint details

    - {!! Form::label('touched_at', 'Date of contact:', ['class' => 'col-md-3']) !!} - {!! Form::datetime('touched_at', $touchpoint->touched_at, ['class'=>'col-md-3 form-control flatpickr-date-time']) !!} + {{ html()->label('Date of contact:', 'touched_at')->class('col-md-3') }} + {{ html()->datetime('touched_at', $touchpoint->touched_at)->class('col-md-3 form-control flatpickr-date-time') }}
    - {!! Form::label('person_id', 'Name of Contact:', ['class' => 'col-md-3']) !!} - {!! Form::select('person_id', $persons, $touchpoint->person_id, ['class' => 'col-md-3']) !!} + {{ html()->label('Name of Contact:', 'person_id')->class('col-md-3') }} + {{ html()->select('person_id', $persons, $touchpoint->person_id)->class('col-md-3') }}
    - {!! Form::label('staff_id', 'Contacted by:', ['class' => 'col-md-3']) !!} - {!! Form::select('staff_id', $staff, $touchpoint->staff_id, ['class' => 'col-md-3']) !!} + {{ html()->label('Contacted by:', 'staff_id')->class('col-md-3') }} + {{ html()->select('staff_id', $staff, $touchpoint->staff_id)->class('col-md-3') }}
    - {!! Form::label('type', 'Type of Contact:', ['class' => 'col-md-3']) !!} - {!! Form::select('type', config('polanco.touchpoint_source'), $touchpoint->type, ['class' => 'col-md-3']) !!} + {{ html()->label('Type of Contact:', 'type')->class('col-md-3') }} + {{ html()->select('type', config('polanco.touchpoint_source'), $touchpoint->type)->class('col-md-3') }}
    - {!! Form::label('notes', 'Notes:', ['class' => 'col-md-3']) !!} - {!! Form::textarea('notes', $touchpoint->notes, ['class' => 'col-md-3']) !!} + {{ html()->label('Notes:', 'notes')->class('col-md-3') }} + {{ html()->textarea('notes', $touchpoint->notes)->class('col-md-3') }}
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-primary']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-primary']) }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/touchpoints/index.blade.php b/resources/views/touchpoints/index.blade.php index 2ffe90832..c6499cfe7 100644 --- a/resources/views/touchpoints/index.blade.php +++ b/resources/views/touchpoints/index.blade.php @@ -10,10 +10,10 @@ ({{$touchpoints->total()}} records) @can('update-touchpoint') - {!! Html::image('images/create.png', 'Add Touchpoint',array('title'=>"Add Touchpoint",'class' => 'btn btn-primary')) !!} + {{ html()->img('images/create.png', 'Add Touchpoint')->attribute('title', "Add Touchpoint")->class('btn btn-primary') }} - {!! Html::image('images/group_add.png', 'Add Group Touchpoint',array('title'=>"Add Group Touchpoint",'class' => 'btn btn-primary')) !!} + {{ html()->img('images/group_add.png', 'Add Group Touchpoint')->attribute('title', "Add Group Touchpoint")->class('btn btn-primary') }} @endCan {{ $touchpoints->links() }} diff --git a/resources/views/touchpoints/show.blade.php b/resources/views/touchpoints/show.blade.php index 14a2fbcc2..b5f7707a9 100644 --- a/resources/views/touchpoints/show.blade.php +++ b/resources/views/touchpoints/show.blade.php @@ -28,14 +28,14 @@
    @can('update-touchpoint') @endCan @can('delete-touchpoint')
    - {!! Form::open(['method' => 'DELETE', 'route' => ['touchpoint.destroy', $touchpoint->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('touchpoint.destroy', [$touchpoint->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }}
    @endCan
    diff --git a/resources/views/vendor/LaravelLogger/forms/clear-activity-log.blade.php b/resources/views/vendor/LaravelLogger/forms/clear-activity-log.blade.php index 04f2d4fea..b5fab4c93 100644 --- a/resources/views/vendor/LaravelLogger/forms/clear-activity-log.blade.php +++ b/resources/views/vendor/LaravelLogger/forms/clear-activity-log.blade.php @@ -1,4 +1,4 @@ -{!! Form::open(array('route' => 'clear-activity')) !!} - {!! Form::hidden('_method', 'DELETE') !!} - {!! Form::button('' . trans('LaravelLogger::laravel-logger.dashboard.menu.clear'), array('type' => 'button', 'data-toggle' => 'modal', 'data-target' => '#confirmDelete', 'data-title' => trans('LaravelLogger::laravel-logger.modals.clearLog.title'),'data-message' => trans('LaravelLogger::laravel-logger.modals.clearLog.message'), 'class' => 'dropdown-item')) !!} -{!! Form::close() !!} +{{ html()->form('POST', route('clear-activity'))->open() }} + {{ html()->hidden('_method', 'DELETE') }} + {{ html()->button('' . trans('LaravelLogger::laravel-logger.dashboard.menu.clear'))->type('button')->data('toggle', 'modal')->data('target', '#confirmDelete')->data('title', trans('LaravelLogger::laravel-logger.modals.clearLog.title'))->data('message', trans('LaravelLogger::laravel-logger.modals.clearLog.message'))->class('dropdown-item') }} +{{ html()->form()->close() }} diff --git a/resources/views/vendor/LaravelLogger/forms/delete-activity-log.blade.php b/resources/views/vendor/LaravelLogger/forms/delete-activity-log.blade.php index 76c66afe3..4d312da8c 100644 --- a/resources/views/vendor/LaravelLogger/forms/delete-activity-log.blade.php +++ b/resources/views/vendor/LaravelLogger/forms/delete-activity-log.blade.php @@ -1,4 +1,4 @@ -{!! Form::open(array('route' => 'destroy-activity', 'class' => 'mb-0')) !!} - {!! Form::hidden('_method', 'DELETE') !!} - {!! Form::button('' . trans('LaravelLogger::laravel-logger.dashboardCleared.menu.deleteAll'), array('type' => 'button', 'class' => 'text-danger dropdown-item', 'data-toggle' => 'modal', 'data-target' => '#confirmDelete', 'data-title' => trans('LaravelLogger::laravel-logger.modals.deleteLog.title'),'data-message' => trans('LaravelLogger::laravel-logger.modals.deleteLog.message'))) !!} -{!! Form::close() !!} +{{ html()->form('POST', route('destroy-activity'))->class('mb-0')->open() }} + {{ html()->hidden('_method', 'DELETE') }} + {{ html()->button('' . trans('LaravelLogger::laravel-logger.dashboardCleared.menu.deleteAll'))->type('button')->class('text-danger dropdown-item')->data('toggle', 'modal')->data('target', '#confirmDelete')->data('title', trans('LaravelLogger::laravel-logger.modals.deleteLog.title'))->data('message', trans('LaravelLogger::laravel-logger.modals.deleteLog.message')) }} +{{ html()->form()->close() }} diff --git a/resources/views/vendor/LaravelLogger/forms/restore-activity-log.blade.php b/resources/views/vendor/LaravelLogger/forms/restore-activity-log.blade.php index 20fead6ff..484079d23 100644 --- a/resources/views/vendor/LaravelLogger/forms/restore-activity-log.blade.php +++ b/resources/views/vendor/LaravelLogger/forms/restore-activity-log.blade.php @@ -1,3 +1,3 @@ -{!! Form::open(array('route' => 'restore-activity', 'method' => 'POST', 'class' => 'mb-0')) !!} - {!! Form::button('' . trans('LaravelLogger::laravel-logger.dashboardCleared.menu.restoreAll'), array('type' => 'button', 'class' => 'text-success dropdown-item', 'data-toggle' => 'modal', 'data-target' => '#confirmRestore', 'data-title' => trans('LaravelLogger::laravel-logger.modals.restoreLog.title'),'data-message' => trans('LaravelLogger::laravel-logger.modals.restoreLog.message'))) !!} -{!! Form::close() !!} +{{ html()->form('POST', route('restore-activity'))->class('mb-0')->open() }} + {{ html()->button('' . trans('LaravelLogger::laravel-logger.dashboardCleared.menu.restoreAll'))->type('button')->class('text-success dropdown-item')->data('toggle', 'modal')->data('target', '#confirmRestore')->data('title', trans('LaravelLogger::laravel-logger.modals.restoreLog.title'))->data('message', trans('LaravelLogger::laravel-logger.modals.restoreLog.message')) }} +{{ html()->form()->close() }} diff --git a/resources/views/vendor/LaravelLogger/modals/confirm-modal.blade.php b/resources/views/vendor/LaravelLogger/modals/confirm-modal.blade.php index f3b039f65..e3ed0e274 100644 --- a/resources/views/vendor/LaravelLogger/modals/confirm-modal.blade.php +++ b/resources/views/vendor/LaravelLogger/modals/confirm-modal.blade.php @@ -24,8 +24,8 @@

    Are you sure?

    diff --git a/resources/views/vendors/create.blade.php b/resources/views/vendors/create.blade.php index 7d7b2cb49..356392dd0 100644 --- a/resources/views/vendors/create.blade.php +++ b/resources/views/vendors/create.blade.php @@ -6,60 +6,60 @@

    Add a Vendor

    - {!! Form::open(['url' => 'vendor', 'method' => 'post', 'class' => 'form-horizontal panel']) !!} + {{ html()->form('POST', 'vendor')->class('form-horizontal panel')->open() }}
    - {!! Form::label('organization_name', 'Name') !!} - {!! Form::text('organization_name', null, ['class'=>'form-control']) !!} + {{ html()->label('Name', 'organization_name') }} + {{ html()->text('organization_name')->class('form-control') }}
    - {!! Form::label('street_address', 'Address Line 1') !!} - {!! Form::text('street_address', null, ['class'=>'form-control']) !!} + {{ html()->label('Address Line 1', 'street_address') }} + {{ html()->text('street_address')->class('form-control') }}
    - {!! Form::label('supplemental_address_1', 'Address Line 2') !!} - {!! Form::text('supplemental_address_1', null, ['class'=>'form-control']) !!} + {{ html()->label('Address Line 2', 'supplemental_address_1') }} + {{ html()->text('supplemental_address_1')->class('form-control') }}
    - {!! Form::label('city', 'City') !!} - {!! Form::text('city', null, ['class'=>'form-control']) !!} + {{ html()->label('City', 'city') }} + {{ html()->text('city')->class('form-control') }}
    - {!! Form::label('state_province_id', 'State') !!} - {!! Form::select('state_province_id', $states, $defaults['state_province_id'], ['class' => 'form-control']) !!} + {{ html()->label('State', 'state_province_id') }} + {{ html()->select('state_province_id', $states, $defaults['state_province_id'])->class('form-control') }}
    - {!! Form::label('postal_code', 'Zip') !!} - {!! Form::text('postal_code', null, ['class'=>'form-control']) !!} + {{ html()->label('Zip', 'postal_code') }} + {{ html()->text('postal_code')->class('form-control') }}
    - {!! Form::label('country_id', 'Country') !!} - {!! Form::select('country_id', $countries, $defaults['country_id'], ['class' => 'form-control']) !!} + {{ html()->label('Country', 'country_id') }} + {{ html()->select('country_id', $countries, $defaults['country_id'])->class('form-control') }}
    - {!! Form::label('phone_main_phone', 'Phone') !!} - {!! Form::text('phone_main_phone', null, ['class'=>'form-control']) !!} + {{ html()->label('Phone', 'phone_main_phone') }} + {{ html()->text('phone_main_phone')->class('form-control') }}
    - {!! Form::label('phone_main_fax', 'Fax') !!} - {!! Form::text('phone_main_fax', null, ['class'=>'form-control']) !!} + {{ html()->label('Fax', 'phone_main_fax') }} + {{ html()->text('phone_main_fax')->class('form-control') }}
    - {!! Form::label('email_main', 'Email') !!} - {!! Form::text('email_main', null, ['class'=>'form-control']) !!} + {{ html()->label('Email', 'email_main') }} + {{ html()->text('email_main')->class('form-control') }}
    - {!! Form::label('note', 'Note') !!} - {!! Form::textarea('note', null, ['class'=>'form-control', 'rows'=>'3']) !!} + {{ html()->label('Note', 'note') }} + {{ html()->textarea('note')->class('form-control')->rows('3') }}
    @@ -73,10 +73,10 @@
    - {!! Form::submit('Add Vendor', ['class'=>'btn btn-outline-dark']) !!} + {{ html()->submit('Add Vendor')->class('btn btn-outline-dark') }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop \ No newline at end of file diff --git a/resources/views/vendors/create/urls.blade.php b/resources/views/vendors/create/urls.blade.php index 40b5401fa..4c66c82aa 100644 --- a/resources/views/vendors/create/urls.blade.php +++ b/resources/views/vendors/create/urls.blade.php @@ -41,56 +41,56 @@
    - {!! Form::label('url_main', 'Personal (main):') !!} - {!! Form::text('url_main', null, ['class' => 'form-control']) !!} + {{ html()->label('Personal (main):', 'url_main') }} + {{ html()->text('url_main')->class('form-control') }}
    - {!! Form::label('url_work', 'Work:') !!} - {!! Form::text('url_work', null, ['class' => 'form-control']) !!} + {{ html()->label('Work:', 'url_work') }} + {{ html()->text('url_work')->class('form-control') }}
    - {!! Form::label('url_facebook', 'Facebook:') !!} - {!! Form::text('url_facebook', null, ['class' => 'form-control']) !!} + {{ html()->label('Facebook:', 'url_facebook') }} + {{ html()->text('url_facebook')->class('form-control') }}
    - {!! Form::label('url_google', 'Google+:') !!} - {!! Form::text('url_google', null, ['class' => 'form-control']) !!} + {{ html()->label('Google+:', 'url_google') }} + {{ html()->text('url_google')->class('form-control') }}
    - {!! Form::label('url_instagram', 'Instagram:') !!} - {!! Form::text('url_instagram', null, ['class' => 'form-control']) !!} + {{ html()->label('Instagram:', 'url_instagram') }} + {{ html()->text('url_instagram')->class('form-control') }}
    - {!! Form::label('url_linkedin', 'LinkedIn:') !!} - {!! Form::text('url_linkedin', null, ['class' => 'form-control']) !!} + {{ html()->label('LinkedIn:', 'url_linkedin') }} + {{ html()->text('url_linkedin')->class('form-control') }}
    - {!! Form::label('url_twitter', 'Twitter:') !!} - {!! Form::text('url_twitter', null, ['class' => 'form-control']) !!} + {{ html()->label('Twitter:', 'url_twitter') }} + {{ html()->text('url_twitter')->class('form-control') }}
    diff --git a/resources/views/vendors/edit.blade.php b/resources/views/vendors/edit.blade.php index 141bcc46e..9a161cfbc 100644 --- a/resources/views/vendors/edit.blade.php +++ b/resources/views/vendors/edit.blade.php @@ -6,11 +6,11 @@

    Edit: {{ $vendor->organization_name }}

    - {!! Form::open(['method' => 'PUT', 'files'=>'true', 'route' => ['vendor.update', $vendor->id]]) !!} - {!! Form::hidden('id', $vendor->id) !!} + {{ html()->form('PUT', route('vendor.update', [$vendor->id]))->acceptsFiles()->open() }} + {{ html()->hidden('id', $vendor->id) }}
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
    @@ -19,16 +19,16 @@
    - {!! Form::label('organization_name', 'Name') !!} - {!! Form::text('organization_name', $vendor->organization_name, ['class' => 'form-control']) !!} + {{ html()->label('Name', 'organization_name') }} + {{ html()->text('organization_name', $vendor->organization_name)->class('form-control') }}
    - {!! Form::label('display_name', 'Display') !!} - {!! Form::text('display_name', $vendor->display_name, ['class' => 'form-control']) !!} + {{ html()->label('Display', 'display_name') }} + {{ html()->text('display_name', $vendor->display_name)->class('form-control') }}
    - {!! Form::label('sort_name', 'Sort') !!} - {!! Form::text('sort_name', $vendor->sort_name, ['class' => 'form-control']) !!} + {{ html()->label('Sort', 'sort_name') }} + {{ html()->text('sort_name', $vendor->sort_name)->class('form-control') }}
    @@ -38,28 +38,28 @@
    - {!! Form::label('street_address', 'Address') !!} - {!! Form::text('street_address', $vendor->address_primary_street, ['class' => 'form-control']) !!} + {{ html()->label('Address', 'street_address') }} + {{ html()->text('street_address', $vendor->address_primary_street)->class('form-control') }}
    - {!! Form::label('supplemental_address_1', 'Address Line 2') !!} - {!! Form::text('supplemental_address_1', $vendor->address_primary_supplemental_address, ['class' => 'form-control']) !!} + {{ html()->label('Address Line 2', 'supplemental_address_1') }} + {{ html()->text('supplemental_address_1', $vendor->address_primary_supplemental_address)->class('form-control') }}
    - {!! Form::label('city', 'City') !!} - {!! Form::text('city', $vendor->address_primary_city, ['class' => 'form-control']) !!} + {{ html()->label('City', 'city') }} + {{ html()->text('city', $vendor->address_primary_city)->class('form-control') }}
    - {!! Form::label('state_province_id', 'State') !!} - {!! Form::select('state_province_id', $states, $vendor->address_primary_state_id, ['class' => 'form-control']) !!} + {{ html()->label('State', 'state_province_id') }} + {{ html()->select('state_province_id', $states, $vendor->address_primary_state_id)->class('form-control') }}
    - {!! Form::label('postal_code', 'Zip') !!} - {!! Form::text('postal_code', $vendor->address_primary_postal_code, ['class' => 'form-control']) !!} + {{ html()->label('Zip', 'postal_code') }} + {{ html()->text('postal_code', $vendor->address_primary_postal_code)->class('form-control') }}
    - {!! Form::label('country_id', 'Country') !!} - {!! Form::select('country_id', $countries, $vendor->address_primary_country_id, ['class' => 'form-control']) !!} + {{ html()->label('Country', 'country_id') }} + {{ html()->select('country_id', $countries, $vendor->address_primary_country_id)->class('form-control') }}
    @@ -70,24 +70,24 @@
    - {!! Form::label('phone_main_phone', 'Phone') !!} + {{ html()->label('Phone', 'phone_main_phone') }} @if (empty($vendor->phone_primary)) - {!! Form::text('phone_main_phone', NULL, ['class' => 'form-control']) !!} + {{ html()->text('phone_main_phone')->class('form-control') }} @else - {!! Form::text('phone_main_phone', $vendor->phone_main_phone_number, ['class' => 'form-control']) !!} + {{ html()->text('phone_main_phone', $vendor->phone_main_phone_number)->class('form-control') }} @endif
    - {!! Form::label('phone_main_fax', 'Fax') !!} + {{ html()->label('Fax', 'phone_main_fax') }} @if (empty($vendor->phone_main_fax)) - {!! Form::text('phone_main_fax', NULL, ['class' => 'form-control']) !!} + {{ html()->text('phone_main_fax')->class('form-control') }} @else - {!! Form::text('phone_main_fax', $vendor->phone_main_fax_number, ['class' => 'form-control']) !!} + {{ html()->text('phone_main_fax', $vendor->phone_main_fax_number)->class('form-control') }} @endif
    - {!! Form::label('email_primary', 'Email') !!} - {!! Form::text('email_primary', $vendor->email_primary_text, ['class' => 'form-control']) !!} + {{ html()->label('Email', 'email_primary') }} + {{ html()->text('email_primary', $vendor->email_primary_text)->class('form-control') }}
    @@ -103,24 +103,24 @@
    - {!! Form::label('note_vendor', 'Notes') !!} - {!! Form::textarea('note_vendor', $vendor->note_vendor_text, ['class'=>'form-control', 'rows'=>'3']) !!} + {{ html()->label('Notes', 'note_vendor') }} + {{ html()->textarea('note_vendor', $vendor->note_vendor_text)->class('form-control')->rows('3') }}
    - {!! Form::label('avatar', 'Picture (max 5M)') !!} - {!! Form::file('avatar'); !!} + {{ html()->label('Picture (max 5M)', 'avatar') }} + {{ html()->file('avatar') }}
    - {!! Form::label('attachment', 'Attachment (max 10M): ', ['class' => '']) !!} - {!! Form::file('attachment'); !!} + {{ html()->label('Attachment (max 10M): ', 'attachment')->class('') }} + {{ html()->file('attachment') }}
    - {!! Form::label('attachment_description', 'Attachment Description (max 200)') !!} - {!! Form::text('attachment_description', NULL, ['class' => 'form-control']) !!} + {{ html()->label('Attachment Description (max 200)', 'attachment_description') }} + {{ html()->text('attachment_description')->class('form-control') }}
    @@ -128,10 +128,10 @@
    - {!! Form::image('images/save.png','btnSave',['class' => 'btn btn-outline-dark']) !!} + {{ html()->image('images/save.png', 'btnSave', ['class' => 'btn btn-outline-dark']) }}
    - {!! Form::close() !!} + {{ html()->form()->close() }}
    @stop diff --git a/resources/views/vendors/index.blade.php b/resources/views/vendors/index.blade.php index dc2f45c9d..a968066c6 100644 --- a/resources/views/vendors/index.blade.php +++ b/resources/views/vendors/index.blade.php @@ -7,7 +7,7 @@ @can('create-contact') - {!! Html::image('images/create.png', 'Create Vendor',array('title'=>"Create Vendor",'class' => 'btn btn-light')) !!} + {{ html()->img('images/create.png', 'Create Vendor')->attribute('title', "Create Vendor")->class('btn btn-light') }} @endCan diff --git a/resources/views/vendors/show.blade.php b/resources/views/vendors/show.blade.php index 889e71782..e91cfc281 100644 --- a/resources/views/vendors/show.blade.php +++ b/resources/views/vendors/show.blade.php @@ -15,15 +15,15 @@
    - {!! Html::link('#notes','Notes',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#relationships','Relationships',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#registrations','Registrations',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#touchpoints','Touchpoints',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#attachments','Attachments',array('class' => 'btn btn-outline-dark')) !!} - {!! Html::link('#donations','Donations',array('class' => 'btn btn-outline-dark')) !!} + {{ html()->a(url('#notes'), 'Notes')->class('btn btn-outline-dark') }} + {{ html()->a(url('#relationships'), 'Relationships')->class('btn btn-outline-dark') }} + {{ html()->a(url('#registrations'), 'Registrations')->class('btn btn-outline-dark') }} + {{ html()->a(url('#touchpoints'), 'Touchpoints')->class('btn btn-outline-dark') }} + {{ html()->a(url('#attachments'), 'Attachments')->class('btn btn-outline-dark') }} + {{ html()->a(url('#donations'), 'Donations')->class('btn btn-outline-dark') }}
    - {!! Html::image('images/vendor.png', 'Vendor Index',array('title'=>"Vendor Index",'class' => 'btn btn-outline-dark')) !!} + {{ html()->img('images/vendor.png', 'Vendor Index')->attribute('title', "Vendor Index")->class('btn btn-outline-dark') }} @can('create-touchpoint') id) }} class="btn btn-outline-dark">Add Touchpoint @endCan @@ -86,10 +86,10 @@ @foreach($vendor->a_relationships as $a_relationship)
  • @can('delete-relationship') - {!! Form::open(['method' => 'DELETE', 'route' => ['relationship.destroy', $a_relationship->id],'onsubmit'=>'return ConfirmDelete()']) !!} + {{ html()->form('DELETE', route('relationship.destroy', [$a_relationship->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} {!!$vendor->contact_link!!} {{ $a_relationship->relationship_type->label_a_b }} {!! $a_relationship->contact_b->contact_link !!} - {!! Form::image('images/delete.png','btnDelete',['title'=>'Delete Relationship '.$a_relationship->id, 'style'=>'padding-left: 50px;']) !!} - {!! Form::close() !!} + {{ html()->image('images/delete.png', 'btnDelete', ['title' => 'Delete Relationship ' . $a_relationship->id, 'style' => 'padding-left: 50px;']) }} + {{ html()->form()->close() }} @else {!!$vendor->contact_link!!} {{ $a_relationship->relationship_type->label_a_b }} {!! $a_relationship->contact_b->contact_link !!} @endCan @@ -99,10 +99,10 @@ @foreach($vendor->b_relationships as $b_relationship)
  • @can('delete-relationship') - {!! Form::open(['method' => 'DELETE', 'route' => ['relationship.destroy', $b_relationship->id],'onsubmit'=>'return ConfirmDelete()']) !!} + {{ html()->form('DELETE', route('relationship.destroy', [$b_relationship->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} {!!$vendor->contact_link!!} {{ $b_relationship->relationship_type->label_b_a }} {!! $b_relationship->contact_a->contact_link!!} - {!! Form::image('images/delete.png','btnDelete',['title'=>'Delete Relationship '.$b_relationship->id, 'style'=>'padding-left: 50px;']) !!} - {!! Form::close() !!} + {{ html()->image('images/delete.png', 'btnDelete', ['title' => 'Delete Relationship ' . $b_relationship->id, 'style' => 'padding-left: 50px;']) }} + {{ html()->form()->close() }} @else {!!$vendor->contact_link!!} {{ $b_relationship->relationship_type->label_b_a }} {!! $b_relationship->contact_a->contact_link!!} @endCan @@ -112,24 +112,24 @@ @can('create-relationship')
    - {!! Form::open(['method' => 'POST', 'route' => ['relationship_type.addme']]) !!} + {{ html()->form('POST', route('relationship_type.addme', ))->open() }}
    Create a New Relationship
    - {!! Form::label('relationship_type_name', 'Relationship: ', ['class' => 'font-weight-bold']) !!} - {!! Form::select('relationship_type_name', $relationship_filter_types, NULL, ['class' => 'form-control']) !!} - {!! Form::hidden('contact_id',$vendor->id)!!} + {{ html()->label('Relationship: ', 'relationship_type_name')->class('font-weight-bold') }} + {{ html()->select('relationship_type_name', $relationship_filter_types)->class('form-control') }} + {{ html()->hidden('contact_id', $vendor->id) }}
    - {!! Form::label('relationship_filter_alternate_name', 'Alternate name: ', ['class' => 'font-weight-bold']) !!} - {!! Form::text('relationship_filter_alternate_name', null, ['class' => 'form-control','required']) !!} + {{ html()->label('Alternate name: ', 'relationship_filter_alternate_name')->class('font-weight-bold') }} + {{ html()->text('relationship_filter_alternate_name')->class('form-control')->required() }}
    - {!! Form::submit('Create', ['class' => 'm-1 btn btn-primary']) !!} - {!! Form::close() !!} + {{ html()->submit('Create')->class('m-1 btn btn-primary') }} + {{ html()->form()->close() }}
    @@ -271,14 +271,14 @@
    @can('delete-contact') - {!! Form::open(['method' => 'DELETE', 'route' => ['vendor.destroy', $vendor->id],'onsubmit'=>'return ConfirmDelete()']) !!} - {!! Form::image('images/delete.png','btnDelete',['class' => 'btn btn-danger','title'=>'Delete']) !!} - {!! Form::close() !!} + {{ html()->form('DELETE', route('vendor.destroy', [$vendor->id]))->attribute('onsubmit', 'return ConfirmDelete()')->open() }} + {{ html()->image('images/delete.png', 'btnDelete', ['class' => 'btn btn-danger', 'title' => 'Delete']) }} + {{ html()->form()->close() }} @endCan
    diff --git a/resources/views/vendors/update/urls.blade.php b/resources/views/vendors/update/urls.blade.php index af4d139ef..1ebaeb519 100644 --- a/resources/views/vendors/update/urls.blade.php +++ b/resources/views/vendors/update/urls.blade.php @@ -41,48 +41,48 @@
    - {!! Form::label('url_main', 'Personal (main):') !!} - {!! Form::text('url_main', $defaults['Main']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Personal (main):', 'url_main') }} + {{ html()->text('url_main', $defaults['Main']['url'])->class('form-control') }}
    - {!! Form::label('url_work', 'Work:') !!} - {!! Form::text('url_work', $defaults['Work']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Work:', 'url_work') }} + {{ html()->text('url_work', $defaults['Work']['url'])->class('form-control') }}
    - {!! Form::label('url_facebook', 'Facebook:') !!} - {!! Form::text('url_facebook', $defaults['Facebook']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Facebook:', 'url_facebook') }} + {{ html()->text('url_facebook', $defaults['Facebook']['url'])->class('form-control') }}
    - {!! Form::label('url_instagram', 'Instagram:') !!} - {!! Form::text('url_instagram', $defaults['Instagram']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Instagram:', 'url_instagram') }} + {{ html()->text('url_instagram', $defaults['Instagram']['url'])->class('form-control') }}
    - {!! Form::label('url_linkedin', 'LinkedIn:') !!} - {!! Form::text('url_linkedin', $defaults['LinkedIn']['url'], ['class' => 'form-control']) !!} + {{ html()->label('LinkedIn:', 'url_linkedin') }} + {{ html()->text('url_linkedin', $defaults['LinkedIn']['url'])->class('form-control') }}
    - {!! Form::label('url_twitter', 'Twitter:') !!} - {!! Form::text('url_twitter', $defaults['Twitter']['url'], ['class' => 'form-control']) !!} + {{ html()->label('Twitter:', 'url_twitter') }} + {{ html()->text('url_twitter', $defaults['Twitter']['url'])->class('form-control') }}
  • - {!! Html::link(action([\App\Http\Controllers\StripeBalanceTransactionController::class, 'import'],$payout->id),'Import ' . $stripe_balance_transactions->count() . ' Stripe Balance Transactions',array('class' => 'btn btn-secondary'))!!} + {{ html()->a(url(action([\App\Http\Controllers\StripeBalanceTransactionController::class, 'import'], $payout->id)), 'Import ' . $stripe_balance_transactions->count() . ' Stripe Balance Transactions')->class('btn btn-secondary') }}