Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added goal tracking

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/AccountController.php
View File

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

3
app/controllers/ReportController.php
View File

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

1
app/ninja/repositories/AccountRepository.php
View File

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

2
app/views/accounts/nav_advanced.blade.php
View File

@ -8,7 +8,7 @@
@if (!Auth::user()->account->isPro()) @if (!Auth::user()->account->isPro())
<div class="container"> <div class="container">
<div class="row"> <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; &nbsp;<p/>&nbsp;
</div> </div>
</div> </div>

2
app/views/accounts/payments.blade.php
View File

@ -95,7 +95,7 @@
var contents = $(this).parent().contents(); var contents = $(this).parent().contents();
contents[contents.length - 1].nodeValue = ''; contents[contents.length - 1].nodeValue = '';
$(this).after('<img src="' +$(this).attr('data-imageUrl') + '" /><br />'); $(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>');
}); });

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

2
app/views/invoices/edit.blade.php
View File

@ -276,7 +276,7 @@
@if (!Auth::user()->account->isPro()) @if (!Auth::user()->account->isPro())
<div style="font-size:larger"> <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> </div>
@endif @endif

2
app/views/master.blade.php
View File

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

4
app/views/public/header.blade.php
View File

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

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

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

10
public/built.js
View File

@ -39443,3 +39443,13 @@ function setDocHexDraw(doc, hex) {
var b = hexToB(hex); var b = hexToB(hex);
return doc.setDrawColor(r, g, b); 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);
}

0
public/images/LaptopwIcon.jpg → public/images/laptopwicon.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

10
public/js/script.js
View File

@ -1727,3 +1727,13 @@ function setDocHexDraw(doc, hex) {
var b = hexToB(hex); var b = hexToB(hex);
return doc.setDrawColor(r, g, b); 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);
}