Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 20:18:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #950 from codedge/#868-Configurable-start-of-week

Browse Source 
Adding configuration for first day of the week
This commit is contained in:
Hillel Coren 2016-07-10 12:42:12 +03:00 committed by GitHub
commit fd2155d10a
9 changed files with 181 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/AccountController.php
View File

@ -471,6 +471,7 @@ class AccountController extends BaseController
'datetimeFormats' => Cache::get('datetimeFormats'),
'currencies' => Cache::get('currencies'),
'title' => trans('texts.localization'),
'weekdays' => Utils::getTranslatedWeekdayNames(),
];
return View::make('accounts.localization', $data);
@ -1270,6 +1271,7 @@ class AccountController extends BaseController
$account->language_id = Input::get('language_id') ? Input::get('language_id') : 1; // English
$account->military_time = Input::get('military_time') ? true : false;
$account->show_currency_code = Input::get('show_currency_code') ? true : false;
$account->start_of_week = Input::get('start_of_week') ? Input::get('start_of_week') : 0;
$account->save();
event(new UserSettingsChanged());

29
app/Libraries/Utils.php
View File

@ -18,6 +18,11 @@ use WePay;
class Utils
{
private static $weekdayNames = [
"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday",
];
public static function isRegistered()
{
return Auth::check() && Auth::user()->registered;
@ -1020,4 +1025,28 @@ class Utils
return new WePay(null);
}
}
/**
* Gets an array of weekday names (in English)
*
* @see getTranslatedWeekdayNames()
*
* @return \Illuminate\Support\Collection
*/
public static function getWeekdayNames()
{
return collect(static::$weekdayNames);
}
/**
* Gets an array of translated weekday names
*
* @return \Illuminate\Support\Collection
*/
public static function getTranslatedWeekdayNames()
{
return collect(static::$weekdayNames)->transform(function ($day) {
return trans('texts.'.strtolower($day));
});
}
}

3
app/Models/Account.php
View File

@ -79,6 +79,7 @@ class Account extends Eloquent
'show_item_taxes',
'default_tax_rate_id',
'enable_second_tax_rate',
'start_of_week',
];
/**
@ -1063,6 +1064,8 @@ class Account extends Eloquent
$format = str_replace('g:i a', 'H:i', $format);
}
Session::put(SESSION_DATETIME_FORMAT, $format);
Session::put('start_of_week', $this->start_of_week);
}
/**

34
database/migrations/2016_07_04_110152_add_start_of_week_to_accounts_table.php Normal file
View File

@ -0,0 +1,34 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
/**
* Class AddStartOfWeekToAccountsTable
*/
class AddStartOfWeekToAccountsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('accounts', function (Blueprint $table) {
$table->integer('start_of_week');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('accounts', function (Blueprint $table) {
$table->dropColumn('start_of_week');
});
}
}

1
resources/lang/de/texts.php
View File

