Changeset 20112 for branches/version-2_5-dev/html

Timestamp:

2011/02/08 00:39:38 (11 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110207061343-pdr6j83tx0vflxw6

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/default/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fconfirm.tpl
data/Smarty/templates/default/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fpayment.tpl
data/Smarty/templates/mobile/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fshopping%2Fconfirm.tpl
data/Smarty/templates/mobile/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Fshopping%2Fpayment.tpl
data/Smarty/templates/mobile/shopping/select_deliv.tpl select_deliv.tpl-20110207152600-lm5bjhtot5ipow7j-1
data/Smarty/templates/sphone/shopping/confirm.tpl confirm.tpl-20101209134550-lsv02w9wikfx9cj3-35
data/Smarty/templates/sphone/shopping/payment.tpl payment.tpl-20101209134550-lsv02w9wikfx9cj3-40
data/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.php
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.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/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

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110207153932-24u51fmjk6whjykx

bzr:revno:

2840

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/default/shopping/confirm.tpl ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21
data/Smarty/templates/default/shopping/payment.tpl ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21
data/Smarty/templates/mobile/shopping/confirm.tpl ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21
data/Smarty/templates/mobile/shopping/payment.tpl ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21
data/Smarty/templates/mobile/shopping/select_deliv.tpl ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21
data/Smarty/templates/sphone/shopping/confirm.tpl ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21
data/Smarty/templates/sphone/shopping/payment.tpl ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21
data/class/SC_CartSession.php ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21
data/class/helper/SC_Helper_Purchase.php ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21
data/class/pages/shopping/LC_Page_Shopping_Confirm.php ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21
data/class/pages/shopping/LC_Page_Shopping_Payment.php ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21
html/install/sql/create_table_mysql.sql ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21
html/install/sql/create_table_pgsql.sql ohkouchi@loop-az.jp-20110207153818-bz29olj49qadtm21

bzr:timestamp:

2011-02-08 00:39:32.996000051 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-07T15:39:32.996000Z

Message:

#990(配送設定・支払方法設定の仕様変更)

• 支払方法設定ページ

Location:

branches/version-2_5-dev/html/install/sql

Files:

• create_table_mysql.sql (modified) (2 diffs)
• create_table_pgsql.sql (modified) (2 diffs)

branches/version-2_5-dev/html/install/sql/create_table_mysql.sql

@@ -624 +624 @@
     subtotal numeric,
     discount numeric,
-    deliv_fee numeric,  
+    deliv_id int,
+    deliv_fee numeric,
     charge numeric,
     use_point numeric,
@@ -680 +681 @@
     subtotal numeric,
     discount numeric,
+    deliv_id int,
     deliv_fee numeric,
     charge numeric,

branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql

@@ -624 +624 @@
     subtotal numeric,
     discount numeric,
+    deliv_id int,
     deliv_fee numeric,
     charge numeric,
@@ -680 +681 @@
     subtotal numeric,
     discount numeric,
+    deliv_id int,
     deliv_fee numeric,
     charge numeric,