refs #443 Bill create and edit page added stack and fixed category type for expense, income

This commit is contained in:
cuneytsenturk
2018-08-16 11:34:08 +03:00
parent 30298635fd
commit 47ad57eaed
12 changed files with 204 additions and 335 deletions

View File

@ -8,6 +8,7 @@ use App\Events\BillUpdated;
use App\Http\Controllers\Controller;
use App\Http\Requests\Expense\Bill as Request;
use App\Http\Requests\Expense\BillPayment as PaymentRequest;
use Illuminate\Http\Request as ItemRequest;
use App\Models\Banking\Account;
use App\Models\Expense\BillStatus;
use App\Models\Expense\Vendor;
@ -719,6 +720,31 @@ class Bills extends Controller
return redirect()->back();
}
public function addItem(ItemRequest $request)
{
if ($request['item_row']) {
$item_row = $request['item_row'];
$taxes = Tax::enabled()->orderBy('rate')->get()->pluck('title', 'id');
$html = view('expenses.bills.item', compact('item_row', 'taxes'))->render();
return response()->json([
'success' => true,
'error' => false,
'message' => 'null',
'html' => $html,
]);
}
return response()->json([
'success' => false,
'error' => true,
'message' => trans('issue'),
'html' => 'null',
]);
}
protected function prepareBill(Bill $bill)
{
$paid = 0;

View File

@ -4,6 +4,7 @@ namespace App\Http\Controllers\Modals;
use App\Http\Controllers\Controller;
use App\Http\Requests\Setting\Category as Request;
use Illuminate\Http\Request as CRequest;
use App\Models\Setting\Category;
class Categories extends Controller
@ -25,9 +26,11 @@ class Categories extends Controller
*
* @return Response
*/
public function create()
public function create(CRequest $request)
{
$html = view('modals.categories.create', compact('currencies'))->render();
$type = $request['type'];
$html = view('modals.categories.create', compact('currencies', 'type'))->render();
return response()->json([
'success' => true,