diff --git a/app/Modules/Plan7/Http/Livewire/Plan7SelectorLivewire.php b/app/Modules/Plan7/Http/Livewire/Plan7SelectorLivewire.php index 9c9b08e..7f72a86 100644 --- a/app/Modules/Plan7/Http/Livewire/Plan7SelectorLivewire.php +++ b/app/Modules/Plan7/Http/Livewire/Plan7SelectorLivewire.php @@ -14,7 +14,7 @@ class Plan7SelectorLivewire extends Component public $types; public $access; public $summary; - public $room; + public $room = false; public $objects = []; private $apiSummary = 'https://plan7.ru/catalog/exp/json/summary/?token=0754c5e6a3824322&zk=614'; private $apiAll = 'https://plan7.ru/catalog/exp/json/?token=0754c5e6a3824322&zk=614'; @@ -63,7 +63,10 @@ public function setHouse($id) public function setRoom($id) { $this->room = $this->allObjects['data'][$id]; - $this->filter['id'] = $id; + //$this->filter['id'] = $id; + } + public function unsetRoom() { + $this->room = false; } public function resetFilter() { $this->filter = []; @@ -71,6 +74,7 @@ public function resetFilter() { public function start() { $this->mode = 'select'; $this->filter = []; + //$this->room = false; $this->getData(); } public function done() { @@ -83,19 +87,19 @@ public function render() if (count($this->filter)) { foreach ($this->allObjects['data'] as $key => $room) { if ($room['access'] != 0) { - if (array_key_exists('id', $this->filter) && $this->filter['id'] !== null && $room['id'] != $this->filter['id']) { + if (array_key_exists('id', $this->filter) && $this->filter['id'] != null && $room['id'] != $this->filter['id']) { continue; } - if (array_key_exists('bs', $this->filter) && $this->filter['bs'] !== null && $room['bs'] != $this->filter['bs']) { + if (array_key_exists('bs', $this->filter) && $this->filter['bs'] != null && $room['bs'] != $this->filter['bs']) { continue; } - if (array_key_exists('type', $this->filter) && $this->filter['type'] !== null && $room['type'] != $this->filter['type']) { + if (array_key_exists('type', $this->filter) && $this->filter['type'] != null && $room['type'] != $this->filter['type']) { continue; } - if (array_key_exists('min_area', $this->filter) && $this->filter['min_area'] !== null && $room['area'] < $this->filter['min_area']) { + if (array_key_exists('min_area', $this->filter) && $this->filter['min_area'] != null && $room['area'] < $this->filter['min_area']) { continue; } - if (array_key_exists('max_area', $this->filter) && $this->filter['max_area'] !== null && $room['area'] > $this->filter['max_area']) { + if (array_key_exists('max_area', $this->filter) && $this->filter['max_area'] != null && $room['area'] > $this->filter['max_area']) { continue; } $room['mode'] = 'room'; diff --git a/app/Modules/Plan7/Views/livewire/selector.blade.php b/app/Modules/Plan7/Views/livewire/selector.blade.php index 1d8b7ff..35aeef5 100644 --- a/app/Modules/Plan7/Views/livewire/selector.blade.php +++ b/app/Modules/Plan7/Views/livewire/selector.blade.php @@ -13,7 +13,8 @@ @endif - - +
-
-
-
- -
- -
+ @if($room) +
+
+ ...
-
- -
- +
+

+ {{ (($room['type'] == 0) ? $room['room'] . ' комн. ' . mb_strtolower($this->types[$room['type']]) : $this->types[$room['type']]) }} +

+
+
+
+ Помещение{{ $room['name'] }} +
+
+ Этаж{{ $room['level'] }} +
+
+
+ Площадь{{ $room['area'] }} м2 +
+
+ Стоимость{{ ($room['summ']) ? number_format($room['summ'], 0, '', ' ') . ' р.' : '' }} +
- @if(array_key_exists('type', $filter)) - @foreach($summary as $typeSummary) - @if(array_key_exists('type', $typeSummary) && $typeSummary['type'] == $filter['type']) -
- -
- от - - до - -
+ @endif + @if(!$room) +
+
+
+ +
+
-
- -
- от - - до - -
-
-
- -
+
+
+ +
+
- @endif - @endforeach - @endif -
- @if(count($filter) && count($objs)) -
Всего помещений: {{ count($objs) }}
- @endif - @if(!count($objs)) -
- Нет помещений для отображения по выбранным параметрам -
- @endif -
- @foreach($objs as $obj) -
- @if($obj['mode'] == 'bs') -
-
-
{{ $obj['name'] }}
-
Секция/дoм
-

- Выбрать -
-
- @elseif($obj['mode'] == 'room') -
-
-
- ... +
+
+ @if(array_key_exists('type', $filter)) + @foreach($summary as $typeSummary) + @if(array_key_exists('type', $typeSummary) && $typeSummary['type'] == $filter['type']) +
+ +
+ от + + до +
-
-
-
- {{ (($obj['type'] == 0) ? $obj['room'] . ' комн. ' . mb_strtolower($this->types[$obj['type']]) : $this->types[$obj['type']]) }} -
-

-

Помещение: {{ $obj['name'] }}
-
Площадь: {{ $obj['area'] }}
-
Этаж: {{ $obj['level'] }}
-

-

- {{ ($obj['summ']) ? number_format($obj['summ'], 0, '', ' ') . ' р.' : '' }} -

+
+
+ +
+ от + + до + +
+
+
+ +
+ @foreach($summary as $typeSummary) + @if(array_key_exists('type', $typeSummary) && $typeSummary['type'] == $filter['type']) + @foreach($typeSummary['floor'] as $floor) + + @endforeach + @endif + @endforeach +
+
+ @endif + @endforeach + @endif +
+ @if(count($filter) && count($objs)) +
Всего помещений: {{ count($objs) }}
+ @endif + + @if(!count($objs)) +
+ Нет помещений для отображения по выбранным параметрам +
+ @endif +
+ @foreach($objs as $obj) +
+ @if($obj['mode'] == 'bs') +
+
+
{{ $obj['name'] }}
+
Секция/дoм
+

+ Выбрать +
+
+ @elseif($obj['mode'] == 'room') +
+
+
+ ... +
+
+
+
+ {{ (($obj['type'] == 0) ? $obj['room'] . ' комн. ' . mb_strtolower($this->types[$obj['type']]) : $this->types[$obj['type']]) }} +
+

+

Помещение: {{ $obj['name'] }}
+
Площадь: {{ $obj['area'] }}
+
Этаж: {{ $obj['level'] }}
+

+

+ {{ ($obj['summ']) ? number_format($obj['summ'], 0, '', ' ') . ' р.' : '' }} +

+
-
- @endif -
- @endforeach -
+ @endif +
+ @endforeach +
+ @endif
- @if(array_key_exists('id', $filter)) + @if($room)
+