Bug fixes

app/Ninja/Repositories/DashboardRepository.php

@@ -347,7 +347,7 @@ class DashboardRepository
 
         return $activities->orderBy('activities.created_at', 'desc')->orderBy('activities.id', 'desc')
                 ->with('client.contacts', 'user', 'invoice', 'payment', 'credit', 'account', 'task', 'expense', 'contact')
-                ->take(50)
+                ->take(100)
                 ->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'])
                     ->orderBy('invoices.due_date', 'asc')
-                    ->take(50)
+                    ->take(100)
                     ->get();
     }
 
@@ -403,7 +403,7 @@ class DashboardRepository
             $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'])
                     ->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'])
                     ->orderBy('payments.payment_date', 'desc')
-                    ->take(50)
+                    ->take(100)
                     ->get();
     }
 

app/Ninja/Transformers/InvoiceTransformer.php

@@ -156,7 +156,7 @@ class InvoiceTransformer extends EntityTransformer
             'partial' => (float) ($invoice->partial ?: 0.0),
             'partial_due_date' => $invoice->partial_due_date ?: '',
             '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_value2' => (float) $invoice->custom_value2,
             'custom_taxes1' => (bool) $invoice->custom_taxes1,

database/seeds/PaymentTypesSeeder.php

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

resources/lang/en/texts.php

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

resources/views/dashboard.blade.php

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

resources/views/proposals/edit.blade.php

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