diff --git a/app/Livewire/Plan/Accordion.php b/app/Livewire/Plan/Accordion.php index aa8aed7..af3365b 100644 --- a/app/Livewire/Plan/Accordion.php +++ b/app/Livewire/Plan/Accordion.php @@ -20,11 +20,28 @@ class Accordion extends Component public function mount(Plan $plan): void { $this->plan = $plan; - // dd($this->unserializeOptions($plan->packet3_options)); - $this->options1 = $plan->packet1_options; - $this->options2 = $plan->packet2_options; - $this->options3 = $plan->packet3_options; + $this->options1['items'] = $this->filter_not_empty_items($plan->packet1_options['items'] ?? []); + $this->options2['items'] = $this->filter_not_empty_items($plan->packet2_options['items'] ?? []); + $this->options3['items'] = $this->filter_not_empty_items($plan->packet3_options['items'] ?? []); + + $this->options1['price'] = $plan->packet1_options['price'] ?? 0; + $this->options2['price'] = $plan->packet2_options['price'] ?? 0; + $this->options3['price'] = $plan->packet3_options['price'] ?? 0; + + $this->options1['short'] = $plan->packet1_options['short'] ?? ''; + $this->options2['short'] = $plan->packet2_options['short'] ?? ''; + $this->options3['short'] = $plan->packet3_options['short'] ?? ''; + + + $this->options1['description'] = $plan->packet1_options['description'] ?? ''; + $this->options2['description'] = $plan->packet2_options['description'] ?? ''; + $this->options3['description'] = $plan->packet3_options['description'] ?? ''; + } + + private function filter_not_empty_items(array $items = []): array + { + return collect($items)->filter(fn($item) => !empty($item))->toArray(); } public function render() @@ -34,20 +51,11 @@ class Accordion extends Component public function toggleAccordionState($optionName) { - $this->accordionState[$optionName] = ! $this->accordionState[$optionName]; + $this->accordionState[$optionName] = !$this->accordionState[$optionName]; // 1. Если у нас 1 true все остальные делать false(чтобы закрывать остальные вкладки у которых не true) // a. у нас есть ключ у которого будет true // b. проходим по всем ключам accordionState и все кроме true делаем false - array_map(fn ($key) => $key === $optionName ? $optionName : $this->accordionState[$key] = false, array_keys($this->accordionState)); - } - - private function unserializeOptions($str) - { - if (preg_match('/^".*"$/', $str)) { - return json_decode(mb_substr($str, 1, -1), true); - } - - return json_decode($str, true); + array_map(fn($key) => $key === $optionName ? $optionName : $this->accordionState[$key] = false, array_keys($this->accordionState)); } }