@ -1362,6 +1362,7 @@ $LANG = array(
'failed_remove_payment_method' => 'Failed to remove the payment method',
'gateway_exists' => 'This gateway already exists',
'manual_entry' => 'Manual entry',
'start_of_week' => 'Erster Tag der Woche',
// Frequencies
'freq_weekly' => 'wöchentlich',

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

@ -1362,6 +1362,7 @@ $LANG = array(
'failed_remove_payment_method' => 'Failed to remove the payment method',
'gateway_exists' => 'This gateway already exists',
'manual_entry' => 'Manual entry',
'start_of_week' => 'First day of the week',
// Frequencies
'freq_weekly' => 'Weekly',

2
resources/views/accounts/localization.blade.php
View File

@ -30,6 +30,8 @@
->fromQuery($dateFormats) !!}
{!! Former::select('datetime_format_id')->addOption('','')
->fromQuery($datetimeFormats) !!}
{!! Former::select('start_of_week')->addOption('','')
->fromQuery($weekdays) !!}
{!! Former::checkbox('military_time')->text(trans('texts.enable')) !!}
{{-- Former::checkbox('show_currency_code')->text(trans('texts.enable')) --}}

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

@ -5,35 +5,35 @@
<title>{{ trans('texts.client_portal') }}</title>
@else
<title>{{ isset($title) ? ($title . ' | Invoice Ninja') : ('Invoice Ninja | ' . trans('texts.app_title')) }}</title>
<meta name="description" content="{{ isset($description) ? $description : trans('texts.app_description') }}" />
<meta name="description" content="{{ isset($description) ? $description : trans('texts.app_description') }}"/>
<link href="{{ asset('favicon-v2.png') }}" rel="shortcut icon" type="image/png">
@endif
<!-- Source: https://github.com/invoiceninja/invoiceninja -->
<!-- Version: {{ NINJA_VERSION }} -->
<!-- Source: https://github.com/invoiceninja/invoiceninja -->
<!-- Version: {{ NINJA_VERSION }} -->
<meta charset="utf-8">
<meta property="og:site_name" content="Invoice Ninja" />
<meta property="og:url" content="{{ SITE_URL }}" />
<meta property="og:title" content="Invoice Ninja" />
<meta property="og:image" content="{{ SITE_URL }}/images/round_logo.png" />
<meta property="og:description" content="Simple, Intuitive Invoicing." />
<meta property="og:site_name" content="Invoice Ninja"/>
<meta property="og:url" content="{{ SITE_URL }}"/>
<meta property="og:title" content="Invoice Ninja"/>
<meta property="og:image" content="{{ SITE_URL }}/images/round_logo.png"/>
<meta property="og:description" content="Simple, Intuitive Invoicing."/>
<!-- http://stackoverflow.com/questions/19012698/browser-cache-issues-in-laravel-4-application -->
<meta http-equiv="cache-control" content="max-age=0" />
<meta http-equiv="cache-control" content="no-cache" />
<meta http-equiv="cache-control" content="no-store" />
<meta http-equiv="cache-control" content="must-revalidate" />
<meta http-equiv="expires" content="0" />
<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT" />
<meta http-equiv="pragma" content="no-cache" />
<meta http-equiv="cache-control" content="max-age=0"/>
<meta http-equiv="cache-control" content="no-cache"/>
<meta http-equiv="cache-control" content="no-store"/>
<meta http-equiv="cache-control" content="must-revalidate"/>
<meta http-equiv="expires" content="0"/>
<meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT"/>
<meta http-equiv="pragma" content="no-cache"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="msapplication-config" content="none"/>
<link rel="canonical" href="{{ NINJA_APP_URL }}/{{ Request::path() }}" />
<link rel="canonical" href="{{ NINJA_APP_URL }}/{{ Request::path() }}"/>
<script src="{{ asset('built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
@ -55,9 +55,9 @@
// Use StackTraceJS to parse the error context
if (error) {
var message = error.message ? error.message : error;
StackTrace.fromError(error).then(function(result) {
StackTrace.fromError(error).then(function (result) {
var gps = new StackTraceGPS();
gps.findFunctionName(result[0]).then(function(result) {
gps.findFunctionName(result[0]).then(function (result) {
logError(errorMsg + ': ' + JSON.stringify(result));
});
});
@ -66,7 +66,8 @@
}
trackEvent('/error', errorMsg);
} catch(err) {}
} catch (err) {
}
return false;
}
@ -75,12 +76,12 @@
$.ajax({
type: 'GET',
url: '{{ URL::to('log_error') }}',
data: 'error='+encodeURIComponent(message)+'&url='+encodeURIComponent(window.location)
data: 'error=' + encodeURIComponent(message) + '&url=' + encodeURIComponent(window.location)
});
}
/* Set the defaults for DataTables initialisation */
$.extend( true, $.fn.dataTable.defaults, {
$.extend(true, $.fn.dataTable.defaults, {
"bSortClasses": false,
"sDom": "t<'row-fluid'<'span6'i><'span6'p>>l",
"sPaginationType": "bootstrap",
@ -90,45 +91,61 @@
'sLengthMenu': '_MENU_ {{ trans('texts.rows') }}',
'sSearch': ''
}
} );
});
/* Set the defaults for Bootstrap datepicker */
$.extend(true, $.fn.datepicker.defaults, {
weekStart: {{ Session::get('start_of_week') }}
});
/* This causes problems with some languages. ie, fr_CA
var appLocale = '{{App::getLocale()}}';
$.extend( true, $.fn.datepicker.defaults, {
language: appLocale.replace("_", "-")
});
*/
var appLocale = '{{App::getLocale()}}';
*/
@if (env('FACEBOOK_PIXEL'))
<!-- Facebook Pixel Code -->
!function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];t=b.createElement(e);t.async=!0;
t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
document,'script','//connect.facebook.net/en_US/fbevents.js');
<!-- Facebook Pixel Code -->
!function (f, b, e, v, n, t, s) {
if (f.fbq)return;
n = f.fbq = function () {
n.callMethod ?
n.callMethod.apply(n, arguments) : n.queue.push(arguments)
};
if (!f._fbq)f._fbq = n;
n.push = n;
n.loaded = !0;
n.version = '2.0';
n.queue = [];
t = b.createElement(e);
t.async = !0;
t.src = v;
s = b.getElementsByTagName(e)[0];
s.parentNode.insertBefore(t, s)
}(window,
document, 'script', '//connect.facebook.net/en_US/fbevents.js');
fbq('init', '{{ env('FACEBOOK_PIXEL') }}');
fbq('track', "PageView");
fbq('init', '{{ env('FACEBOOK_PIXEL') }}');
fbq('track', "PageView");
(function() {
var _fbq = window._fbq || (window._fbq = []);
if (!_fbq.loaded) {
(function () {
var _fbq = window._fbq || (window._fbq = []);
if (!_fbq.loaded) {
var fbds = document.createElement('script');
fbds.async = true;
fbds.src = '//connect.facebook.net/en_US/fbds.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(fbds, s);
_fbq.loaded = true;
}
})();
}
})();
@else
function fbq() {
// do nothing
};
function fbq() {
// do nothing
}
;
@endif
window._fbq = window._fbq || [];
window._fbq = window._fbq || [];
</script>
@ -139,32 +156,49 @@
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
@yield('head')
@yield('head')
</head>
<body class="body">
@if (isset($_ENV['TAG_MANAGER_KEY']) && $_ENV['TAG_MANAGER_KEY'])
@if (isset($_ENV['TAG_MANAGER_KEY']) && $_ENV['TAG_MANAGER_KEY'])
<!-- Google Tag Manager -->
<noscript><iframe src="//www.googletagmanager.com/ns.html?id={{ $_ENV['TAG_MANAGER_KEY'] }}"
height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','{{ $_ENV['TAG_MANAGER_KEY'] }}');</script>
<noscript>
<iframe src="//www.googletagmanager.com/ns.html?id={{ $_ENV['TAG_MANAGER_KEY'] }}"
height="0" width="0" style="display:none;visibility:hidden"></iframe>
</noscript>
<script>(function (w, d, s, l, i) {
w[l] = w[l] || [];
w[l].push({
'gtm.start': new Date().getTime(), event: 'gtm.js'
});
var f = d.getElementsByTagName(s)[0],
j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
j.async = true;
j.src =
'//www.googletagmanager.com/gtm.js?id=' + i + dl;
f.parentNode.insertBefore(j, f);
})(window, document, 'script', 'dataLayer', '{{ $_ENV['TAG_MANAGER_KEY'] }}');</script>
<!-- End Google Tag Manager -->
<script>
function trackEvent(category, action) {}
function trackEvent(category, action) {
}
</script>
@elseif (isset($_ENV['ANALYTICS_KEY']) && $_ENV['ANALYTICS_KEY'])
@elseif (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),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
(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),
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', '{{ $_ENV['ANALYTICS_KEY'] }}', 'auto');
ga('send', 'pageview');
@ -173,36 +207,40 @@
ga('send', 'event', category, action, this.src);
}
</script>
@else
@else
<script>
function trackEvent(category, action) {}
function trackEvent(category, action) {
}
</script>
@endif
@endif
@yield('body')
<script type="text/javascript">
NINJA.formIsChanged = {{ isset($formIsChanged) && $formIsChanged ? 'true' : 'false' }};
$(function() {
$('form.warn-on-exit input, form.warn-on-exit textarea, form.warn-on-exit select').change(function() {
$(function () {
$('form.warn-on-exit input, form.warn-on-exit textarea, form.warn-on-exit select').change(function () {
NINJA.formIsChanged = true;
});
@if (Session::has('trackEventCategory') && Session::has('trackEventAction'))
@if (Session::get('trackEventAction') === '/buy_pro_plan')
window._fbq.push(['track', '{{ env('FACEBOOK_PIXEL_BUY_PRO') }}', {'value':'{{ session('trackEventAmount') }}','currency':'USD'}]);
@endif
window._fbq.push(['track', '{{ env('FACEBOOK_PIXEL_BUY_PRO') }}', {
'value': '{{ session('trackEventAmount') }}',
'currency': 'USD'
}]);
@endif
@endif
@if (Session::has('onReady'))
{{ Session::get('onReady') }}
{{ Session::get('onReady') }}
@endif
});
$('form').submit(function() {
$('form').submit(function () {
NINJA.formIsChanged = false;
});
$(window).on('beforeunload', function() {
$(window).on('beforeunload', function () {
if (NINJA.formIsChanged) {
return "{{ trans('texts.unsaved_changes') }}";
} else {

3
resources/views/tasks/edit.blade.php
View File

@ -178,7 +178,8 @@
$(element).datetimepicker({
value: current_time
});
}
},
dayOfWeekStart: {{ Session::get('start_of_week') }}
});
$(element).change(function() {