Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
rafael.sisweb 2015-11-16 07:53:07 -05:00
commit ff7226eb35
5 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AccountController.php
View File

@ -842,7 +842,7 @@ class AccountController extends BaseController
{
$rules = array(
'name' => 'required',
'logo' => 'sometimes|max:512|mimes:jpeg,gif,png',
'logo' => 'sometimes|max:200|mimes:jpeg,gif,png',
);
$validator = Validator::make(Input::all(), $rules);

2
app/Http/Controllers/PublicClientController.php
View File

@ -49,7 +49,7 @@ class PublicClientController extends BaseController
}
$invoice = $invitation->invoice;
$query = $this->activityRepo->findByClientPublicId($invoice->client->public_id);
$query = $this->activityRepo->findByClientId($invoice->client_id);
$query->where('activities.adjustment', '!=', 0);
return Datatable::query($query)

5
app/Ninja/Repositories/ActivityRepository.php
View File

@ -61,7 +61,7 @@ class ActivityRepository
return $activity;
}
public function findByClientPublicId($clientPublicId)
public function findByClientId($clientId)
{
return DB::table('activities')
->join('users', 'users.id', '=', 'activities.user_id')
@ -70,8 +70,7 @@ class ActivityRepository
->leftJoin('invoices', 'invoices.id', '=', 'activities.invoice_id')
->leftJoin('payments', 'payments.id', '=', 'activities.payment_id')
->leftJoin('credits', 'credits.id', '=', 'activities.credit_id')
->where('clients.account_id', '=', Auth::user()->account_id)
->where('clients.public_id', '=', $clientPublicId)
->where('clients.id', '=', $clientId)
->where('contacts.is_primary', '=', 1)
->whereNull('contacts.deleted_at')
->select(

4
app/Services/ActivityService.php
View File

@ -18,7 +18,9 @@ class ActivityService extends BaseService
public function getDatatable($clientPublicId = null)
{
$query = $this->activityRepo->findByClientPublicId($clientPublicId);
$clientId = Client::getPrivateId($clientPublicId);
$query = $this->activityRepo->findByClientId($clientId);
return $this->createDatatable(ENTITY_ACTIVITY, $query);
}

24
resources/views/invited/dashboard.blade.php
View File

@ -155,17 +155,19 @@
</div>
</div>
{!! Datatable::table()
->addColumn(
trans('texts.date'),
trans('texts.message'),
trans('texts.balance'),
trans('texts.adjustment'))
->setUrl(route('api.client.activity'))
->setOptions('bFilter', false)
->setOptions('aaSorting', [['0', 'desc']])
->setOptions('sPaginationType', 'bootstrap')
->render('datatable') !!}
<div style="min-height: 550px">
{!! Datatable::table()
->addColumn(
trans('texts.date'),
trans('texts.message'),
trans('texts.balance'),
trans('texts.adjustment'))
->setUrl(route('api.client.activity'))
->setOptions('bFilter', false)
->setOptions('aaSorting', [['0', 'desc']])
->setOptions('sPaginationType', 'bootstrap')
->render('datatable') !!}
</div>
</div>