Андрей Ларионов / rekamore.su

Download as
Browse Code »

Commit 18e40504a16e05a8fcccb96a8526a8d0398fa8ed

Authored by Андрей Ларионов
2 parents 3141fdd9a7 ddb8f38fb5
Exists in master

Обновление недели

Showing 19 changed files Side-by-side Diff

app/Http/Controllers/Admin/JobTitlesController.php
Diff comments   View file @ 18e4050
... ... @@ -16,10 +16,19 @@ class JobTitlesController extends Controller
16 16 *
17 17 * @return \Illuminate\Http\Response
18 18 */
19   - public function index()
  19 + public function index(Request $request)
20 20 {
21   - $Jobs = Job_title::query()->where('is_remove', '=', '0')->
22   - orderByDesc('sort')->orderBy('name')->paginate(15);
  21 + if ($request->has('sort')) {
  22 + $Jobs = Job_title::query()->where('is_remove', '=', '0');
  23 + if ($request->get('sort') == 'up')
  24 + $Jobs = $Jobs->orderBy('sort')->orderBy('name')->paginate(15);
  25 + else
  26 + $Jobs = $Jobs->orderByDesc('sort')->orderBy('name')->paginate(15);
  27 + } else {
  28 + $Jobs = Job_title::query()->where('is_remove', '=', '0')->
  29 + orderByDesc('sort')->orderBy('name')->paginate(15);
  30 + }
  31 +
23 32 return view('admin.job_titles.index', compact('Jobs'));
24 33 }
25 34  
app/Http/Controllers/Admin/MsgAnswersController.php
Diff comments   View file @ 18e4050
... ... @@ -107,7 +107,7 @@ class MsgAnswersController extends Controller
107 107 $id_admin = Auth::user()->id;
108 108 $users = User::query()->OrderBy('name')->where('is_bd', '=', '0')->get();
109 109  
110   - $Msgs = Message::with('user_from')->with('user_to')->with('response')
  110 + $Msgs = Message::with('user_from')->with('user_to') //->with('response')
