git -C '/home/opc/rocketa.git' show c8c5ba6 -- app/Http/Controllers/Admin/General.phpcommit c8c5ba61b1fb4c40e219ffbcf4e593c54f7d4ac6
Author: Satoshi Ujihara <satoshi_ujihara@fivegate.jp>
Date: Thu Dec 18 12:00:15 2025 +0900
メディア会員登録フロー変更
diff --git a/app/Http/Controllers/Admin/General.php b/app/Http/Controllers/Admin/General.php
index e3dac87..a103978 100644
--- a/app/Http/Controllers/Admin/General.php
+++ b/app/Http/Controllers/Admin/General.php
@@ -111,7 +111,7 @@ class General extends Controller
$items['result_method'] = [
'' => __('common.please_select'),
1 => 'API',
- 2 => 'ソケット',
+ 2 => 'Socket',
3 => 'AppsFlyer',
4 => 'Adjust',
5 => 'Airbridge',
@@ -124,28 +124,28 @@ class General extends Controller
// 成果発生日 期間選択肢
$items['period_date_type'] = [
- '' => '未参照',
- 1 => '上記期間',
- 2 => '今月',
- 3 => '先月',
- 4 => '今日',
- 5 => '昨日',
- 6 => '過去7日',
- 7 => '過去30日',
- 8 => '過去60日',
- 9 => '過去90日',
+ '' => __('common.unreferenced'),
+ 1 => __('common.specified_period'),
+ 2 => __('common.this_month'),
+ 3 => __('common.last_month'),
+ 4 => __('common.today'),
+ 5 => __('common.yesterday'),
+ 6 => __('common.last_7_days'),
+ 7 => __('common.last_30_days'),
+ 8 => __('common.last_60_days'),
+ 9 => __('common.last_90_days'),
];
// クリック発生日 期間選択肢
$items['click_period_date_type'] = [
- 1 => '上記期間',
- 2 => '今月',
- 3 => '先月',
- 4 => '今日',
- 5 => '昨日',
- 6 => '過去7日',
- 7 => '3カ月',
- 8 => '半年'
+ 1 => __('common.specified_period'),
+ 2 => __('common.this_month'),
+ 3 => __('common.last_month'),
+ 4 => __('common.today'),
+ 5 => __('common.yesterday'),
+ 6 => __('common.last_7_days'),
+ 7 => __('common.period_3_months'),
+ 8 => __('common.period_6_months')
];
return $items;
@@ -2973,7 +2973,7 @@ class General extends Controller
if ($request->input('date_type') == 1 && $request->input('fixed_date_type') == 1) {
if ($request->input('start_at') == '' && $request->input('end_at') == '' && $request->input('fixed_start_at') == '' && $request->input('fixed_end_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('date_at_null', '期間の絞り込みを入力してください');
+ $validator->errors()->add('date_at_null', __('common.enter_the_date_range_filter'));
});
$date_null_err = true;
@@ -2987,7 +2987,7 @@ class General extends Controller
$start_at = $request->input('start_at');
if (!$request->has('end_at') || $request->input('end_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('end_at_null', '終了日時を入力してください');
+ $validator->errors()->add('end_at_null', __('common.enter_end_datetime'));
});
}
}
@@ -2996,7 +2996,7 @@ class General extends Controller
$end_at = $request->input('end_at');
if (!$request->has('start_at') || $request->input('start_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('start_at_null', '開始日時を入力してください');
+ $validator->errors()->add('start_at_null', __('common.enter_start_datetime'));
});
}
}
@@ -3007,7 +3007,7 @@ class General extends Controller
$validator->after(function ($validator) use($click_period_days) {
if ($click_period_days > 60) {
- $validator->errors()->add('over_days', '最大日数を超えています');
+ $validator->errors()->add('over_days', __('common.exceeded_max_days'));
}
});
@@ -3079,7 +3079,7 @@ class General extends Controller
if ($request->input('fixed_start_at') && $request->input('fixed_start_at') != '') {
if (!$request->has('fixed_end_at') || $request->input('fixed_end_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('fixed_end_at_null', '終了日時を入力してください');
+ $validator->errors()->add('fixed_end_at_null', __('common.enter_end_datetime'));
});
}
}
@@ -3087,7 +3087,7 @@ class General extends Controller
if ($request->input('fixed_end_at') && $request->input('fixed_end_at') != '') {
if (!$request->has('fixed_start_at') || $request->input('fixed_start_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('fixed_start_at_null', '開始日時を入力してください');
+ $validator->errors()->add('fixed_start_at_null', __('common.enter_start_datetime'));
});
}
}
@@ -3101,7 +3101,7 @@ class General extends Controller
$validator->after(function ($validator) use($fixed_period_days) {
if ($fixed_period_days > 60) {
- $validator->errors()->add('fixed_over_days', '最大日数を超えています');
+ $validator->errors()->add('fixed_over_days', __('common.exceeded_max_days'));
}
});
@@ -3540,13 +3540,13 @@ class General extends Controller
if ($request->input('start_at') == '' && $request->input('end_at') == '' && $request->input('fixed_start_at') == '' && $request->input('fixed_end_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('date_at_null', '期間の絞り込みを入力してください');
+ $validator->errors()->add('date_at_null', __('common.enter_the_date_range_filter'));
});
} else {
if ($request->input('start_at') && $request->input('start_at') != '') {
if (!$request->has('end_at') || $request->input('end_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('end_at_null', '終了日時を入力してください');
+ $validator->errors()->add('end_at_null', __('common.enter_end_datetime'));
});
}
}
@@ -3554,7 +3554,7 @@ class General extends Controller
if ($request->input('end_at') && $request->input('end_at') != '') {
if (!$request->has('start_at') || $request->input('start_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('start_at_null', '開始日時を入力してください');
+ $validator->errors()->add('start_at_null', __('common.enter_start_datetime'));
});
}
}
@@ -3562,7 +3562,7 @@ class General extends Controller
if ($request->input('fixed_start_at') && $request->input('fixed_start_at') != '') {
if (!$request->has('fixed_end_at') || $request->input('fixed_end_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('fixed_end_at_null', '終了日時を入力してください');
+ $validator->errors()->add('fixed_end_at_null', __('common.enter_end_datetime'));
});
}
}
@@ -3570,7 +3570,7 @@ class General extends Controller
if ($request->input('fixed_end_at') && $request->input('fixed_end_at') != '') {
if (!$request->has('fixed_start_at') || $request->input('fixed_start_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('fixed_start_at_null', '開始日時を入力してください');
+ $validator->errors()->add('fixed_start_at_null', __('common.enter_start_datetime'));
});
}
}
@@ -3989,7 +3989,7 @@ class General extends Controller
if ($request->input('target_date_type') == 1 && $request->input('fixed_target_date_type') == 1) {
if ($request->input('start_at') == '' && $request->input('end_at') == '' && $request->input('fixed_start_at') == '' && $request->input('fixed_end_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('date_at_null', '期間の絞り込みを入力してください');
+ $validator->errors()->add('date_at_null', __('common.enter_the_date_range_filter'));
});
$date_null_err = true;
@@ -4002,7 +4002,7 @@ class General extends Controller
$start_at = $request->input('start_at');
if (!$request->has('end_at') || $request->input('end_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('end_at_null', '終了日時を入力してください');
+ $validator->errors()->add('end_at_null', __('common.enter_end_datetime'));
});
}
}
@@ -4011,7 +4011,7 @@ class General extends Controller
$end_at = $request->input('end_at');
if (!$request->has('start_at') || $request->input('start_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('start_at_null', '開始日時を入力してください');
+ $validator->errors()->add('start_at_null', __('common.enter_start_datetime'));
});
}
}
@@ -4022,7 +4022,7 @@ class General extends Controller
$validator->after(function ($validator) use($click_period_days) {
if ($click_period_days > 60) {
- $validator->errors()->add('over_days', '最大日数を超えています');
+ $validator->errors()->add('over_days', __('common.exceeded_max_days'));
}
});
@@ -4057,7 +4057,7 @@ class General extends Controller
$fixed_start_at = $request->input('fixed_start_at');
if (!$request->has('fixed_end_at') || $request->input('fixed_end_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('fixed_end_at_null', '終了日時を入力してください');
+ $validator->errors()->add('fixed_end_at_null', __('common.enter_end_datetime'));
});
}
}
@@ -4066,7 +4066,7 @@ class General extends Controller
$fixed_end_at = $request->input('fixed_end_at');
if (!$request->has('fixed_start_at') || $request->input('fixed_start_at') == '') {
$validator->after(function ($validator) {
- $validator->errors()->add('fixed_start_at_null', '開始日時を入力してください');
+ $validator->errors()->add('fixed_start_at_null', __('common.enter_start_datetime'));
});
}
}
@@ -4077,7 +4077,7 @@ class General extends Controller
$validator->after(function ($validator) use($fixed_period_days) {
if ($fixed_period_days > 60) {
- $validator->errors()->add('fixed_over_days', '最大日数を超えています');
+ $validator->errors()->add('fixed_over_days', __('common.exceeded_max_days'));
}
});