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

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

Browse Source
This commit is contained in:
whitedot
2013-10-23 11:03:39 +09:00
parent 3d18bbf9f0 20e7043f11
commit 2bade525f7
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/shop_admin/orderpartcancel.php
View File

@ -10,7 +10,7 @@ $od = sql_fetch($sql);
if(!$od['od_id'])
alert_close('주문정보가 존해하지 않습니다.');
if($od['od_settle_case'] == '계좌이체' && substr($od['od_receipt_time'], 0, 10) >= G4_TIME_YMD)
if($od['od_settle_case'] == '계좌이체' && substr($od['od_receipt_time'], 0, 10) >= G5_TIME_YMD)
alert_close('실시간 계좌이체건의 부분취소 요청은 결제일 익일에 가능합니다.');
if($od['od_receipt_price'] - $od['od_refund_price'] <= 0)

10
adm/shop_admin/orderpartcancelupdate.php
View File

@ -20,7 +20,7 @@ $od = sql_fetch($sql);
if(!$od['od_id'])
alert_close('주문정보가 존재하지 않습니다.');
if($od['od_settle_case'] == '계좌이체' && substr($od['od_receipt_time'], 0, 10) >= G4_TIME_YMD)
if($od['od_settle_case'] == '계좌이체' && substr($od['od_receipt_time'], 0, 10) >= G5_TIME_YMD)
alert_close('실시간 계좌이체건의 부분취소 요청은 결제일 익일에 가능합니다.');
// 금액비교
@ -86,9 +86,9 @@ $tno = $od['od_tno'];
$req_tx = 'mod';
$mod_desc = $cancel_memo;
$cust_ip = getenv('REMOTE_ADDR');
$rem_mny = $od['od_receipt_price'] - $od['od_refund_price'];;
$mod_mny = $tax_mny;
$mod_free_mny = $free_mny;
$rem_mny = (int)$od['od_receipt_price'] - (int)$od['od_refund_price'];;
$mod_mny = (int)$tax_mny;
$mod_free_mny = (int)$free_mny;
$mod_type = 'RN07';
if($od['od_settle_case'] == '계좌이체')
$mod_type = 'STPA';
@ -119,7 +119,7 @@ if ( $req_tx == "mod" )
$c_PayPlus->mf_set_modx_data( "tax_flag" , "TG03" ); // 복합과세 구분
$c_PayPlus->mf_set_modx_data( "mod_tax_mny" , strval($mod_tax_mny) ); // 공급가 부분 취소 요청 금액
$c_PayPlus->mf_set_modx_data( "mod_vat_mny" , strval($mod_vat_mny) ); // 부과세 부분 취소 요청 금액
$c_PayPlus->mf_set_modx_data( "mod_free_mny" , $mod_free_mny ); // 비관세 부분 취소 요청 금액
$c_PayPlus->mf_set_modx_data( "mod_free_mny" , strval($mod_free_mny) ); // 비관세 부분 취소 요청 금액
}
}

36
js/shop.mobile.main.js
View File

@ -131,6 +131,15 @@
$slides.eq(next).css("left", width+"px");
$tabs.removeClass(cfg.tab_active);
if(count >= 3) {
$tabs.removeClass("tab_listed").css("left", "-"+tab_width+"px");
$tabs.eq(next - 1).addClass("tab_listed").css("left", "0px");
$tabs.eq(next).addClass("tab_listed").css("left", pos_left+"px");
$tabs.eq((next + 1) % count).addClass("tab_listed").css("left", pos_right+"px");
}
$tabs.eq(next).addClass(cfg.tab_active);
$slides.eq(idx).clearQueue().animate(
{ left: "-="+width }, cfg.duration,
function() {
@ -141,16 +150,7 @@
$slides.eq(next).clearQueue().animate(
{ left: "-="+width }, cfg.duration,
function() {
if(count >= 3) {
$tabs.removeClass("tab_listed").css("left", "-"+tab_width+"px");
$tabs.eq(next - 1).addClass("tab_listed").css("left", "0px");
$tabs.eq(next).addClass("tab_listed").css("left", pos_left+"px");
$tabs.eq((next + 1) % count).addClass("tab_listed").css("left", pos_right+"px");
}
$wrap.height(next_height);
$tabs.eq(next).addClass(cfg.tab_active);
}
);
@ -182,6 +182,15 @@
$slides.eq(next).css("left", "-"+width+"px");
$tabs.removeClass(cfg.tab_active);
if(count >= 3) {
$tabs.removeClass("tab_listed").css("left", "-"+tab_width+"px");
$tabs.eq(next - 1).addClass("tab_listed").css("left", "0px");
$tabs.eq(next).addClass("tab_listed").css("left", pos_left+"px");
$tabs.eq((next + 1) % count).addClass("tab_listed").css("left", pos_right+"px");
}
$tabs.eq(next).addClass(cfg.tab_active);
$slides.eq(idx).clearQueue().animate(
{ left: "+="+width }, cfg.duration,
function() {
@ -192,16 +201,7 @@
$slides.eq(next).clearQueue().animate(
{ left: "+="+width }, cfg.duration,
function() {
if(count >= 3) {
$tabs.removeClass("tab_listed").css("left", "-"+tab_width+"px");
$tabs.eq(next - 1).addClass("tab_listed").css("left", "0px");
$tabs.eq(next).addClass("tab_listed").css("left", pos_left+"px");
$tabs.eq((next + 1) % count).addClass("tab_listed").css("left", pos_right+"px");
}
$wrap.height(next_height);
$tabs.eq(next).addClass(cfg.tab_active);
}
);