Index: /branches/version-1/data/downloads/module/mdl_cybs/mdl_cybs.php =================================================================== --- /branches/version-1/data/downloads/module/mdl_cybs/mdl_cybs.php (revision 17246) +++ /branches/version-1/data/downloads/module/mdl_cybs/mdl_cybs.php (revision 17308) @@ -2,5 +2,5 @@ /** * ¥â¥¸¥å¡¼¥ë¥Ð¡¼¥¸¥ç¥óɽµ­ - * @version CVS: $Id$ + * @version ### ### 1.0 */ require_once 'mdl_cybs.inc'; @@ -36,5 +36,6 @@ $objConfig =& Mdl_Cybs_Config::getInstanse(); $objConfig->registerConfig($objConfig->createSqlArray($objForm)); - lfCreateBatchIdTable(); + lfCreateBatchIdTable(); // ¥Ð¥Ã¥ÁIDºÎÈÖÍѥơ¼¥Ö¥ë + lfAlterSubsIdCol(); // dtb_cubstomer¤Ë¥µ¥Ö¥¹¥¯¥ê¥×¥·¥ç¥óID¤òÊÝ»ý¤¹¤ë¥«¥é¥à¤òÄɲà $objPage->tpl_onload = 'alert("ÅÐÏ¿´°Î»¤·¤Þ¤·¤¿¡£\n´ðËܾðÊó¡ä»ÙʧÊýË¡ÀßÄê¤è¤ê¾ÜºÙÀßÄê¤ò¤·¤Æ¤¯¤À¤µ¤¤¡£"); window.close();'; break; @@ -106,4 +107,7 @@ $objQuery->query($sql); } - +//$table_name, $col_name, $col_type = "", $dsn = "", $add = false +function lfAlterSubsIdCol() { + sfColumnExists('dtb_customer', 'cybs_subs_id', 'text', "", true); +} ?> Index: /branches/version-1/data/downloads/module/mdl_cybs/mdl_cybs.inc =================================================================== --- /branches/version-1/data/downloads/module/mdl_cybs/mdl_cybs.inc (revision 17246) +++ /branches/version-1/data/downloads/module/mdl_cybs/mdl_cybs.inc (revision 17308) @@ -8,5 +8,5 @@ /** - * dtb_order memo»ÅÍÍ + * dtb_order memo * memo06 Í¿¿®¥¹¥Æ¡¼¥¿¥¹ $arrCybsAuthStatus»²¾È * memo07 request_token @@ -49,12 +49,13 @@ // ICS¥¨¥é¡¼ $arrCybsIcsErr = array( - 'DCALL' => '¥«¡¼¥É²ñ¼Ò¤¬Í¿¿®È½Äê¤ò¼è¤ê¾Ã¤·¤Þ¤·¤¿¡£', - 'DCARDEXPIRED' => '¥«¡¼¥É¤ÎÍ­¸ú´ü¸ÂÀÚ¤ì¤Ç¤¹¡£', - 'DCARDREFUSED' => '¥«¡¼¥É²ñ¼Ò¤¬Í¿¿®¤ò¾µÇ§¤·¤Þ¤»¤ó¤Ç¤·¤¿¡£', - 'DINVALIDCARD' => '¥¯¥ì¥¸¥Ã¥È¥«¡¼¥ÉÈֹ椬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó¡£', - 'DINVALIDDATA' => '¥ê¥¯¥¨¥¹¥È¤Ë´Þ¤Þ¤ì¤ë¥Ç¡¼¥¿¤¬ÉÔÀµ¤Ç¤¹¡£', + 'DCALL' => '¤´»ØÄê¤Î¥«¡¼¥É¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£¥¨¥é¡¼¤ÎÍýͳ¤Ê¤É¡¢¾ÜºÙ¤Ë¤Ä¤­¤Þ¤·¤Æ¤Ï¥«¡¼¥É²ñ¼Ò¤ØľÀܤªÌ䤤¹ç¤ï¤»²¼¤µ¤¤¤Þ¤»¡£', + 'DCARDEXPIRED' => '¥«¡¼¥É¤ÎÍ­¸ú´ü¸ÂÀÚ¤ì¤Ç¤¹¡£', + 'DCARDREFUSED' => '¤´»ØÄê¤Î¥«¡¼¥É¤ÏÍøÍѤǤ­¤Þ¤»¤ó¡£¥¨¥é¡¼¤ÎÍýͳ¤Ê¤É¡¢¾ÜºÙ¤Ë¤Ä¤­¤Þ¤·¤Æ¤Ï¥«¡¼¥É²ñ¼Ò¤ØľÀܤªÌ䤤¹ç¤ï¤»²¼¤µ¤¤¤Þ¤»¡£', + 'DINVALIDCARD' => '¥¯¥ì¥¸¥Ã¥È¥«¡¼¥ÉÈֹ椬Àµ¤·¤¯¤¢¤ê¤Þ¤»¤ó¡£', + 'DINVALIDDATA' => '¥ê¥¯¥¨¥¹¥È¤Ë´Þ¤Þ¤ì¤ë¥Ç¡¼¥¿¤¬ÉÔÀµ¤Ç¤¹¡£', 'DMISSINGFIELD' => '¥ê¥¯¥¨¥¹¥È¤Ëɬ¿Ü¥Õ¥£¡¼¥ë¥É¤¬·ç¤±¤Æ¤¤¤Þ¤¹¡£', - 'ESYSTEM' => '¥·¥¹¥Æ¥à¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£', - 'ETIMEOUT' => '¥ê¥¯¥¨¥¹¥È¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿¡£', + 'ESYSTEM' => '¥·¥¹¥Æ¥à¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£', + 'ETIMEOUT' => '¥ê¥¯¥¨¥¹¥È¤¬¥¿¥¤¥à¥¢¥¦¥È¤·¤Þ¤·¤¿¡£', + 'DAUTHENTICATIONFAILED' => 'ËÜ¿Íǧ¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£', ); @@ -88,14 +89,6 @@ '002' => 'MasterCard', '003' => 'American Express', - '004' => 'Discover', '005' => 'Diners Club', - '006' => 'Carte Blanche', '007' => 'JCB', - '008' => 'Optima', - '010' => 'Benificial Private Label', - '014' => 'EnRoute', - '017' => 'MBNA', - '021' => 'JAL', - '027' => 'Nicos', ); @@ -175,5 +168,5 @@ break; } - $msg = "½èÍý¤¬µñÈݤµ¤ì¤Þ¤·¤¿¡£ÆþÎÏÆâÍƤ˴ְ㤤¤¬¤Ê¤¤¤«¤´³Îǧ¤¯¤À¤µ¤¤¡£\n"; + $msg = "½èÍý¤¬µñÈݤµ¤ì¤Þ¤·¤¿¡£\n"; $rflag = $arrResults['ics_rflag']; $err = isset($arrCybsIcsErr[$rflag]) ? $arrCybsIcsErr[$rflag] : "¥¨¥é¡¼¥³¡¼¥É¡§$rflag"; Index: /branches/version-1/data/downloads/module/mdl_cybs/mdl_cybs_credit.tpl =================================================================== --- /branches/version-1/data/downloads/module/mdl_cybs/mdl_cybs_credit.tpl (revision 17244) +++ /branches/version-1/data/downloads/module/mdl_cybs/mdl_cybs_credit.tpl (revision 17308) @@ -176,5 +176,5 @@ - + ¤³¤Î¥«¡¼¥É¾ðÊó¤òÅÐÏ¿¤¹¤ë @@ -258,5 +258,5 @@ - ·î/ + ·î/ǯ Index: /branches/version-1/data/downloads/module/mdl_cybs/mdl_cybs_credit.php =================================================================== --- /branches/version-1/data/downloads/module/mdl_cybs/mdl_cybs_credit.php (revision 17307) +++ /branches/version-1/data/downloads/module/mdl_cybs/mdl_cybs_credit.php (revision 17308) @@ -80,28 +80,4 @@ $objPage->arrErr = $arrErr; break; - } - - /** - * ¥ª¥ó¥Ç¥Þ¥ó¥É²Ý¶â¤¬Í­¸ú¤Ç¡¢¤«¤Ä¥«¡¼¥É¤òÅÐÏ¿¤¹¤ë¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤¿¾ì¹ç¤Ï¡¢ - * ¥µ¥Ö¥¹¥¯¥ê¥×¥·¥ç¥ó¤òºîÀ®¤¹¤ë - */ - if ($objCybs->enableOndemand() && $objForm->getValue('register_ondemand')) { - // ÅÐÏ¿·ï¿ô¤Î¥Á¥§¥Ã¥¯ - if (!$objCybs->canAddSubsId()) { - $objPage->tpl_error = 'ÅÐÏ¿½ÐÍè¤ë¥«¡¼¥É¤Î·ï¿ô¤Ï' . MDL_CYBS_SUBS_ID_MAX . "·ï¤Þ¤Ç¤Ç¤¹¡£\n"; - gfPrintLog(' -> ondemand error: over card max ', MDL_CYBS_LOG); - break; - } - // ¥ª¥ó¥Ç¥Þ¥ó¥É²Ý¶â¤Î¥ê¥¯¥¨¥¹¥È¤òÁ÷¿®¤¹¤ë - $arrResults = sfCybsSendRequest(lfCreateOndemandParam($objForm->getHashArray(), $arrData)); - if (PEAR::isError($e = sfCybsIsError($arrResults))) { - $objPage->tpl_error = $e->getMessage(); - gfPrintLog(' -> ondemand error: ' . $e->getMessage(), MDL_CYBS_LOG); - gfPrintLog(print_r($arrResults, true), MDL_CYBS_LOG); - break; - } - // ¥µ¥Ö¥¹¥¯¥ê¥×¥·¥ç¥óID¤ò¸ÜµÒ¥Æ¡¼¥Ö¥ë¤ØÄɲ乤ë - $subsId = $arrResults['pay_subscription_create_subscription_id']; - $objCybs->addSubsId($subsId, $arrResults['merchant_ref_number']); } @@ -144,13 +120,22 @@ } - $arrSendParam = array(); - // ¥ª¥ó¥Ç¥Þ¥ó¥É·èºÑ»þ¤Î¥Ñ¥é¥á¡¼¥¿¹½ÃÛ + $arrSendParam = lfCreateAuthParam($objForm->getHashArray(), $arrData, $authAddParam); + /** + * ¥ª¥ó¥Ç¥Þ¥ó¥É²Ý¶â¤¬Í­¸ú¤Ç¡¢¤«¤Ä¥«¡¼¥É¤òÅÐÏ¿¤¹¤ë¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤¿¾ì¹ç¤Ï¡¢ + * ¥µ¥Ö¥¹¥¯¥ê¥×¥·¥ç¥óºîÀ®¥Ñ¥é¥á¡¼¥¿¤òÄɲ乤ë + */ if ($objCybs->enableOndemand() && $objForm->getValue('register_ondemand')) { - $arrSendParam = lfCreateAuthParam($objForm->getHashArray(), $arrData); - $arrSendParam = lfCreateOndemandAuthParam($subsId, $arrSendParam); - - // Ä̾ï·èºÑ¤Î¥Ñ¥é¥á¡¼¥¿¹½ÃÛ - } else { - $arrSendParam = lfCreateAuthParam($objForm->getHashArray(), $arrData, $authAddParam); + //$arrSendParam = lfCreateAuthParam($objForm->getHashArray(), $arrData); + //$arrSendParam = lfCreateOndemandAuthParam($subsId, $arrSendParam); + // ÅÐÏ¿·ï¿ô¤Î¥Á¥§¥Ã¥¯ + if (!$objCybs->canAddSubsId()) { + $objPage->tpl_error = 'ÅÐÏ¿½ÐÍè¤ë¥«¡¼¥É¤Î·ï¿ô¤Ï' . MDL_CYBS_SUBS_ID_MAX . "·ï¤Þ¤Ç¤Ç¤¹¡£\n"; + gfPrintLog(' -> ondemand error: over card max ', MDL_CYBS_LOG); + break; + } + $arrSendParam['ics_applications'] .= ',ics_pay_subscription_create'; + $arrSendParam['recurring_disable_auto_auth'] = 'Y'; + $arrSendParam['recurring_frequency'] = 'on-demand'; + $arrSendParam['card_type'] = $objForm->getValue('card_company'); } @@ -162,4 +147,9 @@ gfPrintLog(print_r($arrResults, true), MDL_CYBS_LOG); break; + } + + // ¥µ¥Ö¥¹¥¯¥ê¥×¥·¥ç¥óID¤ò¸ÜµÒ¥Æ¡¼¥Ö¥ë¤ØÄɲ乤ë + if (isset($arrResults['pay_subscription_create_subscription_id'])) { + $objCybs->addSubsId($arrResults['pay_subscription_create_subscription_id'], $arrResults['merchant_ref_number']); } @@ -232,13 +222,10 @@ } -lfSetCardInfo($objPage); // ÅÐÏ¿ºÑ¤ß¥«¡¼¥É¾ðÊó¤ò¥»¥Ã¥È¤¹¤ë +lfSetCybsCardInfo($objPage); // ÅÐÏ¿ºÑ¤ß¥«¡¼¥É¾ðÊó¤ò¥»¥Ã¥È¤¹¤ë $objView->assignobj($objPage); $objView->display(SITE_FRAME); -sfPrintR($_POST, 'blue'); -sfPrintR($objPage, 'red'); - -function lfSetCardInfo(&$objPage) { +function lfSetCybsCardInfo(&$objPage) { $objCybs =& Mdl_Cybs_Config::getInstanse(); // ¥ª¥ó¥Ç¥Þ¥ó¥É²Ý¶â¤¬Ìµ¸ú¤Ê¤éreturn @@ -249,7 +236,10 @@ // ¥µ¥Ö¥¹¥¯¥ê¥×¥·¥ç¥óID¤ò¼èÆÀ $arrSubsIds = $objCybs->getSubsIds(); + $objPage->cardCount = 0; // ¥µ¥Ö¥¹¥¯¥ê¥×¥·¥ç¥ó¤ÎÅÐÏ¿·ï¿ô + foreach ($arrSubsIds as $subs) { - $arrResults = sfCybsSendRequest(lfCreateOndemandRetParam($subs['subs_id'], $subs['merchant_ref_number'])); + $arrSendParam = lfCreateOndemandRetParam($subs['subs_id'], $subs['merchant_ref_number']); + $arrResults = sfCybsSendRequest($arrSendParam); if (PEAR::isError($e = sfCybsIsError($arrResults))) { @@ -506,58 +496,4 @@ } -/** - * ¥ª¥ó¥Ç¥Þ¥ó¥É²Ý¶â¤Î¥Ñ¥é¥á¡¼¥¿¤ò¹½ÃÛ¤¹¤ë - * - * @param array $arrForm ¥Õ¥©¡¼¥à¥Ñ¥é¥á¡¼¥¿(¥«¡¼¥É¾ðÊó¤Ê¤É) - * @param array $arrData °ì»þ¼õÃí¥Ç¡¼¥¿ - * @return array - */ -function lfCreateOndemandParam($arrForm, $arrData) { - global $arrCybsRequestURL; - global $arrPref; - $objCustomer = new SC_Customer; - - $objConfig =& Mdl_Cybs_Config::getInstanse(); - $arrConfig = $objConfig->getConfig(); - - $cardNo = $arrForm['card_no01'] . $arrForm['card_no02'] . $arrForm['card_no03'] . $arrForm['card_no04']; - $expMo = $arrForm['card_month']; - $expYr = '20' . $arrForm['card_year']; - $phoneNo = $arrData['order_tel01'] . $arrData['order_tel02'] . $arrData['order_tel03']; - - $arrSendParam = array( - "ics_applications" => "ics_pay_subscription_create", - "server_host" => $arrCybsRequestURL[$arrConfig['cybs_request_url']], - "server_port" => "80", - "customer_account_id" => $objCustomer->getValue('customer_id'), - "customer_cc_number" => $cardNo, - "customer_cc_expmo" => $expMo, - "customer_cc_expyr" => $expYr, - "customer_firstname" => lfToSjis($arrData['order_name02']), - "customer_lastname" => lfToSjis($arrData['order_name01']), - "customer_email" => $arrData['order_email'], - "customer_phone" => $phoneNo, - "bill_address1" => lfToSjis($arrData['order_addr02']), - "bill_city" => lfToSjis($arrData['order_addr01']), - "bill_state" => lfToSjis($arrPref[$arrData['order_pref']]), - "bill_zip" => $arrData['order_zip01'] . $arrData['order_zip02'], - "bill_country" => "JP", - "merchant_id" => $arrConfig['cybs_merchant_id'], - "merchant_ref_number" => $arrData['order_id'], - "currency" => "JPY", - /** - "ship_to_address1" => lfToSjis($arrData['deliv_addr02']), - "ship_to_city" => lfToSjis($arrData['deliv_addr01']), - "ship_to_country" => lfToSjis($arrPref[$arrData['deliv_pref']]), - "ship_to_state" => $arrData['deliv_zip01'] . $arrData['deliv_zip02'], - "ship_to_zip" => "JP", - */ - "recurring_disable_auto_auth" => 'Y', - "recurring_frequency" => 'on-demand', - "card_type" => $arrForm['card_company'], - ); - - return $arrSendParam; -} /** @@ -585,5 +521,4 @@ //'memo10' => $arrResults[''], ); - gfPrintLog(print_r($arrResults, true), MDL_CYBS_LOG); $objQuery = new SC_Query; $objQuery->update("dtb_order_temp", $sqlval, "order_temp_id = ?", array($uniqid));