Changeset 22796 for branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php

Timestamp:

2013/05/02 18:11:36 (11 years ago)

Author:

h_yoshimoto

Message:

#2236 2.12.3リリース以降の2.12-devへのコミット差し戻し

File:

• branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php (modified) (14 diffs)

branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php

@@ -32 +32 @@
  * @version $Id$
  */
-class LC_Page_Shopping extends LC_Page_Ex 
-{
+class LC_Page_Shopping extends LC_Page_Ex {
 
     // }}}
@@ -43 +42 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_title = 'ログイン';
@@ -66 +64 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -78 +75 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objSiteSess = new SC_SiteSession_Ex();
@@ -276 +272 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -287 +282 @@
      * @return void
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
 
         $objFormParam->addParam('お名前(姓)', 'order_name01', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
@@ -325 +319 @@
         $objFormParam->addParam('電話番号2', 'shipping_tel02', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
         $objFormParam->addParam('電話番号3', 'shipping_tel03', TEL_ITEM_LEN, 'n', array('MAX_LENGTH_CHECK' ,'NUM_CHECK'));
+        $objFormParam->addParam('メールマガジン', 'mail_flag', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
     }
 
@@ -333 +328 @@
      * @return void
      */
-    function lfInitLoginFormParam(&$objFormParam)
-    {
+    function lfInitLoginFormParam(&$objFormParam) {
         $objFormParam->addParam('記憶する', 'login_memory', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('メールアドレス', 'login_email', STEXT_LEN, 'a', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'));
@@ -354 +348 @@
      * @return string 遷移先のパス
      */
-    function getNextLocation($product_type_id, $uniqid, &$objCustomer, &$objPurchase, &$objSiteSess)
-    {
+    function getNextLocation($product_type_id, $uniqid, &$objCustomer, &$objPurchase, &$objSiteSess) {
         switch ($product_type_id) {
             case PRODUCT_TYPE_DOWNLOAD:
-                $objPurchase->unsetAllShippingTemp(true);
                 $objPurchase->saveOrderTemp($uniqid, array(), $objCustomer);
                 $objSiteSess->setRegistFlag();
@@ -379 +371 @@
      * @param boolean $isMultiple 複数配送の場合 true
      */
-    function lfRegistData($uniqid, &$objPurchase, &$objCustomer, &$objFormParam, $isMultiple = false)
-    {
+    function lfRegistData($uniqid, &$objPurchase, &$objCustomer, &$objFormParam, $isMultiple = false) {
         $arrParams = $objFormParam->getHashArray();
 
@@ -423 +414 @@
      * @return array エラー情報の配
      */
-    function lfCheckError(&$objFormParam)
-    {
+    function lfCheckError(&$objFormParam) {
         // 入力値の変換
         $objFormParam->convParam();
@@ -473 +463 @@
      * @return void
      */
-    function setFormParams(&$objFormParam, &$objPurchase, $uniqid)
-    {
+    function setFormParams(&$objFormParam, &$objPurchase, $uniqid) {
         $arrOrderTemp = $objPurchase->getOrderTemp($uniqid);
         if (SC_Utils_Ex::isBlank($arrOrderTemp)) {
@@ -492 +481 @@
             $objFormParam->setParam($arrShippingTemp[1]);
         } else {
-            if ($arrOrderTemp['deliv_check'] == 1) {
-                $objFormParam->setParam($arrShippingTemp[1]);
-            } else {
-                $objFormParam->setParam($arrShippingTemp[0]);
-            }
+            $objFormParam->setParam($arrShippingTemp[0]);
         }
         $objFormParam->setValue('order_email02', $arrOrderTemp['order_email']);
@@ -512 +497 @@
      * @see LC_PageError
      */
-    function lfGetErrorMessage($error)
-    {
+    function lfGetErrorMessage($error) {
         switch ($error) {
             case TEMP_LOGIN_ERROR: