Changeset 21810 for branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php

Timestamp:

2012/05/07 01:27:10 (12 years ago)

Author:

nanasess

bzr:base-revision:

nanasess@fsm.ne.jp-20120506152147-ax0qre64rxi2o56m

bzr:committer:

Kentaro Ohkouchi <nanasess@fsm.ne.jp>

bzr:file-ids:

data/Smarty/templates/admin/basis/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fbasis%2Fpayment.tpl
data/Smarty/templates/admin/basis/payment_input.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fbasis%2Fpayment_input.tpl
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/admin/basis/LC_Page_Admin_Basis.php 15291@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php 15298@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Payment.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php 20543@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_PaymentInput.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php 15307@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Point.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php 15335@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_ZipInstall.php
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql

bzr:mapping-version:

v4

bzr:merge:

nanasess@fsm.ne.jp-20120506162631-s0q2vyyi2v6an6xu

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

nanasess@fsm.ne.jp-20120506162703-jf1842vihihlkmfc

bzr:revno:

4478

bzr:revprop:branch-nick:

branches/version-2_12-dev

bzr:root:

branches/version-2_12-dev

bzr:testament:

bazaar-ng testament short form 2.1
revision-id: nanasess@fsm.ne.jp-20120506162703-jf1842vihihlkmfc
sha1: e2d8362ad9c1bb23909d8cd1f8c0b43ca798206b

bzr:timestamp:

2012-05-07 01:27:03.698999882 +0900

bzr:user-agent:

bzr2.4.2+bzr-svn1.1.2

Message:

#1573 プライマリーキーが無いテーブルの改善

• dtb_baseinfo, mtb_zip にはプライマリーキーとなるカラムを追加

#800 SQL標準に準拠する

• rule -> rule_max

File:

• branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php (modified) (1 diff)

branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php

@@ -540 +540 @@
         $where = 'del_flg = 0 AND payment_id IN (' . SC_Utils_Ex::repeatStrWithSeparator('?', count($arrPaymentIds)) . ')';
         $objQuery->setOrder('rank DESC');
-        $payments = $objQuery->select('payment_id, payment_method, rule, upper_rule, note, payment_image, charge', 'dtb_payment', $where, $arrPaymentIds);
+        $payments = $objQuery->select('payment_id, payment_method, rule_max, upper_rule, note, payment_image, charge', 'dtb_payment', $where, $arrPaymentIds);
         foreach ($payments as $data) {
             // 下限と上限が設定されている
-            if (strlen($data['rule']) != 0 && strlen($data['upper_rule']) != 0) {
-                if ($data['rule'] <= $total && $data['upper_rule'] >= $total) {
+            if (strlen($data['rule_max']) != 0 && strlen($data['upper_rule']) != 0) {
+                if ($data['rule_max'] <= $total && $data['upper_rule'] >= $total) {
                     $arrPayment[] = $data;
                 }
             }
             // 下限のみ設定されている
-            elseif (strlen($data['rule']) != 0) {
-                if ($data['rule'] <= $total) {
+            elseif (strlen($data['rule_max']) != 0) {
+                if ($data['rule_max'] <= $total) {
                     $arrPayment[] = $data;
                 }