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

akaunting 3.0 (the last dance)

Browse Source
This commit is contained in:
Burak Civan
2022-06-01 10:15:55 +03:00
parent cead09f6d4
commit d9c0764572
3812 changed files with 126831 additions and 102949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Http/Controllers/Purchases/Bills.php
View File

@ -13,9 +13,7 @@ use App\Jobs\Document\DeleteDocument;
use App\Jobs\Document\DuplicateDocument;
use App\Jobs\Document\UpdateDocument;
use App\Models\Document\Document;
use App\Models\Setting\Currency;
use App\Traits\Documents;
use File;
class Bills extends Controller
{
@ -283,30 +281,6 @@ class Bills extends Controller
return $pdf->download($file_name);
}
/**
* Mark the bill as paid.
*
* @param Document $bill
*
* @return Response
*/
public function markPaid(Document $bill)
{
try {
$this->dispatch(new CreateBankingDocumentTransaction($bill, ['type' => 'expense']));
$message = trans('documents.messages.marked_paid', ['type' => trans_choice('general.bills', 1)]);
flash($message)->success();
} catch(\Exception $e) {
$message = $e->getMessage();
flash($message)->error()->important();
}
return redirect()->back();
}
protected function prepareBill(Document $bill)
{
$paid = 0;

326
app/Http/Controllers/Purchases/Payments.php
View File

@ -1,326 +0,0 @@
<?php
namespace App\Http\Controllers\Purchases;
use App\Abstracts\Http\Controller;
use App\Exports\Purchases\Payments as Export;
use App\Http\Requests\Banking\Transaction as Request;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Imports\Purchases\Payments as Import;
use App\Jobs\Banking\CreateTransaction;
use App\Jobs\Banking\DeleteTransaction;
use App\Jobs\Banking\UpdateTransaction;
use App\Models\Banking\Account;
use App\Models\Banking\Transaction;
use App\Models\Common\Contact;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Traits\Currencies;
use App\Traits\DateTime;
use App\Traits\Transactions;
use App\Utilities\Modules;
class Payments extends Controller
{
use Currencies, DateTime, Transactions;
/**
* Display a listing of the resource.
*
* @return Response
*/
public function index()
{
$payments = Transaction::with('account', 'bill', 'category', 'contact')->expense()->isNotTransfer()->collect(['paid_at'=> 'desc']);
return $this->response('purchases.payments.index', compact('payments'));
}
/**
* Show the form for viewing the specified resource.
*
* @return Response
*/
public function show(Transaction $payment)
{
return view('purchases.payments.show', compact('payment'));
}
/**
* Show the form for creating a new resource.
*
* @return Response
*/
public function create()
{
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$account_currency_code = Account::where('id', setting('default.account'))->pluck('currency_code')->first();
$currency = Currency::where('code', $account_currency_code)->first();
$vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
$file_type_mimes = explode(',', config('filesystems.mimes'));
$file_types = [];
foreach ($file_type_mimes as $mime) {
$file_types[] = '.' . $mime;
}
$file_types = implode(',', $file_types);
return view('purchases.payments.create', compact('accounts', 'currencies', 'account_currency_code', 'currency', 'vendors', 'categories', 'payment_methods', 'file_types'));
}
/**
* Store a newly created resource in storage.
*
* @param Request $request
*
* @return Response
*/
public function store(Request $request)
{
$response = $this->ajaxDispatch(new CreateTransaction($request));
if ($response['success']) {
$response['redirect'] = route('payments.show', $response['data']->id);
$message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('payments.create');
$message = $response['message'];
flash($message)->error()->important();
}
return response()->json($response);
}
/**
* Duplicate the specified resource.
*
* @param Transaction $payment
*
* @return Response
*/
public function duplicate(Transaction $payment)
{
$clone = $payment->duplicate();
$message = trans('messages.success.duplicated', ['type' => trans_choice('general.payments', 1)]);
flash($message)->success();
return redirect()->route('payments.edit', $clone->id);
}
/**
* Import the specified resource.
*
* @param ImportRequest $request
*
* @return Response
*/
public function import(ImportRequest $request)
{
$response = $this->importExcel(new Import, $request, trans_choice('general.payments', 2));
if ($response['success']) {
$response['redirect'] = route('payments.index');
flash($response['message'])->success();
} else {
$response['redirect'] = route('import.create', ['purchases', 'payments']);
flash($response['message'])->error()->important();
}
return response()->json($response);
}
/**
* Show the form for editing the specified resource.
*
* @param Transaction $payment
*
* @return Response
*/
public function edit(Transaction $payment)
{
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$currency = Currency::where('code', $payment->currency_code)->first();
$vendors = Contact::vendor()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
if ($payment->contact && !$vendors->has($payment->contact_id)) {
$vendors->put($payment->contact->id, $payment->contact->name);
}
$categories = Category::expense()->enabled()->orderBy('name')->take(setting('default.select_limit'))->pluck('name', 'id');
if ($payment->category && !$categories->has($payment->category_id)) {
$categories->put($payment->category->id, $payment->category->name);
}
$payment_methods = Modules::getPaymentMethods();
$date_format = $this->getCompanyDateFormat();
$file_type_mimes = explode(',', config('filesystems.mimes'));
$file_types = [];
foreach ($file_type_mimes as $mime) {
$file_types[] = '.' . $mime;
}
$file_types = implode(',', $file_types);
return view('purchases.payments.edit', compact('payment', 'accounts', 'currencies', 'currency', 'vendors', 'categories', 'payment_methods', 'date_format', 'file_types'));
}
/**
* Update the specified resource in storage.
*
* @param Transaction $payment
* @param Request $request
*
* @return Response
*/
public function update(Transaction $payment, Request $request)
{
$response = $this->ajaxDispatch(new UpdateTransaction($payment, $request));
if ($response['success']) {
$response['redirect'] = route('payments.show', $payment->id);
$message = trans('messages.success.updated', ['type' => trans_choice('general.payments', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('payments.edit', $payment->id);
$message = $response['message'];
flash($message)->error()->important();
}
return response()->json($response);
}
/**
* Remove the specified resource from storage.
*
* @param Transaction $payment
*
* @return Response
*/
public function destroy(Transaction $payment)
{
$response = $this->ajaxDispatch(new DeleteTransaction($payment));
$response['redirect'] = route('payments.index');
if ($response['success']) {
$message = trans('messages.success.deleted', ['type' => trans_choice('general.payments', 1)]);
flash($message)->success();
} else {
$message = $response['message'];
flash($message)->error()->important();
}
return response()->json($response);
}
/**
* Export the specified resource.
*
* @return Response
*/
public function export()
{
return $this->exportExcel(new Export, trans_choice('general.payments', 2));
}
/**
* Download the PDF file of payment.
*
* @param Transaction $payment
*
* @return Response
*/
public function emailPayment(Transaction $payment)
{
if (empty($payment->contact->email)) {
return redirect()->back();
}
// Notify the customer
$payment->contact->notify(new Notification($payment, 'payment_new_customer', true));
event(new \App\Events\Banking\TransactionSent($payment));
flash(trans('documents.messages.email_sent', ['type' => trans_choice('general.payments', 1)]))->success();
return redirect()->back();
}
/**
* Print the payment.
*
* @param Transaction $payment
*
* @return Response
*/
public function printPayment(Transaction $payment)
{
event(new \App\Events\Banking\TransactionPrinting($payment));
$view = view($payment->template_path, compact('payment'));
return mb_convert_encoding($view, 'HTML-ENTITIES', 'UTF-8');
}
/**
* Download the PDF file of payment.
*
* @param Transaction $payment
*
* @return Response
*/
public function pdfPayment(Transaction $payment)
{
event(new \App\Events\Banking\TransactionPrinting($payment));
$currency_style = true;
$view = view($payment->template_path, compact('payment', 'currency_style'))->render();
$html = mb_convert_encoding($view, 'HTML-ENTITIES', 'UTF-8');
$pdf = app('dompdf.wrapper');
$pdf->loadHTML($html);
//$pdf->setPaper('A4', 'portrait');
$file_name = $this->getTransactionFileName($payment);
return $pdf->download($file_name);
}
}

189
app/Http/Controllers/Purchases/RecurringBills.php Normal file
View File

@ -0,0 +1,189 @@
<?php
namespace App\Http\Controllers\Purchases;
use App\Abstracts\Http\Controller;
use App\Http\Requests\Document\Document as Request;
use App\Jobs\Document\CreateDocument;
use App\Jobs\Document\DuplicateDocument;
use App\Jobs\Document\UpdateDocument;
use App\Models\Common\Recurring;
use App\Models\Document\Document;
use App\Traits\Documents;
class RecurringBills extends Controller
{
use Documents;
/**
* @var string
*/
public $type = Document::BILL_RECURRING_TYPE;
/**
* Instantiate a new controller instance.
*/
public function __construct()
{
// Add CRUD permission check
$this->middleware('permission:create-purchases-bills')->only('create', 'store', 'duplicate', 'import');
$this->middleware('permission:read-purchases-bills')->only('index', 'show', 'edit', 'export');
$this->middleware('permission:update-purchases-bills')->only('update', 'enable', 'disable');
$this->middleware('permission:delete-purchases-bills')->only('destroy');
}
/**
* Display a listing of the resource.
*
* @return Response
*/
public function index()
{
$bills = Document::with('contact', 'transactions', 'recurring')->billRecurring()->collect(['issued_at' => 'desc']);
return $this->response('purchases.recurring_bills.index', compact('bills'));
}
/**
* Show the form for viewing the specified resource.
*
* @param Document $recurring_bill
*
* @return Response
*/
public function show(Document $recurring_bill)
{
$recurring_bill->load(['category', 'recurring', 'children']);
return view('purchases.recurring_bills.show', compact('recurring_bill'));
}
/**
* Show the form for creating a new resource.
*
* @return Response
*/
public function create()
{
return view('purchases.recurring_bills.create');
}
/**
* Store a newly created resource in storage.
*
* @param Request $request
*
* @return Response
*/
public function store(Request $request)
{
$response = $this->ajaxDispatch(new CreateDocument($request->merge(['issued_at' => $request->get('recurring_started_at')])));
if ($response['success']) {
$response['redirect'] = route('recurring-bills.show', $response['data']->id);
$message = trans('messages.success.added', ['type' => trans_choice('general.recurring_bills', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('recurring-bills.create');
$message = $response['message'];
flash($message)->error()->important();
}
return response()->json($response);
}
/**
* Duplicate the specified resource.
*
* @param Document $recurring_bill
*
* @return Response
*/
public function duplicate(Document $recurring_bill)
{
$clone = $this->dispatch(new DuplicateDocument($recurring_bill));
$message = trans('messages.success.duplicated', ['type' => trans_choice('general.recurring_bills', 1)]);
flash($message)->success();
return redirect()->route('recurring-bills.edit', $clone->id);
}
/**
* Show the form for editing the specified resource.
*
* @param Document $recurring_bill
*
* @return Response
*/
public function edit(Document $recurring_bill)
{
return view('purchases.recurring_bills.edit', compact('recurring_bill'));
}
/**
* Update the specified resource in storage.
*
* @param Document $recurring_bill
* @param Request $request
*
* @return Response
*/
public function update(Document $recurring_bill, Request $request)
{
$response = $this->ajaxDispatch(new UpdateDocument($recurring_bill, $request->merge(['issued_at' => $request->get('recurring_started_at')])));
if ($response['success']) {
$response['redirect'] = route('recurring-bills.show', $response['data']->id);
$message = trans('messages.success.updated', ['type' => trans_choice('general.recurring_bills', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('recurring-bills.edit', $recurring_bill->id);
$message = $response['message'];
flash($message)->error()->important();
}
return response()->json($response);
}
/**
* End recurring template.
*
* @return Response
*/
public function end(Document $recurring_bill)
{
$response = $this->ajaxDispatch(new UpdateDocument($recurring_bill, [
'recurring_frequency' => $recurring_bill->recurring->frequency,
'recurring_interval' => $recurring_bill->recurring->interval,
'recurring_started_at' => $recurring_bill->recurring->started_at,
'recurring_limit' => $recurring_bill->recurring->limit,
'recurring_limit_count' => $recurring_bill->recurring->limit_count,
'recurring_limit_date' => $recurring_bill->recurring->limit_date,
'created_from' => $recurring_bill->created_from,
'created_by' => $recurring_bill->created_by,
'recurring_status' => Recurring::END_STATUS,
]));
if ($response['success']) {
$message = trans('messages.success.ended', ['type' => trans_choice('general.recurring_bills', 1)]);
flash($message)->success();
} else {
$message = $response['message'];
flash($message)->error()->important();
}
return redirect()->route('recurring-bills.index');
}
}

72
app/Http/Controllers/Purchases/Vendors.php
View File

@ -9,11 +9,11 @@ use App\Http\Requests\Common\Import as ImportRequest;
use App\Imports\Purchases\Vendors as Import;
use App\Jobs\Common\CreateContact;
use App\Jobs\Common\DeleteContact;
use App\Jobs\Common\DuplicateContact;
use App\Jobs\Common\UpdateContact;
use App\Models\Banking\Transaction;
use App\Models\Common\Contact;
use App\Models\Document\Document;
use App\Models\Setting\Currency;
use App\Traits\Contacts;
use App\Utilities\Date;
@ -21,6 +21,11 @@ class Vendors extends Controller
{
use Contacts;
/**
* @var string
*/
public $type = Contact::VENDOR_TYPE;
/**
* Display a listing of the resource.
*
@ -42,56 +47,7 @@ class Vendors extends Controller
*/
public function show(Contact $vendor)
{
$amounts = [
'paid' => 0,
'open' => 0,
'overdue' => 0,
];
$counts = [];
// Handle bills
$bills = Document::bill()->with('transactions')->where('contact_id', $vendor->id)->get();
$counts['bills'] = $bills->count();
$today = Date::today()->toDateString();
foreach ($bills as $item) {
// Already in transactions
if ($item->status == 'paid' || $item->status == 'cancelled') {
continue;
}
$transactions = 0;
foreach ($item->transactions as $transaction) {
$transactions += $transaction->getAmountConvertedToDefault();
}
// Check if it's open or overdue invoice
if ($item->due_at > $today) {
$amounts['open'] += $item->getAmountConvertedToDefault() - $transactions;
} else {
$amounts['overdue'] += $item->getAmountConvertedToDefault() - $transactions;
}
}
// Handle payments
$transactions = Transaction::with('account', 'category')->where('contact_id', $vendor->id)->expense()->get();
$counts['transactions'] = $transactions->count();
// Prepare data
$transactions->each(function ($item) use (&$amounts) {
$amounts['paid'] += $item->getAmountConvertedToDefault();
});
$limit = (int) request('limit', setting('default.list_limit', '25'));
$transactions = $this->paginate($transactions->sortByDesc('paid_at'), $limit);
$bills = $this->paginate($bills->sortByDesc('issued_at'), $limit);
return view('purchases.vendors.show', compact('vendor', 'counts', 'amounts', 'transactions', 'bills'));
return view('purchases.vendors.show', compact('vendor'));
}
/**
@ -101,9 +57,7 @@ class Vendors extends Controller
*/
public function create()
{
$currencies = Currency::enabled()->pluck('name', 'code');
return view('purchases.vendors.create', compact('currencies'));
return view('purchases.vendors.create');
}
/**
@ -143,7 +97,7 @@ class Vendors extends Controller
*/
public function duplicate(Contact $vendor)
{
$clone = $vendor->duplicate();
$clone = $this->dispatch(new DuplicateContact($vendor));
$message = trans('messages.success.duplicated', ['type' => trans_choice('general.vendors', 1)]);
@ -185,9 +139,7 @@ class Vendors extends Controller
*/
public function edit(Contact $vendor)
{
$currencies = Currency::enabled()->pluck('name', 'code');
return view('purchases.vendors.edit', compact('vendor', 'currencies'));
return view('purchases.vendors.edit', compact('vendor'));
}
/**
@ -298,10 +250,10 @@ class Vendors extends Controller
return redirect()->route('bills.create')->withInput($data);
}
public function createPayment(Contact $vendor)
public function createExpense(Contact $vendor)
{
$data['contact'] = $vendor;
return redirect()->route('payments.create')->withInput($data);
return redirect()->route('transactions.create', ['type' => 'expense'])->withInput($data);
}
}