Skip to content

Commit 4509e1d

Browse files
authored
Merge pull request #18195 from grokability/#18189-day-of-week
Fixed #18189 - added option to pick the day the week starts on
2 parents bd742ae + 6b9d494 commit 4509e1d

File tree

5 files changed

+71
-1
lines changed

5 files changed

+71
-1
lines changed

app/Http/Controllers/SettingsController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,7 @@ public function postLocalization(StoreLocalizationSettings $request) : RedirectR
589589
$setting->time_display_format = $request->input('time_display_format');
590590
$setting->digit_separator = $request->input('digit_separator');
591591
$setting->name_display_format = $request->input('name_display_format');
592+
$setting->week_start = $request->input('week_start', 0);
592593

593594
if ($setting->save()) {
594595
return redirect()->route('settings.index')
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
3+
use Illuminate\Database\Migrations\Migration;
4+
use Illuminate\Database\Schema\Blueprint;
5+
use Illuminate\Support\Facades\Schema;
6+
7+
return new class extends Migration
8+
{
9+
/**
10+
* Run the migrations.
11+
*/
12+
public function up(): void
13+
{
14+
Schema::table('settings', function (Blueprint $table) {
15+
$table->tinyInteger('week_start')->after('locale')->nullable()->default(0);
16+
});
17+
}
18+
19+
/**
20+
* Reverse the migrations.
21+
*/
22+
public function down(): void
23+
{
24+
Schema::table('settings', function (Blueprint $table) {
25+
if (Schema::hasColumn('settings', 'week_start')) {
26+
$table->dropColumn('week_start');
27+
}
28+
});
29+
}
30+
};

resources/lang/en-US/datepicker.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
|
1414
*/
1515

16+
'week_start_select' => 'Select Day of Week',
17+
'week_start' => 'Day the Week Starts On',
1618
'today' => 'Today',
1719
'clear' => 'Clear',
1820
'days' => [

resources/views/layouts/default.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1145,7 +1145,7 @@
11451145
today: "{{ trans('datepicker.today') }}",
11461146
clear: "{{ trans('datepicker.clear') }}",
11471147
format: "yyyy-mm-dd",
1148-
weekStart: 0
1148+
weekStart: {{ $snipeSettings->week_start ?? 0 }},
11491149
};
11501150
11511151
var clipboard = new ClipboardJS('.js-copy-link');

resources/views/settings/localization.blade.php

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,43 @@
8686

8787
</div>
8888

89+
<!-- Week Start format -->
90+
<div class="form-group {{ $errors->has('week_start') ? 'error' : '' }}">
91+
92+
<label for="week_start" class="col-md-3 control-label">{{ trans('datepicker.week_start') }}</label>
93+
94+
<div class="col-md-5 col-xs-12">
95+
<select name="week_start" class="select2" style="width: 100%;" aria-label="week_start" data-placeholder="{{ trans('datepicker.select_day') }}">
96+
<option value="0" @selected(old('week_start', $setting->week_start) == 0)>
97+
{{ trans('datepicker.days.sunday') }}
98+
</option>
99+
<option value="1" @selected(old('week_start', $setting->week_start) == 1)>
100+
{{ trans('datepicker.days.monday') }}
101+
</option>
102+
<option value="2" @selected(old('week_start', $setting->week_start) == 2)>
103+
{{ trans('datepicker.days.tuesday') }}
104+
</option>
105+
<option value="3" @selected(old('week_start', $setting->week_start) == 3)>
106+
{{ trans('datepicker.days.wednesday') }}
107+
</option>
108+
<option value="4" @selected(old('week_start', $setting->week_start) == 4)>
109+
{{ trans('datepicker.days.thursday') }}
110+
</option>
111+
<option value="5" @selected(old('week_start', $setting->week_start) == 5)>
112+
{{ trans('datepicker.days.friday') }}
113+
</option>
114+
<option value="6" @selected(old('week_start', $setting->week_start) == 6)>
115+
{{ trans('datepicker.days.saturday') }}
116+
</option>
117+
118+
</select>
119+
120+
</div>
121+
122+
{!! $errors->first('week_start', '<div class="col-md-9 col-md-offset-3"><span class="alert-msg" aria-hidden="true">:message</span> </div>') !!}
123+
124+
</div>
125+
89126
<!-- Currency -->
90127
<div class="form-group {{ $errors->has('default_currency') ? 'error' : '' }}">
91128

0 commit comments

Comments
 (0)