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

Minor fixes

Browse Source
This commit is contained in:
Hillel Coren 2016-06-05 19:10:15 +03:00
parent 8b2f7eb39f
commit 5c7a15ff83
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/routes.php
View File

@ -325,6 +325,9 @@ Route::get('/compare-online-invoicing{sites?}', function() {
Route::get('/forgot', function() { Route::get('/forgot', function() {
return Redirect::to(NINJA_APP_URL.'/recover_password', 301); return Redirect::to(NINJA_APP_URL.'/recover_password', 301);
}); });
Route::get('/feed', function() {
return Redirect::to(NINJA_WEB_URL.'/feed', 301);
});
if (!defined('CONTACT_EMAIL')) { if (!defined('CONTACT_EMAIL')) {

6
app/Ninja/Repositories/ReferralRepository.php
View File

@ -7,7 +7,7 @@ class ReferralRepository
{ {
public function getCounts($userId) public function getCounts($userId)
{ {
$accounts = Account::where('referral_user_id', $userId); $accounts = Account::where('referral_user_id', $userId)->get();
$counts = [ $counts = [
'free' => 0, 'free' => 0,
@ -18,7 +18,7 @@ class ReferralRepository
foreach ($accounts as $account) { foreach ($accounts as $account) {
$counts['free']++; $counts['free']++;
$plan = $account->getPlanDetails(false, false); $plan = $account->getPlanDetails(false, false);
if ($plan) { if ($plan) {
$counts['pro']++; $counts['pro']++;
if ($plan['plan'] == PLAN_ENTERPRISE) { if ($plan['plan'] == PLAN_ENTERPRISE) {
@ -29,4 +29,4 @@ class ReferralRepository
return $counts; return $counts;
} }
} }

5
resources/lang/en/texts.php
View File

@ -1334,7 +1334,7 @@ $LANG = array(
'auto_bill_payment_method_paypal' => 'your PayPal account (:email)', 'auto_bill_payment_method_paypal' => 'your PayPal account (:email)',
'auto_bill_notification_placeholder' => 'This invoice will automatically be billed to your Visa card ending in 4242 on the due date.', 'auto_bill_notification_placeholder' => 'This invoice will automatically be billed to your Visa card ending in 4242 on the due date.',
'payment_settings' => 'Payment Settings', 'payment_settings' => 'Payment Settings',
'on_send_date' => 'On send date', 'on_send_date' => 'On send date',
'on_due_date' => 'On due date', 'on_due_date' => 'On due date',
'auto_bill_ach_date_help' => 'ACH auto bill will always happen on the due date', 'auto_bill_ach_date_help' => 'ACH auto bill will always happen on the due date',
@ -1348,6 +1348,9 @@ $LANG = array(
'payment_settings_supported_gateways' => 'These options are supported by the WePay, Stripe, and Braintree gateways.', 'payment_settings_supported_gateways' => 'These options are supported by the WePay, Stripe, and Braintree gateways.',
'ach_email_prompt' => 'Please enter your email address:', 'ach_email_prompt' => 'Please enter your email address:',
'verification_pending' => 'Verification Pending', 'verification_pending' => 'Verification Pending',
'update_font_cache' => 'Please force refresh the page to update the font cache.',
); );
return $LANG; return $LANG;

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

@ -48,7 +48,7 @@
} }
if (errorMsg.indexOf('No unicode cmap for font') > -1) { if (errorMsg.indexOf('No unicode cmap for font') > -1) {
alert("Please force refresh the page to update the font cache.\n\n - Windows: Ctrl + F5\n - Mac/Apple: Apple + R or Command + R\n - Linux: F5"); alert("{{ trans('texts.update_font_cache') }}\n\n - Windows: Ctrl + F5\n - Mac/Apple: Apple + R or Command + R\n - Linux: F5");
} }
try { try {