Merge branch 'master' of http://share.barunsoft.net:9105/git/solarai

app/Libs/TraitBoard.php

@@ -237,11 +237,8 @@ trait TraitBoard
 
             $boardCode = $request->code;
             if ($boardCode == 'inquiry') {
-                unset($rules['subject']);
-
                 $rules['name'] = 'required|string';
                 $rules['email'] = 'required|string';
-                $rules['phone'] = 'required|string';
             }
 
             $validator = $this->validation($request, $rules);
@@ -266,19 +263,33 @@ trait TraitBoard
             $postData = array_map('setDefault', $postData);
 
             if (!isset($postData['subject'])) {
-                $postData['subject'] = 0;
+                $postData['subject'] = '';
             }
+
             if (!isset($postData['notice'])) {
                 $postData['notice'] = 0;
             }
+
             if (!isset($postData['name'])) {
-                $postData['name'] = auth()->user()->name;
+                if (auth()->check()) {
+                    $postData['name'] = auth()->user()->name;
+                } else {
+                    $postData['name'] = '';
+                }
             }
             if (!isset($postData['email'])) {
-                $postData['email'] = auth()->user()->email;
+                if (auth()->check()) {
+                    $postData['email'] = auth()->user()->email;
+                } else {
+                    $postData['email'] = '';
+                }
             }
             if (!isset($postData['phone'])) {
-                $postData['phone'] = auth()->user()->phone;
+                if (auth()->check()) {
+                    $postData['email'] = auth()->user()->phone;
+                } else {
+                    $postData['phone'] = '';
+                }
             }
 
             // 목록이미지 삭제

public/js/main.js

@@ -7,14 +7,17 @@ $(document).ready(function() {
     });
 
     $('#writeForm').submit(function () {
-        if (!$("#name").checkEmpty('이름을 입력해 주세요.')) return false;
+        if (!$("#name").checkEmpty('이름 또는 업체명을 입력해 주세요.')) return false;
-        if (!$("#phone").checkEmpty('연락처를 입력해 주세요.')) return false;
+        if (!$("#email").checkEmpty('이메일 주소를 입력해 주세요.')) return false;
-        if (!$("#email").checkEmpty('이메일을 입력해 주세요.')) return false;
+        if (!$("#subject").checkEmpty('제목을을 입력해 주세요.')) return false;
         if (!$("#content").checkEmpty('문의내용을 입력해 주세요.')) return false;
+
         $.post($(this).attr('action'), $(this).serialize(), function(result) {
-            alert(result.message);
             if (result.code == 'success') {
+                alert('등록되었습니다.');
                 window.location.reload();
+            } else {
+                alert(result.message);
             }
         }).fail(function(result) {
             console.log(result);

resources/views/admin/board/inquiry/index.blade.php

@@ -32,7 +32,7 @@
                 <thead>
                 <tr>
                     <th class="width-40">순번</th>
-                    <th class="width-70">이름</th>
+                    <th class="width-80">이름</th>
                     <th class="text-left">문의내용</th>
                     <th class="width-70">등록일</th>
                 </tr>
@@ -42,7 +42,7 @@
                     <tr>
                         <td>{{ $row->number }}</td>
                         <td class="nowrap"><span>{{ $row->name }}</span></td>
-                        <td class="ellipsis ellipsis-wide text-left"><span><a href="{{ route('cms.board.view', [$code, $row->uid], false) }}" class="view-link">{{ Str::limit(strip_tags($row->content), 100, ' ‥') }}</a></span></td>
+                        <td class="ellipsis ellipsis-wide text-left"><span><a href="{{ route('cms.board.view', [$code, $row->uid], false) }}" class="view-link">{{ Str::limit(strip_tags($row->subject), 100, ' ‥') }}</a></span></td>
                         <td class="nowrap">{{ str_replace('-', '.', substr($row->created_at, 0, 10)) }}</td>
                     </tr>
                 @endforeach

resources/views/admin/board/inquiry/view.blade.php

@@ -14,14 +14,14 @@
                     <label for="name">이름</label>
                     <input type="text" class="form-control" name="name" id="name" required value="{{ $data->name }}" />
                 </div>
-                <div class="form-group">
-                    <label for="phone">연락처</label>
-                    <input type="text" class="form-control" name="phone" id="phone" required value="{{ $data->phone }}" />
-                </div>
                 <div class="form-group">
                     <label for="email">이메일</label>
                     <input type="text" class="form-control" name="email" id="email" required value="{{ $data->email }}" />
                 </div>
+                <div class="form-group">
+                    <label for="subject">제목</label>
+                    <input type="text" class="form-control" name="subject" id="subject" required value="{{ $data->subject }}" />
+                </div>
                 <div class="form-group">
                     <label for="content">문의내용</label>
                     <textarea class="form-control autosize" name="content" id="content" rows="3" required>{{ $data->content }}</textarea>

resources/views/pages/inquiry.blade.php

@@ -9,14 +9,13 @@
             <div class="inquiry-form">
                 <div class="row">
                     <div class="col-12 col-md-6 mx-auto">
-                        <form id="writeForm" method="post" accept-charset="utf-8" action="{{ route('board.store', null, false) }}">
+                        <form id="writeForm" method="post" accept-charset="utf-8" action="{{ route('board.store', null, false) }}" onsubmit="return false;">
                             <input type="hidden" name="_token" value="{{ csrf_token() }}" />
                             <input type="hidden" name="mode" value="add" />
                             <input type="hidden" name="code" value="inquiry" />
                             <input type="hidden" name="board_id" value="3" />
                             <input type="hidden" name="uid" value="" />
                             <input type="hidden" name="category" value="" />
-                            <input type="hidden" name="notice" value="0" />
                             <div class="row">
                                 <div class="col-12">
                                     <label for="name" class="form-label mb-3">이름 또는 업체명 *</label>
@@ -45,27 +44,3 @@
     </div>
 </section>
 
-@push('scripts')
-<script type="text/javascript">
-$(document).ready(function() {
-    $('#writeForm').submit(function () {
-        if (!$("#name").checkEmpty('이름을 입력해 주세요.')) return false;
-        if (!$("#email").checkEmpty('연락처를 입력해 주세요.')) return false;
-        if (!$("#subject").checkEmpty('이메일을 입력해 주세요.')) return false;
-        if (!$("#content").checkEmpty('문의내용을 입력해 주세요.')) return false;
-
-        $.post($(this).attr('action'), $(this).serialize(), function(result) {
-            alert(result.message);
-            if (result.code == 'success') {
-                window.history.go(-1);
-            }
-        }).fail(function(result) {
-            console.log(result);
-            alert('문의 등록에 실패했습니다!!\n잠시 후 다시 시도해 주세요.');
-        });
-
-        return false;
-    });
-});
-</script>
-@endpush