bug fixes

This commit is contained in:
Hillel Coren 2014-03-05 17:03:31 +02:00
parent 09bc3f2f39
commit 70b9256ddb
4 changed files with 7 additions and 1 deletions

View File

@ -57,7 +57,7 @@ class Invoice extends EntityModel
$this->setVisible(['invoice_number', 'discount', 'po_number', 'invoice_date', 'due_date', 'terms', 'public_notes', 'amount', 'balance', 'invoice_items', 'client', 'tax_name', 'tax_rate', 'account']); $this->setVisible(['invoice_number', 'discount', 'po_number', 'invoice_date', 'due_date', 'terms', 'public_notes', 'amount', 'balance', 'invoice_items', 'client', 'tax_name', 'tax_rate', 'account']);
$this->client->setVisible(['name', 'address1', 'address2', 'city', 'state', 'postal_code', 'work_phone', 'payment_terms', 'contacts', 'country', 'currency_id' ]); $this->client->setVisible(['name', 'address1', 'address2', 'city', 'state', 'postal_code', 'work_phone', 'payment_terms', 'contacts', 'country', 'currency_id' ]);
$this->account->setVisible(['name', 'address1', 'address2', 'city', 'state', 'postal_code', 'country', 'currency_id']); $this->account->setVisible(['name', 'address1', 'address2', 'city', 'state', 'postal_code', 'work_phone', 'work_email', 'country', 'currency_id']);
foreach ($this->invoice_items as $invoiceItem) foreach ($this->invoice_items as $invoiceItem)
{ {

View File

@ -28,6 +28,8 @@
<a class="brand" href="#"><img src= <a class="brand" href="#"><img src=
"images/invoiceninja-logo.png"></a> "images/invoiceninja-logo.png"></a>
<ul class="navbar-list"> <ul class="navbar-list">
<li>{{ link_to('about_us', 'About Us' ) }}</li>
<li>{{ link_to('contact_us', 'Contact Us' ) }}</li>
<li>{{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}</li> <li>{{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}</li>
</ul> </ul>
</div> </div>

View File

@ -91,6 +91,8 @@ var contactForm = {
<a class="brand" href="#"><img src= <a class="brand" href="#"><img src=
"images/invoiceninja-logo.png"></a> "images/invoiceninja-logo.png"></a>
<ul class="navbar-list"> <ul class="navbar-list">
<li>{{ link_to('about_us', 'About Us' ) }}</li>
<li>{{ link_to('contact_us', 'Contact Us' ) }}</li>
<li>{{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}</li> <li>{{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}</li>
</ul> </ul>
</div> </div>

View File

@ -51,6 +51,8 @@
<a class="brand" href="#"><img src= <a class="brand" href="#"><img src=
"images/invoiceninja-logo.png"></a> "images/invoiceninja-logo.png"></a>
<ul class="navbar-list"> <ul class="navbar-list">
<!--<li>{{ link_to('about_us', 'About Us' ) }}</li>-->
<!--<li>{{ link_to('contact_us', 'Contact Us' ) }}</li>-->
<li>{{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}</li> <li>{{ link_to('login', Auth::check() ? 'Continue' : 'Login' ) }}</li>
</ul> </ul>
</div> </div>