Merge pull request #258 from nakazawakan/backend

本登録のリレーションチェック

backend/app/Http/Controllers/Api/ChildrenController.php

@@ -12,6 +12,7 @@ use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Storage;
 
 use App\Models\Child;
+use App\Models\Father;
 use App\Models\FatherRelation;
 use App\Models\MeetingApprovals;
 use App\Models\TelActivation;
@@ -115,6 +116,13 @@ class ChildrenController extends Controller {
             return ['status_code' => 400, 'error_messages' => ['仮登録の有効期限が切れました。改めて親にお問い合わせいただき、再登録の手続きを行ってください。']];
         }
 
+        // 親子関係の上限の場合
+        if (!is_null($get->father_id) && null !== ($rel = FatherRelation::where('father_id', $get->father_id)->first())) {
+            if (Father::select('relation_limit')->where('id', $get->father_id)->first()->relation_limit >= FatherRelation::where('father_id', $get->father_id)->count()) {
+                return ['status_code' => 400, 'error_messages' => ['仮登録の有効期限が切れました。改めて親にお問い合わせいただき、再登録の手続きを行ってください。']];
+            }
+        }
+
         if (!is_null($r->image) && count(Storage::disk('private')->files('/')) >= 9999) {
             Log::critical('ストレージの限界を超えています。9999個ファイルまで保存可能ですので、不要なファイルを削除して下さい。');
             return ['status_code' => 400, 'error_messages' => ['登録に失敗しました。']];

backend/public/css/app.css

@@ -12897,7 +12897,7 @@ categories: [project]
 @font-face {
   font-family: "iconfont";
   src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2);
-  src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2) format("eot"), url(/fonts/iconfont.woff?72290a51f520574be856b3621acc29a1) format("woff"), url(/fonts/iconfont.ttf?e240ce427caf7549e576c77b39a1d3f1) format("truetype"), url(/fonts/iconfont.svg?9e48c54f8bbb472c1c286234fdd6636f) format("svg");
+  src: url(/fonts/iconfont.eot?9bd2f8e21fb68f3cb69f306c7a5a07d2) format("eot"), url(/fonts/iconfont.woff?72290a51f520574be856b3621acc29a1) format("woff"), url(/fonts/iconfont.ttf?e240ce427caf7549e576c77b39a1d3f1) format("truetype"), url(/fonts/iconfont.svg?d812f238f7ec32f5cb5ebd322f320a02) format("svg");
   font-weight: normal;
   font-style: normal;
 }

backend/resources/js/child/auth/register/temporary.jsx

@@ -24,7 +24,7 @@ const ChildSignUpTemporary = () => {
 
         if(document.getElementById('father_token')){
             let father_id = document.getElementById('father_token').value;
-            axios.get('/api/fathers/relations/check', {params:{father_id: father_id}})
+            axios.get('/api/children/father/relations/check', {params:{father_id: father_id}})
             .then(response=>{
                 if(mounted){
                     if(response.data.status_code == 200){