From 0b85a3a80c51e4769fd23c363c35e700e324ba35 Mon Sep 17 00:00:00 2001 From: Pavel Mironchik Date: Tue, 2 Nov 2021 20:51:48 +0600 Subject: [PATCH] Fix passing data to the SelectContactCard component. --- app/View/Components/SelectContactCard.php | 24 +++++++++---------- .../documents/form/content.blade.php | 4 ++-- .../components/documents/form/main.blade.php | 4 ++-- .../documents/form/metadata.blade.php | 4 ++-- .../components/select-contact-card.blade.php | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/View/Components/SelectContactCard.php b/app/View/Components/SelectContactCard.php index d920fa756..98b8ad531 100644 --- a/app/View/Components/SelectContactCard.php +++ b/app/View/Components/SelectContactCard.php @@ -16,9 +16,9 @@ class SelectContactCard extends Component public $contacts; - public $search_route; + public $searchRoute; - public $create_route; + public $createRoute; /** @var string */ public $textAddContact; @@ -44,15 +44,15 @@ class SelectContactCard extends Component * @return void */ public function __construct( - $type, $contact = false, $contacts = [], $search_route = '', $create_route = '', string $error = '', + $type, $contact = false, $contacts = [], $searchRoute = '', $createRoute = '', string $error = '', $textAddContact = '', $textCreateNewContact = '', $textEditContact = '', $textContactInfo = '', $textChooseDifferentContact = '' ) { $this->type = $type; $this->contact = $contact; $this->contacts = $contacts; - $this->search_route = $search_route; - $this->create_route = $create_route; + $this->searchRoute = $searchRoute; + $this->createRoute = $createRoute; $this->error = ($error) ?: "form.errors.get('contact_id')" ; $this->textAddContact = $this->getTextAddContact($type, $textAddContact); @@ -73,24 +73,24 @@ class SelectContactCard extends Component $this->contacts = Contact::{$this->type}()->enabled()->orderBy('name')->take(setting('default.select_limit'))->get(); } - if (empty($this->search_route)) { + if (empty($this->searchRoute)) { switch ($this->type) { case 'customer': - $this->search_route = route('customers.index'); + $this->searchRoute = route('customers.index'); break; case 'vendor': - $this->search_route = route('vendors.index'); + $this->searchRoute = route('vendors.index'); break; } } - if (empty($this->create_route)) { + if (empty($this->createRoute)) { switch ($this->type) { case 'customer': - $this->create_route = route('modals.customers.create'); + $this->createRoute = route('modals.customers.create'); break; case 'vendor': - $this->create_route = route('modals.vendors.create'); + $this->createRoute = route('modals.vendors.create'); break; } } @@ -100,7 +100,7 @@ class SelectContactCard extends Component return view('components.select-contact-card'); } - + protected function getTextAddContact($type, $textAddContact) { if (!empty($textAddContact)) { diff --git a/resources/views/components/documents/form/content.blade.php b/resources/views/components/documents/form/content.blade.php index 207e8c2b0..337de1774 100644 --- a/resources/views/components/documents/form/content.blade.php +++ b/resources/views/components/documents/form/content.blade.php @@ -40,8 +40,8 @@ contact-type="{{ $contactType }}" :contact="$contact" :contacts="$contacts" - :search_route="$contactSearchRoute" - :create_route="$contactCreateRoute" + :search-route="$contactSearchRoute" + :create-route="$contactCreateRoute" hide-issued-at="{{ $hideIssuedAt }}" text-issued-at="{{ $textIssuedAt }}" issued-at="{{ $issuedAt }}" diff --git a/resources/views/components/documents/form/main.blade.php b/resources/views/components/documents/form/main.blade.php index 919ff877e..7ced7ccad 100644 --- a/resources/views/components/documents/form/main.blade.php +++ b/resources/views/components/documents/form/main.blade.php @@ -11,8 +11,8 @@ contact-type="{{ $contactType }}" :contact="$contact" :contacts="$contacts" - :search_route="$contactSearchRoute" - :create_route="$contactCreateRoute" + :search-route="$contactSearchRoute" + :create-route="$contactCreateRoute" hide-issued-at="{{ $hideIssuedAt }}" text-issued-at="{{ $textIssuedAt }}" issued-at="{{ $issuedAt }}" diff --git a/resources/views/components/documents/form/metadata.blade.php b/resources/views/components/documents/form/metadata.blade.php index 6582ebdb1..10d161894 100644 --- a/resources/views/components/documents/form/metadata.blade.php +++ b/resources/views/components/documents/form/metadata.blade.php @@ -6,8 +6,8 @@ type="{{ $contactType }}" :contact="$contact" :contacts="$contacts" - :search_route="$contactSearchRoute" - :create_route="$contactCreateRoute" + :search-route="$contactSearchRoute" + :create-route="$contactCreateRoute" error="form.errors.get('contact_name')" :text-add-contact="$textAddContact" :text-create-new-contact="$textCreateNewContact" diff --git a/resources/views/components/select-contact-card.blade.php b/resources/views/components/select-contact-card.blade.php index f242e1ec8..4c8d21dac 100644 --- a/resources/views/components/select-contact-card.blade.php +++ b/resources/views/components/select-contact-card.blade.php @@ -2,8 +2,8 @@ placeholder="{{ $placeholder }}" no-data-text="{{ trans('general.no_data') }}" no-matching-data-text="{{ trans('general.no_matching_data') }}" - search-route="{{ $search_route }}" - create-route="{{ $create_route }}" + search-route="{{ $searchRoute }}" + create-route="{{ $createRoute }}" :contacts="{{ json_encode($contacts) }}" :selected="{{ json_encode($contact) }}" add-contact-text="{{ is_array($textAddContact) ? trans($textAddContact[0], ['field' => trans_choice($textAddContact[1], 1)]) : trans($textAddContact) }}"