111 111 ->where(function($query) use ($id_admin) {
112 112 $query->where('user_id', '=', $id_admin)
113 113 ->orWhere('to_user_id', '=', $id_admin);
app/Http/Controllers/EmployerController.php
Diff comments   View file @ 18e4050
... ... @@ -226,10 +226,12 @@ class EmployerController extends Controller
226 226 switch ($sort) {
227 227 case 'name_up': $vacancy_list = $vacancy_list->orderBy('name')->orderBy('id'); break;
228 228 case 'name_down': $vacancy_list = $vacancy_list->orderByDesc('name')->orderby('id'); break;
  229 + case 'nopublic': $vacancy_list = $vacancy_list->OrderBy('active_is')->orderBy('id'); break;
  230 + case 'public': $vacancy_list = $vacancy_list->OrderByDesc('active_is')->orderBy('id'); break;
229 231 case 'created_at_up': $vacancy_list = $vacancy_list->OrderBy('created_at')->orderBy('id'); break;
230 232 case 'created_at_down': $vacancy_list = $vacancy_list->orderByDesc('created_at')->orderBy('id'); break;
231   - case 'default': $vacancy_list = $vacancy_list->orderBy('id')->orderby('updated_at'); break;
232   - default: $vacancy_list = $vacancy_list->orderBy('id')->orderby('updated_at'); break;
  233 + case 'default': $vacancy_list = $vacancy_list->orderbyDesc('updated_at')->orderBy('name'); break;
  234 + default: $vacancy_list = $vacancy_list->orderByDesc('id')->orderbyDesc('updated_at'); break;
233 235 }
234 236 }
235 237 $vacancy_list = $vacancy_list->paginate(4);
app/Http/Controllers/PagesController.php
Diff comments   View file @ 18e4050
... ... @@ -16,8 +16,9 @@ class PagesController extends Controller
16 16 {
17 17 public function pages(pages $pages) {
18 18 $page = pages::query()->where('slug', $pages->slug)->first();
  19 + $slug = $pages->slug;
19 20  
20   - return view('pages', compact('page'));
  21 + return view('pages', compact('page', 'slug'));
21 22 }
22 23  
23 24 public function form_feedback(RequestSendAdmin $request){
app/Http/Controllers/WorkerController.php
Diff comments   View file @ 18e4050
... ... @@ -704,6 +704,7 @@ class WorkerController extends Controller
704 704  
705 705 $Query = $Query->OrderBy('updated_at')->paginate(3);
706 706  
  707 +
707 708 return view('workers.favorite', compact('Query',
708 709 'Query_count',
709 710 'Job_title'));
app/Http/Requests/JobTitlesRequest.php
Diff comments   View file @ 18e4050
... ... @@ -34,6 +34,12 @@ class JobTitlesRequest extends FormRequest
34 34 'min:0',
35 35 'max:9999999',
36 36 ],
  37 + 'sort' => [
  38 + 'numeric',
  39 + 'min:0',
  40 + 'max:9999999',
  41 + ]
  42 +
37 43 ];
38 44 }
39 45  
resources/views/TITLE_TEXT.blade.php
Diff comments   View file @ 18e4050
... ... @@ -0,0 +1,18 @@
  1 +<div class="numbers__item">
  2 + <b>555+</b>
  3 + <span>Резюме</span>
  4 + Банальные, но неопровержимые выводы, а также элементы политического процесса лишь добавляют
  5 + фракционных разногласий и призваны к ответу.
  6 +</div>
  7 +<div class="numbers__item">
  8 + <b>1 001+</b>
  9 + <span>Вакансий</span>
  10 + В рамках спецификации современных стандартов, диаграммы связей заблокированы в рамках своих
  11 + собственных рациональных ограничений.
  12 +</div>
  13 +<div class="numbers__item">
  14 + <b>265</b>
  15 + <span>Компаний</span>
  16 + Но сторонники тоталитаризма в науке заблокированы в рамках своих собственных рациональных
  17 + ограничений.
  18 +</div>
resources/views/admin/answers/index.blade.php
Diff comments   View file @ 18e4050
... ... @@ -98,7 +98,11 @@
98 98 {{$answer->id}}
99 99 </td>
100 100 <td class="px-4 py-3">
101   - {{$answer->employer->name_company}}
  101 + @if (isset($answer->employer->name_company))
  102 + {{$answer->employer->name_company}}
  103 + @else
  104 + Не определено
  105 + @endif
102 106 </td>
103 107 <td class="px-4 py-3">
104 108 {{$answer->user->name}}
resources/views/admin/job_titles/form.blade.php
Diff comments   View file @ 18e4050
... ... @@ -45,13 +45,18 @@
45 45 @php
46 46 $sort_num = 100;
47 47 @endphp
48   - <select name="sort" class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-select focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
  48 +
  49 + <input name="sort" id="sort"
  50 + class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
  51 + placeholder="Сортировка" value="{{ old('sort') ?? $job_title->sort ?? '100' }}"
  52 + />
  53 + <!--<select name="sort" class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-select focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
49 54 title="Сортировка">
50   - @for($i = 1; $i <= 10; $i++)
51   - <option value="{{ $sort_num }}" @if (isset($job_title)) @if ($sort_num == $job_title->sort) selected @else @endif @endif>{{ $sort_num }}</option>
52   - @php $sort_num = $sort_num + 10; @endphp
53   - @endfor
54   - </select>
  55 + for($i = 1; $i <= 10; $i++)
  56 + <option value="{ $sort_num }}" if (isset($job_title)) if ($sort_num == $job_title->sort) selected else endif endif>{ $sort_num }}</option>
  57 + php $sort_num = $sort_num + 10; endphp
  58 + endfor
  59 + </select>-->
