diff --git a/app/Http/routes.php b/app/Http/routes.php index cf396c3de9e2..f6574b9762c9 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -306,6 +306,9 @@ Route::get('/compare-online-invoicing{sites?}', function() { Route::get('/forgot', function() { 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')) { define('CONTACT_EMAIL', Config::get('mail.from.address')); diff --git a/app/Ninja/Repositories/ReferralRepository.php b/app/Ninja/Repositories/ReferralRepository.php index f96475c72ddc..f6170af296e3 100644 --- a/app/Ninja/Repositories/ReferralRepository.php +++ b/app/Ninja/Repositories/ReferralRepository.php @@ -7,7 +7,7 @@ class ReferralRepository { public function getCounts($userId) { - $accounts = Account::where('referral_user_id', $userId); + $accounts = Account::where('referral_user_id', $userId)->get(); $counts = [ 'free' => 0, @@ -18,7 +18,7 @@ class ReferralRepository foreach ($accounts as $account) { $counts['free']++; $plan = $account->getPlanDetails(false, false); - + if ($plan) { $counts['pro']++; if ($plan['plan'] == PLAN_ENTERPRISE) { @@ -29,4 +29,4 @@ class ReferralRepository return $counts; } -} \ No newline at end of file +} diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 624a472f8ac9..571d2b518a00 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -1054,14 +1054,14 @@ $LANG = array( 'enable_portal_password_help'=>'Allows you to set a password for each contact. If a password is set, the contact will be required to enter a password before viewing invoices.', 'send_portal_password'=>'Generate password automatically', 'send_portal_password_help'=>'If no password is set, one will be generated and sent with the first invoice.', - + 'expired' => 'Expired', 'invalid_card_number' => 'The credit card number is not valid.', 'invalid_expiry' => 'The expiration date is not valid.', 'invalid_cvv' => 'The CVV is not valid.', 'cost' => 'Cost', 'create_invoice_for_sample' => 'Note: create your first invoice to see a preview here.', - + // User Permissions 'owner' => 'Owner', 'administrator' => 'Administrator', @@ -1079,8 +1079,8 @@ $LANG = array( 'create_all_help' => 'Allow user to create and modify records', 'view_all_help' => 'Allow user to view records they didn\'t create', 'edit_all_help' => 'Allow user to modify records they didn\'t create', - 'view_payment' => 'View Payment', - + 'view_payment' => 'View Payment', + 'january' => 'January', 'february' => 'February', 'march' => 'March', @@ -1093,7 +1093,7 @@ $LANG = array( 'october' => 'October', 'november' => 'November', 'december' => 'December', - + // Documents 'documents_header' => 'Documents:', 'email_documents_header' => 'Documents:', @@ -1125,11 +1125,11 @@ $LANG = array( 'enable_client_portal_help' => 'Show/hide the client portal.', 'enable_client_portal_dashboard' => 'Dashboard', 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', - + // Plans 'account_management' => 'Account Management', 'plan_status' => 'Plan Status', - + 'plan_upgrade' => 'Upgrade', 'plan_change' => 'Change Plan', 'pending_change_to' => 'Changes To', @@ -1159,9 +1159,9 @@ $LANG = array( 'plan_paid' => 'Term Started', 'plan_started' => 'Plan Started', 'plan_expires' => 'Plan Expires', - + 'white_label_button' => 'White Label', - + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', 'enterprise_plan_product' => 'Enterprise Plan', @@ -1181,9 +1181,11 @@ $LANG = array( 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', 'return_to_app' => 'Return to app', - + + 'update_font_cache' => 'Please force refresh the page to update the font cache.', + ); return $LANG; -?>. \ No newline at end of file +?>. diff --git a/resources/views/master.blade.php b/resources/views/master.blade.php index 19bb607ce612..3d4ee77e0cfb 100644 --- a/resources/views/master.blade.php +++ b/resources/views/master.blade.php @@ -48,7 +48,7 @@ } 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 {