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

v2 first commit

Browse Source
This commit is contained in:
denisdulici
2019-11-16 10:21:14 +03:00
parent 5b23e9c2c4
commit 6d50fa8442
3075 changed files with 3451681 additions and 65594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

385
app/Http/Controllers/Expenses/Bills.php
View File

@ -2,44 +2,33 @@
namespace App\Http\Controllers\Expenses;
use App\Events\BillCreated;
//use App\Events\BillPrinting;
use App\Events\BillUpdated;
use App\Http\Controllers\Controller;
use App\Abstracts\Http\Controller;
use App\Exports\Expenses\Bills as Export;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Http\Requests\Expense\Bill as Request;
use App\Http\Requests\Expense\BillAddItem as ItemRequest;
use App\Http\Requests\Expense\BillPayment as PaymentRequest;
use App\Imports\Expenses\Bills as Import;
use App\Jobs\Expense\CreateBill;
use App\Jobs\Expense\DuplicateBill;
use App\Jobs\Expense\UpdateBill;
use App\Jobs\Expense\CreateBillPayment;
use App\Models\Banking\Account;
use App\Models\Common\Media;
use App\Models\Expense\BillStatus;
use App\Models\Expense\Vendor;
use App\Models\Expense\Bill;
use App\Models\Expense\BillItem;
use App\Models\Expense\BillItemTax;
use App\Models\Expense\BillTotal;
use App\Models\Expense\BillHistory;
use App\Models\Expense\BillPayment;
use App\Models\Common\Contact;
use App\Models\Common\Item;
use App\Models\Expense\BillStatus;
use App\Models\Expense\Bill;
use App\Models\Expense\BillHistory;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Models\Setting\Tax;
use App\Traits\Contacts;
use App\Traits\Currencies;
use App\Traits\DateTime;
use App\Traits\Uploads;
use App\Utilities\Import;
use App\Utilities\ImportFile;
use App\Utilities\Modules;
use Date;
use File;
use Image;
use Storage;
class Bills extends Controller
{
use DateTime, Currencies, Uploads;
use Contacts, Currencies, DateTime, Uploads;
/**
* Display a listing of the resource.
@ -48,13 +37,13 @@ class Bills extends Controller
*/
public function index()
{
$bills = Bill::with(['vendor', 'status', 'items', 'payments', 'histories'])->collect(['billed_at'=> 'desc']);
$bills = Bill::with(['contact', 'items', 'histories', 'status', 'transactions'])->collect(['billed_at'=> 'desc']);
$vendors = collect(Vendor::enabled()->orderBy('name')->pluck('name', 'id'));
$vendors = Contact::type($this->getVendorTypes())->enabled()->orderBy('name')->pluck('name', 'id');
$categories = collect(Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id'));
$categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
$statuses = collect(BillStatus::get()->each(function($item) {
$statuses = collect(BillStatus::get()->each(function ($item) {
$item->name = trans('bills.status.' . $item->code);
return $item;
})->pluck('name', 'code'));
@ -75,15 +64,19 @@ class Bills extends Controller
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first();
$currency = Currency::where('code', $invoice->currency_code)->first();
$vendors = Vendor::enabled()->orderBy('name')->pluck('name', 'id');
$account_currency_code = Account::where('id', setting('default.account'))->pluck('currency_code')->first();
$categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id');
$vendors = Contact::type($this->getVendorTypes())->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
return view('expenses.bills.show', compact('bill', 'accounts', 'currencies', 'account_currency_code', 'vendors', 'categories', 'payment_methods'));
$date_format = $this->getCompanyDateFormat();
return view('expenses.bills.show', compact('bill', 'accounts', 'currencies', 'currency', 'account_currency_code', 'vendors', 'categories', 'payment_methods', 'date_format'));
}
/**
@ -93,17 +86,17 @@ class Bills extends Controller
*/
public function create()
{
$vendors = Vendor::enabled()->orderBy('name')->pluck('name', 'id');
$vendors = Contact::type($this->getVendorTypes())->enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$currency = Currency::where('code', '=', setting('general.default_currency'))->first();
$currency = Currency::where('code', setting('default.currency'))->first();
$items = Item::enabled()->orderBy('name')->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
$categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id');
$categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
return view('expenses.bills.create', compact('vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
}
@ -117,83 +110,65 @@ class Bills extends Controller
*/
public function store(Request $request)
{
$bill = dispatch(new CreateBill($request));
$response = $this->ajaxDispatch(new CreateBill($request));
$message = trans('messages.success.added', ['type' => trans_choice('general.bills', 1)]);
if ($response['success']) {
$response['redirect'] = route('bills.index');
flash($message)->success();
$message = trans('messages.success.added', ['type' => trans_choice('general.bills', 1)]);
return redirect('expenses/bills/' . $bill->id);
flash($message)->success();
} else {
$response['redirect'] = route('bills.create');
$message = $response['message'];
flash($message)->error();
}
return response()->json($response);
}
/**
* Duplicate the specified resource.
*
* @param Bill $bill
* @param Bill $bill
*
* @return Response
*/
public function duplicate(Bill $bill)
{
$clone = $bill->duplicate();
// Add bill history
BillHistory::create([
'company_id' => session('company_id'),
'bill_id' => $clone->id,
'status_code' => 'draft',
'notify' => 0,
'description' => trans('messages.success.added', ['type' => $clone->bill_number]),
]);
$clone = $this->dispatch(new DuplicateBill($bill));
$message = trans('messages.success.duplicated', ['type' => trans_choice('general.bills', 1)]);
flash($message)->success();
return redirect('expenses/bills/' . $clone->id . '/edit');
return redirect()->route('bills.edit', $clone->id);
}
/**
* Import the specified resource.
*
* @param ImportFile $import
* @param ImportRequest $request
*
* @return Response
*/
public function import(ImportFile $import)
public function import(ImportRequest $request)
{
$success = true;
$allowed_sheets = ['bills', 'bill_items', 'bill_item_taxes', 'bill_histories', 'bill_payments', 'bill_totals'];
// Loop through all sheets
$import->each(function ($sheet) use (&$success, $allowed_sheets) {
$sheet_title = $sheet->getTitle();
if (!in_array($sheet_title, $allowed_sheets)) {
$message = trans('messages.error.import_sheet');
flash($message)->error()->important();
return false;
}
$slug = 'Expense\\' . str_singular(studly_case($sheet_title));
if (!$success = Import::createFromSheet($sheet, $slug)) {
return false;
}
});
\Excel::import(new Import(), $request->file('import'));
if (!$success) {
return redirect('common/import/expenses/bills');
return redirect()->route('import.create', ['expenses', 'bills']);
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.bills', 2)]);
flash($message)->success();
return redirect('expenses/bills');
return redirect()->route('bills.index');
}
/**
@ -205,17 +180,17 @@ class Bills extends Controller
*/
public function edit(Bill $bill)
{
$vendors = Vendor::enabled()->orderBy('name')->pluck('name', 'id');
$vendors = Contact::type($this->getVendorTypes())->enabled()->orderBy('name')->pluck('name', 'id');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code');
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$currency = Currency::where('code', '=', $bill->currency_code)->first();
$currency = Currency::where('code', $bill->currency_code)->first();
$items = Item::enabled()->orderBy('name')->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
$categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id');
$categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
return view('expenses.bills.edit', compact('bill', 'vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
}
@ -223,51 +198,56 @@ class Bills extends Controller
/**
* Update the specified resource in storage.
*
* @param Bill $bill
* @param Request $request
* @param Bill $bill
* @param Request $request
*
* @return Response
*/
public function update(Bill $bill, Request $request)
{
$bill = dispatch(new UpdateBill($bill, $request));
$response = $this->ajaxDispatch(new UpdateBill($bill, $request));
$message = trans('messages.success.updated', ['type' => trans_choice('general.bills', 1)]);
if ($response['success']) {
$response['redirect'] = route('bills.index');
flash($message)->success();
$message = trans('messages.success.updated', ['type' => trans_choice('general.bills', 1)]);
return redirect('expenses/bills/' . $bill->id);
flash($message)->success();
} else {
$response['redirect'] = route('bills.edit', $bill->id);
$message = $response['message'];
flash($message)->error();
}
return response()->json($response);
}
/**
* Remove the specified resource from storage.
*
* @param Bill $bill
* @param $id
*
* @return Response
*/
public function destroy(Bill $bill)
{
// Decrease stock
$bill->items()->each(function ($bill_item) {
$item = Item::find($bill_item->item_id);
$response = $this->ajaxDispatch(new DeleteBill($bill));
if (empty($item)) {
return;
}
$response['redirect'] = route('bills.index');
$item->quantity += (double) $bill_item->quantity;
$item->save();
});
if ($response['success']) {
$message = trans('messages.success.deleted', ['type' => trans_choice('general.bills', 1)]);
$this->deleteRelationships($bill, ['items', 'item_taxes', 'histories', 'payments', 'recurring', 'totals']);
$bill->delete();
flash($message)->success();
} else {
$message = $response['message'];
$message = trans('messages.success.deleted', ['type' => trans_choice('general.bills', 1)]);
flash($message)->error();
}
flash($message)->success();
return redirect('expenses/bills');
return response()->json($response);
}
/**
@ -277,37 +257,7 @@ class Bills extends Controller
*/
public function export()
{
\Excel::create('bills', function ($excel) {
$bills = Bill::with(['items', 'item_taxes', 'histories', 'payments', 'totals'])->filter(request()->input())->get();
$excel->sheet('bills', function ($sheet) use ($bills) {
$sheet->fromModel($bills->makeHidden([
'company_id', 'parent_id', 'created_at', 'updated_at', 'deleted_at', 'attachment', 'discount', 'items', 'item_taxes', 'histories', 'payments', 'totals', 'media', 'paid', 'amount_without_tax'
]));
});
$tables = ['items', 'item_taxes', 'histories', 'payments', 'totals'];
foreach ($tables as $table) {
$excel->sheet('bill_' . $table, function ($sheet) use ($bills, $table) {
$hidden_fields = ['id', 'company_id', 'created_at', 'updated_at', 'deleted_at', 'title'];
$i = 1;
foreach ($bills as $bill) {
$model = $bill->$table->makeHidden($hidden_fields);
if ($i == 1) {
$sheet->fromModel($model, null, 'A1', false);
} else {
// Don't put multiple heading columns
$sheet->fromModel($model, null, 'A1', false, false);
}
$i++;
}
});
}
})->download('xlsx');
return \Excel::download(new Export(), trans_choice('general.bills', 2) . '.xlsx');
}
/**
@ -328,10 +278,12 @@ class Bills extends Controller
'bill_id' => $bill->id,
'status_code' => 'received',
'notify' => 0,
'description' => trans('bills.mark_recevied'),
'description' => trans('bills.mark_received'),
]);
flash(trans('bills.messages.received'))->success();
$message = trans('bills.messages.received');
flash($message)->success();
return redirect()->back();
}
@ -366,7 +318,7 @@ class Bills extends Controller
$view = view($bill->template_path, compact('bill', 'currency_style'))->render();
$html = mb_convert_encoding($view, 'HTML-ENTITIES');
$pdf = \App::make('dompdf.wrapper');
$pdf = app('dompdf.wrapper');
$pdf->loadHTML($html);
$file_name = 'bill_' . time() . '.pdf';
@ -374,165 +326,6 @@ class Bills extends Controller
return $pdf->download($file_name);
}
/**
* Add payment to the bill.
*
* @param PaymentRequest $request
*
* @return Response
*/
public function payment(PaymentRequest $request)
{
// Get currency object
$currencies = Currency::enabled()->pluck('rate', 'code')->toArray();
$currency = Currency::where('code', $request['currency_code'])->first();
$request['currency_code'] = $currency->code;
$request['currency_rate'] = $currency->rate;
$bill = Bill::find($request['bill_id']);
$total_amount = $bill->amount;
$default_amount = (double) $request['amount'];
if ($bill->currency_code == $request['currency_code']) {
$amount = $default_amount;
} else {
$default_amount_model = new BillPayment();
$default_amount_model->default_currency_code = $bill->currency_code;
$default_amount_model->amount = $default_amount;
$default_amount_model->currency_code = $request['currency_code'];
$default_amount_model->currency_rate = $currencies[$request['currency_code']];
$default_amount = (double) $default_amount_model->getDivideConvertedAmount();
$convert_amount = new BillPayment();
$convert_amount->default_currency_code = $request['currency_code'];
$convert_amount->amount = $default_amount;
$convert_amount->currency_code = $bill->currency_code;
$convert_amount->currency_rate = $currencies[$bill->currency_code];
$amount = (double) $convert_amount->getDynamicConvertedAmount();
}
if ($bill->payments()->count()) {
$total_amount -= $bill->payments()->paid();
}
// For amount cover integer
$multiplier = 1;
for ($i = 0; $i < $currency->precision; $i++) {
$multiplier *= 10;
}
$amount_check = (int) ($amount * $multiplier);
$total_amount_check = (int) (round($total_amount, $currency->precision) * $multiplier);
if ($amount_check > $total_amount_check) {
$error_amount = $total_amount;
if ($bill->currency_code != $request['currency_code']) {
$error_amount_model = new BillPayment();
$error_amount_model->default_currency_code = $request['currency_code'];
$error_amount_model->amount = $error_amount;
$error_amount_model->currency_code = $bill->currency_code;
$error_amount_model->currency_rate = $currencies[$bill->currency_code];
$error_amount = (double) $error_amount_model->getDivideConvertedAmount();
$convert_amount = new BillPayment();
$convert_amount->default_currency_code = $bill->currency_code;
$convert_amount->amount = $error_amount;
$convert_amount->currency_code = $request['currency_code'];
$convert_amount->currency_rate = $currencies[$request['currency_code']];
$error_amount = (double) $convert_amount->getDynamicConvertedAmount();
}
$message = trans('messages.error.over_payment', ['amount' => money($error_amount, $request['currency_code'], true)]);
return response()->json([
'success' => false,
'error' => true,
'data' => [
'amount' => $error_amount
],
'message' => $message,
'html' => 'null',
]);
} elseif ($amount_check == $total_amount_check) {
$bill->bill_status_code = 'paid';
} else {
$bill->bill_status_code = 'partial';
}
$bill->save();
$bill_payment = dispatch(new CreateBillPayment($request, $bill));
// Upload attachment
if ($request->file('attachment')) {
$media = $this->getMedia($request->file('attachment'), 'bills');
$bill_payment->attachMedia($media, 'attachment');
}
$message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]);
return response()->json([
'success' => true,
'error' => false,
'message' => $message,
]);
}
/**
* Remove the specified resource from storage.
*
* @param BillPayment $payment
*
* @return Response
*/
public function paymentDestroy(BillPayment $payment)
{
$bill = Bill::find($payment->bill_id);
if ($bill->payments()->count() > 1) {
$bill->bill_status_code = 'partial';
} else {
$bill->bill_status_code = 'received';
}
$bill->save();
$desc_amount = money((float) $payment->amount, (string) $payment->currency_code, true)->format();
$description = $desc_amount . ' ' . trans_choice('general.payments', 1);
// Add bill history
BillHistory::create([
'company_id' => $bill->company_id,
'bill_id' => $bill->id,
'status_code' => $bill->bill_status_code,
'notify' => 0,
'description' => trans('messages.success.deleted', ['type' => $description]),
]);
$payment->delete();
$message = trans('messages.success.deleted', ['type' => trans_choice('general.bills', 1)]);
flash($message)->success();
return redirect()->back();
}
public function addItem(ItemRequest $request)
{
$item_row = $request['item_row'];
@ -543,7 +336,7 @@ class Bills extends Controller
$currency = Currency::where('code', '=', $currency_code)->first();
if (empty($currency)) {
$currency = Currency::where('code', '=', setting('general.default_currency'))->first();
$currency = Currency::where('code', '=', setting('default.currency'))->first();
}
if ($currency) {
@ -574,7 +367,7 @@ class Bills extends Controller
if ($bill->currency_code != $item->currency_code) {
$item->default_currency_code = $bill->currency_code;
$amount = $item->getDynamicConvertedAmount();
$amount = $item->getAmountConvertedFromCustomDefault();
}
$paid += $amount;

160
app/Http/Controllers/Expenses/Payments.php
View File

@ -2,21 +2,27 @@
namespace App\Http\Controllers\Expenses;
use App\Http\Controllers\Controller;
use App\Http\Requests\Expense\Payment as Request;
use App\Abstracts\Http\Controller;
use App\Exports\Expenses\Payments as Export;
use App\Http\Requests\Banking\Transaction as Request;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Imports\Expenses\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\Expense\Payment;
use App\Models\Expense\Vendor;
use App\Models\Banking\Transaction;
use App\Models\Common\Contact;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Traits\Uploads;
use App\Utilities\Import;
use App\Utilities\ImportFile;
use App\Traits\Contacts;
use App\Traits\Currencies;
use App\Traits\DateTime;
use App\Utilities\Modules;
class Payments extends Controller
{
use Uploads;
use Contacts, Currencies, DateTime;
/**
* Display a listing of the resource.
@ -25,13 +31,13 @@ class Payments extends Controller
*/
public function index()
{
$payments = Payment::with(['vendor', 'account', 'category'])->isNotTransfer()->collect(['paid_at'=> 'desc']);
$payments = Transaction::type('expense')->with(['account', 'category', 'contact'])->isNotTransfer()->collect(['paid_at'=> 'desc']);
$vendors = collect(Vendor::enabled()->orderBy('name')->pluck('name', 'id'));
$vendors = Contact::type($this->getVendorTypes())->enabled()->orderBy('name')->pluck('name', 'id');
$categories = collect(Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id'));
$categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
$accounts = collect(Account::enabled()->orderBy('name')->pluck('name', 'id'));
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
$transfer_cat_id = Category::transfer();
@ -45,7 +51,7 @@ class Payments extends Controller
*/
public function show()
{
return redirect('expenses/payments');
return redirect()->route('payments.index');
}
/**
@ -59,13 +65,13 @@ class Payments extends Controller
$currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
$account_currency_code = Account::where('id', setting('general.default_account'))->pluck('currency_code')->first();
$account_currency_code = Account::where('id', setting('default.account'))->pluck('currency_code')->first();
$currency = Currency::where('code', $account_currency_code)->first();
$vendors = Vendor::enabled()->orderBy('name')->pluck('name', 'id');
$vendors = Contact::type($this->getVendorTypes())->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id');
$categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
@ -81,33 +87,33 @@ class Payments extends Controller
*/
public function store(Request $request)
{
$payment = Payment::create($request->input());
$response = $this->ajaxDispatch(new CreateTransaction($request));
// Upload attachment
$media = $this->getMedia($request->file('attachment'), 'payments');
if ($response['success']) {
$response['redirect'] = route('payments.index');
if ($media) {
$payment->attachMedia($media, 'attachment');
$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();
}
// Recurring
$payment->createRecurring();
$message = trans('messages.success.added', ['type' => trans_choice('general.payments', 1)]);
flash($message)->success();
return redirect('expenses/payments');
return response()->json($response);
}
/**
* Duplicate the specified resource.
*
* @param Payment $payment
* @param Transaction $payment
*
* @return Response
*/
public function duplicate(Payment $payment)
public function duplicate(Transaction $payment)
{
$clone = $payment->duplicate();
@ -115,37 +121,35 @@ class Payments extends Controller
flash($message)->success();
return redirect('expenses/payments/' . $clone->id . '/edit');
return redirect()->route('payments.edit', $clone->id);
}
/**
* Import the specified resource.
*
* @param ImportFile $import
* @param ImportRequest $request
*
* @return Response
*/
public function import(ImportFile $import)
public function import(ImportRequest $request)
{
if (!Import::createFromFile($import, 'Expense\Payment')) {
return redirect('common/import/expenses/payments');
}
\Excel::import(new Import(), $request->file('import'));
$message = trans('messages.success.imported', ['type' => trans_choice('general.payments', 2)]);
flash($message)->success();
return redirect('expenses/payments');
return redirect()->route('payments.index');
}
/**
* Show the form for editing the specified resource.
*
* @param Payment $payment
* @param Transaction $payment
*
* @return Response
*/
public function edit(Payment $payment)
public function edit(Transaction $payment)
{
$accounts = Account::enabled()->orderBy('name')->pluck('name', 'id');
@ -153,66 +157,70 @@ class Payments extends Controller
$currency = Currency::where('code', $payment->currency_code)->first();
$vendors = Vendor::enabled()->orderBy('name')->pluck('name', 'id');
$vendors = Contact::type($this->getVendorTypes())->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id');
$categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
$payment_methods = Modules::getPaymentMethods();
return view('expenses.payments.edit', compact('payment', 'accounts', 'currencies', 'currency', 'vendors', 'categories', 'payment_methods'));
$date_format = $this->getCompanyDateFormat();
return view('expenses.payments.edit', compact('payment', 'accounts', 'currencies', 'currency', 'vendors', 'categories', 'payment_methods', 'date_format'));
}
/**
* Update the specified resource in storage.
*
* @param Payment $payment
* @param Request $request
* @param Transaction $payment
* @param Request $request
*
* @return Response
*/
public function update(Payment $payment, Request $request)
public function update(Transaction $payment, Request $request)
{
$payment->update($request->input());
$response = $this->ajaxDispatch(new UpdateTransaction($payment, $request));
// Upload attachment
if ($request->file('attachment')) {
$media = $this->getMedia($request->file('attachment'), 'payments');
if ($response['success']) {
$response['redirect'] = route('payments.index');
$payment->attachMedia($media, 'attachment');
$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();
}
// Recurring
$payment->updateRecurring();
$message = trans('messages.success.updated', ['type' => trans_choice('general.payments', 1)]);
flash($message)->success();
return redirect('expenses/payments');
return response()->json($response);
}
/**
* Remove the specified resource from storage.
*
* @param Payment $payment
* @param Transaction $payment
*
* @return Response
*/
public function destroy(Payment $payment)
public function destroy(Transaction $payment)
{
// Can't delete transfer payment
if ($payment->category->id == Category::transfer()) {
return redirect('expenses/payments');
$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();
}
$payment->recurring()->delete();
$payment->delete();
$message = trans('messages.success.deleted', ['type' => trans_choice('general.payments', 1)]);
flash($message)->success();
return redirect('expenses/payments');
return response()->json($response);
}
/**
@ -222,12 +230,6 @@ class Payments extends Controller
*/
public function export()
{
\Excel::create('payments', function($excel) {
$excel->sheet('payments', function($sheet) {
$sheet->fromModel(Payment::filter(request()->input())->get()->makeHidden([
'id', 'company_id', 'parent_id', 'created_at', 'updated_at', 'deleted_at'
]));
});
})->download('xlsx');
return \Excel::download(new Export(), trans_choice('general.payments', 2) . '.xlsx');
}
}

244
app/Http/Controllers/Expenses/Vendors.php
View File

@ -2,23 +2,24 @@
namespace App\Http\Controllers\Expenses;
use App\Http\Controllers\Controller;
use App\Http\Requests\Expense\Vendor as Request;
use App\Abstracts\Http\Controller;
use App\Exports\Expenses\Vendors as Export;
use App\Http\Requests\Common\Contact as Request;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Imports\Expenses\Vendors as Import;
use App\Jobs\Common\CreateContact;
use App\Jobs\Common\DeleteContact;
use App\Jobs\Common\UpdateContact;
use App\Models\Banking\Transaction;
use App\Models\Common\Contact;
use App\Models\Expense\Bill;
use App\Models\Expense\Payment;
use App\Models\Expense\Vendor;
use App\Models\Setting\Currency;
use App\Traits\Uploads;
use App\Utilities\Import;
use App\Utilities\ImportFile;
use App\Traits\Contacts;
use Date;
use Illuminate\Pagination\Paginator;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
class Vendors extends Controller
{
use Uploads;
use Contacts;
/**
* Display a listing of the resource.
@ -27,7 +28,7 @@ class Vendors extends Controller
*/
public function index()
{
$vendors = Vendor::collect();
$vendors = Contact::type($this->getVendorTypes())->collect();
return view('expenses.vendors.index', compact('vendors'));
}
@ -35,11 +36,11 @@ class Vendors extends Controller
/**
* Show the form for viewing the specified resource.
*
* @param Vendor $vendor
* @param Contact $vendor
*
* @return Response
*/
public function show(Vendor $vendor)
public function show(Contact $vendor)
{
$amounts = [
'paid' => 0,
@ -53,57 +54,42 @@ class Vendors extends Controller
];
// Handle bills
$bills = Bill::with(['status', 'payments'])->where('vendor_id', $vendor->id)->get();
$bills = Bill::where('contact_id', $vendor->id)->get();
$counts['bills'] = $bills->count();
$bill_payments = [];
$today = Date::today()->toDateString();
foreach ($bills as $item) {
$payments = 0;
foreach ($item->payments as $payment) {
$payment->category = $item->category;
$bill_payments[] = $payment;
$amount = $payment->getConvertedAmount();
$amounts['paid'] += $amount;
$payments += $amount;
}
// Already in payments
if ($item->bill_status_code == 'paid') {
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->getConvertedAmount() - $payments;
$amounts['open'] += $item->getAmountConvertedToDefault() - $transactions;
} else {
$amounts['overdue'] += $item->getConvertedAmount() - $payments;
$amounts['overdue'] += $item->getAmountConvertedToDefault() - $transactions;
}
}
// Handle payments
$payments = Payment::with(['account', 'category'])->where('vendor_id', $vendor->id)->get();
$transactions = Transaction::where('contact_id', $vendor->id)->type('expense')->get();
$counts['payments'] = $payments->count();
$counts['transactions'] = $transactions->count();
// Prepare data
$items = collect($payments)->each(function ($item) use (&$amounts) {
$amounts['paid'] += $item->getConvertedAmount();
});
$limit = request('limit', setting('general.list_limit', '25'));
$transactions = $this->paginate($items->merge($bill_payments)->sortByDesc('paid_at'), $limit);
$limit = request('limit', setting('default.list_limit', '25'));
$transactions = $this->paginate($transactions->sortByDesc('paid_at'), $limit);
$bills = $this->paginate($bills->sortByDesc('paid_at'), $limit);
$payments = $this->paginate($payments->sortByDesc('paid_at'), $limit);
return view('expenses.vendors.show', compact('vendor', 'counts', 'amounts', 'transactions', 'bills', 'payments'));
return view('expenses.vendors.show', compact('vendor', 'counts', 'amounts', 'transactions', 'bills'));
}
/**
@ -127,30 +113,33 @@ class Vendors extends Controller
*/
public function store(Request $request)
{
$vendor = Vendor::create($request->all());
$response = $this->ajaxDispatch(new CreateContact($request));
// Upload logo
if ($request->file('logo')) {
$media = $this->getMedia($request->file('logo'), 'vendors');
if ($response['success']) {
$response['redirect'] = route('vendors.index');
$vendor->attachMedia($media, 'logo');
$message = trans('messages.success.added', ['type' => trans_choice('general.vendors', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('vendors.create');
$message = $response['message'];
flash($message)->error();
}
$message = trans('messages.success.added', ['type' => trans_choice('general.vendors', 1)]);
flash($message)->success();
return redirect('expenses/vendors');
return response()->json($response);
}
/**
* Duplicate the specified resource.
*
* @param Vendor $vendor
* @param Contact $vendor
*
* @return Response
*/
public function duplicate(Vendor $vendor)
public function duplicate(Contact $vendor)
{
$clone = $vendor->duplicate();
@ -158,37 +147,35 @@ class Vendors extends Controller
flash($message)->success();
return redirect('expenses/vendors/' . $clone->id . '/edit');
return redirect()->route('vendors.edit', $clone->id);
}
/**
* Import the specified resource.
*
* @param ImportFile $import
* @param ImportRequest $request
*
* @return Response
*/
public function import(ImportFile $import)
public function import(ImportRequest $request)
{
if (!Import::createFromFile($import, 'Expense\Vendor')) {
return redirect('common/import/expenses/vendors');
}
\Excel::import(new Import(), $request->file('import'));
$message = trans('messages.success.imported', ['type' => trans_choice('general.vendors', 2)]);
flash($message)->success();
return redirect('expenses/vendors');
return redirect()->route('vendors.index');
}
/**
* Show the form for editing the specified resource.
*
* @param Vendor $vendor
* @param Contact $vendor
*
* @return Response
*/
public function edit(Vendor $vendor)
public function edit(Contact $vendor)
{
$currencies = Currency::enabled()->pluck('name', 'code');
@ -198,94 +185,92 @@ class Vendors extends Controller
/**
* Update the specified resource in storage.
*
* @param Vendor $vendor
* @param Request $request
* @param Contact $vendor
* @param Request $request
*
* @return Response
*/
public function update(Vendor $vendor, Request $request)
public function update(Contact $vendor, Request $request)
{
$vendor->update($request->all());
$response = $this->ajaxDispatch(new UpdateContact($vendor, $request));
// Upload logo
if ($request->file('logo')) {
$media = $this->getMedia($request->file('logo'), 'vendors');
if ($response['success']) {
$response['redirect'] = route('vendors.index');
$vendor->attachMedia($media, 'logo');
$message = trans('messages.success.updated', ['type' => $vendor->name]);
flash($message)->success();
} else {
$response['redirect'] = route('vendors.edit', $vendor->id);
$message = $response['message'];
flash($message)->error();
}
$message = trans('messages.success.updated', ['type' => trans_choice('general.vendors', 1)]);
flash($message)->success();
return redirect('expenses/vendors');
return response()->json($response);
}
/**
* Enable the specified resource.
*
* @param Vendor $vendor
* @param Contact $vendor
*
* @return Response
*/
public function enable(Vendor $vendor)
public function enable(Contact $vendor)
{
$vendor->enabled = 1;
$vendor->save();
$response = $this->ajaxDispatch(new UpdateContact($vendor, request()->merge(['enabled' => 1])));
$message = trans('messages.success.enabled', ['type' => trans_choice('general.vendors', 1)]);
if ($response['success']) {
$response['message'] = trans('messages.success.enabled', ['type' => $vendor->name]);
}
flash($message)->success();
return redirect()->route('vendors.index');
return response()->json($response);
}
/**
* Disable the specified resource.
*
* @param Vendor $vendor
* @param Contact $vendor
*
* @return Response
*/
public function disable(Vendor $vendor)
public function disable(Contact $vendor)
{
$vendor->enabled = 0;
$vendor->save();
$response = $this->ajaxDispatch(new UpdateContact($vendor, request()->merge(['enabled' => 0])));
$message = trans('messages.success.disabled', ['type' => trans_choice('general.vendors', 1)]);
if ($response['success']) {
$response['message'] = trans('messages.success.disabled', ['type' => $vendor->name]);
}
flash($message)->success();
return redirect()->route('vendors.index');
return response()->json($response);
}
/**
* Remove the specified resource from storage.
*
* @param Vendor $vendor
* @param Contact $vendor
*
* @return Response
*/
public function destroy(Vendor $vendor)
public function destroy(Contact $vendor)
{
$relationships = $this->countRelationships($vendor, [
'bills' => 'bills',
'payments' => 'payments',
]);
$response = $this->ajaxDispatch(new DeleteContact($vendor));
if (empty($relationships)) {
$vendor->delete();
$response['redirect'] = route('vendors.index');
$message = trans('messages.success.deleted', ['type' => trans_choice('general.vendors', 1)]);
if ($response['success']) {
$message = trans('messages.success.deleted', ['type' => $vendor->name]);
flash($message)->success();
} else {
$message = trans('messages.warning.deleted', ['name' => $vendor->name, 'text' => implode(', ', $relationships)]);
$message = $response['message'];
flash($message)->warning();
flash($message)->error();
}
return redirect('expenses/vendors');
return response()->json($response);
}
/**
@ -295,30 +280,16 @@ class Vendors extends Controller
*/
public function export()
{
\Excel::create('vendors', function($excel) {
$excel->sheet('vendors', function($sheet) {
$sheet->fromModel(Vendor::filter(request()->input())->get()->makeHidden([
'id', 'company_id', 'created_at', 'updated_at', 'deleted_at'
]));
});
})->download('xlsx');
return \Excel::download(new Export(), trans_choice('general.vendors', 2) . '.xlsx');
}
public function currency()
public function currency(Contact $vendor)
{
$vendor_id = (int) request('vendor_id');
if (empty($vendor_id)) {
return response()->json([]);
}
$vendor = Vendor::find($vendor_id);
if (empty($vendor)) {
return response()->json([]);
}
$currency_code = setting('general.default_currency');
$currency_code = setting('default.currency');
if (isset($vendor->currency_code)) {
$currencies = Currency::enabled()->pluck('name', 'code')->toArray();
@ -331,6 +302,7 @@ class Vendors extends Controller
// Get currency object
$currency = Currency::where('code', $currency_code)->first();
$vendor->currency_name = $currency->name;
$vendor->currency_code = $currency_code;
$vendor->currency_rate = $currency->rate;
@ -342,30 +314,4 @@ class Vendors extends Controller
return response()->json($vendor);
}
public function vendor(Request $request)
{
$vendor = Vendor::create($request->all());
return response()->json($vendor);
}
/**
* Generate a pagination collection.
*
* @param array|Collection $items
* @param int $perPage
* @param int $page
* @param array $options
*
* @return LengthAwarePaginator
*/
public function paginate($items, $perPage = 15, $page = null, $options = [])
{
$page = $page ?: (Paginator::resolveCurrentPage() ?: 1);
$items = $items instanceof Collection ? $items : Collection::make($items);
return new LengthAwarePaginator($items->forPage($page, $perPage), $items->count(), $perPage, $page, $options);
}
}