기타 추적되지 않는 파일들..

2025-07-02 14:16:37 +09:00
parent 2d7bbdca89
commit b6080d2e47
74 changed files with 14184 additions and 2028 deletions
--- a/adm/menu_form.php
+++ b/adm/menu_form.php
@ -117,15 +117,6 @@ if ($new == 'new' || !$code) {
        });
    });

-    function htmlEscape(str) {
-        return str
-            .replace(/&/g, '&amp;')
-            .replace(/</g, '&lt;')
-            .replace(/>/g, '&gt;')
-            .replace(/"/g, '&quot;')
-            .replace(/'/g, '&#39;');
-    }
-
    function add_menu_list(name, link, code) {
        var $menulist = $("#menulist", opener.document);
        var ms = new Date().getTime();
@ -135,10 +126,7 @@ if ($new == 'new' || !$code) {
        <?php } else { ?>
            sub_menu_class = " class=\"td_category sub_menu_class\"";
        <?php } ?>
-        
-        name = htmlEscape(name);
-        link = htmlEscape(link);
-        
+
        var list = "<tr class=\"menu_list menu_group_<?php echo $code; ?>\">";
        list += "<td" + sub_menu_class + ">";
        list += "<label for=\"me_name_" + ms + "\"  class=\"sound_only\">메뉴<strong class=\"sound_only\"> 필수</strong></label>";
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@ -949,7 +949,7 @@ if(!$default['de_kakaopay_cancelpwd']){
        </tr>

        <tr class="pg_info_fld nicepay_info_fld" id="nicepay_info_anchor">
-            <th scope="row"><label for="de_nicepay_mid">NICEPAY MID</label><br><a href="http://sir.kr/main/service/nicepayments_pg.php" target="_blank" id="scf_nicepay_reg" class="nicepay_btn">NICEPAY 신청하기</a></th>
+            <th scope="row"><label for="de_nicepay_mid">NICEPAY MID</label><br><a href="http://sir.kr/main/service/inicis_pg.php" target="_blank" id="scf_nicepay_reg" class="nicepay_btn">NICEPAY 신청하기</a></th>
            <td>
                <span class="frm_info">NICEPAY로 부터 발급 받으신 상점MID를 SR 을 제외한 나머지 자리를 입력 합니다.<br>NICEPAY 상점관리자 > 가맹점정보 > KEY관리에서 확인 할수 있습니다.<br>만약, 상점아이디가 SR로 시작하지 않는다면 계약담당자에게 변경 요청을 해주시기 바랍니다. 예) SRpaytestm</span>
                <span class="sitecode">SR</span>
--- a/adm/shop_admin/itemqaform.php
+++ b/adm/shop_admin/itemqaform.php
@ -14,7 +14,8 @@ $sql = " select *
 $iq = sql_fetch($sql);
 if (! (isset($iq['iq_id']) && $iq['iq_id'])) alert('등록된 자료가 없습니다.');

-$name = get_sideview($iq['mb_id'], get_text($iq['iq_name']), $iq['mb_email'], $iq['mb_homepage']);
+//$name = get_sideview($iq['mb_id'], get_text($iq['iq_name']), $iq['mb_email'], $iq['mb_homepage']);
+$name = get_text($iq['iq_name']);

 $g5['title'] = '상품문의';
 include_once (G5_ADMIN_PATH.'/admin.head.php');
--- a/adm/shop_admin/itemuseform.php
+++ b/adm/shop_admin/itemuseform.php
@ -26,7 +26,8 @@ if (!isset($is['is_reply_subject'])) {
                ", true);
 }

-$name = get_sideview($is['mb_id'], get_text($is['is_name']), $is['mb_email'], $is['mb_homepage']);
+//$name = get_sideview($is['mb_id'], get_text($is['is_name']), $is['mb_email'], $is['mb_homepage'])
+$name = get_text($is['is_name']);

 // 확인
 $is_confirm_yes  =  $is['is_confirm'] ? 'checked="checked"' : '';
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@ -20,7 +20,7 @@ $od_refund_price = isset($_REQUEST['od_refund_price']) ? clean_xss_tags($_REQUES
 $od_receipt_point = isset($_REQUEST['od_receipt_point']) ? clean_xss_tags($_REQUEST['od_receipt_point'], 1, 1) : '';
 $od_coupon = isset($_REQUEST['od_coupon']) ? clean_xss_tags($_REQUEST['od_coupon'], 1, 1) : '';
 $od_id = isset($_REQUEST['od_id']) ? safe_replace_regex($_REQUEST['od_id'], 'od_id') : '';
-$od_escrow = isset($_REQUEST['od_escrow']) ? clean_xss_tags($_REQUEST['od_escrow'], 1, 1) : ''; 
+$od_escrow = isset($_REQUEST['od_escrow']) ? clean_xss_tags($_REQUEST['od_escrow'], 1, 1) : '';

 $sort1 = isset($_REQUEST['sort1']) ? clean_xss_tags($_REQUEST['sort1'], 1, 1) : '';
 $sort2 = isset($_REQUEST['sort2']) ? clean_xss_tags($_REQUEST['sort2'], 1, 1) : '';
@ -68,7 +68,8 @@ $sql = " select it_id,
                cp_price,
                ct_notax,
                ct_send_cost,
-                it_sc_type
+                it_sc_type,
+                ct_id 
           from {$g5['g5_shop_cart_table']}
          where od_id = '{$od['od_id']}'
          group by it_id
@ -116,7 +117,11 @@ if ($od['od_pg'] === 'nicepay' && $od['od_settle_case'] === '가상계좌' && $o
 // add_javascript('js 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
 ?>
-
+<style>
+    #sodr_qty_log {padding-left: 0px; padding-right: 0px;}
+    .od_test_caution {border-radius: 0px;}
+    strong.sodr_nonpay {border-radius: 0px;}
+</style>
 <section id="anc_sodr_list">
    <h2 class="h2_frm">주문상품 목록</h2>
    <?php echo $pg_anchor; ?>
@ -125,8 +130,6 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
            현재 주문상태 <strong><?php echo $od['od_status'] ?></strong>
            |
            주문일시 <strong><?php echo substr($od['od_time'],0,16); ?> (<?php echo get_yoil($od['od_time']); ?>)</strong>
-            |
-            주문총액 <strong><?php echo number_format($od['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2']); ?></strong>원
        </p>
        <?php if ($default['de_hope_date_use']) { ?><p>희망배송일은 <?php echo $od['od_hope_date']; ?> (<?php echo get_yoil($od['od_hope_date']); ?>) 입니다.</p><?php } ?>
        <?php if($od['od_mobile']) { ?>
@ -162,9 +165,20 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
            <th scope="col">소계</th>
            <th scope="col">쿠폰</th>
            <th scope="col">포인트</th>
+            <?php if ((!isset($rb_item_res['res_is'])) || $rb_item_res['res_is'] != 1) { ?>
            <th scope="col">배송비</th>
+            <?php } ?>
            <th scope="col">포인트반영</th>
            <th scope="col">재고반영</th>
+
+            <!-- 20241018 리빌더 추가 { -->
+            <?php if(isset($pa['pa_is']) && $pa['pa_is'] == 1) { ?>
+            <th scope="col">운송장번호</th>
+            <th scope="col">배송사</th>
+            <th scope="col">배송일시</th>
+            <?php } ?>
+            <!-- } -->
+
        </tr>
        </thead>
        <tbody>
@ -173,22 +187,47 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
        for($i=0; $row=sql_fetch_array($result); $i++) {
            // 상품이미지
            $image = get_it_image($row['it_id'], 50, 50);
+            
+            

            // 상품의 옵션정보
-            $sql = " select ct_id, it_id, ct_price, ct_point, ct_qty, ct_option, ct_status, cp_price, ct_stock_use, ct_point_use, ct_send_cost, io_type, io_price
+            if(isset($pa['pa_is']) && $pa['pa_is'] == 1) {
+                $sql = " select ct_id, it_id, ct_price, ct_point, ct_qty, ct_option, ct_status, cp_price, ct_stock_use, ct_point_use, ct_send_cost, io_type, io_price, ct_delivery_company, ct_invoice, ct_invoice_time
                        from {$g5['g5_shop_cart_table']}
                        where od_id = '{$od['od_id']}'
                          and it_id = '{$row['it_id']}'
                        order by io_type asc, ct_id asc ";
-            $res = sql_query($sql);
+                $res = sql_query($sql);
+            } else {
+                $sql = " select ct_id, it_id, ct_price, ct_point, ct_qty, ct_option, ct_status, cp_price, ct_stock_use, ct_point_use, ct_send_cost, io_type, io_price
+                        from {$g5['g5_shop_cart_table']}
+                        where od_id = '{$od['od_id']}'
+                          and it_id = '{$row['it_id']}'
+                        order by io_type asc, ct_id asc ";
+                $res = sql_query($sql);
+            }
            $rowspan = sql_num_rows($res);

+            if (isset($rb_item_res['res_is']) && $rb_item_res['res_is'] == 1) {
+                $resv = sql_fetch("SELECT * FROM {$g5['g5_shop_cart_table']} WHERE ct_id = '{$row['ct_id']}' ");
+            }
+
            // 합계금액 계산
-            $sql = " select SUM(IF(io_type = 1, (io_price * ct_qty), ((ct_price + io_price) * ct_qty))) as price,
-                            SUM(ct_qty) as qty
-                        from {$g5['g5_shop_cart_table']}
-                        where it_id = '{$row['it_id']}'
-                          and od_id = '{$od['od_id']}' ";
+            $price_calc = "((ct_price + io_price) * ct_qty)";
+            if (isset($rb_item_res['res_is']) && $rb_item_res['res_is'] == 1 && isset($resv['ct_types']) && $resv['ct_types'] == 1) {
+                $price_calc = "((ct_price + io_price) * ct_qty * ct_date_d + 
+                               (COALESCE(ct_user_pri1, 0) * COALESCE(ct_user_qty1, 0)) + 
+                               (COALESCE(ct_user_pri2, 0) * COALESCE(ct_user_qty2, 0)) + 
+                               (COALESCE(ct_user_pri3, 0) * COALESCE(ct_user_qty3, 0)))";
+            }
+            
+            $sql = "SELECT SUM(IF(io_type = 1, (io_price * ct_qty), $price_calc)) AS price,
+                           SUM(ct_point * ct_qty) AS point,
+                           SUM(ct_qty) AS qty
+                    FROM {$g5['g5_shop_cart_table']}
+                    WHERE it_id = '{$row['it_id']}' 
+                      AND od_id = '{$od['od_id']}'";
+
            $sum = sql_fetch($sql);

            // 배송비
@ -220,8 +259,10 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                    $opt_price = $opt['ct_price'] + $opt['io_price'];

                // 소계
-                $ct_price['stotal'] = $opt_price * $opt['ct_qty'];
+                //$ct_price['stotal'] = $opt_price * $opt['ct_qty'];
+                $ct_price['stotal'] = $sum['price'];
                $ct_point['stotal'] = $opt['ct_point'] * $opt['ct_qty'];
+                
            ?>
            <tr>
                <?php if($k == 0) { ?>
@ -239,6 +280,15 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                    <input type="checkbox" name="ct_chk[<?php echo $chk_cnt; ?>]" id="ct_chk_<?php echo $chk_cnt; ?>" value="<?php echo $chk_cnt; ?>" class="sct_sel_<?php echo $i; ?>">
                    <input type="hidden" name="ct_id[<?php echo $chk_cnt; ?>]" value="<?php echo $opt['ct_id']; ?>">
                    <?php echo get_text($opt['ct_option']); ?>
+                    
+                    <?php
+                        //예약정보 로드
+                        if(isset($rb_item_res['res_is']) && $rb_item_res['res_is'] == 1) {
+                            if(isset($resv['ct_types']) && $resv['ct_types'] == 1) {
+                                include (G5_PATH.'/rb/rb.mod/reservation/info.inc.php');
+                            }
+                        }
+                    ?>
                </td>
                <td class="td_mngsmall"><?php echo $opt['ct_status']; ?></td>
                <td class="td_num">
@ -249,9 +299,49 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                <td class="td_num_right"><?php echo number_format($ct_price['stotal']); ?></td>
                <td class="td_num_right"><?php echo number_format($opt['cp_price']); ?></td>
                <td class=" td_num_right"><?php echo number_format($ct_point['stotal']); ?></td>
+                <?php if ((!isset($rb_item_res['res_is'])) || $rb_item_res['res_is'] != 1) { ?>
                <td class="td_sendcost_by"><?php echo $ct_send_cost; ?></td>
-                <td class="td_mngsmall"><?php echo get_yn($opt['ct_point_use']); ?></td>
-                <td class="td_mngsmall"><?php echo get_yn($opt['ct_stock_use']); ?></td>
+                <?php } ?>
+                <td class=""><?php echo get_yn($opt['ct_point_use']); ?></td>
+                <td class=""><?php echo get_yn($opt['ct_stock_use']); ?></td>
+
+                <!-- 20241018 리빌더 추가 { -->
+                <?php if(isset($pa['pa_is']) && $pa['pa_is'] == 1) { ?>
+                <td class=""><input type="text" name="ct_invoice[<?php echo $chk_cnt; ?>]" value="<?php echo $opt['ct_invoice']; ?>" id="ct_invoice_<?php echo $chk_cnt; ?>" class="frm_input"></td>
+
+                <td class="">
+                    <input type="text" name="ct_delivery_company[<?php echo $chk_cnt; ?>]" id="ct_delivery_company_<?php echo $chk_cnt; ?>" value="<?php echo $opt['ct_delivery_company']; ?>" class="frm_input" style="width:60%;">
+
+                    <input type="checkbox" id="ct_delivery_chk_<?php echo $chk_cnt; ?>" value="<?php echo $default['de_delivery_company']; ?>" onclick="chk_delivery_company_<?php echo $chk_cnt; ?>()">
+                    <label for="ct_delivery_chk_<?php echo $chk_cnt; ?>">기본</label>
+
+                    <script>
+                    function chk_delivery_company_<?php echo $chk_cnt; ?>()
+                    {
+                        var chk_<?php echo $chk_cnt; ?> = document.getElementById("ct_delivery_chk_<?php echo $chk_cnt; ?>");
+                        var company_<?php echo $chk_cnt; ?> = document.getElementById("ct_delivery_company_<?php echo $chk_cnt; ?>");
+                        company_<?php echo $chk_cnt; ?>.value = chk_<?php echo $chk_cnt; ?>.checked ? chk_<?php echo $chk_cnt; ?>.value : company_<?php echo $chk_cnt; ?>.defaultValue;
+                    }
+                    </script>
+                </td>
+
+                <td class="">
+                    <input type="text" name="ct_invoice_time[<?php echo $chk_cnt; ?>]" id="ct_invoice_time_<?php echo $chk_cnt; ?>" value="<?php echo is_null_time($opt['ct_invoice_time']) ? "" : $opt['ct_invoice_time']; ?>" class="frm_input" maxlength="19" style="width:60%;">
+                    <input type="checkbox" id="ct_invoice_chk_<?php echo $chk_cnt; ?>" value="<?php echo date("Y-m-d H:i:s", G5_SERVER_TIME); ?>" onclick="chk_invoice_time_<?php echo $chk_cnt; ?>()">
+                    <label for="ct_invoice_chk_<?php echo $chk_cnt; ?>">현재</label>
+
+                    <script>
+                    function chk_invoice_time_<?php echo $chk_cnt; ?>()
+                    {
+                        var chk_<?php echo $chk_cnt; ?> = document.getElementById("ct_invoice_chk_<?php echo $chk_cnt; ?>");
+                        var time_<?php echo $chk_cnt; ?> = document.getElementById("ct_invoice_time_<?php echo $chk_cnt; ?>");
+                        time_<?php echo $chk_cnt; ?>.value = chk_<?php echo $chk_cnt; ?>.checked ? chk_<?php echo $chk_cnt; ?>.value : time_<?php echo $chk_cnt; ?>.defaultValue;
+                    }
+                    </script>
+                </td>
+                <?php } ?>
+                <!-- } -->
+
            </tr>
            <?php
                $chk_cnt++;
@ -270,8 +360,10 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
            <strong>주문 및 장바구니 상태 변경</strong>
            <input type="submit" name="ct_status" value="주문" onclick="document.pressed=this.value" class="btn_02 color_01">
            <input type="submit" name="ct_status" value="입금" onclick="document.pressed=this.value" class="btn_02 color_02">
+            <!--
            <input type="submit" name="ct_status" value="준비" onclick="document.pressed=this.value" class="btn_02 color_03">
            <input type="submit" name="ct_status" value="배송" onclick="document.pressed=this.value" class="btn_02 color_04">
+            -->
            <input type="submit" name="ct_status" value="완료" onclick="document.pressed=this.value" class="btn_02 color_05">
            <input type="submit" name="ct_status" value="취소" onclick="document.pressed=this.value" class="btn_02 color_06">
            <input type="submit" name="ct_status" value="반품" onclick="document.pressed=this.value" class="btn_02 color_06">
@ -280,7 +372,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
    </div>

    <div class="local_desc01 local_desc">
-        <p>주문, 입금, 준비, 배송, 완료는 장바구니와 주문서 상태를 모두 변경하지만, 취소, 반품, 품절은 장바구니의 상태만 변경하며, 주문서 상태는 변경하지 않습니다.</p>
+        <p>주문, 입금, 완료는 장바구니와 주문서 상태를 모두 변경하지만, 취소, 반품, 품절은 장바구니의 상태만 변경하며, 주문서 상태는 변경하지 않습니다.</p>
        <p>개별적인(이곳에서의) 상태 변경은 모든 작업을 수동으로 처리합니다. 예를 들어 주문에서 입금으로 상태 변경시 입금액(결제금액)을 포함한 모든 정보는 수동 입력으로 처리하셔야 합니다.</p>
    </div>

@ -306,7 +398,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
    if(isset($tmp_row['P_TID']) && $tmp_row['P_TID']){
 ?>
 <div class="od_test_caution">주의) 이 주문은 결제취소된 내역이 있습니다. 이니시스 관리자 상점에서 반드시 재확인을 해 주세요.</div>
-<?php 
+<?php
    }   //end if
 }   //end if
 ?>
@ -348,7 +440,9 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
            <th scope="col">주문번호</th>
            <th scope="col">결제방법</th>
            <th scope="col">주문총액</th>
+            <?php if ((!isset($rb_item_res['res_is'])) || $rb_item_res['res_is'] != 1) { ?>
            <th scope="col">배송비</th>
+            <?php } ?>
            <th scope="col">포인트결제</th>
            <th scope="col">총결제액</th>
            <th scope="col">쿠폰</th>
@ -360,7 +454,9 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
            <td><?php echo $od['od_id']; ?></td>
            <td class="td_paybybig"><?php echo $s_receipt_way; ?></td>
            <td class="td_numbig td_numsum"><?php echo display_price($amount['order']); ?></td>
+            <?php if ((!isset($rb_item_res['res_is'])) || $rb_item_res['res_is'] != 1) { ?>
            <td class="td_numbig"><?php echo display_price($od['od_send_cost'] + $od['od_send_cost2']); ?></td>
+            <?php } ?>
            <td class="td_numbig"><?php echo display_point($od['od_receipt_point']); ?></td>
            <td class="td_numbig td_numincome"><?php echo number_format($amount['receipt']); ?>원</td>
            <td class="td_numbig td_numcoupon"><?php echo display_price($amount['coupon']); ?></td>
@ -575,20 +671,30 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                    <th scope="row">결제취소/환불액</th>
                    <td><?php echo display_price($od['od_refund_price']); ?></td>
                </tr>
-                <?php if ($od['od_invoice']) { ?>
-                <tr>
-                    <th scope="row">배송회사</th>
-                    <td><?php echo $od['od_delivery_company']; ?> <?php echo get_delivery_inquiry($od['od_delivery_company'], $od['od_invoice'], 'dvr_link'); ?></td>
-                </tr>
-                <tr>
-                    <th scope="row">운송장번호</th>
-                    <td><?php echo $od['od_invoice']; ?></td>
-                </tr>
-                <tr>
-                    <th scope="row">배송일시</th>
-                    <td><?php echo is_null_time($od['od_invoice_time']) ? "" : $od['od_invoice_time']; ?></td>
-                </tr>
+
+                <!-- 20241018 리빌더 수정 { -->
+                <?php if(isset($pa['pa_is']) && $pa['pa_is'] == 1) { ?>
+                    <?php } else { ?>
+                    <?php if ((!isset($rb_item_res['res_is'])) || $rb_item_res['res_is'] != 1) { ?>
+                    <?php if ($od['od_invoice']) { ?>
+                    <tr>
+                        <th scope="row">배송회사</th>
+                        <td><?php echo $od['od_delivery_company']; ?> <?php echo get_delivery_inquiry($od['od_delivery_company'], $od['od_invoice'], 'dvr_link'); ?></td>
+                    </tr>
+
+                    <tr>
+                        <th scope="row">운송장번호</th>
+                        <td><?php echo $od['od_invoice']; ?></td>
+                    </tr>
+                    <tr>
+                        <th scope="row">배송일시</th>
+                        <td><?php echo is_null_time($od['od_invoice_time']) ? "" : $od['od_invoice_time']; ?></td>
+                    </tr>
+                    <?php } ?>
+                    <?php } ?>
                <?php } ?>
+                <!-- } -->
+                <?php if ((!isset($rb_item_res['res_is'])) || $rb_item_res['res_is'] != 1) { ?>
                <tr>
                    <th scope="row"><label for="od_send_cost">배송비</label></th>
                    <td>
@ -607,6 +713,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                        <input type="text" name="od_send_cost2" value="<?php echo $od['od_send_cost2']; ?>" id="od_send_cost2" class="frm_input" size="10"> 원
                    </td>
                </tr>
+                <?php } ?>
                <?php
                if ($od['od_misu'] == 0 && $od['od_receipt_price'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '가상계좌' || $od['od_settle_case'] == '계좌이체')) {
                ?>
@ -634,7 +741,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                            $cash = unserialize($od['od_cash_info']);
                            $cash_receipt_script = 'window.open(\'https://iniweb.inicis.com/DefaultWebApp/mall/cr/cm/Cash_mCmReceipt.jsp?noTid='.$cash['TID'].'&clpaymethod=22\',\'showreceipt\',\'width=380,height=540,scrollbars=no,resizable=no\');';
                        } else if($od['od_pg'] == 'nicepay') {
-                            
+
                            $od_tid = $od['od_tno'];
                            $cash_type = 0;

@ -714,11 +821,11 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                <tr>
                    <th scope="row"><label for="od_deposit_name">입금자명</label></th>
                    <td>
-                        <?php if ($config['cf_sms_use'] && $default['de_sms_use4']) { ?>
+
                        <input type="checkbox" name="od_sms_ipgum_check" id="od_sms_ipgum_check">
-                        <label for="od_sms_ipgum_check">SMS 입금 문자전송</label>
+                        <label for="od_sms_ipgum_check">SMS 입금 문자 및 알림전송</label>
                        <br>
-                        <?php } ?>
+
                        <input type="text" name="od_deposit_name" value="<?php echo get_text($od['od_deposit_name']); ?>" id="od_deposit_name" class="frm_input">
                    </td>
                </tr>
@ -818,14 +925,21 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                        <input type="text" name="od_refund_price" value="<?php echo $od['od_refund_price']; ?>" id="od_refund_price" class="frm_input" size="10"> 원
                    </td>
                </tr>
+
+
+                <!-- 20241018 리빌더 수정 { -->
+                <?php if(isset($pa['pa_is']) && $pa['pa_is'] == 1) { ?>
+
+                <?php } else { ?>
+                <?php if ((!isset($rb_item_res['res_is'])) || $rb_item_res['res_is'] != 1) { ?>
                <tr>
                    <th scope="row"><label for="od_invoice">운송장번호</label></th>
                    <td>
-                        <?php if ($config['cf_sms_use'] && $default['de_sms_use5']) { ?>
+
                        <input type="checkbox" name="od_sms_baesong_check" id="od_sms_baesong_check">
-                        <label for="od_sms_baesong_check">SMS 배송 문자전송</label>
+                        <label for="od_sms_baesong_check">SMS 배송 문자 및 알림전송</label>
                        <br>
-                        <?php } ?>
+
                        <input type="text" name="od_invoice" value="<?php echo $od['od_invoice']; ?>" id="od_invoice" class="frm_input">
                    </td>
                </tr>
@ -845,17 +959,23 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                        <input type="text" name="od_invoice_time" id="od_invoice_time" value="<?php echo is_null_time($od['od_invoice_time']) ? "" : $od['od_invoice_time']; ?>" class="frm_input" maxlength="19">
                    </td>
                </tr>
+                <?php } ?>

                <?php if ($config['cf_email_use']) { ?>
-                <tr>
-                    <th scope="row"><label for="od_send_mail">메일발송</label></th>
-                    <td>
-                        <?php echo help("주문자님께 입금, 배송내역을 메일로 발송합니다.\n메일발송시 상점메모에 기록됩니다."); ?>
-                        <input type="checkbox" name="od_send_mail" value="1" id="od_send_mail"> 메일발송
-                    </td>
-                </tr>
+                    <tr>
+                        <th scope="row"><label for="od_send_mail">메일발송</label></th>
+                        <td>
+                            <?php echo help("주문자님께 입금, 배송내역을 메일로 발송합니다.\n메일발송시 상점메모에 기록됩니다."); ?>
+                            <input type="checkbox" name="od_send_mail" value="1" id="od_send_mail"> 메일발송
+                        </td>
+                    </tr>
                <?php } ?>

+                <?php } ?>
+
+
+                <!-- } -->
+
                </tbody>
                </table>
            </div>
@ -908,7 +1028,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
 </section>

 <section>
-    <h2 class="h2_frm">주문자/배송지 정보</h2>
+    <h2 class="h2_frm">주문자/사용자 정보</h2>
    <?php echo $pg_anchor; ?>

    <form name="frmorderform3" action="./orderformupdate.php" method="post">
@ -923,11 +1043,11 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
    <div class="compare_wrap">

        <section id="anc_sodr_orderer" class="compare_left">
-            <h3>주문하신 분</h3>
+            <h3>주문자 정보</h3>

            <div class="tbl_frm01">
                <table>
-                <caption>주문자/배송지 정보</caption>
+                <caption>주문자 정보</caption>
                <colgroup>
                    <col class="grid_4">
                    <col>
@ -957,8 +1077,8 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                        <input type="text" name="od_addr2" value="<?php echo get_text($od['od_addr2']); ?>" id="od_addr2" class="frm_input" size="35">
                        <label for="od_addr2">상세주소</label>
                        <br>
-                        <input type="text" name="od_addr3" value="<?php echo get_text($od['od_addr3']); ?>" id="od_addr3" class="frm_input" size="35">
-                        <label for="od_addr3">참고항목</label>
+                        <input type="text" name="od_addr3" value="<?php echo get_text($od['od_addr3']); ?>" id="od_addr3" class="frm_input" size="35"><br>
+
                        <input type="hidden" name="od_addr_jibeon" value="<?php echo get_text($od['od_addr_jibeon']); ?>"><br>
                    </td>
                </tr>
@ -973,14 +1093,14 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                </tbody>
                </table>
            </div>
-        </section>
-
-        <section id="anc_sodr_taker" class="compare_right">
-            <h3>받으시는 분</h3>
+            
+            <br><br>
+            
+            <h3>사용자(수령자) 정보</h3>

            <div class="tbl_frm01">
                <table>
-                <caption>받으시는 분 정보</caption>
+                <caption>사용자(수령자) 정보</caption>
                <colgroup>
                    <col class="grid_4">
                    <col>
@ -1004,13 +1124,12 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                        <label for="od_b_zip" class="sound_only">우편번호</label>
                        <input type="text" name="od_b_zip" value="<?php echo get_text($od['od_b_zip1']).get_text($od['od_b_zip2']); ?>" id="od_b_zip" required class="frm_input required" size="5">
                        <button type="button" class="btn_frmline" onclick="win_zip('frmorderform3', 'od_b_zip', 'od_b_addr1', 'od_b_addr2', 'od_b_addr3', 'od_b_addr_jibeon');">주소 검색</button><br>
-                        <input type="text" name="od_b_addr1" value="<?php echo get_text($od['od_b_addr1']); ?>" id="od_b_addr1" required class="frm_input required" size="35">
-                        <label for="od_b_addr1">기본주소</label>
-                        <input type="text" name="od_b_addr2" value="<?php echo get_text($od['od_b_addr2']); ?>" id="od_b_addr2" class="frm_input" size="35">
-                        <label for="od_b_addr2">상세주소</label>
-                        <input type="text" name="od_b_addr3" value="<?php echo get_text($od['od_b_addr3']); ?>" id="od_b_addr3" class="frm_input" size="35">
-                        <label for="od_b_addr3">참고항목</label>
-                        <input type="hidden" name="od_b_addr_jibeon" value="<?php echo get_text($od['od_b_addr_jibeon']); ?>"><br>
+                        <input type="text" name="od_b_addr1" value="<?php echo get_text($od['od_b_addr1']); ?>" id="od_b_addr1" required class="frm_input required" size="35" style="margin-top:5px;">
+                        <label for="od_b_addr1">기본주소</label><br>
+                        <input type="text" name="od_b_addr2" value="<?php echo get_text($od['od_b_addr2']); ?>" id="od_b_addr2" class="frm_input" size="35" style="margin-top:5px;">
+                        <label for="od_b_addr2">상세주소</label><br>
+                        <input type="text" name="od_b_addr3" value="<?php echo get_text($od['od_b_addr3']); ?>" id="od_b_addr3" class="frm_input" size="35" style="margin-top:5px;">
+                        <input type="hidden" name="od_b_addr_jibeon" value="<?php echo get_text($od['od_b_addr_jibeon']); ?>">
                    </td>
                </tr>

@ -1032,6 +1151,41 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
            </div>
        </section>

+        <section id="anc_sodr_taker" class="compare_right">
+            <?php
+            if (isset($rb_item_res['res_is']) && $rb_item_res['res_is'] == 1) {
+            $resv = sql_fetch("SELECT ct_user_qty1 FROM {$g5['g5_shop_cart_table']} WHERE od_id = '{$od['od_id']}' AND ct_select = '1' LIMIT 1");
+            $ct_user_qty1 = (int)$resv['ct_user_qty1'];
+            if(isset($ct_user_qty1) && $ct_user_qty1 > 0) {
+                
+                $names = explode('|', $od['od_names']);
+                $hps = explode('|', $od['od_hps']);
+                
+                if($names[0]) {
+        ?>
+        
+        <section id="sod_fin_receiver">
+            <h3>추가사용자 정보</h3>
+
+            <div class="tbl_head01 tbl_wrap">
+                <table>
+          
+                <tbody>
+                <?php for($i = 0; $i < $ct_user_qty1; $i++) { ?>
+                <tr>
+                    <th scope="row">사용자 <?php echo $i+1 ?></th>
+                    <td><?php echo get_text($names[$i] ?? ''); ?> / <?php echo get_text($hps[$i] ?? ''); ?></td>
+                </tr>
+                <?php } ?>
+                </tbody>
+                </table>
+            </div>
+        </section>
+        <?php } ?>
+        <?php } ?>
+        <?php } ?>
+        </section>
+
    </div>

    <div class="btn_confirm01 btn_confirm">
@ -1162,4 +1316,4 @@ function chk_receipt_price()
 </script>

 <?php
-include_once(G5_ADMIN_PATH.'/admin.tail.php');
+include_once(G5_ADMIN_PATH.'/admin.tail.php');
--- a/adm/shop_admin/orderformcartupdate.php
+++ b/adm/shop_admin/orderformcartupdate.php
@ -35,6 +35,15 @@ for ($i=0; $i<$cnt; $i++)
    if($k === '') continue;

    $ct_id = isset($_POST['ct_id'][$k]) ? (int) $_POST['ct_id'][$k] : 0;
+    
+    /* 20241018 리빌더 수정 { */
+    if(isset($pa['pa_is']) && $pa['pa_is'] == 1) {
+        $ct_delivery_company = isset($_POST['ct_delivery_company'][$k]) ? $_POST['ct_delivery_company'][$k] : '';
+        $ct_invoice = isset($_POST['ct_invoice'][$k]) ? $_POST['ct_invoice'][$k] : '';
+        $ct_invoice_time = isset($_POST['ct_invoice_time'][$k]) ? $_POST['ct_invoice_time'][$k] : '';
+    }
+    /* } */
+

    if(!$ct_id)
        continue;
@ -142,15 +151,37 @@ for ($i=0; $i<$cnt; $i++)
    // 히스토리에 남길때는 작업|아이디|시간|IP|그리고 나머지 자료
    $now = G5_TIME_YMDHIS;
    $ct_history="\n$ct_status|{$member['mb_id']}|$now|$REMOTE_ADDR";
+    
+    /* 20241018 리빌더 수정 { */
+    if(isset($pa['pa_is']) && $pa['pa_is'] == 1) {
+        
+        $sql = " update {$g5['g5_shop_cart_table']}
+                    set ct_point_use  = '$point_use',
+                        ct_stock_use  = '$stock_use',
+                        ct_status     = '$ct_status',
+                        ct_delivery_company     = '$ct_delivery_company',
+                        ct_invoice     = '$ct_invoice',
+                        ct_invoice_time     = '$ct_invoice_time',
+                        ct_history    = CONCAT(ct_history,'$ct_history')
+                    where od_id = '$od_id'
+                    and ct_id  = '$ct_id' ";
+        sql_query($sql);

-    $sql = " update {$g5['g5_shop_cart_table']}
-                set ct_point_use  = '$point_use',
-                    ct_stock_use  = '$stock_use',
-                    ct_status     = '$ct_status',
-                    ct_history    = CONCAT(ct_history,'$ct_history')
-                where od_id = '$od_id'
-                and ct_id  = '$ct_id' ";
-    sql_query($sql);
+    } else { 
+        $sql = " update {$g5['g5_shop_cart_table']}
+                    set ct_point_use  = '$point_use',
+                        ct_stock_use  = '$stock_use',
+                        ct_status     = '$ct_status',
+                        ct_history    = CONCAT(ct_history,'$ct_history')
+                    where od_id = '$od_id'
+                    and ct_id  = '$ct_id' ";
+        sql_query($sql);
+    }
+    /* } */
+
+    
+    
+    

    // it_id를 배열에 저장
    if($ct_status == '주문' || $ct_status == '취소' || $ct_status == '반품' || $ct_status == '품절' || $ct_status == '완료')
@ -349,7 +380,6 @@ $sql = " update {$g5['g5_shop_order_table']}
                od_send_coupon  = '{$info['od_send_coupon']}',
                od_cancel_price = '{$info['od_cancel_price']}',
                od_send_cost    = '{$info['od_send_cost']}',
-                od_misu         = '{$info['od_misu']}',
                od_tax_mny      = '{$info['od_tax_mny']}',
                od_vat_mny      = '{$info['od_vat_mny']}',
                od_free_mny     = '{$info['od_free_mny']}' ";
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@ -16,7 +16,6 @@ $sort2 = (isset($_GET['sort2']) && in_array($_GET['sort2'], array('desc', 'asc')
 $sel_field = (isset($_GET['sel_field']) && in_array($_GET['sel_field'], array('od_id', 'mb_id', 'od_name', 'od_tel', 'od_hp', 'od_b_name', 'od_b_tel', 'od_b_hp', 'od_deposit_name', 'od_invoice')) ) ? $_GET['sel_field'] : ''; 
 $od_status = isset($_GET['od_status']) ? get_search_string($_GET['od_status']) : '';
 $search = isset($_GET['search']) ? get_search_string($_GET['search']) : '';
-$save_search = isset($_GET['save_search']) ? get_search_string($_GET['save_search']) : '';

 $fr_date = (isset($_GET['fr_date']) && preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $_GET['fr_date'])) ? $_GET['fr_date'] : '';
 $to_date = (isset($_GET['to_date']) && preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $_GET['to_date'])) ? $_GET['to_date'] : '';
--- a/adm/shop_admin/ordersms.inc.php
+++ b/adm/shop_admin/ordersms.inc.php
@ -87,4 +87,31 @@ if ($config['cf_sms_use']) {
            $SMS->Init(); // 보관하고 있던 결과값을 지웁니다.
        }
    }
-}
+}
+
+/* 리빌더 20241016 추가 { */
+if($od['mb_id']) {
+    if ($od_sms_ipgum_check) {
+        
+        $od_al = "입금확인 안내
+        
+입금금액 : ".number_format($od_receipt_price)."원
+주문번호 : ".$od_id;
+        
+        //입금발송
+        memo_auto_send($od_al, '', $od['mb_id'], "system-msg");
+    }
+    
+    if ($od_sms_baesong_check) {
+        
+        $od_al = "주문 상품 배송처리 안내
+        
+배송사 : ".$od_delivery_company."
+운송장번호 : ".$od_invoice."
+주문번호 : ".$od_id;
+        
+        //배송발송
+        memo_auto_send($od_al, '', $od['mb_id'], "system-msg");
+    }
+}
+/* } */