Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2019-09-29 12:28:34 +03:00
parent ae672a25b1
commit 21c4721942
6 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Ninja/Repositories/DashboardRepository.php
View File

@ -347,7 +347,7 @@ class DashboardRepository
return $activities->orderBy('activities.created_at', 'desc')->orderBy('activities.id', 'desc') return $activities->orderBy('activities.created_at', 'desc')->orderBy('activities.id', 'desc')
->with('client.contacts', 'user', 'invoice', 'payment', 'credit', 'account', 'task', 'expense', 'contact') ->with('client.contacts', 'user', 'invoice', 'payment', 'credit', 'account', 'task', 'expense', 'contact')
->take(50) ->take(100)
->get(); ->get();
} }
@ -374,7 +374,7 @@ class DashboardRepository
return $pastDue->select([DB::raw("coalesce(invoices.partial_due_date, invoices.due_date) due_date"), 'invoices.balance', 'invoices.public_id', 'invoices.invoice_number', 'clients.name as client_name', 'contacts.email', 'contacts.first_name', 'contacts.last_name', 'clients.currency_id', 'clients.public_id as client_public_id', 'clients.user_id as client_user_id', 'invoice_type_id']) return $pastDue->select([DB::raw("coalesce(invoices.partial_due_date, invoices.due_date) due_date"), 'invoices.balance', 'invoices.public_id', 'invoices.invoice_number', 'clients.name as client_name', 'contacts.email', 'contacts.first_name', 'contacts.last_name', 'clients.currency_id', 'clients.public_id as client_public_id', 'clients.user_id as client_user_id', 'invoice_type_id'])
->orderBy('invoices.due_date', 'asc') ->orderBy('invoices.due_date', 'asc')
->take(50) ->take(100)
->get(); ->get();
} }
@ -403,7 +403,7 @@ class DashboardRepository
$upcoming = $upcoming->where('invoices.user_id', '=', $userId); $upcoming = $upcoming->where('invoices.user_id', '=', $userId);
} }
return $upcoming->take(50) return $upcoming->take(100)
->select([DB::raw("coalesce(invoices.partial_due_date, invoices.due_date) due_date"), 'invoices.balance', 'invoices.public_id', 'invoices.invoice_number', 'clients.name as client_name', 'contacts.email', 'contacts.first_name', 'contacts.last_name', 'clients.currency_id', 'clients.public_id as client_public_id', 'clients.user_id as client_user_id', 'invoice_type_id']) ->select([DB::raw("coalesce(invoices.partial_due_date, invoices.due_date) due_date"), 'invoices.balance', 'invoices.public_id', 'invoices.invoice_number', 'clients.name as client_name', 'contacts.email', 'contacts.first_name', 'contacts.last_name', 'clients.currency_id', 'clients.public_id as client_public_id', 'clients.user_id as client_user_id', 'invoice_type_id'])
->get(); ->get();
} }
@ -428,7 +428,7 @@ class DashboardRepository
return $payments->select(['payments.payment_date', DB::raw('(payments.amount - payments.refunded) as amount'), 'invoices.public_id', 'invoices.invoice_number', 'clients.name as client_name', 'contacts.email', 'contacts.first_name', 'contacts.last_name', 'clients.currency_id', 'clients.public_id as client_public_id', 'clients.user_id as client_user_id']) return $payments->select(['payments.payment_date', DB::raw('(payments.amount - payments.refunded) as amount'), 'invoices.public_id', 'invoices.invoice_number', 'clients.name as client_name', 'contacts.email', 'contacts.first_name', 'contacts.last_name', 'clients.currency_id', 'clients.public_id as client_public_id', 'clients.user_id as client_user_id'])
->orderBy('payments.payment_date', 'desc') ->orderBy('payments.payment_date', 'desc')
->take(50) ->take(100)
->get(); ->get();
} }

2
app/Ninja/Transformers/InvoiceTransformer.php
View File

@ -156,7 +156,7 @@ class InvoiceTransformer extends EntityTransformer
'partial' => (float) ($invoice->partial ?: 0.0), 'partial' => (float) ($invoice->partial ?: 0.0),
'partial_due_date' => $invoice->partial_due_date ?: '', 'partial_due_date' => $invoice->partial_due_date ?: '',
'has_tasks' => (bool) $invoice->has_tasks, 'has_tasks' => (bool) $invoice->has_tasks,
'auto_bill' => (bool) $invoice->auto_bill, 'auto_bill' => (int) $invoice->auto_bill,
'custom_value1' => (float) $invoice->custom_value1, 'custom_value1' => (float) $invoice->custom_value1,
'custom_value2' => (float) $invoice->custom_value2, 'custom_value2' => (float) $invoice->custom_value2,
'custom_taxes1' => (bool) $invoice->custom_taxes1, 'custom_taxes1' => (bool) $invoice->custom_taxes1,

1
database/seeds/PaymentTypesSeeder.php
View File