55 60 </label><br>
56 61  
57 62 <label class="block text-sm">
resources/views/admin/job_titles/index.blade.php
Diff comments   View file @ 18e4050
1 1 @extends('layout.admin', ['title' => 'Админка - Справочник Должности'])
2 2  
3 3 @section('script')
  4 + <script>
  5 + console.log('Test system');
  6 + $(document).on('change', '#sort_ajax', function() {
  7 + var this_ = $(this);
  8 + var val_ = this_.val();
  9 + console.log('sort items '+val_);
  10 +
  11 + $.ajax({
  12 + type: "GET",
  13 + url: "{{ url()->current() }}",
  14 + data: "sort="+val_+"&search=@if ((isset($_GET['search']))&&(!empty($_GET['search']))){{$_GET['search']}}@endif",
  15 + success: function (data) {
  16 + console.log('Выбор сортировки');
  17 + console.log(data);
  18 + history.pushState({}, '', "{{ route('employer.vacancy_list') }}?search=@if ((isset($_GET['search']))&&(!empty($_GET['search']))){{$_GET['search']}}@endif"+"&sort="+val_+"@if (isset($_GET['page']))&page={{ $_GET['page'] }}@endif");
  19 + $('#main_ockar').html(data);
  20 + },
  21 + headers: {
  22 + 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
  23 + },
  24 + error: function (data) {
  25 + data = JSON.stringify(data);
  26 + console.log('Error: ' + data);
  27 + }
  28 + });
  29 + });
  30 + </script>
4 31 @endsection
5 32  
6 33 @section('search')
... ... @@ -20,7 +47,7 @@
20 47 <th class="px-4 py-3">Родитель</th>
21 48 <th class="px-4 py-3">Должность</th>
22 49 <th class="px-4 py-3">Видимость</th>
23   - <th class="px-4 py-3">Сортировка</th>
  50 + <th class="px-4 py-3"><a id="sort_jobs" name="sort_jobs" @if(isset($_GET['sort'])) @if($_GET['sort']=='up') href="?sort=down" @else href="?sort=up" @endif @else href="?sort=down" @endif>Сортировка ↑↓</a></th>
24 51 <th class="px-4 py-3">Дата создания</th>
25 52 <th class="px-4 py-3">Изменить</th>
26 53 </tr>
resources/views/ajax/list_vacancies.blade.php
Diff comments   View file @ 18e4050
... ... @@ -36,19 +36,23 @@
36 36 @else
37 37 <img src="{{ asset('images/default_ship.jpg') }}" alt="{{ $Rec->title }}" class="main__vacancies-thing-pic">
38 38 @endif
39   - <span>@if (!empty($Q->name)) {{ $Q->name }} @endif</span>
  39 + <span>@if (isset($Q->employer->name_company)) {{ $Q->employer->name_company }} @else Не определена @endif</span>
40 40 </div>
41 41  
42 42 <div class="main__employer-page-two-item-text">
43   - <div class="main__employer-page-two-item-text-name">Судоходная компания ведет набор
44   - специалистов на следующие должности:</div>
45   - <div class="main__employer-page-two-item-text-links">
46   - @if (isset($Q->jobs))
47   - @foreach ($Q->jobs as $key => $j)
48   - <a>“{{ $j->name }}” – з/п от @if (isset($Q->jobs_code[$key]->min_salary)) {{ $Q->jobs_code[$key]->min_salary }} @endif - @if (isset($Q->jobs_code[$key]->max_salary)) {{ $Q->jobs_code[$key]->max_salary }} @endif рублей (на руки)</a>
49   - @endforeach
50   - @endif
  43 + <div class="main__employer-page-two-item-text-name">
  44 + <h3>@if (!empty($Q->name)) {{ $Q->name }}@else Не указано @endif </h3>
