diff --git a/adm/shop_admin/orderpartcancel.php b/adm/shop_admin/orderpartcancel.php index 47018b0e4..55df2c5a3 100644 --- a/adm/shop_admin/orderpartcancel.php +++ b/adm/shop_admin/orderpartcancel.php @@ -49,12 +49,10 @@ $od_misu = abs($od['od_misu']); 원 - 원 - diff --git a/mobile/shop/orderform.sub.php b/mobile/shop/orderform.sub.php index 2c531f740..a5387de71 100644 --- a/mobile/shop/orderform.sub.php +++ b/mobile/shop/orderform.sub.php @@ -1174,6 +1174,10 @@ function pay_approval() // 카카오페이 지불 if(settle_method == "KAKAOPAY") { + + pf.SupplyAmt.value = parseInt(pf.comm_tax_mny.value) + parseInt(pf.comm_free_mny.value); + pf.GoodsVat.value = parseInt(pf.comm_vat_mny.value); + pf.good_mny.value = f.good_mny.value; getTxnId(pf); return false; diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index d6e420b8d..66cea39f2 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -485,7 +485,7 @@ if($escw_yn == 'Y') $od_tax_mny = round($i_price / 1.1); $od_vat_mny = $i_price - $od_tax_mny; $od_free_mny = 0; -if($default['de_tax_flag_use'] && $od_pg != 'KAKAOPAY') { +if($default['de_tax_flag_use']) { $od_tax_mny = (int)$_POST['comm_tax_mny']; $od_vat_mny = (int)$_POST['comm_vat_mny']; $od_free_mny = (int)$_POST['comm_free_mny']; @@ -513,9 +513,6 @@ $od_memo = clean_xss_tags($od_memo); $od_deposit_name = clean_xss_tags($od_deposit_name); $od_tax_flag = $default['de_tax_flag_use']; -if($od_tax_flag && $od_pg == 'KAKAOPAY') - $od_tax_flag = 0; - // 주문서에 입력 $sql = " insert {$g5['g5_shop_order_table']} set od_id = '$od_id', diff --git a/shop/inicis/orderpartcancel.inc.php b/shop/inicis/orderpartcancel.inc.php index 23d127167..816e3caef 100644 --- a/shop/inicis/orderpartcancel.inc.php +++ b/shop/inicis/orderpartcancel.inc.php @@ -5,15 +5,15 @@ if($od['od_pg'] != 'inicis') return; include_once(G5_SHOP_PATH.'/settle_inicis.inc.php'); -$od_tax_mny = round((int)$mod_tax_mny / 1.1); +$vat_mny = round((int)$tax_mny / 1.1); $currency = 'WON'; $oldtid = $od['od_tno']; -$price = (int)$mod_tax_mny + (int)$mod_free_mny; +$price = (int)$tax_mny + (int)$free_mny; $confirm_price = (int)$od['od_receipt_price'] - (int)$od['od_refund_price'] - $price; $buyeremail = $od['od_email']; -$tax = (int)$mod_tax_mny - $od_tax_mny; -$taxfree = (int)$mod_free_mny; +$tax = (int)$tax_mny - $vat_mny; +$taxfree = (int)$free_mny; /*********************** * 3. 재승인 정보 설정 * diff --git a/shop/kakaopay/getTxnId.php b/shop/kakaopay/getTxnId.php index fd941fa81..f43b796d9 100644 --- a/shop/kakaopay/getTxnId.php +++ b/shop/kakaopay/getTxnId.php @@ -18,30 +18,37 @@ $kmFunc = new kmpayFunc($LogDir); $kmFunc->setPhpVersion($phpVersion); // TXN_ID를 요청하기 위한 PARAMETERR -$REQUESTDEALAPPROVEURL = KMPayRequest("requestDealApproveUrl"); //인증 요청 경로 -$PR_TYPE = KMPayRequest("prType"); //결제 요청 타입 -$MERCHANT_ID = KMPayRequest("MID"); //가맹점 ID -$MERCHANT_TXN_NUM = KMPayRequest("merchantTxnNum"); //가맹점 거래번호 +$REQUESTDEALAPPROVEURL = KMPayRequest("requestDealApproveUrl"); //인증 요청 경로 +$PR_TYPE = KMPayRequest("prType"); //결제 요청 타입 +$MERCHANT_ID = KMPayRequest("MID"); //가맹점 ID +$MERCHANT_TXN_NUM = KMPayRequest("merchantTxnNum"); //가맹점 거래번호 $channelType = KMPayRequest("channelType"); -$PRODUCT_NAME = KMPayRequest("GoodsName"); //상품명 -$AMOUNT = KMPayRequest("Amt"); //상품금액(총거래금액) (총거래금액 = 공급가액 + 부가세 + 봉사료) +$PRODUCT_NAME = KMPayRequest("GoodsName"); //상품명 +$AMOUNT = KMPayRequest("Amt"); //상품금액(총거래금액) (총거래금액 = 공급가액 + 부가세 + 봉사료) -$CURRENCY = KMPayRequest("currency"); //거래통화(KRW/USD/JPY 등) -$RETURN_URL = KMPayRequest("returnUrl"); //결제승인결과전송URL -$CERTIFIED_FLAG = KMPayRequest("CERTIFIED_FLAG"); //가맹점 인증 구분값 ("N","NC") +$CURRENCY = KMPayRequest("currency"); //거래통화(KRW/USD/JPY 등) +$RETURN_URL = KMPayRequest("returnUrl"); //결제승인결과전송URL +$CERTIFIED_FLAG = KMPayRequest("CERTIFIED_FLAG"); //가맹점 인증 구분값 ("N","NC") -$OFFER_PERIOD_FLAG = KMPayRequest("OFFER_PERIOD_FLAG"); //상품제공기간 플래그 -$OFFER_PERIOD = KMPayRequest("OFFER_PERIOD"); //상품제공기간 +$OFFER_PERIOD_FLAG = KMPayRequest("OFFER_PERIOD_FLAG"); //상품제공기간 플래그 +$OFFER_PERIOD = KMPayRequest("OFFER_PERIOD"); //상품제공기간 //무이자옵션 -$NOINTYN = KMPayRequest("noIntYN"); //무이자 설정 -$NOINTOPT = KMPayRequest("noIntOpt"); //무이자 옵션 -$MAX_INT =KMPayRequest("maxInt"); //최대할부개월 -$FIXEDINT = KMPayRequest("fixedInt"); //고정할부개월 -$POINT_USE_YN = KMPayRequest("pointUseYn"); //카드사포인트사용여부 -$POSSICARD = KMPayRequest("possiCard"); //결제가능카드설정 -$BLOCK_CARD = KMPayRequest("blockCard"); //금지카드설정 +$NOINTYN = KMPayRequest("noIntYN"); //무이자 설정 +$NOINTOPT = KMPayRequest("noIntOpt"); //무이자 옵션 +$MAX_INT =KMPayRequest("maxInt"); //최대할부개월 +$FIXEDINT = KMPayRequest("fixedInt"); //고정할부개월 +$POINT_USE_YN = KMPayRequest("pointUseYn"); //카드사포인트사용여부 +$POSSICARD = KMPayRequest("possiCard"); //결제가능카드설정 +$BLOCK_CARD = KMPayRequest("blockCard"); //금지카드설정 + +// 복합과세 +if($default['de_tax_flag_use']) { + $SUPPLY_AMT = KMPayRequest("SupplyAmt"); // 공급가액 + $GOODS_VAT = KMPayRequest("GoodsVat"); // 부가가치세 + $SERVICE_AMT = KMPayRequest("ServiceAmt"); // 봉사료 +} // ENC KEY와 HASH KEY는 가맹점에서 생성한 KEY 로 SETTING 한다. $merchantEncKey = KMPayRequest("merchantEncKey"); @@ -77,6 +84,13 @@ $strJsonString->setValue("POINT_USE_YN", $POINT_USE_YN); $strJsonString->setValue("POSSI_CARD", $POSSICARD); $strJsonString->setValue("BLOCK_CARD", $BLOCK_CARD); +// 복합과세 +if($default['de_tax_flag_use']) { + $strJsonString->setValue("SUPPLY_AMT", $SUPPLY_AMT); + $strJsonString->setValue("GOODS_VAT", $GOODS_VAT); + $strJsonString->setValue("SERVICE_AMT", $SERVICE_AMT); +} + $strJsonString->setValue("PAYMENT_HASH", $payHash); // 결과값을 담는 부분 diff --git a/shop/kakaopay/orderform.2.php b/shop/kakaopay/orderform.2.php index 608316229..240ce5097 100644 --- a/shop/kakaopay/orderform.2.php +++ b/shop/kakaopay/orderform.2.php @@ -26,6 +26,11 @@ if($is_kakaopay_use) { + + + + + + f.SupplyAmt.value = parseInt(f.comm_tax_mny.value) + parseInt(f.comm_free_mny.value); + f.GoodsVat.value = parseInt(f.comm_vat_mny.value); + getTxnId(f); return false; } diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index 466b62364..1ef1d6230 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -470,7 +470,7 @@ if($escw_yn == 'Y') $od_tax_mny = round($i_price / 1.1); $od_vat_mny = $i_price - $od_tax_mny; $od_free_mny = 0; -if($default['de_tax_flag_use'] && $od_pg != 'KAKAOPAY') { +if($default['de_tax_flag_use']) { $od_tax_mny = (int)$_POST['comm_tax_mny']; $od_vat_mny = (int)$_POST['comm_vat_mny']; $od_free_mny = (int)$_POST['comm_free_mny']; @@ -498,9 +498,6 @@ $od_memo = clean_xss_tags($od_memo); $od_deposit_name = clean_xss_tags($od_deposit_name); $od_tax_flag = $default['de_tax_flag_use']; -if($od_tax_flag && $od_pg == 'KAKAOPAY') - $od_tax_flag = 0; - // 주문서에 입력 $sql = " insert {$g5['g5_shop_order_table']} set od_id = '$od_id',