From d2e30108c8b0332f3949dfc16c69d53b19c70093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=20=D0=9B=D0=B0=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BE=D0=BD=D0=BE=D0=B2?= <alarionov@nologostudio.ru>
Date: Tue, 21 Mar 2023 18:18:42 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B8=D0=BD=D0=BA=D0=B8=20=D1=82=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B5=D1=84=D0=BE=D0=BD=D0=BE=D0=B2=20=D0=B2=20=D0=BA=D0=B0=D1=80?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BA=D0=B0=D1=85=20=D0=BE=D1=84=D0=B8=D1=81=D0?=
 =?UTF-8?q?=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/MainController.php       |    6 +++++-
 app/Providers/ComposerServiceProvider.php     |    2 +-
 resources/views/admin/houses/form.blade.php   |    4 ++--
 resources/views/catalogs/elemhouse.blade.php  |    5 ++++-
 resources/views/catalogs/house_mini.blade.php |    7 +++++--
 resources/views/house/post.blade.php          |   18 +++++++++++-------
 resources/views/layout/site.blade.php         |   10 +++++-----
 7 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/MainController.php b/app/Http/Controllers/MainController.php
index 931149a..089bddd 100644
--- a/app/Http/Controllers/MainController.php
+++ b/app/Http/Controllers/MainController.php
@@ -228,6 +228,9 @@ class MainController extends Controller
         $MailBD->save();
     }
 
+    /*
+     * Форма записаться на просмотр
+     */
     public function rec_view_form(FooterFeedbackRequest $request) {
         $RentTorg = Contact::query()->limit(1)->get();
         $MailBD = new ModelMailFeedback();
@@ -236,6 +239,7 @@ class MainController extends Controller
         $MailBD->subject = "Пользователь <".$request->NameUser.">";
         $MailBD->form = 'Форма записи на просмотр';
         $MailBD->text = "От пользователя: ".$request->NameUser." Сообщение: Заказываю просмотр офиса";
+        $MailBD->text .= "Адрес офиса-объекта: ".url()->previous()." ";
         $MailBD->save();
     }
 
@@ -773,7 +777,7 @@ class MainController extends Controller
 
         // выводим количество пользователей гостей данной страницы
         $count_user = DB::table('pages')->where('url', '=', "$url")->get();
