shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed transactions from portal

Browse Source
This commit is contained in:
denisdulici
2019-11-30 02:08:25 +03:00
parent 3d48bf4345
commit 7b13b79c27
10 changed files with 23 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Portal/Payments.php
View File

@ -3,9 +3,7 @@
namespace App\Http\Controllers\portal;
use App\Abstracts\Http\Controller;
use App\Models\Banking\Account;
use App\Models\Banking\Transaction;
use App\Models\Setting\Category;
use App\Utilities\Modules;
class Payments extends Controller
@ -18,17 +16,11 @@ class Payments extends Controller
*/
public function index()
{
$payments = Transaction::type('income')->with(['account', 'category'])->where('contact_id', '=', user()->contact->id)->paginate();
$payments = Transaction::type('income')->where('contact_id', '=', user()->contact->id)->paginate();
$payment_methods = Modules::getPaymentMethods('all');
$categories = collect(Category::type('income')->enabled()->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), '');
$accounts = collect(Account::enabled()->pluck('name', 'id'))
->prepend(trans('general.all_type', ['type' => trans_choice('general.accounts', 2)]), '');
return view('portal.payments.index', compact('payments', 'payment_methods', 'categories', 'accounts'));
return view('portal.payments.index', compact('payments', 'payment_methods'));
}
/**

23
app/Http/Controllers/Portal/Transactions.php
View File

@ -1,23 +0,0 @@
<?php
namespace App\Http\Controllers\Portal;
use App\Abstracts\Http\Controller;
use App\Models\Banking\Transaction;
use Auth;
class Transactions extends Controller
{
/**
* Display a listing of the resource.
*
* @return Response
*/
public function index()
{
$transactions = Transaction::type('income')->where('contact_id', user()->contact->id)->get();
return view('portal.transactions.index', compact('transactions'));
}
}

7
app/Listeners/Menu/AddPortalItems.php
View File

@ -16,13 +16,10 @@ class AddPortalItems
{
$menu = $event->menu;
// Dashboard
$menu->route('portal.dashboard', trans_choice('general.dashboards', 1), [], 1, ['icon' => 'fa fa-tachometer-alt']);
// Invoices
$menu->route('portal.invoices.index', trans_choice('general.invoices', 2), [], 2, ['icon' => 'fa fa-money-bill']);
$menu->route('portal.invoices.index', trans_choice('general.invoices', 2), [], 2, ['icon' => 'fa fa-file-signature']);
// Payments
$menu->route('portal.payments.index', trans_choice('general.payments', 2), [], 3, ['icon' => 'fa fa-shopping-cart']);
$menu->route('portal.payments.index', trans_choice('general.payments', 2), [], 3, ['icon' => 'fa fa-money-bill']);
}
}

3
app/Listeners/Update/V20/Version200.php
View File

@ -649,7 +649,6 @@ class Version200 extends Listener
'client-portal' => 'r',
'portal-invoices' => 'r,u',
'portal-payments' => 'r,u',
'portal-transactions' => 'r',
'portal-profile' => 'r,u',
],
]);
@ -837,6 +836,8 @@ class Version200 extends Listener
'resources/assets/js/components/Example.vue',
'resources/assets/sass/_variables.scss',
'resources/assets/sass/app.scss',
'resources/views/expenses/bills/bill.blade.php',
'resources/views/incomes/invoices/invoice.blade.php',
'resources/views/layouts/customer.blade.php',
'resources/views/layouts/link.blade.php',
'resources/views/modules/token/create.blade.php',