Merge branch 'master' of https://github.com/brkcvn/akaunting into cod…

…e-clean
0x1a8510f2 · Sep 7, 2022 · f7694c2 · f7694c2
2 parents ccc566c + 513f451
commit f7694c2
Show file tree

Hide file tree

Showing 76 changed files with 1,015 additions and 696 deletions.
diff --git a/app/Abstracts/View/Components/Contacts/Index.php b/app/Abstracts/View/Components/Contacts/Index.php
@@ -282,7 +282,7 @@ public function getSummaryItems($type, $summaryItems)
         foreach ($totals as $key => $total) {
             $items[] = [
                 'title'     => ($key == 'overdue') ? trans('general.overdue') : trans('documents.statuses.' . $key),
-                'href'      => route($route, ['search' => 'status:' . $key]),
+                //'href'      => route($route, ['search' => 'status:' . $key]),
                 'amount'    => money($total, setting('default.currency'), true)->formatForHumans(),
                 'tooltip'   => money($total, setting('default.currency'), true)->format(),
             ];

diff --git a/app/Abstracts/View/Components/Documents/Index.php b/app/Abstracts/View/Components/Documents/Index.php
@@ -397,7 +397,7 @@ public function getSummaryItems($type, $summaryItems)
 
             $items[] = [
                 'title'     => $title,
-                'href'      => $href,
+                //'href'      => $href,
                 'amount'    => $amount,
                 'tooltip'   => $tooltip,
             ];

diff --git a/app/Http/Controllers/Api/Settings/Settings.php b/app/Http/Controllers/Api/Settings/Settings.php
@@ -6,6 +6,8 @@
 use App\Http\Requests\Setting\Setting as Request;
 use App\Http\Resources\Setting\Setting as Resource;
 use App\Models\Setting\Setting;
+use Laratrust\Middleware\LaratrustMiddleware;
+
 
 class Settings extends ApiController
 {
@@ -15,9 +17,10 @@ class Settings extends ApiController
     public function __construct()
     {
         // Add CRUD permission check
-        $this->middleware('permission:create-settings-settings')->only('create', 'store', 'duplicate', 'import');
-        $this->middleware('permission:read-settings-settings')->only('index', 'show', 'edit', 'export');
-        $this->middleware('permission:update-settings-settings')->only('update', 'enable', 'disable', 'destroy');
+        // We've added base 3 permission then get all setting thsi permissions
+        $this->middleware('permission:create-settings-company|create-settings-defaults|create-settings-localisation')->only('create', 'store', 'duplicate', 'import');
+        $this->middleware('permission:read-settings-company|read-settings-defaults|read-settings-localisation')->only('index', 'show', 'edit', 'export');
+        $this->middleware('permission:update-settings-company|update-settings-defaults|update-settings-localisation')->only('update', 'enable', 'disable', 'destroy');
     }
 
     /**

diff --git a/app/Http/Controllers/Modals/DocumentTransactions.php b/app/Http/Controllers/Modals/DocumentTransactions.php
@@ -113,13 +113,7 @@ public function store(Document $document, Request $request)
         $response = $this->ajaxDispatch(new CreateBankingDocumentTransaction($document, $request));
 
         if ($response['success']) {
-            $route = config('type.document.' . $document->type . '.route.prefix');
-
-            if ($alias = config('type.document.' . $document->type . '.alias')) {
-                $route = $alias . '.' . $route;
-            }
-
-            $response['redirect'] = route($route . '.show', $document->id);
+            $response['redirect'] = url()->previous();
 
             $message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]);
 

diff --git a/app/Http/Controllers/Wizard/Currencies.php b/app/Http/Controllers/Wizard/Currencies.php
@@ -91,6 +91,8 @@ public function update(Currency $currency, Request $request)
     {
         $response = $this->ajaxDispatch(new UpdateCurrency($currency, $request));
 
+        $currency->default = setting('default.currency') == $currency->code;
+
         if ($response['success']) {
             $message = trans('messages.success.updated', ['type' => $currency->name]);
         } else {

diff --git a/app/Http/Livewire/Report/Pin.php b/app/Http/Livewire/Report/Pin.php
@@ -13,7 +13,7 @@ class Pin extends Component
 
     public $pinned = false;
 
-    public $reportId = null;
+    public $report;
 
     public function render(): View
     {
@@ -38,7 +38,7 @@ public function render(): View
                         continue;
                     }
 
-                    if (in_array($this->reportId, $pins)) {
+                    if (in_array($this->report->id, $pins)) {
                         $this->pinned = true;
 
                         break;

diff --git a/app/Jobs/Banking/UpdateReconciliation.php b/app/Jobs/Banking/UpdateReconciliation.php
@@ -15,19 +15,22 @@ public function handle(): Reconciliation
             $reconcile = (int) $this->request->get('reconcile');
             $transactions = $this->request->get('transactions');
 
+            $this->model->transactions = $transactions;
             $this->model->reconciled = $reconcile;
             $this->model->save();
 
             if ($transactions) {
                 foreach ($transactions as $key => $value) {
-                    if (empty($value)) {
-                        continue;
+                    $transaction_reconcile = $reconcile;
+
+                    if (empty($value) || $value === 'false') {
+                        $transaction_reconcile = 0;
                     }
 
                     $t = explode('_', $key);
 
                     $transaction = Transaction::find($t[1]);
-                    $transaction->reconciled = $reconcile;
+                    $transaction->reconciled = $transaction_reconcile;
                     $transaction->save();
                 }
             }

diff --git a/app/Models/Auth/Role.php b/app/Models/Auth/Role.php
@@ -43,20 +43,29 @@ public function getLineActionsAttribute()
             'icon' => 'edit',
             'url' => route('roles.roles.edit', $this->id),
             'permission' => 'update-roles-roles',
+            'attributes' => [
+                'id' => 'index-line-actions-edit-role-' . $this->id,
+            ],
         ];
 
         $actions[] = [
             'title' => trans('general.duplicate'),
             'icon' => 'file_copy',
             'url' => route('roles.roles.duplicate', $this->id),
             'permission' => 'create-roles-roles',
+            'attributes' => [
+                'id' => 'index-line-actions-duplicate-role-' . $this->id,
+            ],
         ];
 
         $actions[] = [
             'type' => 'delete',
             'icon' => 'delete',
             'route' => 'roles.roles.destroy',
             'permission' => 'delete-roles-roles',
+            'attributes' => [
+                'id' => 'index-line-actions-delete-role-' . $this->id,
+            ],
             'model' => $this,
         ];
 

diff --git a/app/Models/Auth/User.php b/app/Models/Auth/User.php
@@ -326,6 +326,9 @@ public function getLineActionsAttribute()
             'icon' => 'edit',
             'url' => route('users.edit', $this->id),
             'permission' => 'update-auth-users',
+            'attributes' => [
+                'id' => 'index-line-actions-show-user-' . $this->id,
+            ],
         ];
 
         if ($this->hasPendingInvitation()) {
@@ -334,6 +337,9 @@ public function getLineActionsAttribute()
                 'icon' => 'replay',
                 'url' => route('users.invite', $this->id),
                 'permission' => 'update-auth-users',
+                'attributes' => [
+                    'id' => 'index-line-actions-resend-user-' . $this->id,
+                ],
             ];
         }
 
@@ -342,6 +348,9 @@ public function getLineActionsAttribute()
             'icon' => 'delete',
             'route' => 'users.destroy',
             'permission' => 'delete-auth-users',
+            'attributes' => [
+                'id' => 'index-line-actions-delete-user-' . $this->id,
+            ],
             'model' => $this,
         ];
 

diff --git a/app/Models/Banking/Account.php b/app/Models/Banking/Account.php
@@ -170,13 +170,19 @@ public function getLineActionsAttribute()
             'icon' => 'visibility',
             'url' => route('accounts.show', $this->id),
             'permission' => 'read-banking-accounts',
+            'attributes' => [
+                'id' => 'index-line-actions-show-account-' . $this->id,
+            ],
         ];
 
         $actions[] = [
             'title' => trans('general.edit'),
             'icon' => 'edit',
             'url' => route('accounts.edit', $this->id),
             'permission' => 'update-banking-accounts',
+            'attributes' => [
+                'id' => 'index-line-actions-edit-account-' . $this->id,
+            ],
         ];
 
         $actions[] = [
@@ -185,6 +191,9 @@ public function getLineActionsAttribute()
             'route' => 'accounts.destroy',
             'permission' => 'delete-banking-accounts',
             'model' => $this,
+            'attributes' => [
+                'id' => 'index-line-actions-delete-account-' . $this->id,
+            ],
         ];
 
         return $actions;

diff --git a/app/Models/Banking/Reconciliation.php b/app/Models/Banking/Reconciliation.php
@@ -28,6 +28,7 @@ class Reconciliation extends Model
     protected $casts = [
         'closing_balance' => 'double',
         'reconciled' => 'boolean',
+        'transactions' => 'array',
     ];
 
     /**
@@ -56,13 +57,19 @@ public function getLineActionsAttribute()
             'icon' => 'edit',
             'url' => route('reconciliations.edit', $this->id),
             'permission' => 'update-banking-reconciliations',
+            'attributes' => [
+                'id' => 'index-line-actions-edit-reconciliation-' . $this->id,
+            ],
         ];
 
         $actions[] = [
             'type' => 'delete',
             'icon' => 'delete',
             'route' => 'reconciliations.destroy',
             'permission' => 'delete-banking-reconciliations',
+            'attributes' => [
+                'id' => 'index-line-actions-delete-reconciliation-' . $this->id,
+            ],
             'model' => $this,
         ];
 

diff --git a/app/Models/Banking/Transaction.php b/app/Models/Banking/Transaction.php
@@ -455,7 +455,7 @@ public function getLineActionsAttribute()
                 'url' => route($prefix. '.show', $this->id),
                 'permission' => 'read-banking-transactions',
                 'attributes' => [
-                    'id' => 'index-more-actions-show-' . $this->id,
+                    'id' => 'index-line-actions-show-' . $this->type . '-'  . $this->id,
                 ],
             ];
         } catch (\Exception $e) {}
@@ -468,7 +468,7 @@ public function getLineActionsAttribute()
                     'url' => route($prefix. '.edit', $this->id),
                     'permission' => 'update-banking-transactions',
                     'attributes' => [
-                        'id' => 'index-more-actions-edit-' . $this->id,
+                        'id' => 'index-line-actions-edit-' . $this->type . '-'  . $this->id,
                     ],
                 ];
             }
@@ -482,7 +482,7 @@ public function getLineActionsAttribute()
                     'url' => route($prefix. '.duplicate', $this->id),
                     'permission' => 'create-banking-transactions',
                     'attributes' => [
-                        'id' => 'index-more-actions-duplicate-' . $this->id,
+                        'id' => 'index-line-actions-duplicate-' . $this->type . '-'  . $this->id,
                     ],
                 ];
             }
@@ -496,7 +496,7 @@ public function getLineActionsAttribute()
                     'icon' => 'sensors',
                     'permission' => 'create-banking-transactions',
                     'attributes' => [
-                        'id' => 'index-transactions-more-actions-connect-' . $this->id,
+                        'id' => 'index-line-actions-connect-' . $this->type . '-'  . $this->id,
                         '@click' => 'onConnectTransactions(\'' . route('transactions.dial', $this->id) . '\')',
                     ],
                 ];
@@ -516,7 +516,7 @@ public function getLineActionsAttribute()
                 'url' => route($prefix. '.print', $this->id),
                 'permission' => 'read-banking-transactions',
                 'attributes' => [
-                    'id' => 'index-more-actions-print-' . $this->id,
+                    'id' => 'index-line-actions-print-' . $this->type . '-'  . $this->id,
                     'target' => '_blank',
                 ],
             ];
@@ -529,7 +529,7 @@ public function getLineActionsAttribute()
                 'url' => route($prefix. '.pdf', $this->id),
                 'permission' => 'read-banking-transactions',
                 'attributes' => [
-                    'id' => 'index-more-actions-pdf-' . $this->id,
+                    'id' => 'index-line-actions-pdf-' . $this->type . '-'  . $this->id,
                     'target' => '_blank',
                 ],
             ];
@@ -549,7 +549,7 @@ public function getLineActionsAttribute()
                         'url' => route('modals.transactions.share.create', $this->id),
                         'permission' => 'read-banking-transactions',
                         'attributes' => [
-                            'id' => 'index-more-actions-share-' . $this->id,
+                            'id' => 'index-line-actions-share-' . $this->type . '-'  . $this->id,
                             '@click' => 'onShareLink("' . route('modals.transactions.share.create', $this->id) . '")',
                         ],
                     ];
@@ -564,7 +564,7 @@ public function getLineActionsAttribute()
                             'url' => route('modals.transactions.emails.create', $this->id),
                             'permission' => 'read-banking-transactions',
                             'attributes' => [
-                                'id' => 'index-more-actions-send-email-' . $this->id,
+                                'id' => 'index-line-actions-send-email-' . $this->type . '-'  . $this->id,
                                 '@click' => 'onEmail("' . route('modals.transactions.emails.create', $this->id) . '")',
                             ],
                         ];
@@ -583,6 +583,9 @@ public function getLineActionsAttribute()
                             'text' => ! empty($this->recurring) ? 'transactions' : 'recurring_template',
                             'route' => $prefix. '.destroy',
                             'permission' => 'delete-banking-transactions',
+                            'attributes' => [
+                                'id' => 'index-line-actions-delete-' . $this->type . '-'  . $this->id,
+                            ],
                             'model' => $this,
                         ];
                     }
@@ -595,6 +598,9 @@ public function getLineActionsAttribute()
                     'icon' => 'block',
                     'url' => route($prefix. '.end', $this->id),
                     'permission' => 'update-banking-transactions',
+                    'attributes' => [
+                        'id' => 'index-line-actions-end-' . $this->type . '-'  . $this->id,
+                    ],
                 ];
             } catch (\Exception $e) {}
         }

diff --git a/app/Models/Banking/Transfer.php b/app/Models/Banking/Transfer.php
@@ -246,27 +246,39 @@ public function getLineActionsAttribute()
             'icon' => 'visibility',
             'url' => route('transfers.show', $this->id),
             'permission' => 'read-banking-transfers',
+            'attributes' => [
+                'id' => 'index-line-actions-show-transfer-' . $this->id,
+            ],
         ];
 
         $actions[] = [
             'title' => trans('general.edit'),
             'icon' => 'edit',
             'url' => route('transfers.edit', $this->id),
             'permission' => 'update-banking-transfers',
+            'attributes' => [
+                'id' => 'index-line-actions-edit-transfer-' . $this->id,
+            ],
         ];
 
         $actions[] = [
             'title' => trans('general.duplicate'),
             'icon' => 'file_copy',
             'url' => route('transfers.duplicate', $this->id),
             'permission' => 'update-banking-transfers',
+            'attributes' => [
+                'id' => 'index-line-actions-duplicate-transfer-' . $this->id,
+            ],
         ];
 
         $actions[] = [
             'type' => 'delete',
             'icon' => 'delete',
             'route' => 'transfers.destroy',
             'permission' => 'delete-banking-transfers',
+            'attributes' => [
+                'id' => 'index-line-actions-delete-transfer-' . $this->id,
+            ],
             'model' => $this,
         ];
 

diff --git a/app/Models/Common/Company.php b/app/Models/Common/Company.php
@@ -70,7 +70,7 @@ public static function boot()
     {
         parent::boot();
 
-        try { 
+        try {
             // TODO will optimize..
             static::retrieved(function($model) {
                 $model->setCommonSettingsAsAttributes();
@@ -550,6 +550,9 @@ public function getLineActionsAttribute()
                 'icon' => 'settings_ethernet',
                 'url' => route('companies.switch', $this->id),
                 'permission' => 'read-common-companies',
+                'attributes' => [
+                    'id' => 'index-line-actions-switch-company-' . $this->id,
+                ],
             ];
         }
 
@@ -558,13 +561,19 @@ public function getLineActionsAttribute()
             'icon' => 'edit',
             'url' => route('companies.edit', $this->id),
             'permission' => 'update-common-companies',
+            'attributes' => [
+                'id' => 'index-line-actions-edit-company-' . $this->id,
+            ],
         ];
 
         $actions[] = [
             'type' => 'delete',
             'icon' => 'delete',
             'route' => 'companies.destroy',
             'permission' => 'delete-common-companies',
+            'attributes' => [
+                'id' => 'index-line-actions-delete-company-' . $this->id,
+            ],
             'model' => $this,
         ];