From 4ba773405584ce112e064c93b936dcc9c8a199a8 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 18 Sep 2017 16:58:25 +0300 Subject: [PATCH 1/2] fixed #3 --- app/Http/Controllers/Api/Auth/Roles.php | 6 ++---- app/Http/Controllers/Api/Auth/Users.php | 6 ++---- app/Http/Controllers/Api/Expenses/Bills.php | 2 +- app/Http/Controllers/Api/Expenses/Payments.php | 2 +- app/Http/Controllers/Api/Incomes/Invoices.php | 2 +- app/Http/Controllers/Api/Incomes/Revenues.php | 2 +- app/Http/Controllers/Expenses/Bills.php | 2 +- app/Http/Controllers/Expenses/Payments.php | 2 +- app/Http/Controllers/Incomes/Invoices.php | 2 +- app/Http/Controllers/Incomes/Revenues.php | 2 +- 10 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/Api/Auth/Roles.php b/app/Http/Controllers/Api/Auth/Roles.php index acafe95c4..2e58554ec 100644 --- a/app/Http/Controllers/Api/Auth/Roles.php +++ b/app/Http/Controllers/Api/Auth/Roles.php @@ -27,13 +27,11 @@ class Roles extends ApiController /** * Display the specified resource. * - * @param int $id + * @param Role $role * @return \Dingo\Api\Http\Response */ - public function show($id) + public function show(Role $role) { - $role = Role::with('permissions')->findOrFail($id); - return $this->response->item($role, new Transformer()); } diff --git a/app/Http/Controllers/Api/Auth/Users.php b/app/Http/Controllers/Api/Auth/Users.php index be65ee2b3..54c8e40dd 100644 --- a/app/Http/Controllers/Api/Auth/Users.php +++ b/app/Http/Controllers/Api/Auth/Users.php @@ -27,13 +27,11 @@ class Users extends ApiController /** * Display the specified resource. * - * @param int $id + * @param User $user * @return \Dingo\Api\Http\Response */ - public function show($id) + public function show(User $user) { - $user = User::with(['roles', 'permissions'])->findOrFail($id); - return $this->response->item($user, new Transformer()); } diff --git a/app/Http/Controllers/Api/Expenses/Bills.php b/app/Http/Controllers/Api/Expenses/Bills.php index a2941e02c..c9e2955a4 100644 --- a/app/Http/Controllers/Api/Expenses/Bills.php +++ b/app/Http/Controllers/Api/Expenses/Bills.php @@ -27,7 +27,7 @@ class Bills extends ApiController */ public function index() { - $bills = Bill::with('bill_statuses')->collect(); + $bills = Bill::with(['vendor', 'status', 'items', 'payments', 'histories'])->collect(); return $this->response->paginator($bills, new Transformer()); } diff --git a/app/Http/Controllers/Api/Expenses/Payments.php b/app/Http/Controllers/Api/Expenses/Payments.php index 9993557df..b831f165d 100644 --- a/app/Http/Controllers/Api/Expenses/Payments.php +++ b/app/Http/Controllers/Api/Expenses/Payments.php @@ -19,7 +19,7 @@ class Payments extends ApiController */ public function index() { - $payments = Payment::with('account', 'vendor', 'category')->collect(); + $payments = Payment::with(['account', 'vendor', 'category'])->collect(); return $this->response->paginator($payments, new Transformer()); } diff --git a/app/Http/Controllers/Api/Incomes/Invoices.php b/app/Http/Controllers/Api/Incomes/Invoices.php index bb8729276..2bc774444 100644 --- a/app/Http/Controllers/Api/Incomes/Invoices.php +++ b/app/Http/Controllers/Api/Incomes/Invoices.php @@ -27,7 +27,7 @@ class Invoices extends ApiController */ public function index() { - $invoices = Invoice::with('invoice_statuses')->collect(); + $invoices = Invoice::with(['customer', 'status', 'items', 'payments', 'histories'])->collect(); return $this->response->paginator($invoices, new Transformer()); } diff --git a/app/Http/Controllers/Api/Incomes/Revenues.php b/app/Http/Controllers/Api/Incomes/Revenues.php index fb8aa7b67..0b7fc9942 100644 --- a/app/Http/Controllers/Api/Incomes/Revenues.php +++ b/app/Http/Controllers/Api/Incomes/Revenues.php @@ -19,7 +19,7 @@ class Revenues extends ApiController */ public function index() { - $revenues = Revenue::with('account', 'customer', 'category')->collect(); + $revenues = Revenue::with(['account', 'customer', 'category'])->collect(); return $this->response->paginator($revenues, new Transformer()); } diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index 9acba181b..412189299 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -36,7 +36,7 @@ class Bills extends Controller */ public function index() { - $bills = Bill::with('bill_statuses')->collect(); + $bills = Bill::with('status')->collect(); $status = collect(BillStatus::all()->pluck('name', 'code')) ->prepend(trans('general.all_statuses'), ''); diff --git a/app/Http/Controllers/Expenses/Payments.php b/app/Http/Controllers/Expenses/Payments.php index 69f90cd19..b5c57c454 100644 --- a/app/Http/Controllers/Expenses/Payments.php +++ b/app/Http/Controllers/Expenses/Payments.php @@ -22,7 +22,7 @@ class Payments extends Controller */ public function index() { - $payments = Payment::with('account', 'category')->collect(); + $payments = Payment::with(['account', 'category'])->collect(); $categories = collect(Category::enabled()->type('expense')->pluck('name', 'id')) ->prepend(trans('categories.all'), ''); diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index 0d0fe389e..f64f1c1ad 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -38,7 +38,7 @@ class Invoices extends Controller */ public function index() { - $invoices = Invoice::with('invoice_statuses')->collect(); + $invoices = Invoice::with('status')->collect(); $status = collect(InvoiceStatus::all()->pluck('name', 'code')) ->prepend(trans('general.all_statuses'), ''); diff --git a/app/Http/Controllers/Incomes/Revenues.php b/app/Http/Controllers/Incomes/Revenues.php index b27ad123a..441a6465b 100644 --- a/app/Http/Controllers/Incomes/Revenues.php +++ b/app/Http/Controllers/Incomes/Revenues.php @@ -25,7 +25,7 @@ class Revenues extends Controller */ public function index() { - $revenues = Revenue::with('account', 'category', 'customer')->collect(); + $revenues = Revenue::with(['account', 'category', 'customer'])->collect(); $customers = collect(Customer::enabled()->pluck('name', 'id')) ->prepend(trans('customer.all'), ''); From 80be5c8fd2caa856b5bb4358613a4d7a5dff77f1 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 18 Sep 2017 17:31:43 +0300 Subject: [PATCH 2/2] close #4 --- app/Http/Controllers/Api/Auth/Users.php | 11 +++++++++-- app/Http/Controllers/Api/Expenses/Vendors.php | 11 +++++++++-- app/Http/Controllers/Api/Incomes/Customers.php | 11 +++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Api/Auth/Users.php b/app/Http/Controllers/Api/Auth/Users.php index 54c8e40dd..ab75d6d42 100644 --- a/app/Http/Controllers/Api/Auth/Users.php +++ b/app/Http/Controllers/Api/Auth/Users.php @@ -27,11 +27,18 @@ class Users extends ApiController /** * Display the specified resource. * - * @param User $user + * @param int|string $id * @return \Dingo\Api\Http\Response */ - public function show(User $user) + public function show($id) { + // Check if we're querying by id or email + if (is_numeric($id)) { + $user = User::with(['roles', 'permissions'])->findOrFail($id); + } else { + $user = User::with(['roles', 'permissions'])->where('email', $id)->first(); + } + return $this->response->item($user, new Transformer()); } diff --git a/app/Http/Controllers/Api/Expenses/Vendors.php b/app/Http/Controllers/Api/Expenses/Vendors.php index beb3bec92..b7321eb87 100644 --- a/app/Http/Controllers/Api/Expenses/Vendors.php +++ b/app/Http/Controllers/Api/Expenses/Vendors.php @@ -27,11 +27,18 @@ class Vendors extends ApiController /** * Display the specified resource. * - * @param Vendor $vendor + * @param int|string $id * @return \Dingo\Api\Http\Response */ - public function show(Vendor $vendor) + public function show($id) { + // Check if we're querying by id or email + if (is_numeric($id)) { + $vendor = Vendor::findOrFail($id); + } else { + $vendor = Vendor::where('email', $id)->first(); + } + return $this->response->item($vendor, new Transformer()); } diff --git a/app/Http/Controllers/Api/Incomes/Customers.php b/app/Http/Controllers/Api/Incomes/Customers.php index 736b410dc..8638cfc3d 100644 --- a/app/Http/Controllers/Api/Incomes/Customers.php +++ b/app/Http/Controllers/Api/Incomes/Customers.php @@ -27,11 +27,18 @@ class Customers extends ApiController /** * Display the specified resource. * - * @param Customer $customer + * @param int|string $id * @return \Dingo\Api\Http\Response */ - public function show(Customer $customer) + public function show($id) { + // Check if we're querying by id or email + if (is_numeric($id)) { + $customer = Customer::findOrFail($id); + } else { + $customer = Customer::where('email', $id)->first(); + } + return $this->response->item($customer, new Transformer()); }