Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 12:12:48 +01:00
Code Issues Releases Activity

Working on multi-user support

Browse Source
This commit is contained in:
Hillel Coren 2014-07-23 23:28:40 +03:00
parent f431426469
commit 0123ee36a2
8 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/Account.php
View File

@ -207,7 +207,7 @@ class Account extends Eloquent
'your_quote',
'quote_date',
'quote_number',
'total'
'total',
];
foreach ($fields as $field)
@ -236,6 +236,10 @@ class Account extends Eloquent
{
return false;
}
else if ($datePaid == '2000-01-01')
{
return true;
}
$today = new DateTime('now');
$datePaid = DateTime::createFromFormat('Y-m-d', $datePaid);

5
app/models/Invoice.php
View File

@ -67,7 +67,6 @@ class Invoice extends EntityModel
$this->setVisible([
'invoice_number',
'discount',
//'shipping',
'po_number',
'invoice_date',
'due_date',
@ -123,7 +122,9 @@ class Invoice extends EntityModel
'primary_color',
'secondary_color',
'hide_quantity',
'hide_paid_to_date']);
'hide_paid_to_date',
'custom_invoice_label1',
'custom_invoice_label2']);
foreach ($this->invoice_items as $invoiceItem)
{

4
app/views/accounts/user_management.blade.php
View File

@ -4,7 +4,9 @@
@parent
@include('accounts.nav_advanced')
{{ Button::success_link(URL::to('users/create'), trans("texts.add_user"), array('class' => 'pull-right'))->append_with_icon('plus-sign') }}
@if (Utils::isPro())
{{ Button::success_link(URL::to('users/create'), trans("texts.add_user"), array('class' => 'pull-right'))->append_with_icon('plus-sign') }}
@endif
{{ Datatable::table()
->addColumn(

7
app/views/payments/payment.blade.php
View File

@ -184,6 +184,13 @@
{{ Button::block_primary_submit_lg(strtoupper(trans('texts.pay_now')) . ' - ' . Utils::formatMoney($amount, $currencyId) ) }}
</div>
</div>
<div class="row">
<div class="col-md-12">
<p>&nbsp;</p>
<a href="https://www.invoiceninja.com/terms" target="_blank">Click here</a> to view our terms of service.
</div>
</div>
</div>
</div>

3
app/views/plans.blade.php
View File

@ -8,6 +8,7 @@
<div class="cell">Live .PDF invoice creation </div>
<div class="cell">4 beautiful invoice templates</div>
<div class="cell">Accept credit card payments</div>
<div class="cell">Multi-user support</div>
<div class="cell">Quotes/pro-forma invoices</div>
<div class="cell">Custom invoice fields and colors</div>
<div class="cell">Dynamic chart builder</div>
@ -25,6 +26,7 @@
<div class="cell"><div class="hide-desktop">Live .PDF invoice creation</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">4 beautiful invoice templates</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Accept credit card payments</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Multi-user support</div><span class="glyphicon glyphicon-remove"></div>
<div class="cell"><div class="hide-desktop">Quotes/pro-forma invoices</div><span class="glyphicon glyphicon-remove"></div>
<div class="cell"><div class="hide-desktop">Custom fields and invoice colors</div><span class="glyphicon glyphicon-remove"></div>
<div class="cell"><div class="hide-desktop">Dynamic chart builder</div><span class="glyphicon glyphicon-remove"></div>
@ -42,6 +44,7 @@
<div class="cell"><div class="hide-desktop">Live .PDF invoice creation</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">4 beautiful invoice templates</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Accept credit card payments</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Multi-user support</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Quotes/pro-forma invoices</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Custom invoice fields and colors</div><span class="glyphicon glyphicon-ok"></div>
<div class="cell"><div class="hide-desktop">Dynamic chart builder</div><span class="glyphicon glyphicon-ok"></div>

2
app/views/public/terms.blade.php
View File

@ -29,7 +29,7 @@
<div class="row">
<div class="col-md-8 col-md-offset-2">
<h2>Definitions</h2>
<p>Invoiceninja.com users who access invoiceninja.com services are defined as “User Accounts.” User Account clients who use access invoiceninja.com services to view and/or pay invoices are defined as “Clients.” The wording “data” and “content” are used interchangeably. </p></div>
<p>Invoiceninja.com users who access invoiceninja.com services are defined as “User Accounts”. User Account clients who use invoiceninja.com services to view and/or pay invoices are defined as “Clients.” The wording “data” and “content” are used interchangeably. </p></div>
</div>
</div>
</section>

2
public/built.public.css
View File

@ -298,7 +298,7 @@ a .cta:hover span {
padding-right: 15px;
position: relative;
padding: 10px 35px 20px 35px;
height: 212px;
xheight: 212px;
border-left: 1px dotted #ccc;
margin-top: 100px;
text-align: left;

2
public/css/splash.css
View File

@ -280,7 +280,7 @@ a .cta:hover span {
padding-right: 15px;
position: relative;
padding: 10px 35px 20px 35px;
height: 212px;
xheight: 212px;
border-left: 1px dotted #ccc;
margin-top: 100px;
text-align: left;