Bug fixes

This commit is contained in:
Hillel Coren 2015-05-11 14:16:36 +03:00
parent 6747e56b71
commit 0fa30fb55f
3 changed files with 6 additions and 5 deletions

View File

@ -60,10 +60,11 @@ class InvoiceApiController extends Controller
} }
if (isset($data['email'])) { if (isset($data['email'])) {
$contact = Contact::scope()->with('client')->whereEmail($data['email'])->first(); $client = Client::scope()->whereHas('contacts', function($query) use ($data) {
if ($contact) { $query->where('email', '=', $data['email']);
$client = $contact->client; })->first();
} else {
if (!$client) {
$clientData = ['contact' => ['email' => $data['email']]]; $clientData = ['contact' => ['email' => $data['email']]];
foreach (['name', 'private_notes'] as $field) { foreach (['name', 'private_notes'] as $field) {
if (isset($data[$field])) { if (isset($data[$field])) {

View File

@ -1,5 +1,6 @@
<?php namespace app\Http\Middleware; <?php namespace app\Http\Middleware;
use Request;
use Closure; use Closure;
use Utils; use Utils;
use App; use App;

View File

@ -1,6 +1,5 @@
<?php <?php
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Application Routes | Application Routes