51 45 </div>
  46 + <!--Судоходная компания ведет набор
  47 + специалистов на следующие должности:</div>
  48 + <div class="main__employer-page-two-item-text-links">
  49 + if (isset($Q->jobs))
  50 + foreach ($Q->jobs as $key => $j)
  51 + <a>“{ $j->name }}” <!--– з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
  52 + <!-- </a>
  53 + endforeach
  54 + endif
  55 + </div>-->
52 56 </div>
53 57  
54 58 <div class="main__employer-page-two-item-text">
... ... @@ -57,24 +61,25 @@
57 61 {!! $Q->text !!}
58 62 </div>
59 63 </div>
60   - <div class="main__employer-page-two-item-text">
  64 + <!--<div class="main__employer-page-two-item-text">
61 65 <div class="main__employer-page-two-item-text-name">Наши ожидания:</div>
62 66 <div class="main__employer-page-two-item-text-body">
63   - {!! $Q->description !!}
  67 + !! $Q->description !!}
64 68 </div>
65 69 </div>
66 70 <div class="main__employer-page-two-item-text">
67 71 <div class="main__employer-page-two-item-text-name">Резюме направляйте на почту:</div>
68 72 <div class="main__employer-page-two-item-text-body">
69   - {!! $Q->contacts_emails !!}
  73 + !! $Q->contacts_emails !!}
70 74 </div>
71 75 </div>
72 76 <div class="main__employer-page-two-item-text">
73 77 <div class="main__employer-page-two-item-text-name">Или звоните:</div>
74 78 <div class="main__employer-page-two-item-text-body">
75   - {!! $Q->contacts_telephones !!}
  79 + !! $Q->contacts_telephones !!}
76 80 </div>
77 81 </div>
  82 + -->
78 83  
79 84 <div class="main__employer-page-two-item-tags">
80 85 @if (!empty($Q->jobs_code[0]->position_ship))
... ... @@ -87,6 +92,7 @@
87 92 @endif
88 93 @endif
89 94 </div>
  95 +
90 96 <div class="main__employer-page-two-item-buttons">
91 97 @guest
92 98 <button type="button" data-fancybox data-src="#question" data-options='{"touch":false,"autoFocus":false}'
resources/views/employers/list_vacancy.blade.php
Diff comments   View file @ 18e4050
... ... @@ -67,11 +67,13 @@
67 67 <div class="cabinet__filters-item">
68 68 <div class="select">
69 69 <select class="js-select2" id="sort_ajax" name="sort_ajax">
70   - <option value="default">Сортировка (по умолчанию)</option>
71   - <option value="name_up">По имени (возрастание)</option>
  70 + <option value="default" @if (isset($_GET['sort']) && ($_GET['sort'] == 'default')) selected @endif>От новых к старым (по умолчанию)</option>
  71 + <option value="public" @if (isset($_GET['sort']) && ($_GET['sort'] == 'public')) selected @endif>Опубликовано</option>
  72 + <option value="nopublic" @if (isset($_GET['sort']) && ($_GET['sort'] == 'nopublic')) selected @endif>Не опубликовано</option>
  73 + <!--<option value="name_up">По имени (возрастание)</option>
72 74 <option value="name_down">По имени (убывание)</option>
73 75 <option value="created_at_up">По дате (возрастание)</option>
74   - <option value="created_at_down">По дате (убывание)</option>
  76 + <option value="created_at_down">По дате (убывание)</option>-->
75 77 </select>
76 78 </div>
77 79 </div>
resources/views/employers/subcribe.blade.php
Diff comments   View file @ 18e4050
... ... @@ -18,7 +18,7 @@
18 18 </div>
19 19  
20 20  
21   - @include('employers.menu', ['item' => 12])
  21 + @include('employers.menu', ['item' => 11])
