firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge remote-tracking branch '그누보드/master'

Browse Source
This commit is contained in:
KWON
2026-02-20 11:42:31 +09:00
parent 4900f86d74 ef1be317e1
commit bdf228e69d
33 changed files with 156 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/shop/orderform.sub.php
View File

@ -1499,8 +1499,8 @@ function pay_approval()
break;
}
f.method.value = pay_method;
f.orderId.value = '<?=$od_id?>';
f.orderName.value = '<?=$goods?>';
f.orderId.value = "<?php echo $od_id; ?>";
f.orderName.value = "<?php echo $goods; ?>";
f.customerName.value = pf.od_name.value;
f.customerEmail.value = pf.od_email.value;
@ -1523,6 +1523,10 @@ function pay_approval()
f.amountCurrency.value = 'KRW';
f.amountValue.value = f.good_mny.value;
if (pf && pf.amountValue) {
pf.amountValue.value = f.good_mny.value;
}
<?php if($default['de_tax_flag_use']) { ?>
f.taxFreeAmount.value = pf.comm_free_mny.value;
<?php } ?>

4
mobile/shop/personalpayformupdate.php
View File

@ -183,7 +183,7 @@ if((int)$pp['pp_price'] !== (int)$pg_price) {
include G5_SHOP_PATH.'/lg/xpay_cancel.php';
break;
case 'toss':
include G5_SHOP_PATH.'/toss/toss_result.php';
include G5_SHOP_PATH.'/toss/toss_cancel.php';
break;
case 'inicis':
include G5_SHOP_PATH.'/inicis/inipay_cancel.php';
@ -271,7 +271,7 @@ if($pp_receipt_price > 0 && $pp['pp_id'] && $pp['od_id']) {
include G5_SHOP_PATH.'/lg/xpay_cancel.php';
break;
case 'toss':
include G5_SHOP_PATH.'/toss/toss_result.php';
include G5_SHOP_PATH.'/toss/toss_cancel.php';
break;
case 'inicis':
include G5_SHOP_PATH.'/inicis/inipay_cancel.php';

2
mobile/shop/toss/toss_approval.php
View File

@ -90,7 +90,7 @@ foreach($payReqMap as $key => $value) {
* 수정불가.
*/
const clientKey = "<?php echo $config['cf_toss_client_key']; ?>";
const customerKey = "<?php echo isset($member['mb_id']) ? $member['mb_id'] : ''; ?>";
const customerKey = "<?php echo $is_member ? $member['mb_id'] : md5(get_session('ss_order_id')); ?>";
const tossPayments = TossPayments(clientKey);
const payment = tossPayments.payment({ customerKey });