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-06-11 13:58:05 +09:00
parent 5b2aa2fe53 fd06e07689
commit 55c11d471e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/shop/orderformupdate.php
View File

@ -206,7 +206,7 @@ if($is_member && $send_cost > 0) {
$dc = 0; $dc = 0;
if($cp['cp_id'] && ($cp['cp_minimum'] <= $tot_od_amount)) { if($cp['cp_id'] && ($cp['cp_minimum'] <= $tot_od_amount)) {
if($cp['cp_type']) { if($cp['cp_type']) {
$dc = floor(($tot_od_amount * ($cp['cp_amount'] / 100)) / $cp['cp_trunc']) * $cp['cp_trunc']; $dc = floor(($send_cost * ($cp['cp_amount'] / 100)) / $cp['cp_trunc']) * $cp['cp_trunc'];
} else { } else {
$dc = $cp['cp_amount']; $dc = $cp['cp_amount'];
} }

2
shop/orderformupdate.php
View File

@ -200,7 +200,7 @@ if($is_member && $send_cost > 0) {
$dc = 0; $dc = 0;
if($cp['cp_id'] && ($cp['cp_minimum'] <= $tot_od_amount)) { if($cp['cp_id'] && ($cp['cp_minimum'] <= $tot_od_amount)) {
if($cp['cp_type']) { if($cp['cp_type']) {
$dc = floor(($tot_od_amount * ($cp['cp_amount'] / 100)) / $cp['cp_trunc']) * $cp['cp_trunc']; $dc = floor(($send_cost * ($cp['cp_amount'] / 100)) / $cp['cp_trunc']) * $cp['cp_trunc'];
} else { } else {
$dc = $cp['cp_amount']; $dc = $cp['cp_amount'];
} }