정지윤 / project_opensource

Go to a project
Toggle navigation Toggle navigation pinning
정지윤
e96c4ab2 1 parent 6f12697e

데이터베이스 오류 수정

Inline Side-by-side
Showing 5 changed files with 232 additions and 218 deletions
...@@ -30,9 +30,8 @@ router.post('/reservation',function(req, res){ ...@@ -30,9 +30,8 @@ router.post('/reservation',function(req, res){
30 var restime = req.body.restime; 30 var restime = req.body.restime;
31 var resmin = req.body.resmin; 31 var resmin = req.body.resmin;
32 var date = req.body.date; 32 var date = req.body.date;
33 - 33 + var food = req.body.food;
34 var content = req.body.content; 34 var content = req.body.content;
35 - var food = req.body.food;
36 pool.getConnection(function (err, connection) 35 pool.getConnection(function (err, connection)
37 { 36 {
38 // Use the connection 37 // Use the connection
...@@ -40,6 +39,7 @@ router.post('/reservation',function(req, res){ ...@@ -40,6 +39,7 @@ router.post('/reservation',function(req, res){
40 connection.query(sqlForInsertBoard, function (err, rows) { 39 connection.query(sqlForInsertBoard, function (err, rows) {
41 if (err) console.error("err : " + err); 40 if (err) console.error("err : " + err);
42 console.log("rows : " + JSON.stringify(rows)); 41 console.log("rows : " + JSON.stringify(rows));
42 + res.redirect('/resconfirm');
43 connection.release(); 43 connection.release();
44 // Don't use the connection here, it has been returned to the pool. 44 // Don't use the connection here, it has been returned to the pool.
45 }); 45 });
...@@ -75,6 +75,7 @@ router.get('/db', function(req, res){ ...@@ -75,6 +75,7 @@ router.get('/db', function(req, res){
75 /* GET home page. */ 75 /* GET home page. */
76 router.get('/pay', function(req, res, next) { 76 router.get('/pay', function(req, res, next) {
77 res.render('pay', { title: '결제' }); 77 res.render('pay', { title: '결제' });
78 + res.render('first');
78 }); 79 });
79 80
80 module.exports = router; 81 module.exports = router;
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 <div class="col-lg-8 mx-auto"> 63 <div class="col-lg-8 mx-auto">
64 <h1 class="brand-heading" style="background-color: rgba( 0, 0, 0, 0.7 );">별빛바다 달빛초원</h1> 64 <h1 class="brand-heading" style="background-color: rgba( 0, 0, 0, 0.7 );">별빛바다 달빛초원</h1>
65 <p class="intro-text"> 65 <p class="intro-text">
66 - <br>정지윤</p> 66 + <br>아래로 내리세요</p>
67 <a href="#about" class="btn btn-circle js-scroll-trigger"> 67 <a href="#about" class="btn btn-circle js-scroll-trigger">
68 <i class="fa fa-angle-double-down animated"></i> 68 <i class="fa fa-angle-double-down animated"></i>
69 </a> 69 </a>
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 buyer_tel : '010-8762-3073', 44 buyer_tel : '010-8762-3073',
45 buyer_addr : '서울특별시 강남구 삼성동', 45 buyer_addr : '서울특별시 강남구 삼성동',
46 buyer_postcode : '123-456', 46 buyer_postcode : '123-456',
47 - m_redirect_url : 'https://localhost:3000/resconfirm' 47 + m_redirect_url : 'http://localhost:3000/reservation'
48 }, function(rsp) { 48 }, function(rsp) {
49 if ( rsp.success ) { 49 if ( rsp.success ) {
50 var msg = '결제가 완료되었습니다.'; 50 var msg = '결제가 완료되었습니다.';
...@@ -52,11 +52,17 @@ ...@@ -52,11 +52,17 @@
52 msg += '상점 거래ID : ' + rsp.merchant_uid; 52 msg += '상점 거래ID : ' + rsp.merchant_uid;
53 msg += '결제 금액 : ' + rsp.paid_amount; 53 msg += '결제 금액 : ' + rsp.paid_amount;
54 msg += '카드 승인번호 : ' + rsp.apply_num; 54 msg += '카드 승인번호 : ' + rsp.apply_num;
55 - } else { 55 +
56 + alert(msg);
57 + document.location.href="/reservation";
58 + }
59 +
60 + else {
56 var msg = '결제에 실패하였습니다.'; 61 var msg = '결제에 실패하였습니다.';
57 msg += '에러내용 : ' + rsp.error_msg; 62 msg += '에러내용 : ' + rsp.error_msg;
63 + alert(msg);
64 + document.location.href="/first";
58 } 65 }
59 - alert(msg);
60 }); 66 });
61 </script> 67 </script>
62 </html> 68 </html>
......
...@@ -35,241 +35,249 @@ ...@@ -35,241 +35,249 @@
35 } 35 }
36 </style> 36 </style>
37 37
38 - <section id="about" class="reservationTheme content-section "> 38 +
39 - <div class="container"> 39 +<div class="container">
40 <br><br> 40 <br><br>
41 <h2>Reservation <br>예약하기</h2> 41 <h2>Reservation <br>예약하기</h2>
42 <br><br> 42 <br><br>
43 - <form class="well form-horizontal" action=" " method="post" id="contact_form"> 43 + <form class="well form-horizontal" action=" " method="post" id="contact_form">
44 - <fieldset> 44 + <fieldset>
45 - 45 + <form method="POST" action="/reservation"> <!-- Text input-->
46 - <form method="POST" action="/reservation">
47 - <!-- Form Name -->
48 -
49 - <!-- Text input-->
50 46
47 + <!-- Button -->
51 <div class="form-group"> 48 <div class="form-group">
52 - <div class="col-md-4 inputGroupContainer "> 49 + <div class="inputGroupContainer ">
53 - <div class="input-group"> 50 + <label class="col-md-4 control-label"></label>
54 - <label class="col-md-4 control-label ">이름</label> 51 + <div class="col-md-4">
55 - <i class="glyphicon glyphicon-envelope"></i> 52 + 잠깐! No Show 문제를 방지하기 위해 예약 전, 선금 2000원을 입금해야 합니다!
56 - <input name="creater_id" placeholder="홍길동" class="form-control" type="text"> 53 + <a href="/pay" class="btn btn-default btn-lg">입금하기</a>
57 - </div> 54 + &nbsp;
55 + <a href="/first" class="btn btn-default btn-lg">돌아가기</a>
58 </div> 56 </div>
59 - </div>
60 -
61 -
62 - <!-- 휴대전화-->
63 - <div class="form-group">
64 - <div class="col-md-4 inputGroupContainer">
65 - <div class="input-group">
66 - <label class="col-md-4 control-label">휴대전화</label>
67 - <i class="glyphicon glyphicon-earphone"></i>
68 - <input name="phone" placeholder="0101234567" class="form-control" type="text">
69 </div> 57 </div>
70 </div> 58 </div>
71 - </div>
72 -
73 -
74 59
75 - <!-- Text input--> 60 + <br>ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ
76 - <div class="form-group"> 61 + <br>
77 - <div class="col-md-4 inputGroupContainer"> 62 + <br>
78 - <div class="input-group"> 63 + <br>
79 - <label class="col-md-4 control-label">이메일주소</label> 64 +
65 +
66 + <!-- 이름-->
67 + <div class="form-group">
68 + <div class="col-md-4 inputGroupContainer ">
69 + <div class="input-group">
70 + <label class="col-md-4 control-label ">이름</label>
71 + <i class="glyphicon glyphicon-envelope"></i>
72 + <input name="creater_id" placeholder="홍길동" class="form-control" type="text">
73 + </div>
74 + </div>
75 + </div>
76 +
77 + <!-- 휴대전화-->
78 + <div class="form-group">
79 + <div class="col-md-4 inputGroupContainer">
80 + <div class="input-group">
81 + <label class="col-md-4 control-label">휴대전화</label>
82 + <i class="glyphicon glyphicon-earphone"></i>
83 + <input name="phone" placeholder="0101234567" class="form-control" type="text">
84 + </div>
85 + </div>
86 + </div>
80 87
81 - <i class="glyphicon glyphicon-envelope"></i> 88 + <!-- 이메일주소-->
82 - <input name="email" placeholder="E-Mail Address" class="form-control" type="text"> 89 + <div class="form-group">
83 - </div> 90 + <div class="col-md-4 inputGroupContainer">
84 - </div> 91 + <div class="input-group">
85 - </div> 92 + <label class="col-md-4 control-label">이메일주소</label>
86 - 93 + <i class="glyphicon glyphicon-envelope"></i>
87 - <!--인원수--> 94 + <input name="email" placeholder="E-Mail Address" class="form-control" type="text">
88 - <div class="form-group"> 95 + </div>
89 - <div class="col-md-4 selectContainer"> 96 + </div>
90 - <div class="input-group"> 97 + </div>
91 - <label class="col-md-4 control-label">인원 수</label>
92 - <i class="glyphicon glyphicon-list"></i>
93 - <select name="num" class="form-control selectpicker" >
94 - <option>1~4명</option>
95 - <option>5~10명</option>
96 - <option >10명~15명</option>
97 - <option >15명~20명</option>
98 - <option >20명 이상</option>
99 - </select>
100 - </div>
101 - </div>
102 - </div>
103 -
104 -
105 -
106 - <!--예약시간-->
107 - <div class="form-group">
108 - <div class="col-md-4 selectContainer">
109 - <div class="input-group">
110 - <label class="col-md-4 control-label">예약 시간</label>
111 -
112 - <i class="glyphicon glyphicon-list"></i>
113 - <select name="restime" class="form-control selectpicker" >
114 - <option value=" " >시간</option>
115 - <option>10시</option>
116 - <option>11시</option>
117 - <option>12시</option>
118 - <option>13시</option>
119 - <option>14시</option>
120 - <option>15시</option>
121 - <option>16시</option>
122 - <option>17시</option>
123 - <option>18시</option>
124 - <option>19시</option>
125 - <option>20시</option>
126 - </select>
127 - &nbsp;
128 - <select name="resmin" class="form-control selectpicker" >
129 - <option value=" " >분</option>
130 - <option>00분</option>
131 - <option>15분</option>
132 - <option>30분</option>
133 - <option>45분</option>
134 - </select>
135 - </div>
136 - </div>
137 - </div>
138 98
139 - <div class="form-group"> 99 + <!--인원수-->
140 - <div class="col-md-4 selectContainer"> 100 + <div class="form-group">
141 - <div class="input-group"> 101 + <div class="col-md-4 selectContainer">
102 + <div class="input-group">
103 + <label class="col-md-4 control-label">인원 수</label>
104 + <i class="glyphicon glyphicon-list"></i>
105 + <select name="num" class="form-control selectpicker" >
106 + <option>1~4명</option>
107 + <option>5~10명</option>
108 + <option >10명~15명</option>
109 + <option >15명~20명</option>
110 + <option >20명 이상</option>
111 + </select>
112 + </div>
113 + </div>
114 + </div>
142 115
143 - <label class="col-md-4 control-label">예약 날짜</label> 116 + <!--예약시간-->
144 - <div class="input-group input-append date" id="dateRangePicker"> </div> 117 + <div class="form-group">
145 - <script> 118 + <div class="col-md-4 selectContainer">
146 - $('#dateRangePicker').datepicker({ 119 + <div class="input-group">
147 - format: "yyyy-mm-dd", 120 + <label class="col-md-4 control-label">예약 시간</label>
148 - language: "kr" 121 +
149 - }); 122 + <i class="glyphicon glyphicon-list"></i>
150 - </script> 123 + <select name="restime" class="form-control selectpicker" >
151 - </div> 124 + <option value=" " >시간</option>
152 - </div> 125 + <option>10시</option>
153 - </div> 126 + <option>11시</option>
154 - 127 + <option>12시</option>
155 - 128 + <option>13시</option>
156 - <div class="form-group"> 129 + <option>14시</option>
157 - <div class="col-md-4 selectContainer"> 130 + <option>15시</option>
158 - <div class="input-group"> 131 + <option>16시</option>
159 - <label class="col-md-4 control-label"></label> 132 + <option>17시</option>
160 - 133 + <option>18시</option>
161 - <i class="glyphicon glyphicon-list"></i> 134 + <option>19시</option>
162 - <select name="date" class="form-control selectpicker" > 135 + <option>20시</option>
163 - 136 + </select>
164 - <option><script language="JavaScript"> 137 + &nbsp;
165 - var today = new Date( ) 138 + <select name="resmin" class="form-control selectpicker" >
166 - document.write(today.getMonth( )+1 , "월 " , today.getDate( ) , "일") 139 + <option value=" " >분</option>
167 - </script> </option> 140 + <option>00분</option>
168 - 141 + <option>15분</option>
169 - <option><script language="JavaScript"> 142 + <option>30분</option>
170 - var today = new Date( ) 143 + <option>45분</option>
171 - document.write(today.getMonth( )+1 , "월 " , today.getDate( )+1 , "일") 144 + </select>
172 - </script> </option> 145 + </div>
173 - 146 + </div>
174 - <option><script language="JavaScript"> 147 + </div>
175 - var today = new Date( )
176 - document.write(today.getMonth( )+1 , "월 " , today.getDate( )+2 , "일")
177 - </script> </option>
178 -
179 - <option><script language="JavaScript">
180 - var today = new Date( )
181 - document.write(today.getMonth( )+1 , "월 " , today.getDate( )+3 , "일")
182 - </script> </option>
183 -
184 - <option><script language="JavaScript">
185 - var today = new Date( )
186 - document.write(today.getMonth( )+1 , "월 " , today.getDate( )+4 , "일")
187 - </script> </option>
188 -
189 - <option><script language="JavaScript">
190 - var today = new Date( )
191 - document.write(today.getMonth( )+1 , "월 " , today.getDate( )+5 , "일")
192 - </script> </option>
193 -
194 - <option><script language="JavaScript">
195 - var today = new Date( )
196 - document.write(today.getMonth( )+1 , "월 " , today.getDate( )+6 , "일")
197 - </script> </option>
198 -
199 - <option><script language="JavaScript">
200 - var today = new Date( )
201 - document.write(today.getMonth( )+1 , "월 " , today.getDate( )+7 , "일 (예약은 1주일까지만 가능합니다)")
202 - </script> </option>
203 -
204 - </select>
205 - </div>
206 - </div>
207 - </div>
208 148
209 - <!-- radio checks--> 149 + <!--달력-->
210 - <div class="form-group"> 150 + <div class="form-group">
211 - <div class="col-md-4 selectContainer"> 151 + <div class="col-md-4 selectContainer">
212 - <div class="input-group"> 152 + <div class="input-group">
213 - <label class="col-md-4 control-label">메뉴</label> 153 +
214 - 154 + <label class="col-md-4 control-label">예약 날짜</label>
215 - <div class="checkbox"> 155 + <div class="input-group input-append date" id="dateRangePicker"> </div>
216 - <label> 156 + <script>
217 - <image src = "/img/pizza.jpg" width=100 height=100> 157 + $('#dateRangePicker').datepicker({
218 - <br><input type="checkbox" name="food" value="pizza" /> 피자 158 + format: "yyyy-mm-dd",
219 - </label> 159 + language: "kr"
160 + });
161 + </script>
162 + </div>
220 </div> 163 </div>
221 - &nbsp;
222 - &nbsp;
223 - &nbsp;
224 - <div class="checkbox">
225 - <label>
226 - <image src = "/img/파스타.jpg" width=100 height=100>
227 - <br><input type="checkbox" name="food" value="pasta" /> 파스타
228 - </label>
229 </div> 164 </div>
230 165
231 - &nbsp; 166 + <!--예약날짜-->
232 - &nbsp; 167 + <div class="form-group">
233 - &nbsp; 168 + <div class="col-md-4 selectContainer">
234 - <div class="checkbox"> 169 + <div class="input-group">
235 - <label> 170 + <label class="col-md-4 control-label"></label>
236 - <image src = "/img/와인.jpg" width=100 height=100> 171 +
237 - <br><input type="checkbox" name="food" value="wine" /> 와인 172 + <i class="glyphicon glyphicon-list"></i>
238 - </label> 173 + <select name="date" class="form-control selectpicker" >
174 +
175 + <option><script language="JavaScript">
176 + var today = new Date( )
177 + document.write(today.getMonth( )+1 , "월 " , today.getDate( ) , "일")
178 + </script> </option>
179 +
180 + <option><script language="JavaScript">
181 + var today = new Date( )
182 + document.write(today.getMonth( )+1 , "월 " , today.getDate( )+1 , "일")
183 + </script> </option>
184 +
185 + <option><script language="JavaScript">
186 + var today = new Date( )
187 + document.write(today.getMonth( )+1 , "월 " , today.getDate( )+2 , "일")
188 + </script> </option>
189 +
190 + <option><script language="JavaScript">
191 + var today = new Date( )
192 + document.write(today.getMonth( )+1 , "월 " , today.getDate( )+3 , "일")
193 + </script> </option>
194 +
195 + <option><script language="JavaScript">
196 + var today = new Date( )
197 + document.write(today.getMonth( )+1 , "월 " , today.getDate( )+4 , "일")
198 + </script> </option>
199 +
200 + <option><script language="JavaScript">
201 + var today = new Date( )
202 + document.write(today.getMonth( )+1 , "월 " , today.getDate( )+5 , "일")
203 + </script> </option>
204 +
205 + <option><script language="JavaScript">
206 + var today = new Date( )
207 + document.write(today.getMonth( )+1 , "월 " , today.getDate( )+6 , "일")
208 + </script> </option>
209 +
210 + <option><script language="JavaScript">
211 + var today = new Date( )
212 + document.write(today.getMonth( )+1 , "월 " , today.getDate( )+7 , "일 (예약은 1주일까지만 가능합니다)")
213 + </script> </option>
214 +
215 + </select>
216 + </div>
217 + </div>
239 </div> 218 </div>
240 - </div>
241 - </div>
242 - </div>
243 219
220 + <!-- 메뉴체크-->
221 + <div class="form-group">
222 + <div class="col-md-4 selectContainer">
223 + <div class="input-group">
224 + <label class="col-md-4 control-label">메뉴</label>
225 + <div class="checkbox">
226 + <label>
227 + <image src = "/img/pizza.jpg" width=100 height=100>
228 + <br><input type="checkbox" name="food" value="pizza" /> 피자
229 + </label>
230 + </div>
231 + &nbsp;
232 + &nbsp;
233 + &nbsp;
234 + <div class="checkbox">
235 + <label>
236 + <image src = "/img/파스타.jpg" width=100 height=100>
237 + <br><input type="checkbox" name="food" value="pasta" /> 파스타
238 + </label>
239 + </div>
240 + &nbsp;
241 + &nbsp;
242 + &nbsp;
243 + <div class="checkbox">
244 + <label>
245 + <image src = "/img/와인.jpg" width=100 height=100>
246 + <br><input type="checkbox" name="food" value="wine" /> 와인
247 + </label>
248 + </div>
249 + </div>
250 + </div>
251 + </div>
244 252
245 - <br> 253 + <br>
246 - <div class="form-group"> 254 +
247 - <div class="col-md-4 selectContainer"> 255 + <!-- 요청사항-->
248 - <div class="input-group"> 256 + <div class="form-group">
249 - <label class="col-md-4 control-label">요청 사항</label> 257 + <div class="col-md-4 selectContainer">
250 - <i class="glyphicon glyphicon-pencil"></i> 258 + <div class="input-group">
251 - <textarea class="form-control" name="content" placeholder="요청 사항을 적어주세요." style="width:310px; height:100px;"></textarea> 259 + <label class="col-md-4 control-label">요청 사항</label>
252 - </div> 260 + <i class="glyphicon glyphicon-pencil"></i>
253 - </div> 261 + <textarea class="form-control" name="content" placeholder="요청 사항을 적어주세요." style="width:310px; height:100px;"></textarea>
262 + </div>
263 + </div>
264 + </div>
254 265
266 + <br>ㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡㅡ
255 267
268 + <!-- 예약완료 버튼-->
269 + <div class="form-group">
270 + <label class="col-md-4 control-label"></label>
271 + <div class="col-md-4">
272 + <button type="submit" class="btn btn-warning" >예약 <span class="glyphicon glyphicon-send"></span></button>
273 + </div>
274 + </div>
256 275
257 - <!-- Button -->
258 - <div class="form-group">
259 - <label class="col-md-4 control-label"></label>
260 - <div class="col-md-4">
261 - 잠깐! No Show 문제를 방지하기 위해 예약 전, 선금 2000원을 입금해야 합니다!
262 - <a href="/pay" class="btn btn-default btn-lg">입금하기</a>
263 - <a href="/first" class="btn btn-default btn-lg">돌아가기</a>
264 - </div>
265 276
266 - </div>
267 </form> 277 </form>
268 - </fieldset> 278 + </fieldset>
269 - </form> 279 + </form>
270 - </div> 280 + </div>
271 - </div>
272 -</script>
273 281
274 282
275 <script> 283 <script>
...@@ -347,7 +355,6 @@ ...@@ -347,7 +355,6 @@
347 return false; 355 return false;
348 } 356 }
349 357
350 -
351 } 358 }
352 </script> 359 </script>
353 360
......