From 0123ee36a2de73560cbb101d7683f1d2b3cd1680 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 23 Jul 2014 23:28:40 +0300 Subject: [PATCH] Working on multi-user support --- app/models/Account.php | 6 +++++- app/models/Invoice.php | 5 +++-- app/views/accounts/user_management.blade.php | 4 +++- app/views/payments/payment.blade.php | 7 +++++++ app/views/plans.blade.php | 3 +++ app/views/public/terms.blade.php | 2 +- public/built.public.css | 2 +- public/css/splash.css | 2 +- 8 files changed, 24 insertions(+), 7 deletions(-) diff --git a/app/models/Account.php b/app/models/Account.php index 5b9140908e3e..4767cf5dc998 100755 --- a/app/models/Account.php +++ b/app/models/Account.php @@ -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); diff --git a/app/models/Invoice.php b/app/models/Invoice.php index 32a9dd0a7917..a951b5a1ef4b 100755 --- a/app/models/Invoice.php +++ b/app/models/Invoice.php @@ -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) { diff --git a/app/views/accounts/user_management.blade.php b/app/views/accounts/user_management.blade.php index 3906222c553f..1bba99364492 100644 --- a/app/views/accounts/user_management.blade.php +++ b/app/views/accounts/user_management.blade.php @@ -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( diff --git a/app/views/payments/payment.blade.php b/app/views/payments/payment.blade.php index db672ed2c805..a00f612b2942 100755 --- a/app/views/payments/payment.blade.php +++ b/app/views/payments/payment.blade.php @@ -184,6 +184,13 @@ {{ Button::block_primary_submit_lg(strtoupper(trans('texts.pay_now')) . ' - ' . Utils::formatMoney($amount, $currencyId) ) }} +
+
+

 

+ Click here to view our terms of service. +
+
+ diff --git a/app/views/plans.blade.php b/app/views/plans.blade.php index c2628a884ae6..6aa004835e4e 100644 --- a/app/views/plans.blade.php +++ b/app/views/plans.blade.php @@ -8,6 +8,7 @@
Live .PDF invoice creation
4 beautiful invoice templates
Accept credit card payments
+
Multi-user support
Quotes/pro-forma invoices
Custom invoice fields and colors
Dynamic chart builder
@@ -25,6 +26,7 @@
Live .PDF invoice creation
4 beautiful invoice templates
Accept credit card payments
+
Multi-user support
Quotes/pro-forma invoices
Custom fields and invoice colors
Dynamic chart builder
@@ -42,6 +44,7 @@
Live .PDF invoice creation
4 beautiful invoice templates
Accept credit card payments
+
Multi-user support
Quotes/pro-forma invoices
Custom invoice fields and colors
Dynamic chart builder
diff --git a/app/views/public/terms.blade.php b/app/views/public/terms.blade.php index 44776fa9fabf..ddbea803a134 100644 --- a/app/views/public/terms.blade.php +++ b/app/views/public/terms.blade.php @@ -29,7 +29,7 @@

Definitions

-

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.

+

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.

diff --git a/public/built.public.css b/public/built.public.css index 2483d9faf366..d77447734409 100644 --- a/public/built.public.css +++ b/public/built.public.css @@ -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; diff --git a/public/css/splash.css b/public/css/splash.css index 6667d6f24f7c..bff37eabf211 100644 --- a/public/css/splash.css +++ b/public/css/splash.css @@ -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;