- Timestamp:
- 2011/03/16 10:55:14 (13 years ago)
- bzr:base-revision:
- ohkouchi@loop-az.jp-20110316014024-d505efe315lr02r5
- bzr:committer:
- Kentaro Ohkouchi <ohkouchi@loop-az.jp>
- bzr:file-ids:
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1- bzr:mapping-version:
- v4
- bzr:merge:
ohkouchi@loop-az.jp-20110316015420-ianw8mqdm4f2x0n8- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- ohkouchi@loop-az.jp-20110316015501-x1fqvmay077xgiyc
- bzr:revno:
- 3382
- bzr:revprop:branch-nick:
- branches/version-2_5-dev
- bzr:root:
- branches/version-2_5-dev
- bzr:text-revisions:
data/class/helper/SC_Helper_Purchase.php ohkouchi@loop-az.jp-20110316015420-ianw8mqdm4f2x0n8- bzr:timestamp:
- 2011-03-16 10:55:01.522000074 +0900
- bzr:user-agent:
- bzr2.2.1+bzr-svn1.0.4
- svn:original-date:
- 2011-03-16T01:55:01.522000Z
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
r20660 r20662 363 363 364 364 $arrPaymentIds = $this->getPayments($deliv_id); 365 if (SC_Utils_Ex::isBlank($arrPaymentIds)) { 366 return array(); 367 } 368 365 369 $objQuery =& SC_Query_Ex::getSingletonInstance(); 366 370 … … 369 373 $objQuery->setOrder("rank DESC"); 370 374 $payments = $objQuery->select("payment_id, payment_method, rule, upper_rule, note, payment_image, charge", "dtb_payment", $where, $arrPaymentIds); 371 372 375 foreach ($payments as $data) { 373 376 // 下限と上限が設定されている 374 377 if (strlen($data['rule']) != 0 && strlen($data['upper_rule']) != 0) { 375 if ($data['rule'] <= $total _inctax && $data['upper_rule'] >= $total_inctax) {378 if ($data['rule'] <= $total && $data['upper_rule'] >= $total) { 376 379 $arrPayment[] = $data; 377 380 } … … 379 382 // 下限のみ設定されている 380 383 elseif (strlen($data['rule']) != 0) { 381 if($data['rule'] <= $total _inctax) {384 if($data['rule'] <= $total) { 382 385 $arrPayment[] = $data; 383 386 } … … 385 388 // 上限のみ設定されている 386 389 elseif (strlen($data['upper_rule']) != 0) { 387 if($data['upper_rule'] >= $total _inctax) {390 if($data['upper_rule'] >= $total) { 388 391 $arrPayment[] = $data; 389 392 }
Note: See TracChangeset
for help on using the changeset viewer.