22 22 </div>
23 23  
24 24 <div class="cabinet__body">
resources/views/index.blade.php
Diff comments   View file @ 18e4050
... ... @@ -69,24 +69,7 @@
69 69 <section class="numbers">
70 70 <div class="container">
71 71 <div class="numbers__body">
72   - <div class="numbers__item">
73   - <b>500+</b>
74   - <span>Резюме</span>
75   - Банальные, но неопровержимые выводы, а также элементы политического процесса лишь добавляют
76   - фракционных разногласий и призваны к ответу.
77   - </div>
78   - <div class="numbers__item">
79   - <b>1 000+</b>
80   - <span>Вакансий</span>
81   - В рамках спецификации современных стандартов, диаграммы связей заблокированы в рамках своих
82   - собственных рациональных ограничений.
83   - </div>
84   - <div class="numbers__item">
85   - <b>265</b>
86   - <span>Компаний</span>
87   - Но сторонники тоталитаризма в науке заблокированы в рамках своих собственных рациональных
88   - ограничений.
89   - </div>
  72 + @include('TITLE_TEXT')
90 73 </div>
91 74 </div>
92 75 </section>
resources/views/info_company_new.blade.php
Diff comments   View file @ 18e4050
... ... @@ -207,17 +207,19 @@
207 207 @else
208 208 <img src="{{ asset('images/default_ship.jpg') }}" alt="{{ $job->name }}">
209 209 @endif
210   - <span>{{ $job->name }}</span>
  210 + <span>{{ $company[0]->name_company }}</span>
211 211 </div>
212 212 <!--<div class="main__employer-page-two-item-title"> $item->flot }}</div>-->
213 213 <div class="main__employer-page-two-item-text">
214   - @if ((isset($job->jobs)) && ($job->jobs->count()))
215   - @foreach($job->jobs as $item)
  214 + <h3>{{ $job->name }}</h3>
  215 + <!--if ((isset($job->jobs)) && ($job->jobs->count()))
  216 + foreach($job->jobs as $item)
216 217 <a class="main__employer-page-two-item-text-name">
217   - {{ $item->name }}
  218 + { $item->name }}
218 219 </a>
219   - @endforeach
220   - @endif
  220 + endforeach
  221 + endif
  222 + -->
221 223 <span>Описание:
222 224 {!! $job->text !!}
223 225 </span>
resources/views/list_vacancies.blade.php
Diff comments   View file @ 18e4050
... ... @@ -233,20 +233,23 @@
233 233 @else
234 234 <img src="{{ asset('images/default_ship.jpg') }}" alt="{{ $Rec->title }}" class="main__vacancies-thing-pic">
235 235 @endif
236   - <span>@if (!empty($Q->name)) {{ $Q->name }} @endif</span>
  236 + <span>@if (isset($Q->employer->name_company)) {{ $Q->employer->name_company }} @else Не определена @endif</span>
237 237 </div>
238 238  
239 239 <div class="main__employer-page-two-item-text">
240   - <div class="main__employer-page-two-item-text-name">Судоходная компания ведет набор
  240 + <div class="main__employer-page-two-item-text-name">
  241 + <h3>@if (!empty($Q->name)) {{ $Q->name }}@else Не указано @endif </h3>
  242 + </div>
  243 + <!--Судоходная компания ведет набор
241 244 специалистов на следующие должности:</div>
242 245 <div class="main__employer-page-two-item-text-links">
243   - @if (isset($Q->jobs))
244   - @foreach ($Q->jobs as $key => $j)
245   - <a>“{{ $j->name }}” <!--– з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
246   - </a>
247   - @endforeach
248   - @endif
249   - </div>
  246 + if (isset($Q->jobs))
  247 + foreach ($Q->jobs as $key => $j)
  248 + <a>“{ $j->name }}” <!--– з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
  249 + <!-- </a>
  250 + endforeach
  251 + endif
  252 + </div>-->
