Commit d3253dda authored by Lucas Nunes's avatar Lucas Nunes

fix

parent 1d41b71d
......@@ -3,6 +3,14 @@
<component name="ChangeListManager">
<list default="true" id="853286ae-8652-453d-8e83-ab776ad9c7ae" name="Default" comment="fix">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/PreRegisterController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/PreRegisterController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/database/seeds/SliderSeeder.php" beforeDir="false" afterPath="$PROJECT_DIR$/database/seeds/SliderSeeder.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/lang/pt-Br/labels.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/lang/pt-Br/labels.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/backend/courses/create.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/backend/courses/create.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/backend/courses/edit.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/backend/courses/edit.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/emails/offlineOrderMail.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/emails/offlineOrderMail.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/frontend/auth/pre-register.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/frontend/auth/pre-register.blade.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/frontend/cart/partials/order-stats.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/frontend/cart/partials/order-stats.blade.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -269,6 +277,7 @@
<workItem from="1567832429427" duration="62000" />
<workItem from="1579682757164" duration="8495000" />
<workItem from="1579740326050" duration="49668000" />
<workItem from="1580210370317" duration="6696000" />
</task>
<task id="LOCAL-00001" summary="fix">
<created>1579690799404</created>
......@@ -411,10 +420,10 @@
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="2063" y="265" key="#com.jetbrains.php.actions.copyPaste.importReferences.PhpImportReferencesDialog/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580121803082" />
<state x="1975" y="104" key="CommitChangelistDialog2" timestamp="1580123112450">
<state x="1975" y="104" key="CommitChangelistDialog2" timestamp="1580123565754">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="1975" y="104" key="CommitChangelistDialog2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580123112450" />
<state x="1975" y="104" key="CommitChangelistDialog2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580123565754" />
<state x="2046" y="323" key="NewPhpClassDialog" timestamp="1580104601096">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
......@@ -427,22 +436,22 @@
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="2148" y="220" key="RollbackChangesDialog/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580073294419" />
<state x="1925" y="243" key="Vcs.Push.Dialog.v2" timestamp="1580123115316">
<state x="1925" y="243" key="Vcs.Push.Dialog.v2" timestamp="1580123568511">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="1925" y="243" key="Vcs.Push.Dialog.v2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580123115316" />
<state x="1925" y="243" key="Vcs.Push.Dialog.v2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580123568511" />
<state x="2102" y="244" key="VcsDiffUtil.ChangesDialog" timestamp="1579686223702">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="2102" y="244" key="VcsDiffUtil.ChangesDialog/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1579686223702" />
<state x="2019" y="340" key="com.intellij.ide.util.TipDialog" timestamp="1579740357559">
<state x="2019" y="340" key="com.intellij.ide.util.TipDialog" timestamp="1580210692377">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="2019" y="340" key="com.intellij.ide.util.TipDialog/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1579740357559" />
<state x="2025" y="115" width="628" height="795" key="find.popup" timestamp="1580122795089">
<state x="2019" y="340" key="com.intellij.ide.util.TipDialog/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580210692377" />
<state x="2025" y="115" width="628" height="795" key="find.popup" timestamp="1580365747615">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="2025" y="115" width="628" height="795" key="find.popup/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580122795089" />
<state x="2025" y="115" width="628" height="795" key="find.popup/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580365747615" />
<state x="1989" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1580090095601">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
......
......@@ -4,6 +4,7 @@
namespace App\Http\Controllers;
use App\Models\Course;
use Illuminate\Http\Request;
class PreRegisterController extends Controller
......@@ -12,7 +13,9 @@ class PreRegisterController extends Controller
$states = get_br_states();
return view('frontend.auth.pre-register', compact('states'));
$courses = Course::get();
return view('frontend.auth.pre-register', compact('states', 'courses'));
}
public function store(Request $request){
......
......@@ -13,7 +13,7 @@ class SliderSeeder extends Seeder
{
$slide_1 = [
'name' => 'Slide 1',
'content' => '{"hero_text":"Faça sua inscrição e garanta sua vaga","sub_text":"Organização de educação e treinamento","buttons":[{"label":"Pré-Matricula","link":"'.env('APP_URL').'/pre-register"}]}',
'content' => '{"hero_text":"Faça a inscrição e garanta sua vaga","sub_text":"Organização de educação e treinamento","buttons":[{"label":"Pré-Matricula","link":"'.env('APP_URL').'/pre-register"}]}',
'bg_image' => 'slider-1.jpg',
'sequence' => 1,
'status' => 1,
......@@ -40,7 +40,7 @@ class SliderSeeder extends Seeder
$slide_4 = [
'name' => 'Slide 4',
'content' => '{"hero_text":"Informação ao alcance das suas mãos","sub_text":"","widget":{"type":2,"timer":"2019/02/15 11:01"},"buttons":[{"label":"Sobre Nós","link":"'.env('APP_URL').'about-us"},{"label":"Entre em contato","link":"'.env('APP_URL').'/contact-us"}]}',
'content' => '{"hero_text":"Informação ao alcance das suas mãos","sub_text":"","widget":{"type":2,"timer":"2019/02/15 11:01"},"buttons":[{"label":"Sobre Nós","link":"'.env('APP_URL').'about-us"},{"label":"Contato","link":"'.env('APP_URL').'/contact-us"}]}',
'bg_image' => 'slider-3.jpg',
'sequence' => 3,
'status' => 1,
......
......@@ -1171,6 +1171,7 @@ return array (
'cpf' => 'CPF',
'cpf_front_image' => 'CPF Frente',
'cpf_verse_image' => 'CPF Verso',
'personal_image' => 'Foto 3x4',
'button' => 'Enviar Informação',
),
'badges' =>
......
......@@ -53,7 +53,7 @@
<div class="col-12 form-group">
{!! Form::label('description', trans('labels.backend.courses.fields.description'), ['class' => 'control-label']) !!}
{!! Form::textarea('description', old('description'), ['class' => 'form-control ', 'placeholder' => trans('labels.backend.courses.fields.description')]) !!}
{!! Form::textarea('description', old('description'), ['class' => 'form-control editor', 'placeholder' => trans('labels.backend.courses.fields.description')]) !!}
</div>
</div>
<div class="row">
......@@ -162,6 +162,8 @@
@stop
@push('after-scripts')
<script src="//cdn.ckeditor.com/4.5.4/full/ckeditor.js"></script>
<script src="{{asset('plugins/bootstrap-tagsinput/bootstrap-tagsinput.js')}}"></script>
<script>
$(document).ready(function () {
......@@ -191,7 +193,6 @@
})
})
$(document).on('change', '#media_type', function () {
if ($(this).val()) {
if ($(this).val() != 'upload') {
......@@ -207,7 +208,45 @@
}
})
$('.editor').each(function () {
CKEDITOR.replace($(this).attr('id'), {
filebrowserImageBrowseUrl: '/laravel-filemanager?type=Images',
filebrowserImageUploadUrl: '/laravel-filemanager/upload?type=Images&_token={{csrf_token()}}',
filebrowserBrowseUrl: '/laravel-filemanager?type=Files',
filebrowserUploadUrl: '/laravel-filemanager/upload?type=Files&_token={{csrf_token()}}',
toolbarGroups: [{
"name": "basicstyles",
"groups": ["basicstyles"]
},
{
"name": "links",
"groups": ["links"]
},
{
"name": "paragraph",
"groups": ["list", "blocks"]
},
{
"name": "document",
"groups": ["mode"]
},
{
"name": "insert",
"groups": ["insert"]
},
{
"name": "styles",
"groups": ["styles"]
},
{
"name": "about",
"groups": ["about"]
}
],
// Remove the redundant buttons from toolbar groups defined above.
removeButtons: 'Underline,Strike,Subscript,Superscript,Anchor,Styles,Specialchar'
});
});
</script>
@endpush
\ No newline at end of file
......@@ -55,7 +55,7 @@
<div class="row">
<div class="col-12 form-group">
{!! Form::label('description',trans('labels.backend.courses.fields.description'), ['class' => 'control-label']) !!}
{!! Form::textarea('description', old('description'), ['class' => 'form-control ', 'placeholder' => trans('labels.backend.courses.fields.description')]) !!}
{!! Form::textarea('description', old('description'), ['class' => 'form-control editor', 'placeholder' => trans('labels.backend.courses.fields.description')]) !!}
</div>
</div>
<div class="row">
......@@ -109,15 +109,12 @@
</div>
@endif
@if($course->mediavideo && ($course->mediavideo->type == 'upload'))
<video width="300" class="mt-2 d-none video-player" controls>
<source src="{{($course->mediavideo && $course->mediavideo->type == 'upload') ? $course->mediavideo->url : ""}}"
type="video/mp4">
Your browser does not support HTML5 video.
</video>
@endif
@lang('labels.backend.lessons.video_guide')
......@@ -148,11 +145,11 @@
{!! Form::checkbox('popular', 1, old('popular'), []) !!}
{!! Form::label('popular', trans('labels.backend.courses.fields.popular'), ['class' => 'checkbox control-label font-weight-bold']) !!}
</div>
<div class="checkbox d-inline mr-4">
{{--<div class="checkbox d-inline mr-4">
{!! Form::hidden('free', 0) !!}
{!! Form::checkbox('free', 1, old('free'), []) !!}
{!! Form::label('free', trans('labels.backend.courses.fields.free'), ['class' => 'checkbox control-label font-weight-bold']) !!}
</div>
</div>--}}
</div>
</div>
......@@ -186,8 +183,9 @@
@stop
@push('after-scripts')
<script src="//cdn.ckeditor.com/4.5.4/full/ckeditor.js"></script>
<script src="{{asset('plugins/bootstrap-tagsinput/bootstrap-tagsinput.js')}}"></script>
<script>
$(document).ready(function () {
$('#start_date').datepicker({
autoclose: true,
......@@ -274,7 +272,45 @@
}
})
$('.editor').each(function () {
CKEDITOR.replace($(this).attr('id'), {
filebrowserImageBrowseUrl: '/laravel-filemanager?type=Images',
filebrowserImageUploadUrl: '/laravel-filemanager/upload?type=Images&_token={{csrf_token()}}',
filebrowserBrowseUrl: '/laravel-filemanager?type=Files',
filebrowserUploadUrl: '/laravel-filemanager/upload?type=Files&_token={{csrf_token()}}',
toolbarGroups: [{
"name": "basicstyles",
"groups": ["basicstyles"]
},
{
"name": "links",
"groups": ["links"]
},
{
"name": "paragraph",
"groups": ["list", "blocks"]
},
{
"name": "document",
"groups": ["mode"]
},
{
"name": "insert",
"groups": ["insert"]
},
{
"name": "styles",
"groups": ["styles"]
},
{
"name": "about",
"groups": ["about"]
}
],
// Remove the redundant buttons from toolbar groups defined above.
removeButtons: 'Underline,Strike,Subscript,Superscript,Anchor,Styles,Specialchar'
});
});
</script>
@endpush
\ No newline at end of file
......@@ -118,11 +118,11 @@
<img class="logo" src="{{public_path('storage/logos/'.config('logo_b_image'))}}">
<div class="col-12 text-block align-self-center">
<p class="text-center mb-0">This is to certify that <span class="font-weight-bold" style="font-family: DejaVu Sans;">{{$data['name']}}</span> successfully completed
<p class="text-center mb-0">Certificamos que <span class="font-weight-bold" style="font-family: DejaVu Sans;">{{$data['name']}}</span> concluiu com sucesso
</p>
<p style="word-wrap: break-word;white-space: nowrap"><span class="font-weight-bold" style="font-family: DejaVu Sans;">{{$data['course_name']}}</span>
</p>
<p style="word-wrap: break-word;white-space: nowrap">on <span class="font-weight-bold" style="font-family: DejaVu Sans;">{{config('app.name')}}</span> online course on <span class="font-weight-bold">{{$data['date']}}</span></p>
<p style="word-wrap: break-word;white-space: nowrap">na <span class="font-weight-bold" style="font-family: DejaVu Sans;">{{config('app.name')}}</span> através de um curso online em <span class="font-weight-bold">{{$data['date']}}</span></p>
</div>
<img width="100%" src="{{public_path('images/certificate.jpg')}}">
</div>
......
@component('mail::message')
<h4>Hello Admin, Following contact has messaged you from Contact Page of <a style="font-weight:bold;" href="{{env('APP_URL')}}">{{env('APP_NAME')}}</a></h4>
Name: {{ $contactMessage->name }}
<h4>Hello Admin, O contato a seguir enviou uma mensagem para você da Página de contato of <a style="font-weight:bold;" href="{{env('APP_URL')}}">{{env('APP_NAME')}}</a></h4>
Nome: {{ $contactMessage->name }}
Email: {{ $contactMessage->emails }}
Number: {{ $contactMessage->number }}
Message: {{ $contactMessage->message }}
Telefone: {{ $contactMessage->number }}
Mensagem: {{ $contactMessage->message }}
Thanks,
Atenciosamente,
{{ config('app.name') }}
@endcomponent
@component('mail::message')
#Hello {{auth()->user()->name}}
#Olá {{auth()->user()->name}}
We have successfully received your request for following:<br>
Order Reference No. {{$content['reference_no']}}
Recebemos com sucesso sua solicitação:<br>
Pedido No. {{$content['reference_no']}}
@foreach($content['items'] as $item)
#{{$item['number']}}. {{$item['name']}} {{'$'.$item['price']}}
@endforeach
#Total Amount : ${{$content['total']}}
#Total : ${{$content['total']}}
Our representatives will contact you soon regarding order payments.
Happy Shopping.
Nossos representantes entrarão em contato com você em breve sobre pagamentos de pedidos.
Até breve.
Thanks,<br>
Atenciosamente,<br>
{{ config('app.name') }}
@endcomponent
......@@ -162,16 +162,16 @@
<div class="col-md-4 form-group">
{!! Form::label('rg_front_image', trans('labels.frontend.pre-register.rg_front_image'), ['class' => 'control-label']) !!}
{!! Form::file('rg_front_image', ['class' => 'form-control', 'accept' => 'image/jpeg,image/gif,image/png']) !!}
{!! Form::hidden('rg_front_image_image_max_size', 8) !!}
{!! Form::hidden('rg_front_image_image_max_width', 4000) !!}
{!! Form::hidden('rg_front_image_image_max_height', 4000) !!}
{!! Form::hidden('rg_front_image_max_size', 8) !!}
{!! Form::hidden('rg_front_image_max_width', 4000) !!}
{!! Form::hidden('rg_front_image_max_height', 4000) !!}
</div>
<div class="col-md-4 form-group">
{!! Form::label('rg_verse_image', trans('labels.frontend.pre-register.rg_verse_image'), ['class' => 'control-label']) !!}
{!! Form::file('rg_verse_image', ['class' => 'form-control', 'accept' => 'image/jpeg,image/gif,image/png']) !!}
{!! Form::hidden('rg_verse_image_image_max_size', 8) !!}
{!! Form::hidden('rg_verse_image_image_max_width', 4000) !!}
{!! Form::hidden('rg_verse_image_image_max_height', 4000) !!}
{!! Form::hidden('rg_verse_image_max_size', 8) !!}
{!! Form::hidden('rg_verse_image_max_width', 4000) !!}
{!! Form::hidden('rg_verse_image_max_height', 4000) !!}
</div>
</div>
<br><br>
......@@ -188,18 +188,56 @@
<div class="col-md-4 form-group">
{!! Form::label('cpf_front_image', trans('labels.frontend.pre-register.cpf_front_image'), ['class' => 'control-label']) !!}
{!! Form::file('cpf_front_image', ['class' => 'form-control', 'accept' => 'image/jpeg,image/gif,image/png']) !!}
{!! Form::hidden('cpf_front_image_image_max_size', 8) !!}
{!! Form::hidden('cpf_front_image_image_max_width', 4000) !!}
{!! Form::hidden('cpf_front_image_image_max_height', 4000) !!}
{!! Form::hidden('cpf_front_image_max_size', 8) !!}
{!! Form::hidden('cpf_front_image_max_width', 4000) !!}
{!! Form::hidden('cpf_front_image_max_height', 4000) !!}
</div>
<div class="col-md-4 form-group">
{!! Form::label('cpf_verse_image', trans('labels.frontend.pre-register.cpf_verse_image'), ['class' => 'control-label']) !!}
{!! Form::file('cpf_verse_image', ['class' => 'form-control', 'accept' => 'image/jpeg,image/gif,image/png']) !!}
{!! Form::hidden('cpf_verse_image_image_max_size', 8) !!}
{!! Form::hidden('cpf_verse_image_image_max_width', 4000) !!}
{!! Form::hidden('cpf_verse_image_image_max_height', 4000) !!}
{!! Form::hidden('cpf_verse_image_max_size', 8) !!}
{!! Form::hidden('cpf_verse_image_max_width', 4000) !!}
{!! Form::hidden('cpf_verse_image_max_height', 4000) !!}
</div>
</div>
<br><br>
<div class="row">
<div class="col-md-8">
<div class="contact-info">
<label class="text-uppercase">Curso de interesse</label>
<select name="course_id" class="form-control listing-filter-form select" required>
<option value="">Selecione seu curso</option>
@if(count($courses) > 0)
@foreach($courses as $course)
<option value="{{$course->id}}">{{$course->title}}</option>
@endforeach
@endif
</select>
@if($errors->has('course_id'))
<span class="help-block text-danger">{{$errors->first('course_id')}}</span>
@endif
</div>
</div>
<div class="col-md-4 form-group">
{!! Form::label('personal_image', trans('labels.frontend.pre-register.personal_image'), ['class' => 'control-label']) !!}
{!! Form::file('personal_image_image', ['class' => 'form-control', 'accept' => 'image/jpeg,image/gif,image/png']) !!}
{!! Form::hidden('personal_image_image_image_max_size', 8) !!}
{!! Form::hidden('personal_image_image_image_max_width', 4000) !!}
{!! Form::hidden('personal_image_image_image_max_height', 4000) !!}
</div>
</div>
<br><br>
<div>
<input type="checkbox" id="scales" name="accept" required>
<label for="accept">Declaro que são autênticos os documentos por mim apresentados, e verdadeiras as informações
prestadas, no processo de matrícula nesta instituição.</label>
</div>
......
......@@ -34,7 +34,7 @@
<div class="input-group mt-3 mb-1">
<input type="text" id="coupon" pattern="[^\s]+" name="coupon"
class="form-control" placeholder="Enter Coupon">
class="form-control" placeholder="Adiconar Cupon">
<div class="input-group-append">
<button class="btn btn-dark shadow-none " id="applyCoupon"
type="button">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment