1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 20:52:56 +01:00

Added goal tracking

This commit is contained in:
Hillel Coren 2014-05-09 16:28:20 +03:00
parent aa7542c2fa
commit 4d2473dc9f
14 changed files with 112 additions and 82 deletions

View File

@ -184,7 +184,8 @@ class AccountController extends \BaseController {
else if ($section == ACCOUNT_ADVANCED_SETTINGS)
{
$data = [
'account' => Auth::user()->account
'account' => Auth::user()->account,
'feature' => $subSection
];
return View::make("accounts.{$subSection}", $data);

View File

@ -96,7 +96,8 @@ class ReportController extends \BaseController {
'chartType' => $chartType,
'startDate' => $startDate->format(Session::get(SESSION_DATE_FORMAT)),
'endDate' => $endDate->modify('-1'.$padding)->format(Session::get(SESSION_DATE_FORMAT)),
'groupBy' => $groupBy
'groupBy' => $groupBy,
'feature' => ACCOUNT_CHART_BUILDER,
];
return View::make('reports.report_builder', $params);

View File

@ -198,6 +198,7 @@ class AccountRepository
$client = new Client;
$client->public_id = Auth::user()->account_id;
$client->user_id = $ninjaAccount->users()->first()->id;
$client->currency_id = 1;
foreach (['name', 'address1', 'address2', 'city', 'state', 'postal_code', 'country_id', 'work_phone'] as $field)
{
$client->$field = Auth::user()->account->$field;

View File

@ -8,7 +8,7 @@
@if (!Auth::user()->account->isPro())
<div class="container">
<div class="row">
<div style="font-size:larger;" class="col-md-8 col-md-offset-2">{{ trans('texts.pro_plan_advanced_settings', ['link'=>'<a href="#" onclick="showProPlan()">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}</div>
<div style="font-size:larger;" class="col-md-8 col-md-offset-2">{{ trans('texts.pro_plan_advanced_settings', ['link'=>'<a href="#" onclick="showProPlan(\''.$feature.'\')">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}</div>
&nbsp;<p/>&nbsp;
</div>
</div>

View File

@ -95,7 +95,7 @@
var contents = $(this).parent().contents();
contents[contents.length - 1].nodeValue = '';
$(this).after('<img src="' +$(this).attr('data-imageUrl') + '" /><br />');
$(this).parent().children().last().after('<a href="' + $(this).attr('data-siteUrl') + '">Create an account</a>');
$(this).parent().children().last().after('<a href="#" onclick="openUrl(\'' + $(this).attr('data-siteUrl') + '\')">Create an account</a>');
});

View File

@ -489,6 +489,7 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
'&new_last_name=' + encodeURIComponent($('form.signUpForm #new_last_name').val()) +
'&go_pro=' + $('#go_pro').val(),
success: function(result) {
trackUrl('/signed_up');
if (result) {
localStorage.setItem('guest_key', '');
NINJA.isRegistered = true;
@ -526,15 +527,19 @@ Want something changed? We're {{ link_to('https://github.com/hillelcoren/invoice
function showSignUp() {
$('#signUpModal').modal('show');
trackUrl('/view_sign_up');
}
@if (Auth::check() && !Auth::user()->isPro())
function showProPlan() {
var proPlanFeature = false;
function showProPlan(feature) {
proPlanFeature = feature;
$('#proPlanModal').modal('show');
trackUrl('/view_pro_plan/' + feature);
}
function submitProPlan() {
trackUrl('/submit_pro_plan/' + proPlanFeature);
if (NINJA.isRegistered) {
$('#proPlanDiv, #proPlanFooter').hide();
$('#proPlanWorking').show();

View File

@ -276,7 +276,7 @@
@if (!Auth::user()->account->isPro())
<div style="font-size:larger">
{{ trans('texts.pro_plan.remove_logo', ['link'=>'<a href="#" onclick="showProPlan()">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}
{{ trans('texts.pro_plan.remove_logo', ['link'=>'<a href="#" onclick="showProPlan(\'remove_logo\')">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}
</div>
@endif

View File

@ -51,7 +51,7 @@
<body>
@if (App::environment() == ENV_PRODUCTION && isset($_ENV['ANALYTICS_KEY']) && $_ENV['ANALYTICS_KEY'])
@if (isset($_ENV['ANALYTICS_KEY']) && $_ENV['ANALYTICS_KEY'])
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

View File

@ -4,87 +4,87 @@
<section class="hero background hero-features center" data-speed="2" data-type="background">
<div class="container">
<div class="row">
<h1><img src="{{ asset('images/icon-features.png') }}"><span class="thin">THE</span> FEATURES</h1>
</div>
</div>
</section>
<h1><img src="{{ asset('images/icon-features.png') }}"><span class="thin">THE</span> FEATURES</h1>
</div>
</div>
</section>
<section class="features features1">
<section class="features features1">
<div class="container">
<div class="row">
<div class="col-md-5 valign">
<div class="headline">
<div class="icon open"><span class="img-wrap"><img src="{{ asset('images/icon-opensource.png') }}"></span></div><h2>Open Source Platform</h2>
</div>
<p class="first">Set the code free! Here at Invoice Ninja, were all about being non-evil, and providing full code transparency is a central manifestation of this value.</p>
<p>Our users started seeing the benefits of open source within days of our launch, when we rolled out v1.0.2, which included some key code improvements that our friends on GitHub sent our way.
</p>
<p>We firmly believe that being an open source product helps everyone involved. Were looking forward to seeing what the developers out there can do to take Invoice Ninja into new realms of usefulness.</p>
</div>
<div class="col-md-7">
<img src="{{ asset('images/features1.jpg') }}">
<div class="headline">
<div class="icon open"><span class="img-wrap"><img src="{{ asset('images/icon-opensource.png') }}"></span></div><h2>Open Source Platform</h2>
</div>
<p class="first">Set the code free! Here at Invoice Ninja, were all about being non-evil, and providing full code transparency is a central manifestation of this value.</p>
<p>Our users started seeing the benefits of open source within days of our launch, when we rolled out v1.0.2, which included some key code improvements that our friends on GitHub sent our way.
</p>
<p>We firmly believe that being an open source product helps everyone involved. Were looking forward to seeing what the developers out there can do to take Invoice Ninja into new realms of usefulness.</p>
</div>
<div class="col-md-7">
<img src="{{ asset('images/features1.jpg') }}">
</div>
</div>
</div>
</section>
<section class="blue features">
<div class="container">
<div class="row">
<div class="col-md-7">
<img src="{{ asset('images/devices-2.png') }}">
</div>
<div class="col-md-5 valign">
<div class="headline">
<div class="icon free"><span class="img-wrap"><img src="{{ asset('images/icon-free2.png') }}"></span></div><h2>FREE. Forever.</h2>
</div>
<p class="first">Set the code free! Here at Invoice Ninja, were all about being non-evil, and providing full code transparency is a central manifestation of this value.</p>
<p>Our users started seeing the benefits of open source within days of our launch, when we rolled out v1.0.2, which included some key code improvements that our friends on GitHub sent our way.
</p>
<p>We firmly believe that being an open source product helps everyone involved. Were looking forward to seeing what the developers out there can do to take Invoice Ninja into new realms of usefulness.</p>
</div>
</div>
</div>
</section>
<section class="features features3">
<div class="container">
<div class="row">
<div class="col-md-7">
<img src="{{ asset('images/devices-2.png') }}">
</div>
<div class="col-md-5 valign">
<div class="headline">
<div class="icon free"><span class="img-wrap"><img src="{{ asset('images/icon-free2.png') }}"></span></div><h2>FREE. Forever.</h2>
</div>
<p class="first">Set the code free! Here at Invoice Ninja, were all about being non-evil, and providing full code transparency is a central manifestation of this value.</p>
<p>Our users started seeing the benefits of open source within days of our launch, when we rolled out v1.0.2, which included some key code improvements that our friends on GitHub sent our way.
</p>
<p>We firmly believe that being an open source product helps everyone involved. Were looking forward to seeing what the developers out there can do to take Invoice Ninja into new realms of usefulness.</p>
</div>
</div>
</div>
</section>
<section class="features features3">
<div class="container">
<div class="row">
<div class="col-md-5">
<div class="headline">
<div class="icon secure"><span class="img-wrap"><img src="{{ asset('images/icon-secure.png') }}"></span></div><h2>Secure & Private</h2>
</div>
<p class="first">Invoice Ninja has been built from the ground up to keep your data safe. Only you have access to your login & accounting details, & we will never share your transaction data to any third party.</p>
<p>Our website operates with 256-bit encryption, which is even more secure than most banking websites. Invoice Ninja uses the TLS 1.0 cryptographic protocol, AES_256_CBC string encryption, SHA1 message authentication and DHE_RSA key exchanges. We feel safe here and have invested heavily in measures to ensure that you do too.</p>
</div>
<div class="col-md-7 valign">
<img src="{{ asset('images/laptopwicon.jpg') }}">
<div class="headline">
<div class="icon secure"><span class="img-wrap"><img src="{{ asset('images/icon-secure.png') }}"></span></div><h2>Secure & Private</h2>
</div>
<p class="first">Invoice Ninja has been built from the ground up to keep your data safe. Only you have access to your login & accounting details, & we will never share your transaction data to any third party.</p>
<p>Our website operates with 256-bit encryption, which is even more secure than most banking websites. Invoice Ninja uses the TLS 1.0 cryptographic protocol, AES_256_CBC string encryption, SHA1 message authentication and DHE_RSA key exchanges. We feel safe here and have invested heavily in measures to ensure that you do too.</p>
</div>
<div class="col-md-7 valign">
<img src="{{ asset('images/laptopwicon.jpg') }}">
</div>
</div>
</div>
</section>
<section class="features features4">
<div class="container">
<div class="row">
<div class="col-md-7">
<img src="{{ asset('images/features4.jpg') }}">
<div class="col-md-7">
<img src="{{ asset('images/features4.jpg') }}">
</div>
<div class="col-md-5 valign">
<div class="headline">
<div class="icon pdf"><span class="img-wrap"><img src="{{ asset('images/icon-pdf.png') }}"></span></div><h2>Live .PDF View</h2>
</div>
<div class="col-md-5 valign">
<div class="headline">
<div class="icon pdf"><span class="img-wrap"><img src="{{ asset('images/icon-pdf.png') }}"></span></div><h2>Live .PDF View</h2>
</div>
<p class="first">With Invoice Ninja, weve done away with the need for cumbersome multi-click invoice previewing after each save.</p>
<p>When you enter the details of your customer and/or invoice in our editor, you can instantly see the results in the pdf preview pane below. Want to see what your invoice would look like in a different layout style? The live pdf can show you four beautiful preset styles in real time too.
</p><p><i>Just create, save, send, and youre done!</i></p>
</div>
<p class="first">With Invoice Ninja, weve done away with the need for cumbersome multi-click invoice previewing after each save.</p>
<p>When you enter the details of your customer and/or invoice in our editor, you can instantly see the results in the pdf preview pane below. Want to see what your invoice would look like in a different layout style? The live pdf can show you four beautiful preset styles in real time too.
</p><p><i>Just create, save, send, and youre done!</i></p>
</div>
</div>
</div>
</section>
@ -92,24 +92,24 @@
<div class="container">
<div class="row">
<div class="col-md-5 valign">
<div class="headline">
<div class="icon pay"><span class="img-wrap"><img src="{{ asset('images/icon-payment.png') }}"></span></div><h2>Online Payments</h2>
</div>
<p class="first">Invoice Ninja seamlessly integrates with all of the top internet payment processors and gateways so you can get paid for your work quickly and easily.</p>
<p>Invoices crated with our tools arent just for bookkeeping purposes - they bring in the Benjamins. We also make it super easy to choose the right gateway for the specific needs of your business and are happy to help you to get started working with the gateway of your choice. Whats more, were constantly working on rolling out additional gateway integrations, so if you dont see the one you use here, just let us know, and theres a good chance well add it for you. </p>
</div>
<div class="col-md-7">
<img src="{{ asset('images/features5.jpg') }}">
<div class="headline">
<div class="icon pay"><span class="img-wrap"><img src="{{ asset('images/icon-payment.png') }}"></span></div><h2>Online Payments</h2>
</div>
<p class="first">Invoice Ninja seamlessly integrates with all of the top internet payment processors and gateways so you can get paid for your work quickly and easily.</p>
<p>Invoices crated with our tools arent just for bookkeeping purposes - they bring in the Benjamins. We also make it super easy to choose the right gateway for the specific needs of your business and are happy to help you to get started working with the gateway of your choice. Whats more, were constantly working on rolling out additional gateway integrations, so if you dont see the one you use here, just let us know, and theres a good chance well add it for you. </p>
</div>
<div class="col-md-7">
<img src="{{ asset('images/features5.jpg') }}">
</div>
</div>
</div>
</section>
<section class="upper-footer features center">
<div class="container">
<section class="upper-footer features center">
<div class="container">
<div class="row">
<div class="col-md-4">
<div class="col-md-4">
<h2 class="thin">Like what you see?</h2>
</div>
</div>
<div class="col-md-4">
<a href="#">
<div class="cta">

View File

@ -23,7 +23,7 @@
background-image: url({{ asset('/images/hero-bg-1.jpg') }});
}
.hero-about {
background-image: url({{ asset('/images/hero-bg-3.jpg.jpg') }});
background-image: url({{ asset('/images/hero-bg-4.jpg') }});
}
.hero-plans {
background-image: url({{ asset('/images/hero-bg-plans.jpg') }});
@ -98,6 +98,7 @@
<li>{{ link_to('about', 'About Us' ) }}</li>
<li>{{ link_to('plans', 'Plans' ) }}</li>
<li>{{ link_to('contact', 'Contact Us' ) }}</li>
<li>{{ link_to('http://blog.invoiceninja.com', 'Blog' ) }}</li>
<li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
</ul>
</div>
@ -157,6 +158,7 @@
<li>{{ link_to('about', 'About Us' ) }}</li>
<li>{{ link_to('plans', 'Plans' ) }}</li>
<li>{{ link_to('contact', 'Contact Us' ) }}</li>
<li>{{ link_to('http://blog.invoiceninja.com', 'Blog' ) }}</li>
<li>{{ link_to('login', Auth::check() ? 'My Account' : 'Login' ) }}</li>
</ul>

View File

@ -95,7 +95,7 @@
</div>
</div>
<!-- <p>or {{ link_to('features', 'View Our Features' ) }}</a></p> -->
<p><i>No signup needed</i></p>
<p>No signup needed</p>
</div>
<div class="col-md-7">
<img src="{{ asset('images/devices.png') }}">

View File

@ -39443,3 +39443,13 @@ function setDocHexDraw(doc, hex) {
var b = hexToB(hex);
return doc.setDrawColor(r, g, b);
}
function openUrl(url) {
trackUrl(url);
window.open(url, '_blank');
}
function trackUrl(url) {
url = '/track' + url.replace('http:/', '');
ga('send', 'pageview', url);
}

View File

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -1727,3 +1727,13 @@ function setDocHexDraw(doc, hex) {
var b = hexToB(hex);
return doc.setDrawColor(r, g, b);
}
function openUrl(url) {
trackUrl(url);
window.open(url, '_blank');
}
function trackUrl(url) {
url = '/track' + url.replace('http:/', '');
ga('send', 'pageview', url);
}