Changeset 17891

Timestamp:

2009/03/07 22:13:02 (17 years ago)

Author:

Seasoft

Message:

merge 17401
・取得元: version-2
・未テスト
【取得元のログメッセージ】
GMOPG連携組み込み

Location:

branches/comu-ver2/data

Files:

• Smarty/templates/default/cart/index.tpl (modified) (1 diff)
• Smarty/templates/default/detail.tpl (modified) (1 diff)
• Smarty/templates/default/mypage/change.tpl (modified) (1 diff)
• class/SC_CartSession.php (modified) (1 diff)
• class/pages/cart/LC_Page_Cart.php (modified) (1 diff)
• class/pages/mypage/LC_Page_Mypage_Change.php (modified) (2 diffs)
• class/pages/products/LC_Page_Products_Detail.php (modified) (3 diffs)

branches/comu-ver2/data/Smarty/templates/default/cart/index.tpl

@@ -57 +57 @@
 
    <!--{if count($arrProductsClass) > 0}-->
+   
    <form name="form1" id="form1" method="post" action="?">
+   <!--{if function_exists('sfGMOCartDisplay')}-->
+     <!--{''|sfGMOCartDisplay}-->
+   <!--{/if}-->
+   
      <input type="hidden" name="mode" value="confirm" />
      <input type="hidden" name="cart_no" value="" />

branches/comu-ver2/data/Smarty/templates/default/detail.tpl

@@ -207 +207 @@
 
                 <!--{if $tpl_stock_find}-->
-                <p class="btn">
-                    <!--{if $smarty.const.OPTION_FAVOFITE_PRODUCT == 1 && $tpl_login}-->
-                        <!--{assign var=add_favorite value="add_favorite`$product_id`"}-->
-                        <!--{if $arrErr[$add_favorite]}--><div class="attention"><!--{$arrErr[$add_favorite]}--></div><!--{/if}-->
-                        <!--{if !$arrProduct.favorite_count}-->
-                        <a href="javascript:fnModeSubmit('add_favorite','favorite_product_id','<!--{$arrProduct.product_id}-->');">[お気に入りに追加]</a><br />
-                        <!--{else}-->
-                        [お気に入り登録済]<br />
+                    <p class="btn">
+                        <!--{if $smarty.const.OPTION_FAVOFITE_PRODUCT == 1 && $tpl_login}-->
+                            <!--{assign var=add_favorite value="add_favorite`$product_id`"}-->
+                            <!--{if $arrErr[$add_favorite]}--><div class="attention"><!--{$arrErr[$add_favorite]}--></div><!--{/if}-->
+                            <!--{if !$arrProduct.favorite_count}-->
+                            <a href="javascript:fnModeSubmit('add_favorite','favorite_product_id','<!--{$arrProduct.product_id}-->');">[お気に入りに追加]</a><br />
+                            <!--{else}-->
+                            [お気に入り登録済]<br />
+                            <!--{/if}-->
                         <!--{/if}-->
-                    <!--{/if}-->
-                    <!--★カゴに入れる★-->
-                    <a href="javascript:void(document.form1.submit())" onmouseover="chgImg('<!--{$TPL_DIR}-->img/products/b_cartin_on.gif','cart');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/products/b_cartin.gif','cart');">
-                        <img src="<!--{$TPL_DIR}-->img/products/b_cartin.gif" width="115" height="25" alt="カゴに入れる" name="cart" id="cart" />
-                    </a>
-                </p>
+                        <!--★カゴに入れる★-->
+                        <a href="javascript:void(document.form1.submit())" onmouseover="chgImg('<!--{$TPL_DIR}-->img/products/b_cartin_on.gif','cart');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/products/b_cartin.gif','cart');">
+                            <img src="<!--{$TPL_DIR}-->img/products/b_cartin.gif" width="115" height="25" alt="カゴに入れる" name="cart" id="cart" />
+                        </a>
+                    </p>
+                    <!--{if function_exists(sfGMODetailDisplay)}--><!--{* GMOワンクリック *}-->
+                        <!--{''|sfGMODetailDisplay}-->
+                    <!--{/if}-->
                 <!--{else}-->
                 <div class="attention">申し訳ございませんが、只今品切れ中です。</div>

