Skip to content

Commit

Permalink
Document permission name typo
Browse files Browse the repository at this point in the history
  • Loading branch information
@cuneytsenturk
cuneytsenturk committed Jan 6, 2021
1 parent 41dec0b commit 409173c
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 99 deletions.
82 changes: 28 additions & 54 deletions app/Abstracts/View/Components/DocumentIndex.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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,
Expand All @@ -201,7 +198,7 @@ public function __construct(
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;
Expand All @@ -210,8 +207,7 @@ public function __construct(
$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);
Expand Down Expand Up @@ -282,9 +278,9 @@ public function __construct(
$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'];
Expand Down Expand Up @@ -321,28 +317,6 @@ protected function getDocsPath($type, $docsPath)
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)) {
Expand Down Expand Up @@ -806,70 +780,70 @@ protected function getRouteButtonDelete($type, $routeButtonDelete)
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()
Expand Down
52 changes: 26 additions & 26 deletions app/Abstracts/View/Components/DocumentShow.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -356,7 +356,7 @@ public function __construct(
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,
Expand Down Expand Up @@ -405,9 +405,9 @@ public function __construct(
$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;
Expand Down Expand Up @@ -470,7 +470,7 @@ public function __construct(
$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);
Expand Down Expand Up @@ -924,70 +924,70 @@ protected function getRouteButtonEmail($type, $routeButtonEmail)
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)
Expand Down
10 changes: 5 additions & 5 deletions resources/views/components/documents/index/card-body.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
@if ($item->status != 'cancelled')
@stack('duplicate_button_start')
@if (!$hideButtonDuplicate)
@can($permissionDocumentCreate)
@can($permissionCreate)
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ route($routeButtonDuplicate, $item->id) }}">{{ trans('general.duplicate') }}</a>
@endcan
Expand All @@ -210,7 +210,7 @@

@stack('cancel_button_start')
@if (!$hideButtonCancel)
@can($permissionDocumentUpdate)
@can($permissionUpdate)
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ route($routeButtonCancelled, $item->id) }}">{{ trans('general.cancel') }}</a>
@endcan
Expand All @@ -220,7 +220,7 @@
@else
@stack('duplicate_button_start')
@if (!$hideButtonDuplicate)
@can($permissionDocumentCreate)
@can($permissionCreate)
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ route($routeButtonDuplicate, $item->id) }}">{{ trans('general.duplicate') }}</a>
@endcan
Expand All @@ -229,7 +229,7 @@

@stack('cancel_button_start')
@if (!$hideButtonCancel)
@can($permissionDocumentUpdate)
@can($permissionUpdate)
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ route($routeButtonCancelled, $item->id) }}">{{ trans('general.cancel') }}</a>
@endcan
Expand All @@ -239,7 +239,7 @@

@stack('delete_button_start')
@if (!$hideButtonDelete)
@can($permissionDocumentDelete)
@can($permissionDelete)
@if ($checkButtonReconciled)
@if (!$item->reconciled)
{!! Form::deleteLink($item, $routeButtonDelete) !!}
Expand Down
6 changes: 3 additions & 3 deletions resources/views/components/documents/index/content.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ class-actions="{{ $classActions }}"
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 }}"
/>

Expand Down

0 comments on commit 409173c

Please sign in to comment.