close #123
This commit is contained in:
parent
30552413c1
commit
2b2bc4ff5b
@ -102,14 +102,10 @@ class Transfers extends Controller
|
|||||||
|
|
||||||
$request['account_id'] = $request['from_account_id'];
|
$request['account_id'] = $request['from_account_id'];
|
||||||
$request['paid_at'] = $request['transferred_at'];
|
$request['paid_at'] = $request['transferred_at'];
|
||||||
// amount
|
|
||||||
$request['currency_code'] = $payment_currency_code;
|
$request['currency_code'] = $payment_currency_code;
|
||||||
$request['currency_rate'] = $currencies[$payment_currency_code];
|
$request['currency_rate'] = $currencies[$payment_currency_code];
|
||||||
$request['vendor_id'] = '0';
|
$request['vendor_id'] = '0';
|
||||||
// description
|
$request['category_id'] = Category::transfer(); // Transfer Category ID
|
||||||
$request['category_id'] = Category::enabled()->type('other')->pluck('id')->first(); // Transfer Category ID
|
|
||||||
// payment_method
|
|
||||||
// reference
|
|
||||||
$request['attachment'] = '';
|
$request['attachment'] = '';
|
||||||
|
|
||||||
$payment = Payment::create($request->all());
|
$payment = Payment::create($request->all());
|
||||||
@ -195,14 +191,10 @@ class Transfers extends Controller
|
|||||||
|
|
||||||
$request['account_id'] = $request['from_account_id'];
|
$request['account_id'] = $request['from_account_id'];
|
||||||
$request['paid_at'] = $request['transferred_at'];
|
$request['paid_at'] = $request['transferred_at'];
|
||||||
// amount
|
|
||||||
$request['currency_code'] = $payment_currency_code;
|
$request['currency_code'] = $payment_currency_code;
|
||||||
$request['currency_rate'] = $currencies[$payment_currency_code];
|
$request['currency_rate'] = $currencies[$payment_currency_code];
|
||||||
$request['vendor_id'] = '0';
|
$request['vendor_id'] = '0';
|
||||||
// description
|
$request['category_id'] = Category::transfer(); // Transfer Category ID
|
||||||
$request['category_id'] = Category::enabled()->type('other')->pluck('id')->first(); // Transfer Category ID
|
|
||||||
// payment_method
|
|
||||||
// reference
|
|
||||||
$request['attachment'] = '';
|
$request['attachment'] = '';
|
||||||
|
|
||||||
$payment->update($request->all());
|
$payment->update($request->all());
|
||||||
|
@ -18,10 +18,12 @@ class Categories extends Controller
|
|||||||
{
|
{
|
||||||
$categories = Category::collect();
|
$categories = Category::collect();
|
||||||
|
|
||||||
|
$transfer_id = Category::transfer();
|
||||||
|
|
||||||
$types = collect(['expense' => 'Expense', 'income' => 'Income', 'item' => 'Item', 'other' => 'Other'])
|
$types = collect(['expense' => 'Expense', 'income' => 'Income', 'item' => 'Item', 'other' => 'Other'])
|
||||||
->prepend(trans('general.all_type', ['type' => trans_choice('general.types', 2)]), '');
|
->prepend(trans('general.all_type', ['type' => trans_choice('general.types', 2)]), '');
|
||||||
|
|
||||||
return view('settings.categories.index', compact('categories', 'types'));
|
return view('settings.categories.index', compact('categories', 'types', 'transfer_id'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -112,6 +114,11 @@ class Categories extends Controller
|
|||||||
'payments' => 'payments',
|
'payments' => 'payments',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
// Can't delete transfer category
|
||||||
|
if ($category->id == Category::transfer()) {
|
||||||
|
return redirect('settings/categories');
|
||||||
|
}
|
||||||
|
|
||||||
if (empty($relationships)) {
|
if (empty($relationships)) {
|
||||||
$category->delete();
|
$category->delete();
|
||||||
|
|
||||||
|
@ -48,4 +48,15 @@ class Category extends Model
|
|||||||
{
|
{
|
||||||
return $query->where('type', $type);
|
return $query->where('type', $type);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Scope transfer category.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Database\Eloquent\Builder $query
|
||||||
|
* @return \Illuminate\Database\Eloquent\Builder
|
||||||
|
*/
|
||||||
|
public function scopeTransfer($query)
|
||||||
|
{
|
||||||
|
return $query->where('type', 'other')->pluck('id')->first();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,9 @@
|
|||||||
<ul class="dropdown-menu dropdown-menu-right">
|
<ul class="dropdown-menu dropdown-menu-right">
|
||||||
<li><a href="{{ url('settings/categories/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
|
<li><a href="{{ url('settings/categories/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
|
||||||
@permission('delete-settings-categories')
|
@permission('delete-settings-categories')
|
||||||
|
@if ($item->id != $transfer_id)
|
||||||
<li>{!! Form::deleteLink($item, 'settings/categories') !!}</li>
|
<li>{!! Form::deleteLink($item, 'settings/categories') !!}</li>
|
||||||
|
@endif
|
||||||
@endpermission
|
@endpermission
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user