Changeset 19923 for branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php

Timestamp:

2011/01/16 01:20:36 (13 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19922

bzr:committer:

Kentaro Ohkouchi <nanasess@fsm.ne.jp>

bzr:file-ids:

data/Smarty/templates/admin/order/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fedit.tpl
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/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.php
data/class/pages/shopping/LC_Page_Shopping_Multiple.php lc_page_shopping_mul-20110109122547-u3fq5xmi1b4jn5n4-2
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

bzr:mapping-version:

v4

bzr:merge:

nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds

bzr:repository-uuid:

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

bzr:revision-id:

nanasess@fsm.ne.jp-20110115162029-azxvx5ryjasawo2x

bzr:revno:

2652

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/order/edit.tpl nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/Smarty/templates/default/shopping/confirm.tpl nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/class/helper/SC_Helper_Purchase.php nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/class/pages/shopping/LC_Page_Shopping_Multiple.php nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds
data/class/pages/shopping/LC_Page_Shopping_Payment.php nanasess@fsm.ne.jp-20110115161744-w643cxmm1o552cds

bzr:timestamp:

2011-01-16 01:20:29.269999981 +0900

bzr:user-agent:

bzr2.2.2+bzr-svn1.0.4

svn:original-date:

2011-01-15T16:20:29.270000Z

Message:

#843(複数配送先の指定)

• お届け日/お届け時間が反映されるよう修正

File:

• branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php (modified) (1 diff)

branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php

@@ -113 +113 @@
                                                                 array($other_deliv_id));
                                 foreach ($otherDeliv[0] as $key => $val) {
-                                    $sqlval[$other_deliv_id]['shipping_' . $key] = $val;
+                                    $sqlval[$i]['shipping_' . $key] = $val;
                                 }
                             } else {
-                                $objPurchase->copyFromCustomer($sqlval[0], $objCustomer,
+                                $objPurchase->copyFromCustomer($sqlval[$i], $objCustomer,
                                                                "shipping");
                             }
-                        } else {
                         }
-                        $sqlval[$other_deliv_id]['deliv_id'] = $objPurchase->getDeliv($this->cartKey);
-                        $objPurchase->setShipmentItemTemp($other_deliv_id, $params['product_class_id' . $i], $params['quantity' . $i]);
+                        $sqlval[$i]['deliv_id'] = $objPurchase->getDeliv($this->cartKey);
+                        $objPurchase->setShipmentItemTemp($i, $params['product_class_id' . $i], $params['quantity' . $i]);
                         $i++;
                     }
 
-                    foreach ($sqlval as $key => $val) {
-                        $objPurchase->saveShippingTemp($val, $key);
+                    foreach ($sqlval as $shipping_id => $val) {
+                        $objPurchase->saveShippingTemp($val, $shipping_id);
                     }
 
-                    // FIXME
                     $objPurchase->saveOrderTemp($uniqid, $sqlval[0], $objCustomer);
                     $objSiteSess->setRegistFlag();