Changeset 248 for branches/comu/data

Timestamp:

2007/02/14 12:50:06 (17 years ago)

Author:

kakinaka

Message:

 

Location:

branches/comu/data

Files:

• Smarty/templates/admin/contents/campaign.tpl (modified) (4 diffs)
• Smarty/templates/admin/customer/edit_confirm.tpl (modified) (1 diff)
• Smarty/templates/shopping/index.tpl (modified) (1 diff)
• class/SC_CartSession.php (modified) (1 diff)
• class/SC_CustomerList.php (modified) (3 diffs)
• class/SC_SelectSql.php (modified) (2 diffs)

branches/comu/data/Smarty/templates/admin/contents/campaign.tpl

@@ -11 +11 @@
 // ¥«¡¼¥È¤Ë¾¦ÉʤòÆþ¤ì¤ë¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤ë¤«¥Á¥§¥Ã¥¯
 function fnIsCartOn(){
-    if (document.form1.cart_flg.checked){
+    if (document.form1.cart_flg.checked <!--{if $is_update}-->|| <!--{$arrForm.cart_flg}--><!--{/if}-->){
         document.form1.deliv_free_flg.disabled = false;
     } else {
@@ -23 +23 @@
 <input type="hidden" name="mode" value="">
 <input type="hidden" name="campaign_id" value="<!--{$campaign_id}-->" >
+<input type="hidden" name="is_update" value="<!--{$is_update}-->" >
+<!--{if $is_update}-->
+<input type="hidden" name="cart_flg" value="<!--{$arrForm.cart_flg}-->" >
+<!--{/if}-->
+
 <table width="878" border="0" cellspacing="0" cellpadding="0" summary=" ">
     <tr valign="top">
@@ -122 +127 @@
                                     <tr>
                                         <td bgcolor="#f2f1ec" width="140" class="fs12n">¥Ç¥£¥ì¥¯¥È¥ê̾<span class="red"> *</span></td>
-                                        <td bgcolor="#ffffff" width="538" class="fs12n"><span class="red"><!--{$arrErr.directory_name}--></span><input type="text" name="directory_name" size="60" class="box60"  value="<!--{$arrForm.directory_name|escape}-->" <!--{if $arrErr.directory_name}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}--> maxlength="<!--{$smarty.const.STEXT_LEN}-->"/></span>
+                                        <td bgcolor="#ffffff" width="538">
+                                            <span class="red12"><!--{$arrErr.directory_name}--></span><input type="text" name="directory_name" size="60" class="box60"  value="<!--{$arrForm.directory_name|escape}-->" <!--{if $arrErr.directory_name}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}--> maxlength="<!--{$smarty.const.STEXT_LEN}-->"/></span><br/>
+                                            <span class="fs10">¢¨<!--{$smarty.const.SITE_URL|sfTrimURL}--><!--{$smarty.const.URL_DIR|sfTrimURL}--><!--{$smarty.const.CAMPAIGN_URL}-->ÆþÎϤ·¤¿¥Ç¥£¥ì¥¯¥ê̾/ ¤Ç¥¢¥¯¥»¥¹½ÐÍè¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£</span>
                                         </td>
                                     </tr>
@@ -136 +143 @@
                                     <tr class="fs12n">
                                         <td bgcolor="#f2f1ec" width="140">¥«¡¼¥È¤Ë¾¦ÉʤòÆþ¤ì¤ë</td>
-                                        <td bgcolor="#ffffff" width="538"><input type="checkbox" onclick="fnIsCartOn()" name="cart_flg" id="cart_flg" value="1" <!--{if $arrForm.cart_flg eq 1}--> checked <!--{/if}--> ><label for="cart_flg">¥«¡¼¥È¤Ë¾¦ÉʤòÆþ¤ì¤ë¤è¤¦¤Ë¤¹¤ë</label></td>
+                                        <td bgcolor="#ffffff" width="538"><input type="checkbox" onclick="fnIsCartOn()" name="cart_flg" id="cart_flg" value="1" <!--{if $arrForm.cart_flg eq 1}--> checked <!--{/if}--> <!--{if $is_update}-->disabled<!--{/if}-->><label for="cart_flg">¥«¡¼¥È¤Ë¾¦ÉʤòÆþ¤ì¤ë¤è¤¦¤Ë¤¹¤ë</label></td>
                                     </tr>
                                     <tr class="fs12n">

branches/comu/data/Smarty/templates/admin/customer/edit_confirm.tpl

@@ -112 +112 @@
                                     <tr class="fs12n">
                                         <td bgcolor="#f2f1ec" width="190">¤´À­ÊÌ<span class="red"> *</span></td>
-                                        <td bgcolor="#ffffff" width="527"><!--{if $$arrForm.sex eq 1}-->ÃËÀ­<!--{else}-->½÷À­<!--{/if}--></td>
+                                        <td bgcolor="#ffffff" width="527"><!--{if $arrForm.sex eq 1}-->ÃËÀ­<!--{else}-->½÷À­<!--{/if}--></td>
                                     </tr>
                                     <tr class="fs12n">

branches/comu/data/Smarty/templates/shopping/index.tpl

@@ -73 +73 @@
                             <tr><td height="15"></td></tr>
                             <tr>
-                                <td class="fs10">¥Ñ¥¹¥ï¡¼¥É¤ò˺¤ì¤¿Êý¤Ï<a href="<!--{$smarty.const.URL_DIR}-->forgot/index.php" onclick="win01('/forgot/index.php','forget','600','400'); return false;" target="_blank">¤³¤Á¤é</a>¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ÎºÆȯ¹Ô¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£<br>
+                                <td class="fs10">¥Ñ¥¹¥ï¡¼¥É¤ò˺¤ì¤¿Êý¤Ï<a href="<!--{$smarty.const.URL_DIR}-->forgot/index.php" onclick="win01('<!--{$smarty.const.URL_DIR}-->forgot/index.php','forget','600','400'); return false;" target="_blank">¤³¤Á¤é</a>¤«¤é¥Ñ¥¹¥ï¡¼¥É¤ÎºÆȯ¹Ô¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£<br>
                                 ¥á¡¼¥ë¥¢¥É¥ì¥¹¤ò˺¤ì¤¿Êý¤Ï¡¢¤ª¼ê¿ô¤Ç¤¹¤¬¡¢<a href="<!--{$smarty.const.URL_DIR}-->contact/index.php">¤ªÌ䤤¹ç¤ï¤»¥Ú¡¼¥¸</a>¤«¤é¤ªÌ䤤¹ç¤ï¤»¤¯¤À¤µ¤¤¡£</td>
                             </tr>

branches/comu/data/class/SC_CartSession.php

@@ -195 +195 @@
     // Á°ÊǤÎ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;
+        }
     }
     

branches/comu/data/class/SC_CustomerList.php

@@ -78 +78 @@
         // ̾Á°
         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 +90 @@
         //¡¡Ì¾Á°¡Ê¥«¥Ê¡Ë
         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 +107 @@
         //¡¡ÅÅÏÃÈÖ¹æ
         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);

branches/comu/data/class/SC_SelectSql.php

@@ -77 +77 @@
         
         // 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 +86 @@
         }
 
-        //¡¡³«»Ï¢·½ªÎ»
+        //¡¡³«»Ï¡Á½ªÎ»
         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;