Merge pull request #175 from yuh4/20171017

管理画面の集計部分修正
EC-CUBE · Oct 25, 2017 · 6fc2ccf · 6fc2ccf
2 parents 5d4589d + 0aa9ae0
commit 6fc2ccf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/data/Smarty/templates/admin/products/product_class.tpl b/data/Smarty/templates/admin/products/product_class.tpl
@@ -295,7 +295,7 @@
                         <!--{/foreach}-->
                     </td>
                     <td class="center">
-                        <!--{assign var=key value="down_filename}-->
+                        <!--{assign var=key value="down_filename"}-->
                         <!--{if $arrErr[$key][$index]}-->
                             <span class="attention"><!--{$arrErr[$key][$index]}--></span>
                         <!--{/if}-->

diff --git a/data/class/helper/SC_Helper_Customer.php b/data/class/helper/SC_Helper_Customer.php
@@ -248,7 +248,7 @@ public function sfGetCustomerData($customer_id, $mask_flg = true)
         // 誕生日を年月日に分ける
         if (isset($arrForm['birth'])) {
             $birth = explode(' ', $arrForm['birth']);
-            list($arrForm['year'], $arrForm['month'], $arrForm['day']) = explode('-', $birth[0]);
+            list($arrForm['year'], $arrForm['month'], $arrForm['day']) = array_map("intval",explode('-', $birth[0]));
         }
 
         if ($mask_flg) {

diff --git a/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php b/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php
@@ -151,11 +151,11 @@ public function action()
                 $TaxRule = $objTaxRule->getTaxRuleData($tax_rule_id);
 
                 $tmp = explode(" ", $TaxRule['apply_date']);
-                $tmp_ymd = explode("-", $tmp[0]);
+                $tmp_ymd = array_map("intval",explode('-', $tmp[0]));
                 $TaxRule['apply_date_year'] = $tmp_ymd[0];
                 $TaxRule['apply_date_month'] = $tmp_ymd[1];
                 $TaxRule['apply_date_day'] = $tmp_ymd[2];
-                $tmp_hm = explode(":", $tmp[1]);
+                $tmp_hm = array_map("intval",explode(":", $tmp[1]));                
                 $TaxRule['apply_date_hour'] = $tmp_hm[0];
                 $TaxRule['apply_date_minutes'] = $tmp_hm[1];
 

diff --git a/data/class/pages/admin/contents/LC_Page_Admin_Contents.php b/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
@@ -240,7 +240,7 @@ public function checkLinkMethod($link_method)
      */
     public function splitNewsDate($news_date)
     {
-        return explode('-', $news_date);
+        return array_map("intval",explode('-', $news_date));
     }
 
     /**

diff --git a/data/class/pages/admin/total/LC_Page_Admin_Total.php b/data/class/pages/admin/total/LC_Page_Admin_Total.php
@@ -486,7 +486,7 @@ public function lfGetGraphPng($keyname)
     /**
      * @param string $col_date
      */
-    public function lfGetWhereMember($col_date, $sdate, $edate, $type, $col_member = 'customer_id')
+    public function lfGetWhereMember($col_date, $sdate, $edate, $type = NULL, $col_member = 'customer_id')
     {
         $where = '';
         // 取得日付の指定
-Original file line number
+Diff line change
@@ Expand Up / @@ -240,7 +240,7 @@ public function checkLinkMethod($link_method) @@
          */
         public function splitNewsDate($news_date)
         {
-            return explode('-', $news_date);
+            return array_map("intval",explode('-', $news_date));
         }
         /**
@@ Expand Down @@