250 253 </div>
251 254  
252 255 <div class="main__employer-page-two-item-text">
resources/views/pages.blade.php
Diff comments   View file @ 18e4050
... ... @@ -16,6 +16,11 @@
16 16 @endif
17 17 <h1 class="thing__title">{{ $page->name }}</h1>
18 18 <p class="thing__text">{!! $page->anons !!}</p>
  19 + @if ($slug == 'Usloviya-razmescheniya')
  20 + <div class="thing__buttons">
  21 + <a href="{{ route('shipping_companies') }}" class="button">Список компаний</a>
  22 + </div>
  23 + @endif
19 24 </div>
20 25 </div>
21 26 </section>
resources/views/vacance-item.blade.php
Diff comments   View file @ 18e4050
... ... @@ -110,40 +110,42 @@
110 110  
111 111 @foreach ($Query as $Q)
112 112 <div class="main__vacancies-item-page main__employer-page-two-item">
113   - <div class="main__employer-page-two-item-text">
  113 + <!--<div class="main__employer-page-two-item-text">
114 114 <div class="main__employer-page-two-item-text-name">Судоходная компания ведет набор
115 115 специалистов на следующие должности:</div>
116 116 <div class="main__employer-page-two-item-text-links">
117   - @if (isset($Q->jobs))
118   - @foreach ($Q->jobs as $key => $j)
119   - <a>“{{ $j->name }}” – з/п от @if (isset($Q->jobs_code[$key]->min_salary)) {{ $Q->jobs_code[$key]->min_salary }} @endif - @if (isset($Q->jobs_code[$key]->max_salary)) {{ $Q->jobs_code[$key]->max_salary }} @endif рублей (на руки)</a>
120   - @endforeach
121   - @endif
  117 + if (isset($Q->jobs))
  118 + foreach ($Q->jobs as $key => $j)
  119 + <a>“{ $j->name }}”
  120 + <!-- з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
  121 + <!--</a>
  122 + endforeach
  123 + endif
122 124 </div>
123   - </div>
  125 + </div>-->
124 126 <div class="main__employer-page-two-item-text">
125 127 <div class="main__employer-page-two-item-text-name">Мы предлагаем:</div>
126 128 <div class="main__employer-page-two-item-text-body">
127 129 {!! $Q->text !!}
128 130 </div>
129 131 </div>
130   - <div class="main__employer-page-two-item-text">
  132 + <!--<div class="main__employer-page-two-item-text">
131 133 <div class="main__employer-page-two-item-text-name">Наши ожидания:</div>
132 134 <div class="main__employer-page-two-item-text-body">
133   - {!! $Q->description !!}
  135 + !! $Q->description !!}
134 136 </div>
135 137 </div>
136 138 <div class="main__employer-page-two-item-text">
137 139 <div class="main__employer-page-two-item-text-name">Резюме направляйте на почту:</div>
138 140 <div class="main__employer-page-two-item-text-body">
139   - {!! $Q->contacts_emails !!}
  141 + !! $Q->contacts_emails !!}
140 142 </div>
141 143 <div class="main__employer-page-two-item-text">
142 144 <div class="main__employer-page-two-item-text-name">Или звоните:</div>
143 145 <div class="main__employer-page-two-item-text-body">
144   - {!! $Q->contacts_telephones !!}
  146 + !! $Q->contacts_telephones !!}
145 147 </div>
146   - </div>
  148 + </div>-->
147 149  
148 150 <div class="main__employer-page-two-item-tags">
149 151 @if (!empty($Q->jobs_code[0]->position_ship))
... ... @@ -184,7 +186,7 @@
184 186  
185 187 @endforeach
186 188  
187   - </div> <a href="{{ redirect()->back()->getTargetUrl() }}" class="back">
  189 + <a href="{{ redirect()->back()->getTargetUrl() }}" class="back">
188 190 <svg>
189 191 <use xlink:href="{{ asset('images/sprite.svg#back') }}"></use>
190 192 </svg>
... ... @@ -192,6 +194,7 @@
192 194 Вернуться к списку вакансий
193 195 </span>
194 196 </a>
  197 + </div>
