Changeset 20652


Ignore:
Timestamp:
2011/03/15 18:48:32 (10 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20651
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/class/pages/shopping/LC_Page_Shopping_Complete.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Complete.php
html/test/upgrade/index.php 16949@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Ftest%2Fupgrade%2Findex.php
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20110315094451-cokh4p3zev0ie2s3
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110315094827-itb4wjca3gbe1x11
bzr:revno:
3372
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/class/pages/shopping/LC_Page_Shopping_Complete.php ohkouchi@loop-az.jp-20110315094451-cokh4p3zev0ie2s3
bzr:timestamp:
2011-03-15 18:48:27.993999958 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2011-03-15T09:48:27.994000Z
Message:

#844 (決済フローの改善)

  • 決済モジュールからの戻りを考慮し, トランザクションチェックしないように修正
  • テスト用の決済モジュールで, global キーワードを使用しないように修正
Location:
branches/version-2_5-dev
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php

    r20534 r20652  
    7575        parent::destroy(); 
    7676    } 
     77 
     78    /** 
     79     * 決済モジュールから遷移する場合があるため, トークンチェックしない. 
     80     */ 
     81    function doValidToken() { 
     82        // nothing. 
     83    } 
    7784} 
    7885?> 
  • branches/version-2_5-dev/html/test/upgrade/index.php

    r20434 r20652  
    3939 * 本番商品との重複を避けるためにも大きめの値を設定しておくとよいかもしれません. 
    4040 */ 
    41 $arrProductsList = array( 
     41$GLOBALS['productsList'] = array( 
    4242    // サンプルモジュール 
    4343    array( 
     
    8787 */ 
    8888function displayProductsList() { 
    89     global $arrProductsList; 
    9089    $arrRet = array( 
    9190        'status' => 'SUCCESS', 
    92         'data'   => $arrProductsList 
     91        'data'   => $GLOBALS['productsList'] 
    9392    ); 
    9493 
    9594    // FIXME 一覧を取得するたびに更新されるのは微妙かも.. 
    96     updateModuleTable($arrProductsList); 
     95    updateModuleTable($GLOBALS['productsList']); 
    9796 
    9897    echo SC_Utils_Ex::jsonEncode($arrRet); 
     
    107106    $table = 'dtb_module'; 
    108107    $where = 'module_id = ?'; 
    109     $objQuery = new SC_Query; 
     108    $objQuery =& SC_Query_Ex::getSingletonInstance(); 
    110109 
     110    $objQuery->begin(); 
    111111    foreach ($arrProductsList as $arrProduct) { 
    112112        $count = $objQuery->count($table, $where, array($arrProduct['product_id'])); 
     
    133133        } 
    134134    } 
     135    $objQuery->commit(); 
    135136} 
    136137?> 
Note: See TracChangeset for help on using the changeset viewer.