From 1af5720915810390d73e1847b04ab0c36f37e134 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 23 Apr 2018 22:17:20 +0300 Subject: [PATCH] categories for invoices/bills --- app/Http/Controllers/Dashboard/Dashboard.php | 70 +++++++++++-------- app/Http/Controllers/Expenses/Bills.php | 8 ++- app/Http/Controllers/Incomes/Invoices.php | 8 ++- .../Controllers/Reports/ExpenseSummary.php | 33 ++------- .../Reports/IncomeExpenseSummary.php | 47 ++----------- .../Controllers/Reports/IncomeSummary.php | 30 ++------ app/Http/Controllers/Reports/ProfitLoss.php | 55 ++------------- app/Http/Requests/Expense/Bill.php | 1 + app/Http/Requests/Income/Invoice.php | 1 + app/Listeners/Updates/Version120.php | 50 +++++++++++++ app/Models/Expense/Bill.php | 5 ++ app/Models/Income/Invoice.php | 5 ++ app/Models/Setting/Category.php | 18 +++-- ...000_add_category_column_invoices_bills.php | 38 ++++++++++ .../views/expenses/bills/create.blade.php | 7 ++ resources/views/expenses/bills/edit.blade.php | 7 ++ .../views/incomes/invoices/create.blade.php | 7 ++ .../views/incomes/invoices/edit.blade.php | 7 ++ 18 files changed, 215 insertions(+), 182 deletions(-) create mode 100644 database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php diff --git a/app/Http/Controllers/Dashboard/Dashboard.php b/app/Http/Controllers/Dashboard/Dashboard.php index 7c9f5cf2c..9616926f7 100644 --- a/app/Http/Controllers/Dashboard/Dashboard.php +++ b/app/Http/Controllers/Dashboard/Dashboard.php @@ -243,52 +243,63 @@ class Dashboard extends Controller private function calculateAmounts() { - $incomes_amount = $expenses_amount = 0; + $incomes_amount = $open_invoice = $overdue_invoice = 0; + $expenses_amount = $open_bill = $overdue_bill = 0; - // Invoices - $invoices = Invoice::with('payments')->accrued()->get(); - list($invoice_paid_amount, $open_invoice, $overdue_invoice) = $this->calculateTotals($invoices, 'invoice'); - - $incomes_amount += $invoice_paid_amount; - - // Add to Incomes By Category - $this->addToIncomeDonut('#00c0ef', $invoice_paid_amount, trans_choice('general.invoices', 2)); - - // Bills - $bills = Bill::with('payments')->accrued()->get(); - list($bill_paid_amount, $open_bill, $overdue_bill) = $this->calculateTotals($bills, 'bill'); - - $expenses_amount += $bill_paid_amount; - - // Add to Expenses By Category - $this->addToExpenseDonut('#dd4b39', $bill_paid_amount, trans_choice('general.bills', 2)); - - // Revenues & Payments - $categories = Category::orWhere('type', 'income')->orWhere('type', 'expense')->enabled()->get(); + // Get categories + $categories = Category::with(['bills', 'invoices', 'payments', 'revenues'])->orWhere('type', 'income')->orWhere('type', 'expense')->enabled()->get(); foreach ($categories as $category) { switch ($category->type) { case 'income': $amount = 0; + // Revenues foreach ($category->revenues as $revenue) { $amount += $revenue->getConvertedAmount(); } + $incomes_amount += $amount; + + // Invoices + $invoices = $category->invoices()->accrued()->get(); + foreach ($invoices as $invoice) { + list($paid, $open, $overdue) = $this->calculateInvoiceBillTotals($invoice, 'invoice'); + + $incomes_amount += $paid; + $open_invoice += $open; + $overdue_invoice += $overdue; + + $amount += $paid; + } + $this->addToIncomeDonut($category->color, $amount, $category->name); - $incomes_amount += $amount; break; case 'expense': $amount = 0; + // Payments foreach ($category->payments as $payment) { $amount += $payment->getConvertedAmount(); } + $expenses_amount += $amount; + + // Bills + $bills = $category->bills()->accrued()->get(); + foreach ($bills as $bill) { + list($paid, $open, $overdue) = $this->calculateInvoiceBillTotals($bill, 'bill'); + + $expenses_amount += $paid; + $open_bill += $open; + $overdue_bill += $overdue; + + $amount += $paid; + } + $this->addToExpenseDonut($category->color, $amount, $category->name); - $expenses_amount += $amount; break; } } @@ -382,22 +393,19 @@ class Dashboard extends Controller return $profit; } - private function calculateTotals($items, $type) + private function calculateInvoiceBillTotals($item, $type) { $paid = $open = $overdue = 0; $today = $this->today->toDateString(); - foreach ($items as $item) { - $paid += $item->getConvertedAmount(); + $paid += $item->getConvertedAmount(); - $code_field = $type . '_status_code'; - - if ($item->$code_field == 'paid') { - continue; - } + $code_field = $type . '_status_code'; + if ($item->$code_field != 'paid') { $payments = 0; + if ($item->$code_field == 'partial') { foreach ($item->payments as $payment) { $payments += $payment->getConvertedAmount(); diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index 130ae0420..5330d572e 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -102,7 +102,9 @@ class Bills extends Controller $taxes = Tax::enabled()->get()->pluck('title', 'id'); - return view('expenses.bills.create', compact('vendors', 'currencies', 'items', 'taxes')); + $categories = Category::enabled()->type('expense')->pluck('name', 'id'); + + return view('expenses.bills.create', compact('vendors', 'currencies', 'items', 'taxes', 'categories')); } /** @@ -319,7 +321,9 @@ class Bills extends Controller $taxes = Tax::enabled()->get()->pluck('title', 'id'); - return view('expenses.bills.edit', compact('bill', 'vendors', 'currencies', 'items', 'taxes')); + $categories = Category::enabled()->type('expense')->pluck('name', 'id'); + + return view('expenses.bills.edit', compact('bill', 'vendors', 'currencies', 'items', 'taxes', 'categories')); } /** diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index c222f7eed..6dc279ff2 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -105,9 +105,11 @@ class Invoices extends Controller $taxes = Tax::enabled()->get()->pluck('title', 'id'); + $categories = Category::enabled()->type('income')->pluck('name', 'id'); + $number = $this->getNextInvoiceNumber(); - return view('incomes.invoices.create', compact('customers', 'currencies', 'items', 'taxes', 'number')); + return view('incomes.invoices.create', compact('customers', 'currencies', 'items', 'taxes', 'categories', 'number')); } /** @@ -340,7 +342,9 @@ class Invoices extends Controller $taxes = Tax::enabled()->get()->pluck('title', 'id'); - return view('incomes.invoices.edit', compact('invoice', 'customers', 'currencies', 'items', 'taxes')); + $categories = Category::enabled()->type('income')->pluck('name', 'id'); + + return view('incomes.invoices.edit', compact('invoice', 'customers', 'currencies', 'items', 'taxes', 'categories')); } /** diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php index 3f605c47e..a72c03ee1 100644 --- a/app/Http/Controllers/Reports/ExpenseSummary.php +++ b/app/Http/Controllers/Reports/ExpenseSummary.php @@ -23,12 +23,7 @@ class ExpenseSummary extends Controller $status = request('status'); - //if ($filter != 'upcoming') { - $categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray(); - //} - - // Add Bill in Categories - $categories[0] = trans_choice('general.bills', 2); + $categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray(); // Get year $year = request('year'); @@ -49,15 +44,6 @@ class ExpenseSummary extends Controller 'currency_rate' => 1 ); - // Bill - $expenses[0][$dates[$j]] = array( - 'category_id' => 0, - 'name' => trans_choice('general.bills', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ); - foreach ($categories as $category_id => $category_name) { $expenses[$category_id][$dates[$j]] = array( 'category_id' => $category_id, @@ -109,9 +95,6 @@ class ExpenseSummary extends Controller ->credits(false) ->view($chart_template); - // Expenses Graph - $expenses_graph = json_encode($expenses_graph); - return view($view_template, compact('chart', 'dates', 'categories', 'expenses', 'totals')); } @@ -120,13 +103,7 @@ class ExpenseSummary extends Controller foreach ($items as $item) { $date = Date::parse($item->$date_field)->format('F'); - if ($type == 'bill') { - $category_id = 0; - } else { - $category_id = $item->category_id; - } - - if (!isset($expenses[$category_id])) { + if (!isset($expenses[$item->category_id])) { continue; } @@ -139,9 +116,9 @@ class ExpenseSummary extends Controller } } - $expenses[$category_id][$date]['amount'] += $amount; - $expenses[$category_id][$date]['currency_code'] = $item->currency_code; - $expenses[$category_id][$date]['currency_rate'] = $item->currency_rate; + $expenses[$item->category_id][$date]['amount'] += $amount; + $expenses[$item->category_id][$date]['currency_code'] = $item->currency_code; + $expenses[$item->category_id][$date]['currency_rate'] = $item->currency_rate; $graph[Date::parse($item->$date_field)->format('F-Y')] += $amount; diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php index c29899be2..c8a65b73e 100644 --- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php +++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php @@ -26,19 +26,9 @@ class IncomeExpenseSummary extends Controller $status = request('status'); - //if ($filter != 'upcoming') { - $income_categories = Category::enabled()->type('income')->pluck('name', 'id')->toArray(); - //} + $income_categories = Category::enabled()->type('income')->pluck('name', 'id')->toArray(); - // Add Invoice in Categories - $income_categories[0] = trans_choice('general.invoices', 2); - - //if ($filter != 'upcoming') { - $expense_categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray(); - //} - - // Add Bill in Categories - $expense_categories[0] = trans_choice('general.bills', 2); + $expense_categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray(); // Get year $year = request('year'); @@ -59,15 +49,6 @@ class IncomeExpenseSummary extends Controller 'currency_rate' => 1 ); - // Compares - $compares['income'][0][$dates[$j]] = array( - 'category_id' => 0, - 'name' => trans_choice('general.invoices', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ); - foreach ($income_categories as $category_id => $category_name) { $compares['income'][$category_id][$dates[$j]] = array( 'category_id' => $category_id, @@ -78,14 +59,6 @@ class IncomeExpenseSummary extends Controller ); } - $compares['expense'][0][$dates[$j]] = array( - 'category_id' => 0, - 'name' => trans_choice('general.bills', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ); - foreach ($expense_categories as $category_id => $category_name) { $compares['expense'][$category_id][$dates[$j]] = array( 'category_id' => $category_id, @@ -167,15 +140,9 @@ class IncomeExpenseSummary extends Controller foreach ($items as $item) { $date = Date::parse($item->$date_field)->format('F'); - if (($type == 'invoice') || ($type == 'bill')) { - $category_id = 0; - } else { - $category_id = $item->category_id; - } + $group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense'; - $group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense'; - - if (!isset($compares[$group][$category_id])) { + if (!isset($compares[$group][$item->category_id])) { continue; } @@ -188,9 +155,9 @@ class IncomeExpenseSummary extends Controller } } - $compares[$group][$category_id][$date]['amount'] += $amount; - $compares[$group][$category_id][$date]['currency_code'] = $item->currency_code; - $compares[$group][$category_id][$date]['currency_rate'] = $item->currency_rate; + $compares[$group][$item->category_id][$date]['amount'] += $amount; + $compares[$group][$item->category_id][$date]['currency_code'] = $item->currency_code; + $compares[$group][$item->category_id][$date]['currency_rate'] = $item->currency_rate; if ($group == 'income') { $graph[Date::parse($item->$date_field)->format('F-Y')] += $amount; diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php index 896f568a5..16f05aa73 100644 --- a/app/Http/Controllers/Reports/IncomeSummary.php +++ b/app/Http/Controllers/Reports/IncomeSummary.php @@ -23,12 +23,7 @@ class IncomeSummary extends Controller $status = request('status'); - //if ($filter != 'upcoming') { - $categories = Category::enabled()->type('income')->pluck('name', 'id')->toArray(); - //} - - // Add Invoice in Categories - $categories[0] = trans_choice('general.invoices', 2); + $categories = Category::enabled()->type('income')->pluck('name', 'id')->toArray(); // Get year $year = request('year'); @@ -49,15 +44,6 @@ class IncomeSummary extends Controller 'currency_rate' => 1 ); - // Invoice - $incomes[0][$dates[$j]] = array( - 'category_id' => 0, - 'name' => trans_choice('general.invoices', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ); - foreach ($categories as $category_id => $category_name) { $incomes[$category_id][$dates[$j]] = array( 'category_id' => $category_id, @@ -117,13 +103,7 @@ class IncomeSummary extends Controller foreach ($items as $item) { $date = Date::parse($item->$date_field)->format('F'); - if ($type == 'invoice') { - $category_id = 0; - } else { - $category_id = $item->category_id; - } - - if (!isset($incomes[$category_id])) { + if (!isset($incomes[$item->category_id])) { continue; } @@ -136,9 +116,9 @@ class IncomeSummary extends Controller } } - $incomes[$category_id][$date]['amount'] += $amount; - $incomes[$category_id][$date]['currency_code'] = $item->currency_code; - $incomes[$category_id][$date]['currency_rate'] = $item->currency_rate; + $incomes[$item->category_id][$date]['amount'] += $amount; + $incomes[$item->category_id][$date]['currency_code'] = $item->currency_code; + $incomes[$item->category_id][$date]['currency_rate'] = $item->currency_rate; $graph[Date::parse($item->$date_field)->format('F-Y')] += $amount; diff --git a/app/Http/Controllers/Reports/ProfitLoss.php b/app/Http/Controllers/Reports/ProfitLoss.php index 53a201458..1726aeb18 100644 --- a/app/Http/Controllers/Reports/ProfitLoss.php +++ b/app/Http/Controllers/Reports/ProfitLoss.php @@ -28,14 +28,8 @@ class ProfitLoss extends Controller $income_categories = Category::enabled()->type('income')->pluck('name', 'id')->toArray(); - // Add invoice to income categories - $income_categories[0] = trans_choice('general.invoices', 2); - $expense_categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray(); - // Add bill to expense categories - $expense_categories[0] = trans_choice('general.bills', 2); - // Get year $year = request('year'); if (empty($year)) { @@ -53,15 +47,6 @@ class ProfitLoss extends Controller 'currency_rate' => 1 ); - // Compares - $compares['income'][0][$dates[$j]] = [ - 'category_id' => 0, - 'name' => trans_choice('general.invoices', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ]; - foreach ($income_categories as $category_id => $category_name) { $compares['income'][$category_id][$dates[$j]] = [ 'category_id' => $category_id, @@ -72,14 +57,6 @@ class ProfitLoss extends Controller ]; } - $compares['expense'][0][$dates[$j]] = [ - 'category_id' => 0, - 'name' => trans_choice('general.bills', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ]; - foreach ($expense_categories as $category_id => $category_name) { $compares['expense'][$category_id][$dates[$j]] = [ 'category_id' => $category_id, @@ -99,14 +76,6 @@ class ProfitLoss extends Controller 'currency_rate' => 1 ]; - $compares['income'][0]['total'] = [ - 'category_id' => 0, - 'name' => trans_choice('general.totals', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ]; - $gross['income'] = $gross['expense'] = [1 => 0, 2 => 0, 3 => 0, 4 => 0, 'total' => 0]; foreach ($income_categories as $category_id => $category_name) { @@ -119,14 +88,6 @@ class ProfitLoss extends Controller ]; } - $compares['expense'][0]['total'] = [ - 'category_id' => 0, - 'name' => trans_choice('general.totals', 1), - 'amount' => 0, - 'currency_code' => setting('general.default_currency'), - 'currency_rate' => 1 - ]; - foreach ($expense_categories as $category_id => $category_name) { $compares['expense'][$category_id]['total'] = [ 'category_id' => $category_id, @@ -196,15 +157,9 @@ class ProfitLoss extends Controller foreach ($items as $item) { $date = Date::parse($item->$date_field)->quarter; - if (($type == 'invoice') || ($type == 'bill')) { - $category_id = 0; - } else { - $category_id = $item->category_id; - } - $group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense'; - if (!isset($compares[$group][$category_id])) { + if (!isset($compares[$group][$item->category_id])) { continue; } @@ -217,10 +172,10 @@ class ProfitLoss extends Controller } } - $compares[$group][$category_id][$date]['amount'] += $amount; - $compares[$group][$category_id][$date]['currency_code'] = $item->currency_code; - $compares[$group][$category_id][$date]['currency_rate'] = $item->currency_rate; - $compares[$group][$category_id]['total']['amount'] += $amount; + $compares[$group][$item->category_id][$date]['amount'] += $amount; + $compares[$group][$item->category_id][$date]['currency_code'] = $item->currency_code; + $compares[$group][$item->category_id][$date]['currency_rate'] = $item->currency_rate; + $compares[$group][$item->category_id]['total']['amount'] += $amount; if ($group == 'income') { $totals[$date]['amount'] += $amount; diff --git a/app/Http/Requests/Expense/Bill.php b/app/Http/Requests/Expense/Bill.php index ffdcef1b1..8bd84e01c 100644 --- a/app/Http/Requests/Expense/Bill.php +++ b/app/Http/Requests/Expense/Bill.php @@ -39,6 +39,7 @@ class Bill extends Request 'billed_at' => 'required|date', 'due_at' => 'required|date', 'currency_code' => 'required|string', + 'category_id' => 'required|integer', 'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024, ]; } diff --git a/app/Http/Requests/Income/Invoice.php b/app/Http/Requests/Income/Invoice.php index a0ddcdb24..ed35db28c 100644 --- a/app/Http/Requests/Income/Invoice.php +++ b/app/Http/Requests/Income/Invoice.php @@ -39,6 +39,7 @@ class Invoice extends Request 'invoiced_at' => 'required|date', 'due_at' => 'required|date', 'currency_code' => 'required|string', + 'category_id' => 'required|integer', 'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024, ]; } diff --git a/app/Listeners/Updates/Version120.php b/app/Listeners/Updates/Version120.php index 41ea4942c..3ee1329a1 100644 --- a/app/Listeners/Updates/Version120.php +++ b/app/Listeners/Updates/Version120.php @@ -5,6 +5,11 @@ namespace App\Listeners\Updates; use App\Events\UpdateFinished; use App\Models\Auth\Role; use App\Models\Auth\Permission; +use App\Models\Company\Company; +use App\Models\Expense\Bill; +use App\Models\Income\Invoice; +use App\Models\Setting\Category; +use Artisan; class Version120 extends Listener { @@ -25,6 +30,16 @@ class Version120 extends Listener return; } + $this->updatePermissions(); + + // Update database + Artisan::call('migrate', ['--force' => true]); + + $this->updateInvoicesAndBills(); + } + + protected function updatePermissions() + { $permissions = []; // Create tax summary permission @@ -56,4 +71,39 @@ class Version120 extends Listener } } } + + protected function updateInvoicesAndBills() + { + $companies = Company::all(); + + foreach ($companies as $company) { + // Invoices + $invoice_category = Category::create([ + 'company_id' => $company->id, + 'name' => trans_choice('general.invoices', 2), + 'type' => 'income', + 'color' => '#00c0ef', + 'enabled' => '1' + ]); + + foreach ($company->invoices as $invoice) { + $invoice->category_id = $invoice_category->id; + $invoice->save(); + } + + // Bills + $bill_category = Category::create([ + 'company_id' => $company->id, + 'name' => trans_choice('general.bills', 2), + 'type' => 'expense', + 'color' => '#dd4b39', + 'enabled' => '1' + ]); + + foreach ($company->bills as $bill) { + $bill->category_id = $bill_category->id; + $bill->save(); + } + } + } } diff --git a/app/Models/Expense/Bill.php b/app/Models/Expense/Bill.php index 655712881..e278a2c8f 100644 --- a/app/Models/Expense/Bill.php +++ b/app/Models/Expense/Bill.php @@ -60,6 +60,11 @@ class Bill extends Model */ protected $cloneable_relations = ['items', 'totals']; + public function category() + { + return $this->belongsTo('App\Models\Setting\Category'); + } + public function vendor() { return $this->belongsTo('App\Models\Expense\Vendor'); diff --git a/app/Models/Income/Invoice.php b/app/Models/Income/Invoice.php index 16e5cfa9f..dece8caaf 100644 --- a/app/Models/Income/Invoice.php +++ b/app/Models/Income/Invoice.php @@ -61,6 +61,11 @@ class Invoice extends Model */ protected $cloneable_relations = ['items', 'totals']; + public function category() + { + return $this->belongsTo('App\Models\Setting\Category'); + } + public function customer() { return $this->belongsTo('App\Models\Income\Customer'); diff --git a/app/Models/Setting/Category.php b/app/Models/Setting/Category.php index 4fd9b40b1..5aa3f418f 100644 --- a/app/Models/Setting/Category.php +++ b/app/Models/Setting/Category.php @@ -22,9 +22,19 @@ class Category extends Model */ public $sortable = ['name', 'type', 'enabled']; - public function revenues() + public function bills() { - return $this->hasMany('App\Models\Income\Revenue'); + return $this->hasMany('App\Models\Expense\Bill'); + } + + public function invoices() + { + return $this->hasMany('App\Models\Income\Invoice'); + } + + public function items() + { + return $this->hasMany('App\Models\Item\Item'); } public function payments() @@ -32,9 +42,9 @@ class Category extends Model return $this->hasMany('App\Models\Expense\Payment'); } - public function items() + public function revenues() { - return $this->hasMany('App\Models\Item\Item'); + return $this->hasMany('App\Models\Income\Revenue'); } /** diff --git a/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php b/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php new file mode 100644 index 000000000..d32668d85 --- /dev/null +++ b/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php @@ -0,0 +1,38 @@ +integer('category_id'); + }); + + Schema::table('bills', function ($table) { + $table->integer('category_id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('invoices', function ($table) { + $table->dropColumn('category_id'); + }); + + Schema::table('bills', function ($table) { + $table->dropColumn('category_id'); + }); + } +} diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php index fb7de3f00..1fe8904c5 100644 --- a/resources/views/expenses/bills/create.blade.php +++ b/resources/views/expenses/bills/create.blade.php @@ -97,6 +97,9 @@ + + {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} + {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} {{ Form::fileGroup('attachment', trans('general.attachment'),[]) }} @@ -190,6 +193,10 @@ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}" }); + $("#category_id").select2({ + placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)]) }}" + }); + $('#attachment').fancyfile({ text : '{{ trans('general.form.select.file') }}', style : 'btn-default', diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php index a1d7bcc0a..2409cd649 100644 --- a/resources/views/expenses/bills/edit.blade.php +++ b/resources/views/expenses/bills/edit.blade.php @@ -113,6 +113,9 @@ + + {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} + {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} {{ Form::fileGroup('attachment', trans('general.attachment'),[]) }} @@ -210,6 +213,10 @@ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}" }); + $("#category_id").select2({ + placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)]) }}" + }); + $('#attachment').fancyfile({ text : '{{ trans('general.form.select.file') }}', style : 'btn-default', diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php index 0e0a9f46a..e777bb087 100644 --- a/resources/views/incomes/invoices/create.blade.php +++ b/resources/views/incomes/invoices/create.blade.php @@ -97,6 +97,9 @@ + + {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} + {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} {{ Form::fileGroup('attachment', trans('general.attachment')) }} @@ -191,6 +194,10 @@ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}" }); + $("#category_id").select2({ + placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)]) }}" + }); + $('#attachment').fancyfile({ text : '{{ trans('general.form.select.file') }}', style : 'btn-default', diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php index 3abdb1f72..a159593c8 100644 --- a/resources/views/incomes/invoices/edit.blade.php +++ b/resources/views/incomes/invoices/edit.blade.php @@ -112,6 +112,9 @@ + + {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder-open-o', $categories) }} + {{ Form::textareaGroup('notes', trans_choice('general.notes', 2)) }} {{ Form::fileGroup('attachment', trans('general.attachment')) }} @@ -209,6 +212,10 @@ placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}" }); + $("#category_id").select2({ + placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.categories', 1)]) }}" + }); + $('#attachment').fancyfile({ text : '{{ trans('general.form.select.file') }}', style : 'btn-default',