Bug fixes

2025-07-09 03:14:30 -04:00 · 2014-03-23 13:11:04 +02:00 · 2014-03-23 13:11:04 +02:00 · b7061222e8
commit b7061222e8
parent 308a75099a
7 changed files with 79 additions and 11 deletions
--- a/app/controllers/DashboardController.php
+++ b/app/controllers/DashboardController.php
@ -43,11 +43,11 @@ class DashboardController extends \BaseController {
                  ->orderBy('due_date', 'asc')->take(6)->get();

    $data = [
-      'totalIncome' => Utils::formatMoney($totalIncome->value, Session::get(SESSION_CURRENCY)),
-      'billedClients' => $metrics->billed_clients,
-      'invoicesSent' => $metrics->invoices_sent,
-      'activeClients' => $metrics->active_clients,
-      'invoiceAvg' => Utils::formatMoney($metrics->invoice_avg, Session::get(SESSION_CURRENCY)),
+      'totalIncome' => Utils::formatMoney($totalIncome ? $totalIncome->value : 0, Session::get(SESSION_CURRENCY)),
+      'billedClients' => $metrics ? $metrics->billed_clients : 0,
+      'invoicesSent' => $metrics ? $metrics->invoices_sent : 0,
+      'activeClients' => $metrics ? $metrics->active_clients : 0,
+      'invoiceAvg' => Utils::formatMoney(($metrics ? $metrics->invoice_avg : 0), Session::get(SESSION_CURRENCY)),
      'activities' => $activities,
      'pastDue' => $pastDue,
      'upcoming' => $upcoming
--- a/app/controllers/InvoiceController.php
+++ b/app/controllers/InvoiceController.php
@ -335,7 +335,15 @@ class InvoiceController extends \BaseController {
 				else
 				{
 					Session::flash('message', 'Successfully saved invoice'.$message);
-					Session::flash('error', 'Please sign up to email an invoice');
+
+					if (Auth::user()->registered)
+					{
+						Session::flash('error', 'Please confirm your email address');
+					}
+					else
+					{
+						Session::flash('error', 'Please sign up to email an invoice');
+					}
 				}
 			} 
 			else 
--- a/app/views/accounts/notifications.blade.php
+++ b/app/views/accounts/notifications.blade.php
@ -14,6 +14,30 @@
 	{{ Former::checkbox('notify_viewed')->label('&nbsp;')->text('Email me when an invoice is <b>viewed</b>') }}
 	{{ Former::checkbox('notify_paid')->label('&nbsp;')->text('Email me when an invoice is <b>paid</b>') }}

+	{{ Former::legend('Site Updates') }}
+
+	<div class="form-group">
+		<label for="invoice_terms" class="control-label col-lg-4 col-sm-4"></label>
+		<div class="col-lg-8 col-sm-8">
+
+
+		<div id="fb-root"></div>
+		<script>(function(d, s, id) {
+		  var js, fjs = d.getElementsByTagName(s)[0];
+		  if (d.getElementById(id)) return;
+		  js = d.createElement(s); js.id = id;
+		  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId=635126583203143";
+		  fjs.parentNode.insertBefore(js, fjs);
+		}(document, 'script', 'facebook-jssdk'));</script>
+
+		<div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>
+		<div style="padding-left: 70px">	      
+	  	<a href="https://twitter.com/invoiceninja" class="twitter-follow-button" data-show-count="false" data-size="medium">Follow @invoiceninja</a>
+	  	<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
+	  </div>
+
+  </div></div>
+
 	{{ Former::legend('Custom Messages') }}
 	{{ Former::textarea('invoice_terms')->label('Set default invoice terms') }}
 	{{ Former::textarea('email_footer')->label('Set default email signature') }}
--- a/app/views/master.blade.php
+++ b/app/views/master.blade.php
@ -2,7 +2,7 @@
 <html lang="en">
  <head>

-    <title>Invoice Ninja {{ isset($title) ? $title : '' }}</title>
+    <title>Invoice Ninja {{ isset($title) ? $title : ' - Free Online Invoicing' }}</title>
    <link rel="canonical" href="https://www.invoiceninja.com"></link>
    <link href="{{ asset('favicon.ico') }}" rel="icon" type="image/x-icon">    
    
--- a/app/views/public/header.blade.php
+++ b/app/views/public/header.blade.php
@ -70,10 +70,28 @@
    <div class="navbar" style="margin-bottom:0px">
      <div class="container">
        <div class="social">
-          <div class="fb-like" data-href="https://www.invoiceninja.com" data-layout="button" data-action="like" data-show-faces="false" data-share="false"></div>
-          <div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>
-          
+          <!--<div class="fb-follow" data-href="https://www.facebook.com/invoiceninja" data-colorscheme="light" data-layout="button" data-show-faces="false"></div>-->
+      
+          <!--<a href="https://twitter.com/invoiceninja" class="twitter-follow-button" data-show-count="false" data-size="large">Follow @invoiceninja</a>
+          <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>-->
+          <div class="fb-like" data-href="https://www.invoiceninja.com" data-layout="button" data-action="like" data-show-faces="false" data-share="false"></div>          

+          <div style="padding-left: 58px">
+            <a href="https://twitter.com/share" class="twitter-share-button" data-url="https://www.invoiceninja.com/" data-via="invoiceninja" data-related="hillelcoren" data-count="none" data-text="Free online invoicing">Tweet</a>
+            <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
+            &nbsp;
+            <!-- Place this tag where you want the +1 button to render. -->
+            <div class="g-plusone" data-size="medium" data-width="300" data-href="https://www.invoiceninja.com/" data-annotation="none" data-count="false" data-recommendations="false"></div>
+
+            <!-- Place this tag after the last +1 button tag. -->
+            <script type="text/javascript">
+              (function() {
+                var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+                po.src = 'https://apis.google.com/js/platform.js';
+                var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+              })();
+            </script>          
+          </div>
 <!--
 <a href="http://twitter.com/eas_id"><span class=
 "socicon">c</span></a> 
@ -83,7 +101,7 @@
 "http://twitter.com/invoiceninja" target="_blank"><span class=
 "socicon">a</span></a>
 -->
-
+  <p>&nbsp;</p>
  <p>Copyright © 2014 InvoiceNinja. All rights reserved.</p>
 </div> 

--- a/public/css/splash.css
+++ b/public/css/splash.css
@ -528,6 +528,17 @@ footer .social .socicon {
    float: left;    
 }

+div.fb_iframe_widget {
+    position: absolute !important;
+    display: inline-block;
+}
+
+div.fb_iframe_widget > span {
+    vertical-align: top !important;  
+}
+
+
+

@font-face {
    font-family: 'socicon';
--- a/public/css/style.css
+++ b/public/css/style.css
@ -619,6 +619,13 @@ border-color: #08273c;
 #signUpPopOver {
    cursor: pointer;
 }
+div.fb_iframe_widget {
+    position: absolute !important;
+    display: inline-block;
+}
+div.fb_iframe_widget > span {
+    vertical-align: top !important;  
+}
@media (max-width: 767px) {
    .navbar-default .navbar-nav .open .dropdown-menu > li > a {
        color: #ecf0f1;