-        return view('house.post', compact('house', 'houses', 'count_user'));
+        return view('house.post', compact('house',  'houses', 'count_user'));
     }
 
     /*
diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php
index 94b2f6c..49f7bfc 100644
--- a/app/Providers/ComposerServiceProvider.php
+++ b/app/Providers/ComposerServiceProvider.php
@@ -34,7 +34,7 @@ class ComposerServiceProvider extends ServiceProvider
             }
         );
 
-        $views = ['layout.site', 'index', 'about'];
+        $views = ['layout.site', 'index', 'about', 'house.post', 'catalog', 'category_catalog'];
         View::composer($views, function($view) {
             $view->with(['items_contact' => Contact::limit(1)->get()]);
         });
diff --git a/resources/views/admin/houses/form.blade.php b/resources/views/admin/houses/form.blade.php
index bc992e4..1eca5aa 100644
--- a/resources/views/admin/houses/form.blade.php
+++ b/resources/views/admin/houses/form.blade.php
@@ -192,7 +192,7 @@
 <input type="text" class="form-control_ txt" name="renter" placeholder="Арендатор"
        required maxlength="100" style="width: 80%" value="{{ old('renter') ?? $house->renter ?? '' }}"><br><br>
 
-<label for="price">Цена: </label><br>
+<label for="price">Цена (или аренда за месяц): </label><br>
 @error('price')
 <div class="alert alert-danger">{{ $message }}</div>
 @enderror
@@ -206,7 +206,7 @@
 <input type="text" class="form-control_ txt" name="price_m2" placeholder="Цена за метр2"
        required maxlength="100" style="width: 80%" value="{{ old('price_m2') ?? $house->price_m2 ?? '' }}"><br><br>
 
-<label for="rent_in_year">Аренда в год (поле только для аренды): </label><br>
+<label for="rent_in_year">Аренда в год (поле только для аренды и арендованные): </label><br>
 @error('rent_in_year')
 <div class="alert alert-danger">{{ $message }}</div>
 @enderror
diff --git a/resources/views/catalogs/elemhouse.blade.php b/resources/views/catalogs/elemhouse.blade.php
index b54b779..7c914cc 100644
--- a/resources/views/catalogs/elemhouse.blade.php
+++ b/resources/views/catalogs/elemhouse.blade.php
@@ -17,7 +17,7 @@
                               <use xlink:href="{{ asset('images/sprite.svg#card-favorites') }}"></use>
                          </svg>
                     </span>
-                    <a class="card__label card__label-messenger" href="#">
+                    <a class="card__label card__label-messenger" href="tel:{{ $items_contact[0]->telephone }}">
                         <svg width="25" height="25">
                             <use xlink:href="{{ asset('images/sprite.svg#card-messenger') }}"></use>
                         </svg></a></div>
@@ -43,6 +43,9 @@
                     case 'Арендованные':
                         $comment = "<span>в месяц</span>";
                         break;
+                    default:
+                        $comment = "<span>в месяц</span>";
+                        break;
                    }
                 ?>
                 <div class="card__price"><span>{{ $house->price }} ₽ </span><? echo $comment; ?>
diff --git a/resources/views/catalogs/house_mini.blade.php b/resources/views/catalogs/house_mini.blade.php
index 4ca1cd8..77a8fdc 100644
--- a/resources/views/catalogs/house_mini.blade.php
+++ b/resources/views/catalogs/house_mini.blade.php
@@ -13,10 +13,13 @@
                                   </svg>
                                   <svg width="18" height="18">
                                     <use xlink:href="{{ asset('images/sprite.svg#card-favorites') }}"></use>
-                                  </svg></span><a class="card__label card__label-messenger" href="#">
+                                  </svg></span>
+                    <a class="card__label card__label-messenger" href="tel:{{ $items_contact[0]->telephone }}">
                         <svg width="25" height="25">
                             <use xlink:href="{{ asset('images/sprite.svg#card-messenger') }}"></use>
-                        </svg></a></div>
+                        </svg>
+                    </a>
+                </div>
             </div>
             <div class="card__cnt">
                 <div class="card__info">
diff --git a/resources/views/house/post.blade.php b/resources/views/house/post.blade.php
index e52b8be..0b0341d 100644
--- a/resources/views/house/post.blade.php
+++ b/resources/views/house/post.blade.php
@@ -38,7 +38,7 @@
                         </div>
                         <div class="intro__bottom">
                             <div class="intro__views">{{ $count_user->count() }} человек(а) интересовались этим объектом за последние 24&nbsp;ч</div>
-                            <a class="intro__link-phone btn btn--main" href="tel:+70001234567"><span>Позвонить
+                            <a class="intro__link-phone btn btn--main" href="tel:{{ $items_contact[0]->telephone }}"><span>Позвонить
                                <svg width="22" height="22">
                                  <use xlink:href="{{ asset('images/sprite.svg#intro-link-phone') }}"></use>
                                </svg></span></a>
@@ -153,8 +153,12 @@
                         </div>
                         <!--------------------------->
                         <div class="offer__lines">
+                            <? if ($house->format_house == "Продажа") {?>
+                                <div class="offer__line"><span>Цена</span><span>{{ $house->price }} ₽</span></div>
+                            <? } else {?>
                             <div class="offer__line"><span>Аренда в год за м2</span><span>{{ $house->rent_in_year }} ₽</span></div>
-                            <div class="offer__line"><span>Аренда в месяц</span><span>{{ $house->rent_in_month }} ₽</span></div>
+                            <div class="offer__line"><span>Аренда в месяц</span><span>{{ $house->price }} ₽</span></div>
+                            <? } ?>
                             <div class="offer__line"><span>Схема сделки</span><span>{{ $house->scheme_deal }}</span></div>
                         </div>
                         <div class="offer-side__buttons"><a class="offer-side__btn btn btn--main" href="#" data-btn="viewing"><span>Записаться на просмотр
@@ -163,10 +167,10 @@
                         </svg></span></a><a class="offer-side__btn btn btn--main" href="#" data-btn="sending"><span>Отправить по Email
                         <svg width="22" height="22">
                           <use xlink:href="{{ asset('images/sprite.svg#offer-side-btn-email') }}"></use>
-                        </svg></span></a><a class="offer-side__btn btn btn--main" href="tel:+70001234567"><span>Позвонить
+                        </svg></span></a><a class="offer-side__btn btn btn--main" href="tel:{{ $items_contact[0]->telephone }}"><span>Позвонить
                         <svg width="22" height="22">
                           <use xlink:href="{{ asset('images/sprite.svg#intro-link-phone') }}"></use>
-                        </svg></span></a></div><a class="offer-side__download" href="#" download><span>Скачать презентацию
+                        </svg></span></a></div><a class="offer-side__download" href="{{ $house->present }}" download><span>Скачать презентацию
                       <svg width="60" height="60">
                         <use xlink:href="{{  asset('images/sprite.svg#offer-side-download') }}"></use>
                       </svg></span></a>
@@ -177,7 +181,7 @@
                             <div class="offer__line"><span>Площадь, м2</span><span>{{ $house->area  }}</span></div>
                             <div class="offer__line"><span>Адрес</span><span>{{ $house->address  }}</span></div>
                             <div class="offer__line"><span>Тип объекта</span><span>{{ $house->typearea->name_type  }}</span></div>
-                            <div class="offer__line"><span>Формат</span><span>{{ $house->format_house  }}</span></div>
+                            <div class="offer__line"><span>Формат</span><span>{{ $house->format_house }}</span></div>
                             <div class="offer__line"><span>Этаж</span><span>{{ $house->floor  }} эт.</span></div>
                             <div class="offer__line"><span>Этажность здания</span><span>{{ $house->floor_bild  }} эт.</span></div>
                             <div class="offer__line"><span>Арендаторы</span><span>{{ $house->renter  }}</span></div>
@@ -216,12 +220,12 @@
                     <div class="slider__control">
                         <div class="swiper-button-prev">
                             <svg width="10" height="17">
-                                <use xlink:href="images/sprite.svg#slider-arrow"></use>
+                                <use xlink:href="{{ asset('images/sprite.svg#slider-arrow') }}"></use>
                             </svg>
                         </div>
                         <div class="swiper-button-next">
                             <svg width="10" height="17">
-                                <use xlink:href="images/sprite.svg#slider-arrow"></use>
+                                <use xlink:href="{{ asset('images/sprite.svg#slider-arrow') }}"></use>
                             </svg>
                         </div>
                     </div>
diff --git a/resources/views/layout/site.blade.php b/resources/views/layout/site.blade.php
index 4994470..ee7b36a 100644
--- a/resources/views/layout/site.blade.php
+++ b/resources/views/layout/site.blade.php
@@ -35,7 +35,7 @@
                         </svg></a>
                     <div class="header__contacts">
                         <div class="header__col"><a class="header__contact" href="mailto:{{ $items_contact[0]->email }}">{{ $items_contact[0]->email }}</a></div>
-                        <div class="header__col"><a class="header__contact" href="tel:{{ $items_contact[0]->email }}">{{ $items_contact[0]->telephone }}</a>
+                        <div class="header__col"><a class="header__contact" href="tel:{{ $items_contact[0]->telephone }}">{{ $items_contact[0]->telephone }}</a>
                             <button class="header__btn-callback" type="button" data-btn="feedback">Обратный звонок</button>
                         </div>
                     </div>
@@ -342,12 +342,12 @@
     <div class="offer-side-popup__wrap">
         <button class="offer-side-popup__close js_popup_close" type="button">
             <svg width="20" height="20">
-                <use xlink:href="{{ asset('images/sprite.svg#popup-close')}}"></use>
+                <use xlink:href="images/sprite.svg#popup-close"></use>
             </svg>
         </button>
         <div class="offer-side-popup__cnt">
-            <div class="offer-side-popup__item js_offer_side_popup_item active" data-item="1"><img src="{{ asset('images/offer-side-item-img-1.jpg')}}" alt="План объекта"></div>
-            <div class="offer-side-popup__item js_offer_side_popup_item" data-item="2"><img src="{{ asset('images/offer-side-item-img-2.jpg')}}" alt="План этажа"></div>
+            <div class="offer-side-popup__item js_offer_side_popup_item active" data-item="1"><img src="images/offer-side-item-img-1.jpg" alt="План объекта"></div>
+            <div class="offer-side-popup__item js_offer_side_popup_item" data-item="2"><img src="images/offer-side-item-img-2.jpg" alt="План этажа"></div>
         </div>
         <div class="offer-side-popup__tabs">
             <button class="offer-side-popup__tab js_offer_side_popup_tab active" type="button" data-tab="1">План объекта</button>
@@ -355,7 +355,7 @@
         </div>
         <button class="offer-side-popup__sizeoff js_popup_close" type="button">
             <svg width="18" height="18">
-                <use xlink:href="{{ asset('images/sprite.svg#popup-sizeoff')}}"></use>
+                <use xlink:href="images/sprite.svg#popup-sizeoff"></use>
             </svg>
         </button>
     </div>
-- 
1.7.10.4