diff --git a/app/Abstracts/View/Components/DocumentIndex.php b/app/Abstracts/View/Components/DocumentIndex.php index b736f2c40..d872a13d8 100644 --- a/app/Abstracts/View/Components/DocumentIndex.php +++ b/app/Abstracts/View/Components/DocumentIndex.php @@ -83,7 +83,7 @@ abstract class DocumentIndex extends Component public $textContactName; /** @var string */ - public $textIssueAt; + public $textIssuedAt; /** @var string */ public $textDueAt; @@ -196,7 +196,7 @@ abstract class DocumentIndex extends Component string $textBulkAction = '', array $bulkActions = [], string $bulkActionClass = '', array $bulkActionRouteParameters = [], string $formCardHeaderRoute = '', string $searchStringModel = '', bool $hideBulkAction = false, bool $hideSearchString = false, string $classActions = '', string $classBulkAction = '', string $classDocumentNumber = '', string $classContactName = '', string $classIssuedAt = '', string $classDueAt = '', string $classStatus = '', - string $textDocumentNumber = '', string $textContactName = '', string $classAmount = '', string $textIssueAt = '', string $textDueAt = '', string $textDocumentStatus = '', + string $textDocumentNumber = '', string $textContactName = '', string $classAmount = '', string $textIssuedAt = '', string $textDueAt = '', string $textDocumentStatus = '', bool $checkButtonReconciled = true, bool $checkButtonCancelled = true, string $routeButtonShow = '', string $routeButtonEdit = '', string $routeButtonDuplicate = '', string $routeButtonCancelled = '', string $routeButtonDelete = '', bool $hideDocumentNumber = false, bool $hideContactName = false, bool $hideAmount = false, bool $hideIssuedAt = false, bool $hideDueAt = false, bool $hideStatus = false, bool $hideActions = false, @@ -241,7 +241,7 @@ abstract class DocumentIndex extends Component /* -- Card Body Start -- */ $this->textDocumentNumber = $this->getTextDocumentNumber($textDocumentNumber); $this->textContactName = $this->getTextContactName($type, $textContactName); - $this->textIssueAt = $this->getTextIssueAt($type, $textIssueAt); + $this->textIssuedAt = $this->getTextIssuedAt($type, $textIssuedAt); $this->textDueAt = $this->getTextDueAt($type, $textDueAt); $this->textDocumentStatus = $this->getTextDocumentStatus($type, $textDocumentStatus); @@ -584,24 +584,24 @@ abstract class DocumentIndex extends Component return 'col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-2 text-right'; } - protected function getTextIssueAt($type, $textIssueAt) + protected function getTextIssuedAt($type, $textIssuedAt) { - if (!empty($textIssueAt)) { - return $textIssueAt; + if (!empty($textIssuedAt)) { + return $textIssuedAt; } switch ($type) { case 'bill': case 'expense': case 'purchase': - $textIssueAt = 'bills.bill_date'; + $textIssuedAt = 'bills.bill_date'; break; default: - $textIssueAt = 'invoices.invoice_date'; + $textIssuedAt = 'invoices.invoice_date'; break; } - return $textIssueAt; + return $textIssuedAt; } protected function getclassIssuedAt($type, $classIssuedAt) diff --git a/resources/views/components/documents/form/content.blade.php b/resources/views/components/documents/form/content.blade.php index aad23eb79..ec74b2f6a 100644 --- a/resources/views/components/documents/form/content.blade.php +++ b/resources/views/components/documents/form/content.blade.php @@ -22,9 +22,9 @@ 'novalidate' => true ]) !!} @endif - @if (!$hideCompany) + @if (!$hideCompany) @endif - - @if (!$hideFooter) - @endif - @if (!$hideAdvanced) - @endif - @if (!$hideButtons) + @if (!$hideButtons) - @stack('issued_at_th_inside_start') - @sortablelink('issued_at', trans($textIssueAt)) + @sortablelink('issued_at', trans($textIssuedAt)) @stack('issued_at_th_inside_end') @@ -258,4 +258,4 @@ @endforeach - \ No newline at end of file + diff --git a/resources/views/components/documents/index/content.blade.php b/resources/views/components/documents/index/content.blade.php index 27fe36398..c0830c998 100644 --- a/resources/views/components/documents/index/content.blade.php +++ b/resources/views/components/documents/index/content.blade.php @@ -26,7 +26,7 @@ hide-amount="{{ $hideAmount }}" class-amount="{{ $classAmount }}" hide-issued-at="{{ $hideIssuedAt }}" - text-issued-at="{{ $textIssueAt }}" + text-issued-at="{{ $textIssuedAt }}" class-issued-at="{{ $classIssuedAt }}" hide-due-at="{{ $hideDueAt }}" class-due-at="{{ $classDueAt }}" @@ -64,4 +64,4 @@ page="{{ $page }}" docs-path="{{ $docsPath }}" /> -@endif \ No newline at end of file +@endif