Index: branches/comu/html/shopping/index.php =================================================================== --- branches/comu/html/shopping/index.php (revision 15) +++ branches/comu/html/shopping/index.php (revision 248) @@ -71,4 +71,8 @@ // DB¤Ø¤Î¥Ç¡¼¥¿ÅÐÏ¿ lfRegistData($uniqid); + + // ¤ªÆϤ±Àè¤Î¥³¥Ô¡¼ + lfCopyDeliv($uniqid, $_POST); + // Àµ¾ï¤ËÅÐÏ¿¤µ¤ì¤¿¤³¤È¤òµ­Ï¿¤·¤Æ¤ª¤¯ $objSiteSess->setRegistFlag(); @@ -202,4 +206,5 @@ $objQuery->update("dtb_order_temp", $sqlval, $where, array($uniqid)); } + } @@ -245,3 +250,28 @@ return $objErr->arrErr; } + +// ¼õÃí°ì»þ¥Æ¡¼¥Ö¥ë¤Î¤ªÆϤ±Àè¤ò¥³¥Ô¡¼¤¹¤ë +function lfCopyDeliv($uniqid, $arrData) { + $objQuery = new SC_Query(); + + // Ê̤ΤªÆϤ±Àè¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢ÇÛÁ÷Àè¤ËÅÐÏ¿½»½ê¤ò¥³¥Ô¡¼¤¹¤ë¡£ + if($arrData["deliv_check"] != "1") { + $sqlval['deliv_name01'] = $arrData['order_name01']; + $sqlval['deliv_name02'] = $arrData['order_name02']; + $sqlval['deliv_kana01'] = $arrData['order_kana01']; + $sqlval['deliv_kana02'] = $arrData['order_kana02']; + $sqlval['deliv_pref'] = $arrData['order_pref']; + $sqlval['deliv_zip01'] = $arrData['order_zip01']; + $sqlval['deliv_zip02'] = $arrData['order_zip02']; + $sqlval['deliv_addr01'] = $arrData['order_addr01']; + $sqlval['deliv_addr02'] = $arrData['order_addr02']; + $sqlval['deliv_tel01'] = $arrData['order_tel01']; + $sqlval['deliv_tel02'] = $arrData['order_tel02']; + $sqlval['deliv_tel03'] = $arrData['order_tel03']; + $where = "order_temp_id = ?"; + $objQuery->update("dtb_order_temp", $sqlval, $where, array($uniqid)); + } +} + + ?> Index: branches/comu/html/shopping/complete.php =================================================================== --- branches/comu/html/shopping/complete.php (revision 15) +++ branches/comu/html/shopping/complete.php (revision 248) @@ -157,5 +157,5 @@ // °ì»þ¼õÃí¥Æ¡¼¥Ö¥ë¤ÎÆɹþ $arrData = sfGetOrderTemp($uniqid); - + // ²ñ°÷¾ðÊóÅÐÏ¿½èÍý if ($objCustomer->isLoginSuccess()) { @@ -295,27 +295,4 @@ } -// ¼õÃí°ì»þ¥Æ¡¼¥Ö¥ë¤Î¤ªÆϤ±Àè¤ò¥³¥Ô¡¼¤¹¤ë -function lfCopyDeliv($uniqid, $arrData) { - $objQuery = new SC_Query(); - - // Ê̤ΤªÆϤ±Àè¤ò»ØÄꤷ¤Æ¤¤¤Ê¤¤¾ì¹ç¡¢ÇÛÁ÷Àè¤ËÅÐÏ¿½»½ê¤ò¥³¥Ô¡¼¤¹¤ë¡£ - if($arrData["deliv_check"] != "1") { - $sqlval['deliv_name01'] = $arrData['order_name01']; - $sqlval['deliv_name02'] = $arrData['order_name02']; - $sqlval['deliv_kana01'] = $arrData['order_kana01']; - $sqlval['deliv_kana02'] = $arrData['order_kana02']; - $sqlval['deliv_pref'] = $arrData['order_pref']; - $sqlval['deliv_zip01'] = $arrData['order_zip01']; - $sqlval['deliv_zip02'] = $arrData['order_zip02']; - $sqlval['deliv_addr01'] = $arrData['order_addr01']; - $sqlval['deliv_addr02'] = $arrData['order_addr02']; - $sqlval['deliv_tel01'] = $arrData['order_tel01']; - $sqlval['deliv_tel02'] = $arrData['order_tel02']; - $sqlval['deliv_tel03'] = $arrData['order_tel03']; - $where = "order_temp_id = ?"; - $objQuery->update("dtb_order_temp", $sqlval, $where, array($uniqid)); - } -} - // ¼õÃí¥Æ¡¼¥Ö¥ë¤ØÅÐÏ¿ function lfRegistOrder($objQuery, $arrData, $objCampaignSess) { Index: branches/comu/html/admin/total/class/SC_GraphBase.php =================================================================== --- branches/comu/html/admin/total/class/SC_GraphBase.php (revision 15) +++ branches/comu/html/admin/total/class/SC_GraphBase.php (revision 248) @@ -72,4 +72,15 @@ } + // ¥ê¥µ¥ó¥×¥ë(²èÁü¤ò³ê¤é¤«¤Ë½Ì¾®¤¹¤ë) + function resampled() { + $new_width = $this->bgw * 0.8; + $new_height = $this->bgh * 0.8; + $tmp_image = imagecreatetruecolor($new_width, $new_height); + if(imagecopyresampled($tmp_image, $this->image, 0, 0, 0, 0, $new_width, $new_height, $this->bgw, $this->bgh)) { + $this->image = $tmp_image; + } + } + + // ¥ª¥Ö¥¸¥§¥¯¥È¥«¥é¡¼¤ÎÀßÄê function setColorList($arrRGB) { Index: branches/comu/html/admin/contents/campaign.php =================================================================== --- branches/comu/html/admin/contents/campaign.php (revision 15) +++ branches/comu/html/admin/contents/campaign.php (revision 248) @@ -40,4 +40,7 @@ // ¥Õ¥©¡¼¥à¤ÎÃͤò¥»¥Ã¥È $objFormParam->setParam($_POST); + +// ÊÔ½¸½èÍý¤Î¾ì¹ç¤Ï¾õÂÖ¤òÊÝ»ý +$objPage->is_update = $_POST['is_update']; // ¥Õ¥©¡¼¥à¤ÎÃͤò¥Æ¥ó¥×¥ì¡¼¥È¤ØÅϤ¹ @@ -64,4 +67,5 @@ // ¥­¥ã¥ó¥Ú¡¼¥ó¾ðÊó¤ò¼èÆÀ $objPage->arrForm = lfGetCampaign($campaign_id); + $objPage->is_update = true; break; // ºï½ü²¡²¼»þ Index: branches/comu/html/admin/customer/index.php =================================================================== --- branches/comu/html/admin/customer/index.php (revision 15) +++ branches/comu/html/admin/customer/index.php (revision 248) @@ -171,5 +171,5 @@ $objPage->search_data = $objConn->getAll($searchSql, $objSelect->arrVal); - + switch($_POST['mode']) { case 'csv': Index: branches/comu/html/admin/products/product_select.php =================================================================== --- branches/comu/html/admin/products/product_select.php (revision 15) +++ branches/comu/html/admin/products/product_select.php (revision 248) @@ -63,7 +63,5 @@ case 'search_product_code': $where .= " AND product_id IN (SELECT product_id FROM dtb_products_class WHERE product_code ILIKE ? GROUP BY product_id)"; - $where .= " OR product_code ILIKE ?"; - $arrval[] = "%$val%"; - $arrval[] = "%$val%"; + $arrval[] = "$val%"; break; default: Index: branches/comu/html/admin/products/upload_csv.php =================================================================== --- branches/comu/html/admin/products/upload_csv.php (revision 15) +++ branches/comu/html/admin/products/upload_csv.php (revision 248) @@ -187,5 +187,5 @@ $objFormParam->addParam("¥Ý¥¤¥ó¥ÈÉÕͿΨ", "point_rate", PERCENTAGE_LEN, "n", array("EXIST_CHECK","MAX_LENGTH_CHECK","NUM_CHECK")); $objFormParam->addParam("¹ØÆþÀ©¸Â", "sale_limit", INT_LEN, "n", array("MAX_LENGTH_CHECK","NUM_CHECK")); - $objFormParam->addParam("¥á¡¼¥«¡¼URL", "comment1", STEXT_LEN, "KVa", array("SPTAB_CHECK","URL_CHECK","MAX_LENGTH_CHECK")); + $objFormParam->addParam("¥á¡¼¥«¡¼URL", "comment1", URL_LEN, "KVa", array("SPTAB_CHECK","URL_CHECK","MAX_LENGTH_CHECK")); $objFormParam->addParam("¸¡º÷¥ï¡¼¥É", "comment3", STEXT_LEN, "KVa", array("SPTAB_CHECK","MAX_LENGTH_CHECK")); $objFormParam->addParam("°ìÍ÷-¥á¥¤¥ó¥³¥á¥ó¥È", "main_list_comment", LTEXT_LEN, "KVa", array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK")); @@ -250,5 +250,4 @@ case 'price01': case 'price02': - case 'point_rate': case 'stock': case 'product_class_id': Index: branches/comu/html/admin/products/product.php =================================================================== --- branches/comu/html/admin/products/product.php (revision 15) +++ branches/comu/html/admin/products/product.php (revision 248) @@ -296,12 +296,12 @@ function lfInitFile() { global $objUpFile; - $objUpFile->addFile("°ìÍ÷-¥á¥¤¥ó²èÁü", 'main_list_image', array('jpg', 'gif'),IMAGE_SIZE, true, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT); - $objUpFile->addFile("¾ÜºÙ-¥á¥¤¥ó²èÁü", 'main_image', array('jpg', 'gif'), IMAGE_SIZE, true, NORMAL_IMAGE_WIDTH, NORMAL_IMAGE_HEIGHT); - $objUpFile->addFile("¾ÜºÙ-¥á¥¤¥ó³ÈÂç²èÁü", 'main_large_image', array('jpg', 'gif'), IMAGE_SIZE, false, LARGE_IMAGE_WIDTH, LARGE_IMAGE_HEIGHT); + $objUpFile->addFile("°ìÍ÷-¥á¥¤¥ó²èÁü", 'main_list_image', array('jpg', 'gif', 'png'),IMAGE_SIZE, true, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT); + $objUpFile->addFile("¾ÜºÙ-¥á¥¤¥ó²èÁü", 'main_image', array('jpg', 'gif', 'png'), IMAGE_SIZE, true, NORMAL_IMAGE_WIDTH, NORMAL_IMAGE_HEIGHT); + $objUpFile->addFile("¾ÜºÙ-¥á¥¤¥ó³ÈÂç²èÁü", 'main_large_image', array('jpg', 'gif', 'png'), IMAGE_SIZE, false, LARGE_IMAGE_WIDTH, LARGE_IMAGE_HEIGHT); for ($cnt = 1; $cnt <= PRODUCTSUB_MAX; $cnt++) { - $objUpFile->addFile("¾ÜºÙ-¥µ¥Ö²èÁü$cnt", "sub_image$cnt", array('jpg', 'gif'), IMAGE_SIZE, false, NORMAL_SUBIMAGE_WIDTH, NORMAL_SUBIMAGE_HEIGHT); - $objUpFile->addFile("¾ÜºÙ-¥µ¥Ö³ÈÂç²èÁü$cnt", "sub_large_image$cnt", array('jpg', 'gif'), IMAGE_SIZE, false, LARGE_SUBIMAGE_WIDTH, LARGE_SUBIMAGE_HEIGHT); - } - $objUpFile->addFile("¾¦ÉÊÈæ³Ó²èÁü", 'file1', array('jpg', 'gif'), IMAGE_SIZE, false, OTHER_IMAGE1_WIDTH, OTHER_IMAGE1_HEIGHT); + $objUpFile->addFile("¾ÜºÙ-¥µ¥Ö²èÁü$cnt", "sub_image$cnt", array('jpg', 'gif', 'png'), IMAGE_SIZE, false, NORMAL_SUBIMAGE_WIDTH, NORMAL_SUBIMAGE_HEIGHT); + $objUpFile->addFile("¾ÜºÙ-¥µ¥Ö³ÈÂç²èÁü$cnt", "sub_large_image$cnt", array('jpg', 'gif', 'png'), IMAGE_SIZE, false, LARGE_SUBIMAGE_WIDTH, LARGE_SUBIMAGE_HEIGHT); + } + $objUpFile->addFile("¾¦ÉÊÈæ³Ó²èÁü", 'file1', array('jpg', 'gif', 'png'), IMAGE_SIZE, false, OTHER_IMAGE1_WIDTH, OTHER_IMAGE1_HEIGHT); $objUpFile->addFile("¾¦Éʾܺ٥ե¡¥¤¥ë", 'file2', array('pdf'), PDF_SIZE, false, 0, 0, false); } Index: branches/comu/html/admin/products/index_csv.php =================================================================== --- branches/comu/html/admin/products/index_csv.php (revision 15) +++ branches/comu/html/admin/products/index_csv.php (revision 248) @@ -96,5 +96,5 @@ } - $tmp = ereg_replace("[\",]", " ", $tmp); + $tmp = str_replace("\"", "\\\"", $tmp); $line .= "\"".$tmp."\","; } Index: branches/comu/html/admin/order/index.php =================================================================== --- branches/comu/html/admin/order/index.php (revision 15) +++ branches/comu/html/admin/order/index.php (revision 248) @@ -90,10 +90,18 @@ switch ($key) { case 'search_order_name': - $where .= " AND order_name01||order_name02 ILIKE ?"; + if(DB_TYPE == "pgsql"){ + $where .= " AND order_name01||order_name02 ILIKE ?"; + }elseif(DB_TYPE == "mysql"){ + $where .= " AND concat(order_name01,order_name02) ILIKE ?"; + } $nonsp_val = ereg_replace("[ ¡¡]+","",$val); $arrval[] = "%$nonsp_val%"; break; case 'search_order_kana': - $where .= " AND order_kana01||order_kana02 ILIKE ?"; + if(DB_TYPE == "pgsql"){ + $where .= " AND order_kana01||order_kana02 ILIKE ?"; + }elseif(DB_TYPE == "mysql"){ + $where .= " AND concat(order_kana01,order_kana02) ILIKE ?"; + } $nonsp_val = ereg_replace("[ ¡¡]+","",$val); $arrval[] = "%$nonsp_val%"; @@ -126,5 +134,9 @@ break; case 'search_order_tel': - $where .= " AND (order_tel01||order_tel02||order_tel03) ILIKE ?"; + if(DB_TYPE == "pgsql"){ + $where .= " AND (order_tel01||order_tel02||order_tel03) ILIKE ?"; + }elseif(DB_TYPE == "mysql"){ + $where .= " AND concat(order_tel01,order_tel02,order_tel03) ILIKE ?"; + } $nonmark_val = ereg_replace("[()-]+","",$val); $arrval[] = "$nonmark_val%"; Index: branches/comu/html/admin/batch/daily.php =================================================================== --- branches/comu/html/admin/batch/daily.php (revision 15) +++ branches/comu/html/admin/batch/daily.php (revision 248) @@ -132,7 +132,7 @@ $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.order_sex = 2) AS women ) AS women, "; $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.order_sex = 1 AND T2.customer_id <> 0) AS men_member ) AS men_member, "; - $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.order_sex = 1 AND T2.customer_id = 0) AS men_nonmember ) AS men_nonmember, "; + $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.order_sex = 1 AND T1.customer_id = 0) AS men_nonmember ) AS men_nonmember, "; $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.order_sex = 2 AND T2.customer_id <> 0) AS women_member ) AS women_member, "; - $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.order_sex = 2 AND T2.customer_id = 0) AS women_nonmember ) AS women_nonmember, "; + $sql.= "(SELECT sum(cnt) FROM (SELECT COUNT(*) AS cnt $from $where AND T1.order_sex = 2 AND T1.customer_id = 0) AS women_nonmember ) AS women_nonmember, "; $sql.= "SUM(total) AS total, "; $sql.= "(AVG(total)) AS total_average "; @@ -157,5 +157,5 @@ $objQuery = new SC_Query(); $arrRet = $objQuery->getall($sql); - + $sqlval = $arrRet[0]; Index: branches/comu/html/frontparts/bloc/cart.php =================================================================== --- branches/comu/html/frontparts/bloc/cart.php (revision 15) +++ branches/comu/html/frontparts/bloc/cart.php (revision 248) @@ -51,9 +51,11 @@ // Á÷ÎÁ̵ÎÁ¤Þ¤Ç¤Î¶â³Û - $deliv_free = $arrInfo['free_rule'] - $ProductsTotal; - $arrCartList[0]['free_rule'] = $arrInfo['free_rule']; - $arrCartList[0]['ProductsTotal'] = $ProductsTotal; - $arrCartList[0]['TotalQuantity'] = $TotalQuantity; - $arrCartList[0]['deliv_free'] = $deliv_free; + if($arrInfo['free_rule'] > 0){ + $deliv_free = $arrInfo['free_rule'] - $ProductsTotal; + $arrCartList[0]['free_rule'] = $arrInfo['free_rule']; + $arrCartList[0]['ProductsTotal'] = $ProductsTotal; + $arrCartList[0]['TotalQuantity'] = $TotalQuantity; + $arrCartList[0]['deliv_free'] = $deliv_free; + } $objSubPage->arrCartList = $arrCartList; Index: branches/comu/html/test/uehara/test1.html =================================================================== --- branches/comu/html/test/uehara/test1.html (revision 248) +++ branches/comu/html/test/uehara/test1.html (revision 248) @@ -0,0 +1,27 @@ + + + + +test1 + + + + + + + + + + + + + + Index: branches/comu/html/test/naka/graph.php =================================================================== --- branches/comu/html/test/naka/graph.php (revision 5) +++ branches/comu/html/test/naka/graph.php (revision 248) @@ -23,10 +23,10 @@ // ¥Ç¡¼¥¿¤ò¥»¥Ã¥È¤¹¤ë $objGraphPie->setData($arrList); - // ËÞÎã¤ò¥»¥Ã¥È¤¹¤ë + // ËÞÎã¤ò¥»¥Ã¥È¤¹¤ë $objGraphPie->setLegend(array_keys($arrList)); // ±ß¥°¥é¥ÕÉÁ²è - $objGraphPie->drawGraph(); - /* + //$objGraphPie->drawGraph(); + $x = $objGraphPie->cx; $y = $objGraphPie->cy; @@ -72,6 +72,5 @@ } - // ÄìÌ̤ÎÉÁ²è - imagearc($objGraphPie->image, $x, $y + $z, $w, $h, 0, 180 , $objGraphPie->flame_color); + // ¾åÌ̤ÎÉÁ²è @@ -88,5 +87,7 @@ $start = $end; } - + /* + // ÄìÌ̤ÎÉÁ²è + imagearc($objGraphPie->image, $x, $y + $z, $w, $h, 0, 180 , $objGraphPie->flame_color); // ¾åÌ̤αï¼è¤ê @@ -122,11 +123,12 @@ $start = $end; } - + // ¥é¥Ù¥ë¤ÎÉÁ²è - //$objGraphPie->drawLabel($arrRad); + $objGraphPie->drawLabel($arrRad); // ËÞÎã¤ÎÉÁ²è - //$objGraphPie->drawLegend(count($objGraphPie->arrData)); + $objGraphPie->drawLegend(count($objGraphPie->arrData)); */ - + + $objGraphPie->resampled(); $objGraphPie->outputGraph(); Index: branches/comu/data/Smarty/templates/shopping/index.tpl =================================================================== --- branches/comu/data/Smarty/templates/shopping/index.tpl (revision 15) +++ branches/comu/data/Smarty/templates/shopping/index.tpl (revision 248) @@ -73,5 +73,5 @@ - ¥Ñ¥¹¥ï¡¼¥É¤ò˺¤ì¤¿Êý¤Ï¤³¤Á¤é¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ÎºÆȯ¹Ô¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£
+ ¥Ñ¥¹¥ï¡¼¥É¤ò˺¤ì¤¿Êý¤Ï¤³¤Á¤é¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ÎºÆȯ¹Ô¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£
¥á¡¼¥ë¥¢¥É¥ì¥¹¤ò˺¤ì¤¿Êý¤Ï¡¢¤ª¼ê¿ô¤Ç¤¹¤¬¡¢¤ªÌ䤤¹ç¤ï¤»¥Ú¡¼¥¸¤«¤é¤ªÌ䤤¹ç¤ï¤»¤¯¤À¤µ¤¤¡£ Index: branches/comu/data/Smarty/templates/admin/contents/campaign.tpl =================================================================== --- branches/comu/data/Smarty/templates/admin/contents/campaign.tpl (revision 15) +++ branches/comu/data/Smarty/templates/admin/contents/campaign.tpl (revision 248) @@ -11,5 +11,5 @@ // ¥«¡¼¥È¤Ë¾¦ÉʤòÆþ¤ì¤ë¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤ë¤«¥Á¥§¥Ã¥¯ function fnIsCartOn(){ - if (document.form1.cart_flg.checked){ + if (document.form1.cart_flg.checked || ){ document.form1.deliv_free_flg.disabled = false; } else { @@ -23,4 +23,9 @@ + + + + + @@ -122,5 +127,7 @@ - @@ -136,5 +143,5 @@ - + Index: branches/comu/data/Smarty/templates/admin/customer/edit_confirm.tpl =================================================================== --- branches/comu/data/Smarty/templates/admin/customer/edit_confirm.tpl (revision 15) +++ branches/comu/data/Smarty/templates/admin/customer/edit_confirm.tpl (revision 248) @@ -112,5 +112,5 @@ - + Index: branches/comu/data/class/SC_CartSession.php =================================================================== --- branches/comu/data/class/SC_CartSession.php (revision 15) +++ branches/comu/data/class/SC_CartSession.php (revision 248) @@ -195,5 +195,18 @@ // Á°ÊǤÎURL¤òµ­Ï¿¤·¤Æ¤ª¤¯ function setPrevURL($url) { - $_SESSION[$this->key]['prev_url'] = $url; + // Á°ÊǤȤ·¤Æµ­Ï¿¤·¤Ê¤¤¥Ú¡¼¥¸¤ò»ØÄꤹ¤ë¡£ + $arrExclude = array("detail_image.php"); + $exclude = false; + // ¥Ú¡¼¥¸¥Á¥§¥Ã¥¯¤ò¹Ô¤¦¡£ + foreach($arrExclude as $val) { + if(ereg($val, $url)) { + $exclude = true; + break; + } + } + // ½ü³°¥Ú¡¼¥¸¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢Á°ÊǤȤ·¤Æµ­Ï¿¤¹¤ë¡£ + if(!$exclude) { + $_SESSION[$this->key]['prev_url'] = $url; + } } Index: branches/comu/data/class/SC_CustomerList.php =================================================================== --- branches/comu/data/class/SC_CustomerList.php (revision 15) +++ branches/comu/data/class/SC_CustomerList.php (revision 248) @@ -78,5 +78,10 @@ // ̾Á° if ( strlen($this->arrSql['name']) > 0 ) { - $this->setWhere("(name01 || name02 LIKE ?)" ); + if(DB_TYPE == "pgsql"){ + $this->setWhere("(name01 || name02 LIKE ?)" ); + }elseif(DB_TYPE == "mysql"){ + $this->setWhere("concat(name01,name02) LIKE ?" ); + } + $searchName = $this->addSearchStr($this->arrSql['name']); $this->arrVal[] = mb_ereg_replace("[ ¡¡]+","",$searchName); @@ -85,5 +90,9 @@ //¡¡Ì¾Á°¡Ê¥«¥Ê¡Ë if ( strlen($this->arrSql['kana']) > 0 ) { - $this->setWhere("(kana01 || kana02 LIKE ?)"); + if(DB_TYPE == "pgsql"){ + $this->setWhere("(kana01 || kana02 LIKE ?)"); + }elseif(DB_TYPE == "mysql"){ + $this->setWhere("concat(kana01,kana02) LIKE ?" ); + } $searchKana = $this->addSearchStr($this->arrSql['kana']); $this->arrVal[] = mb_ereg_replace("[ ¡¡]+","",$searchKana); @@ -98,5 +107,9 @@ //¡¡ÅÅÏÃÈÖ¹æ if ( is_numeric( $this->arrSql['tel'] ) ) { - $this->setWhere( "(tel01 || tel02 || tel03 LIKE ?)" ); + if(DB_TYPE == "pgsql"){ + $this->setWhere( "(tel01 || tel02 || tel03 LIKE ?)" ); + }elseif(DB_TYPE == "mysql"){ + $this->setWhere("concat(tel01,tel02,tel03) LIKE ?" ); + } $searchTel = $this->addSearchStr($this->arrSql['tel']); $this->arrVal[] = ereg_replace("-", "", $searchTel); Index: branches/comu/data/class/SC_SelectSql.php =================================================================== --- branches/comu/data/class/SC_SelectSql.php (revision 15) +++ branches/comu/data/class/SC_SelectSql.php (revision 248) @@ -77,5 +77,7 @@ // TO - $date2 = $to_year . "/" . $to_month . "/" . $to_day; + $date2 = mktime (0, 0, 0, $to_month, $to_day, $to_year); + $date2 = $date2 + 86400; + $date2 = date('y/m/d', $date2); // ³«»Ï´ü´Ö¤À¤±»ØÄê¤Î¾ì¹ç @@ -84,13 +86,13 @@ } - //¡¡³«»Ï¢·½ªÎ» + //¡¡³«»Ï¡Á½ªÎ» if( ( $from_year != "" ) && ( $from_month != "" ) && ( $from_day != "" ) && ( $to_year != "" ) && ( $to_month != "" ) && ( $to_day != "" ) ) { - $this->setWhere( $column ." >= '" . $date1 ."' AND ". $column . " < date('" . $date2 . "')+1" ); + $this->setWhere( $column ." >= '" . $date1 ."' AND ". $column . " < date('" . $date2 . "')" ); } // ½ªÎ»´ü´Ö¤À¤±»ØÄê¤Î¾ì¹ç if( ( $from_year == "" ) && ( $from_month == "" ) && ( $from_day == "" ) && ( $to_year != "" ) && ( $to_month != "" ) && ( $to_day != "" ) ) { - $this->setWhere( $column ." < date('" . $date2 . "')+1"); + $this->setWhere( $column ." < date('" . $date2 . "')"); } return $return;
¥Ç¥£¥ì¥¯¥È¥ê̾ *style="background-color:" maxlength=""/> + + style="background-color:" maxlength=""/>
+ ¢¨ÆþÎϤ·¤¿¥Ç¥£¥ì¥¯¥ê̾/ ¤Ç¥¢¥¯¥»¥¹½ÐÍè¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
¥«¡¼¥È¤Ë¾¦ÉʤòÆþ¤ì¤ë checked > checked disabled>
¤´À­ÊÌ *ÃËÀ­½÷À­ÃËÀ­½÷À­