195 198 </main>
196 199 </div>
197 200 @endsection
resources/views/workers/favorite.blade.php
Diff comments   View file @ 18e4050
... ... @@ -68,18 +68,23 @@
68 68 @else
69 69 <img src="{{ asset('images/default_ship.jpg') }}" alt="{{ $Q->employer->name }}" class="main__vacancies-thing-pic">
70 70 @endif
71   - <span>@if (!empty($Q->name)) {{ $Q->name }} @endif</span>
  71 + <span>@if (isset($Q->employer->name_company)) {{ $Q->employer->name_company }} @else Не определена @endif </span>
72 72 </div>
73 73 <div class="main__employer-page-two-item-text">
74   - <div class="main__employer-page-two-item-text-name">Судоходная компания ведет набор
  74 + <div class="main__employer-page-two-item-text-name">
  75 + <h2>@if (!empty($Q->name)) {{ $Q->name }}@else Не указано @endif </h2>
  76 + </div>
  77 + <!-- Судоходная компания ведет набор
75 78 специалистов на следующие должности:</div>
76 79 <div class="main__employer-page-two-item-text-links">
77   - @if (isset($Q->jobs))
78   - @foreach ($Q->jobs as $key => $j)
79   - <a>“{{ $j->name }}” – з/п от @if (isset($Q->jobs_code[$key]->min_salary)) {{ $Q->jobs_code[$key]->min_salary }} @endif - @if (isset($Q->jobs_code[$key]->max_salary)) {{ $Q->jobs_code[$key]->max_salary }} @endif рублей (на руки)</a>
80   - @endforeach
81   - @endif
82   - </div>
  80 + if (isset($Q->jobs))
  81 + foreach ($Q->jobs as $key => $j)
  82 + <a>“{ $j->name }}”
  83 + <!-- з/п от if (isset($Q->jobs_code[$key]->min_salary)) { $Q->jobs_code[$key]->min_salary }} endif - if (isset($Q->jobs_code[$key]->max_salary)) { $Q->jobs_code[$key]->max_salary }} endif рублей (на руки)-->
  84 + <!-- </a>
  85 + endforeach
  86 + endif
  87 + </div>-->
83 88 </div>
84 89 <div class="main__employer-page-two-item-text">
85 90 <div class="main__employer-page-two-item-text-name">Мы предлагаем:</div>
... ... @@ -87,24 +92,24 @@
87 92 {!! $Q->text !!}
88 93 </div>
89 94 </div>
90   - <div class="main__employer-page-two-item-text">
  95 + <!--<div class="main__employer-page-two-item-text">
91 96 <div class="main__employer-page-two-item-text-name">Наши ожидания:</div>
92 97 <div class="main__employer-page-two-item-text-body">
93   - {!! $Q->description !!}
  98 + !! $Q->description !!}
94 99 </div>
95 100 </div>
96 101 <div class="main__employer-page-two-item-text">
97 102 <div class="main__employer-page-two-item-text-name">Резюме направляйте на почту:</div>
98 103 <div class="main__employer-page-two-item-text-body">
99   - {!! $Q->contacts_emails !!}
  104 + !! $Q->contacts_emails !!}
100 105 </div>
101 106 </div>
102 107 <div class="main__employer-page-two-item-text">
103 108 <div class="main__employer-page-two-item-text-name">Или звоните:</div>
104 109 <div class="main__employer-page-two-item-text-body">
105   - {!! $Q->contacts_telephones !!}
  110 + !! $Q->contacts_telephones !!}
106 111 </div>
107   - </div>
  112 + </div>-->
108 113 <div class="main__employer-page-two-item-tags">
109 114 @if (isset($Q->jobs))
110 115 @foreach ($Q->jobs as $key => $j)