Merge branch 'master' of github.com:gnuboard/yc4s

adm/config_form.php

@@ -773,7 +773,7 @@ $pg_anchor = '<ul class="anchor">
         <th scope="row"><label for="cf_add_script">추가 script, css</label></th>
         <td>
             <?php echo help('HTML의 &lt;/HEAD&gt; 태그위로 추가될 JavaScript와 css 코드를 설정합니다.<br>관리자 페이지에서는 이 코드를 사용하지 않습니다.') ?>
-            <textarea name="cf_add_script" id="cf_add_script"><?php echo $config['cf_add_script'] ?></textarea>
+            <textarea name="cf_add_script" id="cf_add_script"><?php echo get_text($config['cf_add_script']); ?></textarea>
         </td>
     </tr>
     </tbody>

adm/visit_domain.php

@@ -70,7 +70,7 @@ while ($row=sql_fetch_array($result)) {
                 $link2 = '';
                 $key = '직접';
             } else {
-                $link = '<a href="./visit_list.php?$qstr&amp;domain='.$key.'">';
+                $link = '<a href="./visit_list.php?'.$qstr.'&amp;domain='.$key.'">';
                 $link2 = '</a>';
             }
 

css/default.css

@@ -175,7 +175,7 @@ td.empty_table {padding:85px 0;text-align:center}
 .frm_tbl td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent;vertical-align:top}
 .frm_tbl textarea, .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle}
 .frm_input:focus, input.required:focus {padding:3px 3px 4px;border:0;background:#21272e !important;color:#fff}
-.frm_tbl textarea {width:90%;height:150px}
+.frm_tbl textarea {width:98%;height:100px}
 .frm_address {display:block;margin-top:5px}
 .frm_file {display:block;margin-bottom:5px}
 .frm_tbl #captcha {margin:0;padding:0;border:0;background:transparent}

js/shop.js

@@ -1,5 +1,27 @@
+var option_add = false;
+var supply_add = false;
+
 $(function() {
     // 선택옵션
+    $("select[name='it_option[]']").live("keydown", function(e) {
+        var sel_count = $("select[name='it_option[]']").size();
+        var idx = $("select[name='it_option[]']").index($(this));
+        var code = e.keyCode;
+        var val = $(this).val();
+
+        option_add = false;
+        if(code == 13 && sel_count == idx + 1) {
+            if(val == "")
+                return;
+
+            sel_option_process(true);
+        }
+    });
+
+    $("select[name='it_option[]']").live("mousedown", function() {
+        option_add = true;
+    });
+
     $("select[name='it_option[]']").live("change", function() {
         var sel_count = $("select[name='it_option[]']").size();
         var idx = $("select[name='it_option[]']").index($(this));
@@ -44,6 +66,9 @@ $(function() {
                 }
             );
         } else if((idx + 1) == sel_count) { // 선택옵션처리
+            if(option_add && val == "")
+                return;
+
             var info = val.split(",");
             // 재고체크
             if(parseInt(info[2]) < 1) {
@@ -51,27 +76,39 @@ $(function() {
                 return false;
             }
 
-            // 선택옵션 자동추가 기능을 사용하려면 아래 false를 true로 설정
-            sel_option_process(false);
+            if(option_add)
+                sel_option_process(true);
         }
     });
 
     // 추가옵션
+    $("select[name='it_supply[]']").live("keydown", function(e) {
+        var $el = $(this);
+        var code = e.keyCode;
+        var val = $(this).val();
+
+        supply_add = false;
+        if(code == 13) {
+            if(val == "")
+                return;
+
+            sel_supply_process($el, true);
+        }
+    });
+
+    $("select[name='it_supply[]']").live("mousedown", function() {
+        supply_add = true;
+    });
+
     $("select[name='it_supply[]']").live("change", function() {
         var $el = $(this);
-        // 선택옵션 자동추가 기능을 사용하려면 아래 false를 true로 설정
-        sel_supply_process($el, false);
-    });
+        var val = $(this).val();
 
-    // 선택옵션 추가
-    $("#sit_selopt_submit").live("click", function() {
-        sel_option_process(true);
-    });
+        if(val == "")
+            return;
 
-    // 추가옵션 추가
-    $("button.sit_sel_submit").live("click", function() {
-        var $el = $(this).closest("td").find("select[name='it_supply[]']");
-        sel_supply_process($el, true);
+        if(supply_add)
+            sel_supply_process($el, true);
     });
 
     // 수량변경 및 삭제

lib/shop.lib.php

@@ -705,7 +705,6 @@ function get_item_supply($it_id, $subject)
                 }
             }
             $select .= '</select>'.PHP_EOL;
-            $select .= '<button type="button" id="sit_sel_submit_'.$i.'" class="btn_frmline sit_sel_submit">추가</button>'.PHP_EOL;
 
             $str .= '<td class="td_sit_sel">'.$select.'</td>'.PHP_EOL;
             $str .= '</tr>'.PHP_EOL;

mobile/shop/item.php

@@ -378,9 +378,6 @@ else
                 ?>
                 </tbody>
                 </table>
-                <div class="sit_sel_btn">
-                    <button type="button" id="sit_selopt_submit" class="btn_frmline">추가</button>
-                </div>
             </section>
             <?php
             }

mobile/shop/orderinquiryview.php

@@ -187,6 +187,33 @@ include_once(G4_MSHOP_PATH.'/_head.php');
         // 120615 : 취소된 값을 두번 빼주는 결과가 되어 코드 수정 (군포돼지님)
         //$misu_amount = $tot_amount - $tot_cancel_amount - $receipt_amount - $od[od_dc_amount];
         $misu_amount = $tot_amount - $receipt_amount - $od['od_dc_amount'];
+
+        // 결제정보처리
+        if($od['od_receipt_amount'] > 0)
+            $od_receipt_amount = display_price($od['od_receipt_amount']);
+        else
+            $od_receipt_amount = '아직 입금되지 않았거나 입금정보를 입력하지 못하였습니다.';
+
+        $app_no_subj = '';
+        $disp_bank = true;
+        $disp_receipt = false;
+        if($od['od_settle_case'] == '신용카드') {
+            $sql = " select * from {$g4['shop_card_history_table']} where od_id = '{$od['od_id']}' ";
+            $cd = sql_fetch($sql);
+
+            $app_no_subj = '승인번호';
+            $app_no = $cd['cd_app_no'];
+            $disp_bank = false;
+            $disp_receipt = true;
+        } else if($od['od_settle_case'] == '휴대폰') {
+            $app_no_subj = '휴대폰번호';
+            $app_no = $od['od_bank_account'];
+            $disp_bank = false;
+            $disp_receipt = true;
+        } else if($od['od_settle_case'] == '가상계좌' || $od['od_settle_case'] == '계좌이체') {
+            $app_no_subj = 'KCP 거래번호';
+            $app_no = $od['od_tno'];
+        }
         ?>
 
         <section id="sod_fin_pay">
@@ -207,121 +234,75 @@ include_once(G4_MSHOP_PATH.'/_head.php');
                 <td><?php echo $od['od_time']; ?></td>
             </tr>
 
-            <?php
-            if ($od['od_settle_case'] == '신용카드')
-            {
-                $sql = " select * from {$g4['shop_card_history_table']} where od_id = '{$od['od_id']}' order by cd_id desc ";
-                $result = sql_query($sql);
-                $cd = mysql_fetch_array($result);
-            ?>
-
-            <tr>
-                <th scope="row">결제방식</th>
-                <td>신용카드 결제</td>
-            </tr>
-            <tr>
-                <th scope="row">결제금액</th>
-                <td><?php echo display_price($cd['cd_amount']); ?></td>
-            </tr>
-            <tr>
-                <th scope="row">승인일시</th>
-                <td><?php echo $cd['cd_trade_ymd'].' '.$cd['cd_trade_hms']; ?></td>
-            </tr>
-            <tr>
-                <th scope="row">승인번호</th>
-                <td><?php echo $cd['cd_app_no']; ?></td>
-            </tr>
-            <tr>
-                <th scope="row">영수증</th>
-                <td><a href="javascript:;" onclick="window.open('http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no=<?php echo $od['od_tno']; ?>', 'winreceipt', 'width=620,height=670')">영수증 출력</a></td>
-            </tr>
-
-            <?php
-            }
-            else if ($od['od_settle_case'] == '휴대폰')
-            {
-                $sql = " select * from {$g4['shop_card_history_table']} where od_id = '{$od['od_id']}' order by cd_id desc ";
-                $result = sql_query($sql);
-                $cd = mysql_fetch_array($result);
-            ?>
-
-            <tr>
-                <th scope="row">결제방식</th>
-                <td>휴대폰 결제</td>
-            </tr>
-            <tr>
-                <th scope="row">결제금액</th>
-                <td><?php echo display_price($cd['cd_amount']); ?></td>
-            </tr>
-            <tr>
-                <th scope="row">승인일시</th>
-                <td><?php echo $cd['cd_trade_ymd'].' '.$cd['cd_trade_hms']; ?></td>
-            </tr>
-            <tr>
-                <th scope="row">휴대폰번호</th>
-                <td><?php echo $cd['cd_opt02']; ?></td>
-            </tr>
-            <?php //echo '<tr><th scope="row">영수증</th><td><a href="javascript:;" onclick="window.open(\'http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no='.$od[od_tno].'\', \'winreceipt\', \'width=620,height=670\')">영수증 출력</a></td></tr>'; ?>
-            <tr>
-                <th scope="row">영수증</th>
-                <td><a href="javascript:;" onclick="window.open('https://admin.kcp.co.kr/Modules/Bill/ADSA_MCASH_N_Receipt.jsp?a_trade_no=<?php echo $od['od_tno']; ?>', 'winreceipt', 'width=500,height=690')">영수증 출력</a></td>
-            </tr>
-
-            <?php
-            }
-            else
-            {
-            ?>
-
             <tr>
                 <th scope="row">결제방식</th>
                 <td><?php echo $od['od_settle_case']; ?></td>
             </tr>
-                <?php
-                if ($od['od_receipt_amount'])
-                {
-                ?>
             <tr>
-                <th scope="row">입금액</th>
-                <td><?php echo display_price($od['od_receipt_amount']); ?></td>
+                <th scope="row">결제금액</th>
+                <td><?php echo $od_receipt_amount; ?></td>
             </tr>
+            <?php
+            if($od['od_receipt_amount'] > 0)
+            {
+            ?>
             <tr>
-                <td scope="row">입금확인일시</th>
+                <th scope="row">결제일시</th>
                 <td><?php echo $od['od_receipt_time']; ?></td>
             </tr>
-                <?php
-                }
-                else
-                {
-                ?>
+            <?php
+            }
+
+            // 승인번호, 휴대폰번호, KCP 거래번호
+            if($app_no_subj)
+            {
+            ?>
             <tr>
-                <th scope="row">입금액</th>
-                <td>아직 입금되지 않았거나 입금정보를 입력하지 못하였습니다.</td>
+                <th scope="row"><?php echo $app_no_subj; ?></th>
+                <td><?php echo $app_no; ?></td>
             </tr>
-                <?php
-                }
-                if ($od['od_settle_case'] != '계좌이체') {
-                ?>
-            <tr>
-                <th scope="row">계좌번호</th>
-                <td><?php echo $od['od_bank_account']; ?></td>
-            </tr>
-                <?php
-                }
-                ?>
+            <?php
+            }
+
+            // 계좌정보
+            if($disp_bank)
+            {
+            ?>
             <tr>
                 <th scope="row">입금자명</th>
                 <td><?php echo $od['od_deposit_name']; ?></td>
             </tr>
-                <?php
-                if ($od['od_tno']) {
-                ?>
             <tr>
-                <th scope="row">KCP 거래번호</th>
-                <td><?php echo $od['od_tno']; ?></td>
+                <th scope="row">입금계좌</th>
+                <td><?php echo $od['od_bank_account']; ?></td>
             </tr>
-                <?
-                }
+            <?php
+            }
+
+            if($disp_receipt) {
+            ?>
+            <tr>
+                <th scope="row">영수증</th>
+                <td>
+                    <?php
+                    if($od['od_settle_case'] == '휴대폰')
+                    {
+                    ?>
+                    <a href="javascript:;" onclick="window.open('https://admin.kcp.co.kr/Modules/Bill/ADSA_MCASH_N_Receipt.jsp?a_trade_no=<?php echo $od['od_tno']; ?>', 'winreceipt', 'width=500,height=690')">영수증 출력</a>
+                    <?php
+                    }
+
+                    if($od['od_settle_case'] == '신용카드')
+                    {
+                    ?>
+                    <a href="javascript:;" onclick="window.open('http://admin.kcp.co.kr/Modules/Sale/Card/ADSA_CARD_BILL_Receipt.jsp?c_trade_no=<?php echo $od['od_tno']; ?>', 'winreceipt', 'width=620,height=800')">영수증 출력</a>
+                    <?php
+                    }
+                    ?>
+                <td>
+                </td>
+            </tr>
+            <?php
             }
 
             if ($od['od_receipt_point'] > 0)
@@ -356,15 +337,14 @@ include_once(G4_MSHOP_PATH.'/_head.php');
             }
 
             // 현금영수증 발급을 사용하는 경우에만
-            if ($default['de_taxsave_use']) {
+            if ($default['de_taxsave_use'] && $default['de_card_pg'] == 'kcp') {
                 // 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다.
                 if ($misu_amount == 0 && $od['od_receipt_amount'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌')) {
-                    if ($default['de_card_pg'] == 'kcp') {
             ?>
             <tr>
                 <th scope="row">현금영수증</th>
                 <td>
-                <?
+                <?php
                 if ($od['od_cash'])
                 {
                 ?>
@@ -379,7 +359,6 @@ include_once(G4_MSHOP_PATH.'/_head.php');
                 </td>
             </tr>
             <?php
-                    }
                 }
             }
             ?>

shop/cartoption.php

@@ -53,9 +53,6 @@ if($option_1) {
     ?>
     </tbody>
     </table>
-    <div class="sit_sel_btn">
-        <button type="button" id="sit_selopt_submit" class="btn_frmline">추가</button>
-    </div>
 </section>
 <?php
 }

shop/item.php

@@ -369,9 +369,6 @@ else
                 ?>
                 </tbody>
                 </table>
-                <div class="sit_sel_btn">
-                    <button type="button" id="sit_selopt_submit" class="btn_frmline">추가</button>
-                </div>
             </section>
             <?php
             }

shop/itembuy.php

@@ -8,6 +8,13 @@ $io_id = $_GET['opt'];
 $sql = " select * from {$g4['shop_item_table']} where it_id = '$it_id' ";
 $it = sql_fetch($sql);
 
+// 상품옵션체크
+$sql = " select count(*) as cnt from {$g4['shop_item_option_table']} where it_id = '$it_id' and io_type = '0' and io_use = '1' ";
+$cnt = sql_fetch($sql);
+
+if(($io_id && !$cnt['cnt']) || (!$io_id && $cnt['cnt']))
+    alert('상품의 옵션정보가 변경됐습니다.\\n상품페이지에서 다시 주문해 주십시오.', G4_SHOP_URL.'/item.php?it_id='.$it_id);
+
 // 옵션정보
 if($io_id && $it['it_option_subject']) {
     $sql = " select * from {$g4['shop_item_option_table']} where it_id = '$it_id' and io_id = '$io_id' ";

shop/orderform.php

@@ -106,7 +106,8 @@ function init_pay_button()
 * setTimeout 에 2번째 변수 0은 딜레이 시간 0은 딜래이 없음을 의미
 * - 김민수 - 20101018 -
 */
-setTimeout("init_pay_button();",500);
+/* 문서로딩 후 체크하도록 아래 스크립트를 문서하단으로 이동 */
+//setTimeout("init_pay_button();",500);
 </script>
 
 <form name="forderform" method="post" action="<?php echo $order_action_url; ?>" onsubmit="return forderform_check(this);" autocomplete="off">
@@ -954,6 +955,8 @@ setTimeout("init_pay_button();",500);
 </div>
 
 <script>
+setTimeout("init_pay_button();",300);
+
 $(function() {
     var $cp_btn_el;
     var $cp_row_el;

skin/board/basic/list.skin.php

@@ -128,20 +128,20 @@ if ($is_nogood) $colspan++;
 
     <?php if ($list_href || $is_checkbox || $write_href) { ?>
     <div class="bo_fx">
+        <?php if ($is_checkbox) { ?>
         <ul class="btn_bo_adm">
-            <?php if ($list_href) { ?>
-            <li><a href="<?php echo $list_href ?>" class="btn_b01"> 목록</a></li>
-            <?php } ?>
-            <?php if ($is_checkbox) { ?>
             <li><input type="submit" name="btn_submit" value="선택삭제" onclick="document.pressed=this.value"></li>
             <li><input type="submit" name="btn_submit" value="선택복사" onclick="document.pressed=this.value"></li>
             <li><input type="submit" name="btn_submit" value="선택이동" onclick="document.pressed=this.value"></li>
-            <?php } ?>
         </ul>
+        <?php } ?>
 
+        <?php if ($list_href || $write_href) { ?>
         <ul class="btn_bo_user">
+            <?php if ($list_href) { ?><li><a href="<?php echo $list_href ?>" class="btn_b01">목록</a></li><?php } ?>
             <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b02">글쓰기</a></li><?php } ?>
         </ul>
+        <?php } ?>
     </div>
     <?php } ?>
     </form>

skin/board/basic/view.skin.php

@@ -168,7 +168,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
     </section>
 
     <?php 
-    include(G4_SNS_PATH."/view.sns.skin.php"); 
+    include_once(G4_SNS_PATH."/view.sns.skin.php"); 
     ?>
 
     <?php

skin/board/basic/view_comment.skin.php

@@ -124,10 +124,6 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
         <?php 
         include(G4_SNS_PATH."/view_comment_write.sns.skin.php");
         ?>
-        <?php 
-        @include(G4_SKIN_PATH."/board/basic/view_comment.sns.skin.php");
-        ?>
-
         <tr>
             <th scope="row">내용</th>
             <td>

skin/board/gallery/list.skin.php

@@ -124,23 +124,22 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
 
     <?php if ($list_href || $is_checkbox || $write_href) { ?>
     <div class="bo_fx">
+        <?php if ($is_checkbox) { ?>
         <ul class="btn_bo_adm">
-            <?php if ($list_href) { ?>
-            <li><a href="<?php echo $list_href ?>" class="btn_b01"> 목록</a></li>
-            <?php } ?>
-            <?php if ($is_checkbox) { ?>
             <li><input type="submit" name="btn_submit" value="선택삭제" onclick="document.pressed=this.value"></li>
             <li><input type="submit" name="btn_submit" value="선택복사" onclick="document.pressed=this.value"></li>
             <li><input type="submit" name="btn_submit" value="선택이동" onclick="document.pressed=this.value"></li>
-            <?php } ?>
         </ul>
+        <?php } ?>
 
+        <?php if ($list_href || $write_href) { ?>
         <ul class="btn_bo_user">
-            <li><?php if ($write_href) { ?><a href="<?php echo $write_href ?>" class="btn_b02">글쓰기</a><?php } ?></li>
+            <?php if ($list_href) { ?><li><a href="<?php echo $list_href ?>" class="btn_b01">목록</a></li><?php } ?>
+            <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b02">글쓰기</a></li><?php } ?>
         </ul>
+        <?php } ?>
     </div>
     <?php } ?>
-
     </form>
 </div>
 

skin/search/basic/search.skin.php

@@ -21,7 +21,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     </select>
 
     <label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
-    <input type="text" name="stx" value="<?php echo $text_stx ?>" class="frm_input" required class="required" maxlength="20">
+    <input type="text" name="stx" value="<?php echo $text_stx ?>" id="stx" required class="frm_input required" maxlength="20">
     <input type="submit" class="btn_submit" value="검색">
 
     <script>
@@ -113,6 +113,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
                 $comment_href = "#c_".$list[$idx][$i][wr_id];
             }
          ?>
+
             <li>
                 <a href="<?php echo $list[$idx][$i][href] ?><?php echo $comment_href ?>" class="sch_res_title"><?php echo $comment_def ?><?php echo $list[$idx][$i][subject] ?></a>
                 <a href="<?php echo $list[$idx][$i][href] ?><?php echo $comment_href ?>" target="_blank">새창</a>

skin/search/basic/style.css

@@ -20,4 +20,5 @@
 .sch_res_list h2 {margin:0 0 15px;font-size:1.2em}
 .sch_res_list ul {margin:0;padding:0;list-style:none}
 .sch_res_list li {margin:0 0 10px;padding:0 0 10px;border-bottom:1px solid #e9e9e9}
+.sch_res_title {font-weight:bold}
 .sch_more {text-align:right}