updates
このコミットが含まれているのは:
コミット
fd49f5a83e
|
@ -13,6 +13,7 @@ use App\Models\Father;
|
|||
use App\Models\FatherRelation;
|
||||
use App\Models\Meeting;
|
||||
use App\Models\MeetingApprovals;
|
||||
use App\Models\TelActivation;
|
||||
|
||||
class FatherRelationsController extends Controller {
|
||||
public function checkNull (Request $r) {
|
||||
|
@ -30,7 +31,7 @@ class FatherRelationsController extends Controller {
|
|||
|
||||
$father = Father::select('relation_limit')->where('id', $father_id)->first();
|
||||
|
||||
if ($father->relation_limit <= FatherRelation::select('id')->where('father_id', $father_id)->count()) {
|
||||
if ($father->relation_limit <= FatherRelation::select('id')->where('father_id', $father_id)->count() + TelActivation::select('id')->where('father_id', $father_id)->count()) {
|
||||
return ['status_code' => 401, 'error_messages' => ['契約上限数に達した為、メンバー追加できません。']];
|
||||
}
|
||||
|
||||
|
|
|
@ -31692,7 +31692,6 @@ var ChildSignUpTemporary = function ChildSignUpTemporary() {
|
|||
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
|
||||
isMountedRef.current = false;
|
||||
setLoaded(false);
|
||||
|
||||
if (document.getElementById('father_token')) {
|
||||
var father_id = document.getElementById('father_token').value;
|
||||
axios.get('/api/children/father/relations/check', {
|
||||
|
|
新しいイシューから参照