branches/comu-ver2/data/Smarty/templates/default/mypage/change.tpl

@@ -37 +37 @@
       <!--{include file="`$smarty.const.TEMPLATE_DIR`frontparts/form_personal_input.tpl" flgFields=3 emailMobile=true prefix=""}-->
     </table>
-
+    <!--{if function_exists('sfGMOMypageDisplay')}-->
+      <!--{''|sfGMOMypageDisplay}-->
+    <!--{/if}-->
     <div class="tblareabtn">
       <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/common/b_confirm_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/common/b_confirm.gif',this)" src="<!--{$TPL_DIR}-->img/common/b_confirm.gif" class="box150" alt="確認ページへ" name="refusal" id="refusal" />

branches/comu-ver2/data/class/SC_CartSession.php

@@ -62 +62 @@
         $change = false;
         $max = $this->getMax();
-        for($i = 0; $i <= $max; $i++) {
+        for($i = 1; $i <= $max; $i++) {
             if ($_SESSION[$this->key][$i]['quantity'] != $_SESSION[$this->key_tmp][$i]['quantity']) {
                 $change = true;

branches/comu-ver2/data/class/pages/cart/LC_Page_Cart.php

@@ -24 +24 @@
 // {{{ requires
 require_once(CLASS_PATH . "pages/LC_Page.php");
+if (file_exists(MODULE_PATH . "mdl_gmopg/inc/function.php")) {
+    require_once(MODULE_PATH . "mdl_gmopg/inc/function.php");
+}
 
 /**

branches/comu-ver2/data/class/pages/mypage/LC_Page_Mypage_Change.php

@@ -24 +24 @@
 // {{{ requires
 require_once(CLASS_PATH . "pages/LC_Page.php");
+
+if (file_exists(MODULE_PATH . "mdl_gmopg/inc/function.php")) {
+    require_once(MODULE_PATH . "mdl_gmopg/inc/function.php");
+}
 
 /**
@@ -151 +155 @@
             break;
 
+        case 'gmo_oneclick':
+            sfGMOMypageEdit();
+            $this->arrForm = $this->lfGetCustomerData();
+            $this->arrForm['password'] = DEFAULT_PASSWORD;
+            $this->arrForm['password02'] = DEFAULT_PASSWORD;
+            break;
         case 'complete':
             //エラーなしでかつメールアドレスが重複していない場合

branches/comu-ver2/data/class/pages/products/LC_Page_Products_Detail.php

@@ -25 +25 @@
 require_once(CLASS_PATH . "pages/LC_Page.php");
 
+if (file_exists(MODULE_PATH . "mdl_gmopg/inc/function.php")) {
+    require_once(MODULE_PATH . "mdl_gmopg/inc/function.php");
+}
 /**
  * 商品詳細 のページクラス.
@@ -181 +184 @@
                 $classcategory_id2 = $_POST['classcategory_id2'];
 
+                if (!empty($_POST['gmo_oneclick'])) {
+                    $objCartSess->delAllProducts();
+                }
+
                 // 規格1が設定されていない場合
                 if(!$this->tpl_classcat_find1) {
@@ -193 +200 @@
                 $objCartSess->setPrevURL($_SERVER['REQUEST_URI']);
                 $objCartSess->addProduct(array($_POST['product_id'], $classcategory_id1, $classcategory_id2), $this->objFormParam->getValue('quantity'));
+
+                if (!empty($_POST['gmo_oneclick'])) {
+                    $objSiteSess = new SC_SiteSession;
+                    $objSiteSess->setRegistFlag();
+                    $objCartSess->saveCurrentCart($objSiteSess->getUniqId());
+
+                    $this->sendRedirect($this->getLocation(
+                        URL_DIR . 'user_data/gmopg_oneclick_confirm.php', array(), true));
+                    exit;
+                }
+
                 $this->sendRedirect($this->getLocation(URL_CART_TOP));
                 exit;