From 409173c22d5ca645b623ab19b3aef73d89d1073b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Wed, 6 Jan 2021 16:35:28 +0300 Subject: [PATCH] Document permission name typo --- .../View/Components/DocumentIndex.php | 82 +++++++------------ .../View/Components/DocumentShow.php | 52 ++++++------ .../documents/index/card-body.blade.php | 10 +-- .../documents/index/content.blade.php | 6 +- .../documents/index/top-buttons.blade.php | 6 +- .../documents/show/content.blade.php | 2 +- .../documents/show/timeline.blade.php | 6 +- .../documents/show/top-buttons.blade.php | 8 +- 8 files changed, 73 insertions(+), 99 deletions(-) diff --git a/app/Abstracts/View/Components/DocumentIndex.php b/app/Abstracts/View/Components/DocumentIndex.php index b4c43d7a4..0c92aaea7 100644 --- a/app/Abstracts/View/Components/DocumentIndex.php +++ b/app/Abstracts/View/Components/DocumentIndex.php @@ -20,10 +20,7 @@ abstract class DocumentIndex extends Component public $docsPath; /** @var bool */ - public $checkCreatePermission; - - /** @var string */ - public $createPermission; + public $checkPermissionCreate; /** @var string */ public $createRoute; @@ -167,13 +164,13 @@ abstract class DocumentIndex extends Component public $hideButtonDelete; /** @var string */ - public $permissionDocumentCreate; + public $permissionCreate; /** @var string */ - public $permissionDocumentUpdate; + public $permissionUpdate; /** @var string */ - public $permissionDocumentDelete; + public $permissionDelete; /* -- Card Body End -- */ public $limits; @@ -191,7 +188,7 @@ abstract class DocumentIndex extends Component */ public function __construct( string $type, $documents = [], string $page = '', string $docsPath = '', $limits = [], $hideEmptyPage = false, - bool $checkCreatePermission = true, string $createPermission = '', string $createRoute = '', string $importRoute = '', array $importRouteParameters = [], string $exportRoute = '', + bool $checkPermissionCreate = true, string $createRoute = '', string $importRoute = '', array $importRouteParameters = [], string $exportRoute = '', bool $hideCreate = false, bool $hideImport = false, bool $hideExport = false, // Advanced string $textBulkAction = '', array $bulkActions = [], string $bulkActionClass = '', array $bulkActionRouteParameters = [], string $formCardHeaderRoute = '', string $searchStringModel = '', bool $hideBulkAction = false, bool $hideSearchString = false, @@ -201,7 +198,7 @@ abstract class DocumentIndex extends Component 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, bool $hideButtonShow = false, bool $hideButtonEdit = false, bool $hideButtonDuplicate = false, bool $hideButtonCancel = false, bool $hideButtonDelete = false, - string $permissionDocumentCreate = '', string $permissionDocumentUpdate = '', string $permissionDocumentDelete = '' + string $permissionCreate = '', string $permissionUpdate = '', string $permissionDelete = '' ) { $this->type = $type; $this->documents = $documents; @@ -210,8 +207,7 @@ abstract class DocumentIndex extends Component $this->hideEmptyPage = $hideEmptyPage; /* -- Top Buttons Start -- */ - $this->checkCreatePermission = $checkCreatePermission; - $this->createPermission = $this->getCreatePermission($type, $createPermission); + $this->checkPermissionCreate = $checkPermissionCreate; $this->createRoute = $this->getCreateRoute($type, $createRoute); $this->importRoute = $this->getImportRoute($importRoute); @@ -282,9 +278,9 @@ abstract class DocumentIndex extends Component $this->hideButtonCancel = $hideButtonCancel; $this->hideButtonDelete = $hideButtonDelete; - $this->permissionDocumentCreate = $this->getPermissionDocumentCreate($type, $permissionDocumentCreate); - $this->permissionDocumentUpdate = $this->getPermissionDocumentUpdate($type, $permissionDocumentUpdate); - $this->permissionDocumentDelete = $this->getPermissionDocumentDelete($type, $permissionDocumentDelete); + $this->permissionCreate = $this->getPermissionCreate($type, $permissionCreate); + $this->permissionUpdate = $this->getPermissionUpdate($type, $permissionUpdate); + $this->permissionDelete = $this->getPermissionDelete($type, $permissionDelete); /* -- Card Body End -- */ $this->limits = ($limits) ? $limits : ['10' => '10', '25' => '25', '50' => '50', '100' => '100']; @@ -321,28 +317,6 @@ abstract class DocumentIndex extends Component return $docsPath; } - protected function getCreatePermission($type, $createPermission) - { - if (!empty($createPermission)) { - return $createPermission; - } - - switch ($type) { - case 'sale': - case 'income': - case 'invoice': - $createPermission = 'create-sales-invoices'; - break; - case 'bill': - case 'expense': - case 'purchase': - $createPermission = 'create-purchases-bills'; - break; - } - - return $createPermission; - } - protected function getCreateRoute($type, $createRoute) { if (!empty($createRoute)) { @@ -806,70 +780,70 @@ abstract class DocumentIndex extends Component return $route; } - protected function getPermissionDocumentCreate($type, $permissionDocumentCreate) + protected function getPermissionCreate($type, $permissionCreate) { - if (!empty($permissionDocumentCreate)) { - return $permissionDocumentCreate; + if (!empty($permissionCreate)) { + return $permissionCreate; } switch ($type) { case 'sale': case 'income': case 'invoice': - $permissionDocumentCreate = 'create-sales-invoices'; + $permissionCreate = 'create-sales-invoices'; break; case 'bill': case 'expense': case 'purchase': - $permissionDocumentCreate = 'create-purchases-bills'; + $permissionCreate = 'create-purchases-bills'; break; } - return $permissionDocumentCreate; + return $permissionCreate; } - protected function getPermissionDocumentUpdate($type, $permissionDocumentUpdate) + protected function getPermissionUpdate($type, $permissionUpdate) { - if (!empty($permissionDocumentUpdate)) { - return $permissionDocumentUpdate; + if (!empty($permissionUpdate)) { + return $permissionUpdate; } switch ($type) { case 'sale': case 'income': case 'invoice': - $permissionDocumentUpdate = 'update-sales-invoices'; + $permissionUpdate = 'update-sales-invoices'; break; case 'bill': case 'expense': case 'purchase': - $permissionDocumentUpdate = 'update-purchases-bills'; + $permissionUpdate = 'update-purchases-bills'; break; } - return $permissionDocumentUpdate; + return $permissionUpdate; } - protected function getPermissionDocumentDelete($type, $permissionDocumentDelete) + protected function getPermissionDelete($type, $permissionDelete) { - if (!empty($permissionDocumentDelete)) { - return $permissionDocumentDelete; + if (!empty($permissionDelete)) { + return $permissionDelete; } switch ($type) { case 'sale': case 'income': case 'invoice': - $permissionDocumentDelete = 'delete-sales-invoices'; + $permissionDelete = 'delete-sales-invoices'; break; case 'bill': case 'expense': case 'purchase': - $permissionDocumentDelete = 'delete-purchases-bills'; + $permissionDelete = 'delete-purchases-bills'; break; } - return $permissionDocumentDelete; + return $permissionDelete; } protected function calculateClass() diff --git a/app/Abstracts/View/Components/DocumentShow.php b/app/Abstracts/View/Components/DocumentShow.php index f4c0574df..b2e58a432 100644 --- a/app/Abstracts/View/Components/DocumentShow.php +++ b/app/Abstracts/View/Components/DocumentShow.php @@ -92,13 +92,13 @@ abstract class DocumentShow extends Component public $routeButtonPaid; /** @var string */ - public $permissionDocumentCreate; + public $permissionCreate; /** @var string */ - public $permissionDocumentUpdate; + public $permissionUpdate; /** @var string */ - public $permissionDocumentDelete; + public $permissionDelete; /** @var string */ public $permissionButtonCustomize; @@ -356,7 +356,7 @@ abstract class DocumentShow extends Component string $routeButtonAddNew = '', string $routeButtonEdit = '', string $routeButtonDuplicate = '', string $routeButtonPrint = '', string $routeButtonPdf = '', string $routeButtonCancelled = '', string $routeButtonDelete = '', string $routeButtonCustomize = '', string $routeButtonSent = '', string $routeButtonReceived = '', string $routeButtonEmail = '', string $routeButtonPaid = '', bool $checkButtonReconciled = true, bool $checkButtonCancelled = true, - string $permissionDocumentCreate = '', string $permissionDocumentUpdate = '', string $permissionDocumentDelete = '', string $permissionButtonCustomize = '', + string $permissionCreate = '', string $permissionUpdate = '', string $permissionDelete = '', string $permissionButtonCustomize = '', bool $hideButtonGroupDivider1 = false, bool $hideButtonGroupDivider2 = false, bool $hideButtonGroupDivider3 = false, bool $hideButtonMoreActions = false, bool $hideButtonAddNew = false, bool $hideButtonEdit = false, bool $hideButtonDuplicate = false, bool $hideButtonPrint = false, bool $hideButtonPdf = false, bool $hideButtonCancel = false, bool $hideButtonCustomize = false, bool $hideButtonDelete = false, bool $hideHeader = false,bool $hideRecurringMessage = false, bool $hideStatusMessage = false, bool $hideTimeline = false, bool $hideFooter = false, bool $hideFooterHistories = false, bool $hideFooterTransactions = false, @@ -405,9 +405,9 @@ abstract class DocumentShow extends Component $this->routeButtonDelete = $this->getRouteButtonDelete($type, $routeButtonDelete); $this->routeButtonPaid = $this->getRouteButtonPaid($type, $routeButtonPaid); - $this->permissionDocumentCreate = $this->getPermissionDocumentCreate($type, $permissionDocumentCreate); - $this->permissionDocumentUpdate = $this->getPermissionDocumentUpdate($type, $permissionDocumentUpdate); - $this->permissionDocumentDelete = $this->getPermissionDocumentDelete($type, $permissionDocumentDelete); + $this->permissionCreate = $this->getPermissionCreate($type, $permissionCreate); + $this->permissionUpdate = $this->getPermissionUpdate($type, $permissionUpdate); + $this->permissionDelete = $this->getPermissionDelete($type, $permissionDelete); $this->permissionButtonCustomize = $this->getPermissionButtonCustomize($type, $permissionButtonCustomize); $this->hideButtonGroupDivider1 = $hideButtonGroupDivider1; @@ -470,7 +470,7 @@ abstract class DocumentShow extends Component $this->textTimelineGetPaidMarkPaid = $this->getTextTimelineGetPaidMarkPaid($type, $textTimelineGetPaidMarkPaid); $this->textTimelineGetPaidAddPayment = $this->getTextTimelineGetPaidAddPayment($type, $textTimelineGetPaidAddPayment); - $this->permissionDocumentUpdate = $this->getPermissionDocumentUpdate($type, $permissionDocumentUpdate); + $this->permissionUpdate = $this->getPermissionUpdate($type, $permissionUpdate); $this->routeButtonSent = $this->getRouteButtonSent($type, $routeButtonSent); $this->routeButtonReceived = $this->getRouteButtonReceived($type, $routeButtonReceived); @@ -924,70 +924,70 @@ abstract class DocumentShow extends Component return $route; } - protected function getPermissionDocumentCreate($type, $permissionDocumentCreate) + protected function getPermissionCreate($type, $permissionCreate) { - if (!empty($permissionDocumentCreate)) { - return $permissionDocumentCreate; + if (!empty($permissionCreate)) { + return $permissionCreate; } switch ($type) { case 'sale': case 'income': case 'invoice': - $permissionDocumentCreate = 'create-sales-invoices'; + $permissionCreate = 'create-sales-invoices'; break; case 'bill': case 'expense': case 'purchase': - $permissionDocumentCreate = 'create-purchases-bills'; + $permissionCreate = 'create-purchases-bills'; break; } - return $permissionDocumentCreate; + return $permissionCreate; } - protected function getPermissionDocumentUpdate($type, $permissionDocumentUpdate) + protected function getPermissionUpdate($type, $permissionUpdate) { - if (!empty($permissionDocumentUpdate)) { - return $permissionDocumentUpdate; + if (!empty($permissionUpdate)) { + return $permissionUpdate; } switch ($type) { case 'sale': case 'income': case 'invoice': - $permissionDocumentUpdate = 'update-sales-invoices'; + $permissionUpdate = 'update-sales-invoices'; break; case 'bill': case 'expense': case 'purchase': - $permissionDocumentUpdate = 'update-purchases-bills'; + $permissionUpdate = 'update-purchases-bills'; break; } - return $permissionDocumentUpdate; + return $permissionUpdate; } - protected function getPermissionDocumentDelete($type, $permissionDocumentDelete) + protected function getPermissionDelete($type, $permissionDelete) { - if (!empty($permissionDocumentDelete)) { - return $permissionDocumentDelete; + if (!empty($permissionDelete)) { + return $permissionDelete; } switch ($type) { case 'sale': case 'income': case 'invoice': - $permissionDocumentDelete = 'delete-sales-invoices'; + $permissionDelete = 'delete-sales-invoices'; break; case 'bill': case 'expense': case 'purchase': - $permissionDocumentDelete = 'delete-purchases-bills'; + $permissionDelete = 'delete-purchases-bills'; break; } - return $permissionDocumentDelete; + return $permissionDelete; } protected function getPermissionButtonCustomize($type, $permissionButtonCustomize) diff --git a/resources/views/components/documents/index/card-body.blade.php b/resources/views/components/documents/index/card-body.blade.php index 581a9d93e..b68b322e8 100644 --- a/resources/views/components/documents/index/card-body.blade.php +++ b/resources/views/components/documents/index/card-body.blade.php @@ -201,7 +201,7 @@ @if ($item->status != 'cancelled') @stack('duplicate_button_start') @if (!$hideButtonDuplicate) - @can($permissionDocumentCreate) + @can($permissionCreate)
{{ trans('general.duplicate') }} @endcan @@ -210,7 +210,7 @@ @stack('cancel_button_start') @if (!$hideButtonCancel) - @can($permissionDocumentUpdate) + @can($permissionUpdate)
{{ trans('general.cancel') }} @endcan @@ -220,7 +220,7 @@ @else @stack('duplicate_button_start') @if (!$hideButtonDuplicate) - @can($permissionDocumentCreate) + @can($permissionCreate)
{{ trans('general.duplicate') }} @endcan @@ -229,7 +229,7 @@ @stack('cancel_button_start') @if (!$hideButtonCancel) - @can($permissionDocumentUpdate) + @can($permissionUpdate)
{{ trans('general.cancel') }} @endcan @@ -239,7 +239,7 @@ @stack('delete_button_start') @if (!$hideButtonDelete) - @can($permissionDocumentDelete) + @can($permissionDelete) @if ($checkButtonReconciled) @if (!$item->reconciled) {!! Form::deleteLink($item, $routeButtonDelete) !!} diff --git a/resources/views/components/documents/index/content.blade.php b/resources/views/components/documents/index/content.blade.php index f4645c60d..7a3b32670 100644 --- a/resources/views/components/documents/index/content.blade.php +++ b/resources/views/components/documents/index/content.blade.php @@ -43,13 +43,13 @@ route-button-edit="{{ $routeButtonEdit }}" check-button-cancelled="{{ $checkButtonCancelled }}" hide-button-duplicate="{{ $hideButtonDuplicate }}" - permission-document-create="{{ $permissionDocumentCreate }}" + permission-create="{{ $permissionCreate }}" route-button-duplicate="{{ $routeButtonDuplicate }}" hide-button-cancel="{{ $hideButtonCancel }}" - permission-document-update="{{ $permissionDocumentUpdate }}" + permission-update="{{ $permissionUpdate }}" route-button-cancelled="{{ $routeButtonCancelled }}" hide-button-delete="{{ $hideButtonDelete }}" - permission-document-delete="{{ $permissionDocumentDelete }}" + permission-delete="{{ $permissionDelete }}" route-button-delete="{{ $routeButtonDelete }}" /> diff --git a/resources/views/components/documents/index/top-buttons.blade.php b/resources/views/components/documents/index/top-buttons.blade.php index 2462a8680..6108f4856 100644 --- a/resources/views/components/documents/index/top-buttons.blade.php +++ b/resources/views/components/documents/index/top-buttons.blade.php @@ -1,5 +1,5 @@ -@if ($checkCreatePermission) - @can($createPermission) +@if ($checkPermissionCreate) + @can($permissionCreate) @endif @if (!$hideCreate) @@ -10,7 +10,7 @@ {{ trans('import.import') }} @endif -@if ($checkCreatePermission) +@if ($checkPermissionCreate) @endcan @endif diff --git a/resources/views/components/documents/show/content.blade.php b/resources/views/components/documents/show/content.blade.php index 086060479..26997b2b4 100644 --- a/resources/views/components/documents/show/content.blade.php +++ b/resources/views/components/documents/show/content.blade.php @@ -49,7 +49,7 @@ text-timeline-create-title="{{ $textTimelineCreateTitle }}" text-timeline-create-message="{{ $textTimelineCreateMessage }}" hide-button-edit="{{ $hideButtonEdit }}" - permission-document-update="{{ $permissionDocumentUpdate }}" + permission-update="{{ $permissionUpdate }}" route-button-edit="{{ $routeButtonEdit }}" hide-timeline-sent="{{ $hideTimelineSent }}" text-timeline-sent-title="{{ $textTimelineSentTitle }}" diff --git a/resources/views/components/documents/show/timeline.blade.php b/resources/views/components/documents/show/timeline.blade.php index 484e983ce..e7dc5e928 100644 --- a/resources/views/components/documents/show/timeline.blade.php +++ b/resources/views/components/documents/show/timeline.blade.php @@ -30,7 +30,7 @@
@stack('timeline_create_body_button_edit_start') @if (!$hideButtonEdit) - @can($permissionDocumentUpdate) + @can($permissionUpdate) {{ trans('general.edit') }} @@ -72,7 +72,7 @@
@stack('timeline_sent_body_button_sent_start') @if (!$hideButtonSent) - @can($permissionDocumentUpdate) + @can($permissionUpdate) @if($document->status == 'draft') {{ trans($textTimelineSentStatusMarkSent) }} @@ -88,7 +88,7 @@ @stack('timeline_receive_body_button_received_start') @if (!$hideButtonReceived) - @can($permissionDocumentUpdate) + @can($permissionUpdate) {{ trans($textTimelineSentStatusReceived) }} diff --git a/resources/views/components/documents/show/top-buttons.blade.php b/resources/views/components/documents/show/top-buttons.blade.php index 791776d93..f1e5b0524 100644 --- a/resources/views/components/documents/show/top-buttons.blade.php +++ b/resources/views/components/documents/show/top-buttons.blade.php @@ -9,7 +9,7 @@ @stack('button_dropdown_start') @stack('duplicate_button_start') @if (!$hideButtonDuplicate) - @can($permissionDocumentCreate) + @can($permissionCreate) {{ trans('general.duplicate') }} @@ -50,7 +50,7 @@ @stack('button_pdf_end') @if (!$hideButtonCancel) - @can($permissionDocumentUpdate) + @can($permissionUpdate) @if ($checkButtonCancelled) @if ($document->status != 'cancelled') @stack('button_cancelled_start') @@ -93,7 +93,7 @@ @stack('delete_button_start') @if (!$hideButtonDelete) - @can($permissionDocumentDelete) + @can($permissionDelete) @if ($checkButtonReconciled) @if (!$document->reconciled) {!! Form::deleteLink($document, $routeButtonDelete, $textDeleteModal, 'document_number') !!} @@ -112,7 +112,7 @@ @stack('add_new_button_start') @if (!$hideButtonAddNew) - @can($permissionDocumentCreate) + @can($permissionCreate) {{ trans('general.add_new') }}