Merge pull request #326 from nakazawakan/newbackend

管理者画面からミーティング編集の修正

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

@@ -813,7 +813,7 @@ class MeetingsController extends Controller {
             $meeting->save();
 
             // 子供達を知らせます。
-            if (null !== ($fr = FatherRelation::where('father_id', (int)session()->get('fathers')['id'])->get())) {
+            if (null !== ($fr = FatherRelation::where('father_id', (int)$meeting->id)->get())) {
                 foreach ($fr as $f) {
                     if (null !== ($meeting = MeetingApprovals::where('meeting_id', (int)$meeting_id)->where('child_id', $f->child_id)->whereNotNull('approval_at')->first())) {
                         if (null !== ($child = Child::where('id', $f->child_id)->first())) {

backend/resources/js/parent/meeting/detail.jsx

@@ -28,6 +28,7 @@ const ParentMeetingDetail = () => {
   const [submit_notify, setSubmitNotify] = useState(false);
   const [_success, setSuccess] = useState('');
   const [_400error, set400Error] = useState('');
+  const [_401error, set401Error] = useState('');
   const [_404error, set404Error] = useState('');
 
   const [show_delete_modal, setShowDeleteModal] = useState(false);
@@ -41,6 +42,11 @@ const ParentMeetingDetail = () => {
 
   const isMountedRef = useRef(true);
 
+  const lineText =
+      `「KIKI」の招待が届いています。%0Aまずは以下より仮登録を行ってください。
+      %0A%0A※スマホ本体を最新の状態にアップデートしてからURLをクリックしてください。
+      %0A%0A${document.getElementById('inviteurl_html').value}%0A%0A▼公式サイトはこちら%0A${document.getElementById('siteurl').value}`;
+
   useEffect(() => {
     isMountedRef.current = false;
 
@@ -181,12 +187,27 @@ const ParentMeetingDetail = () => {
     setLoadedChildren(flag);
   }
 
-  const saveStorage = () => {
-    let txt = `${meeting.father.company}さんより\n業務連絡のお知らせ\n新規業務連絡のご確認はこちら\n\nhttps://kikikan.xyz/c-account/meeting/detail/${params?.meeting_id}`; 
-    if(copy(txt)){
-      setSuccess('コピーしました。')
-    } else {
-      set400Error('コピー失敗しました。')
+  const chareToLine = () => {
+    if (isAuthenticate()) {
+      set401Error('');
+      setLoaded(false);
+
+      axios.get('/api/fathers/relations/check', {params:{father_id: father_id}})
+      .then(response=>{
+        if(isMountedRef.current) return;
+
+        switch(response.data.status_code) {
+          case 200: {
+            window.location.href = `http://line.naver.jp/R/msg/text/?${lineText}`;
+            break;
+          }
+          case 400: set400Error(response.data.error_messages); break;
+          case 401: set401Error(response.data.error_messages); set400Error(response.data.error_messages); break;
+        }
+        setNotice(response.data.notice);
+        setLoaded(true);
+      })
+      .catch(err=>console.log(err));
     }
   }
 
@@ -195,7 +216,6 @@ const ParentMeetingDetail = () => {
     navigator('/p-account/meeting/new');
   }
 
-
   return (
       <div className="l-content">
         <div className="l-content-w560">
@@ -244,9 +264,8 @@ const ParentMeetingDetail = () => {
                       <time dateTime="2021-07-30" className="meeting-time">
                         <span className="meeting-date">{ moment(meeting?.updated_at).format('YYYY/MM/DD') }</span>
                       </time>
-                      <div className="clip-copy" onClick={saveStorage}>
-                          <a>この案件のURLをコピーする</a>
-                          <img src="/assets/img/icon/icon-copy.svg" alt="kiki"/>
+                      <div className="clip-copy">
+                          <a onClick={chareToLine}>招待用URLをLINEで送信</a>
                       </div>
                       <ul className="p-article-btn-list">
                         <li className="p-article-btn__item">