@ -41,6 +41,7 @@ class PaymentTypesSeeder extends Seeder
['name' => 'SEPA', 'gateway_type_id' => GATEWAY_TYPE_SEPA], ['name' => 'SEPA', 'gateway_type_id' => GATEWAY_TYPE_SEPA],
['name' => 'GoCardless', 'gateway_type_id' => GATEWAY_TYPE_GOCARDLESS], ['name' => 'GoCardless', 'gateway_type_id' => GATEWAY_TYPE_GOCARDLESS],
['name' => 'Bitcoin', 'gateway_type_id' => GATEWAY_TYPE_BITCOIN], ['name' => 'Bitcoin', 'gateway_type_id' => GATEWAY_TYPE_BITCOIN],
['name' => 'Zelle'],
]; ];
foreach ($paymentTypes as $paymentType) { foreach ($paymentTypes as $paymentType) {

1
resources/lang/en/texts.php
View File

@ -1456,6 +1456,7 @@ $LANG = array(
'payment_type_SEPA' => 'SEPA Direct Debit', 'payment_type_SEPA' => 'SEPA Direct Debit',
'payment_type_Bitcoin' => 'Bitcoin', 'payment_type_Bitcoin' => 'Bitcoin',
'payment_type_GoCardless' => 'GoCardless', 'payment_type_GoCardless' => 'GoCardless',
'payment_type_Zelle' => 'Zelle',
// Industries // Industries
'industry_Accounting & Legal' => 'Accounting & Legal', 'industry_Accounting & Legal' => 'Accounting & Legal',

26
resources/views/dashboard.blade.php
View File

@ -292,6 +292,7 @@
@include('partials/white_label_expired') @include('partials/white_label_expired')
@endif @endif
@if (Auth::user()->hasPermission('admin'))
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="panel panel-default"> <div class="panel panel-default">
@ -421,7 +422,6 @@
</div> </div>
</div> </div>
@if (Auth::user()->hasPermission('view_dashboard'))
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div id="progress-div" class="progress"> <div id="progress-div" class="progress">
@ -440,7 +440,7 @@
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title in-bold-white"> <h3 class="panel-title in-bold-white">
<i class="glyphicon glyphicon-exclamation-sign"></i> {{ trans('texts.activity') }} <i class="glyphicon glyphicon-exclamation-sign"></i> {{ trans('texts.activity') }}
@if ($invoicesSent) @if (Auth::user()->hasPermission('admin') && $invoicesSent)
<div class="pull-right" style="font-size:14px;padding-top:4px"> <div class="pull-right" style="font-size:14px;padding-top:4px">
@if ($invoicesSent == 1) @if ($invoicesSent == 1)
{{ trans('texts.invoice_sent', ['count' => $invoicesSent]) }} {{ trans('texts.invoice_sent', ['count' => $invoicesSent]) }}
@ -466,16 +466,18 @@
<div class="panel panel-default dashboard" style="height:320px;"> <div class="panel panel-default dashboard" style="height:320px;">
<div class="panel-heading" style="margin:0; background-color: #f5f5f5 !important;"> <div class="panel-heading" style="margin:0; background-color: #f5f5f5 !important;">
<h3 class="panel-title" style="color: black !important"> <h3 class="panel-title" style="color: black !important">
@if ($showExpenses && count($averageInvoice)) @if (Auth::user()->hasPermission('admin'))
<div class="pull-right" style="font-size:14px;padding-top:4px;font-weight:bold"> @if ($showExpenses && count($averageInvoice))
@foreach ($averageInvoice as $item) <div class="pull-right" style="font-size:14px;padding-top:4px;font-weight:bold">
<span class="currency currency_{{ $item->currency_id ?: $account->getCurrencyId() }}" style="display:none"> @foreach ($averageInvoice as $item)
{{ trans('texts.average_invoice') }} <span class="currency currency_{{ $item->currency_id ?: $account->getCurrencyId() }}" style="display:none">
{{ Utils::formatMoney($item->invoice_avg, $item->currency_id) }} | {{ trans('texts.average_invoice') }}
</span> {{ Utils::formatMoney($item->invoice_avg, $item->currency_id) }} |
@endforeach </span>
<span class="average-div" style="color:#337ab7"/> @endforeach
</div> <span class="average-div" style="color:#337ab7"/>
</div>
@endif
@endif @endif
<i class="glyphicon glyphicon-ok-sign"></i> {{ trans('texts.recent_payments') }} <i class="glyphicon glyphicon-ok-sign"></i> {{ trans('texts.recent_payments') }}
</h3> </h3>

1
resources/views/proposals/edit.blade.php
View File

@ -147,6 +147,7 @@
} }
invoice.account = {!! auth()->user()->account->load('country') !!}; invoice.account = {!! auth()->user()->account->load('country') !!};
invoice.contact = invoice.client.contacts[0];
var regExp = new RegExp(/\$[a-z][\w\.]*/g); var regExp = new RegExp(/\$[a-z][\w\.]*/g);
var matches = html.match(regExp); var matches = html.match(regExp);