Index: /branches/version-2_13-dev/html/js/eccube.js =================================================================== --- /branches/version-2_13-dev/html/js/eccube.js (revision 23138) +++ /branches/version-2_13-dev/html/js/eccube.js (revision 23170) @@ -291,5 +291,11 @@ 'shipping_tel01', 'shipping_tel02', - 'shipping_tel03' + 'shipping_tel03', + 'shipping_company_name', + 'shipping_country_id', + 'shipping_zipcode', + 'shipping_fax01', + 'shipping_fax02', + 'shipping_fax03' ]; Index: /branches/version-2_13-dev/data/Smarty/templates/sphone/site_frame.tpl =================================================================== --- /branches/version-2_13-dev/data/Smarty/templates/sphone/site_frame.tpl (revision 23142) +++ /branches/version-2_13-dev/data/Smarty/templates/sphone/site_frame.tpl (revision 23170) @@ -52,9 +52,6 @@ - - - - - + + - - - - - + + Index: /branches/version-2_13-dev/data/Smarty/templates/default/shopping/confirm.tpl =================================================================== --- /branches/version-2_13-dev/data/Smarty/templates/default/shopping/confirm.tpl (revision 23162) +++ /branches/version-2_13-dev/data/Smarty/templates/default/shopping/confirm.tpl (revision 23170) @@ -199,5 +199,5 @@ > - <!--{$item.productsClass.name|h}--> + <!--{$item.productsClass.name|h}-->
Index: /branches/version-2_13-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl =================================================================== --- /branches/version-2_13-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl (revision 23122) +++ /branches/version-2_13-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl (revision 23170) @@ -31,5 +31,5 @@
- <!--{$arrProduct.name|h}--> + <!--{$arrProduct.name|h}-->
Index: /branches/version-2_13-dev/data/Smarty/templates/default/popup_header.tpl =================================================================== --- /branches/version-2_13-dev/data/Smarty/templates/default/popup_header.tpl (revision 23153) +++ /branches/version-2_13-dev/data/Smarty/templates/default/popup_header.tpl (revision 23170) @@ -31,8 +31,5 @@ - - - - + <!--{$arrSiteInfo.shop_name}-->/<!--{$subtitle|h}--> Index: /branches/version-2_13-dev/data/Smarty/templates/default/site_frame.tpl =================================================================== --- /branches/version-2_13-dev/data/Smarty/templates/default/site_frame.tpl (revision 23142) +++ /branches/version-2_13-dev/data/Smarty/templates/default/site_frame.tpl (revision 23170) @@ -47,8 +47,5 @@ - - - - + Index: /branches/version-2_13-dev/data/Smarty/templates/mobile/mypage/login.tpl =================================================================== --- /branches/version-2_13-dev/data/Smarty/templates/mobile/mypage/login.tpl (revision 22206) +++ /branches/version-2_13-dev/data/Smarty/templates/mobile/mypage/login.tpl (revision 23170) @@ -32,5 +32,5 @@ -
+
@@ -39,5 +39,5 @@ -
+

パスワードをお忘れの方はこちら
Index: /branches/version-2_13-dev/data/Smarty/templates/mobile/cart/index.tpl =================================================================== --- /branches/version-2_13-dev/data/Smarty/templates/mobile/cart/index.tpl (revision 22766) +++ /branches/version-2_13-dev/data/Smarty/templates/mobile/cart/index.tpl (revision 23170) @@ -57,5 +57,5 @@ ：
- 円 + 円 ×

Index: /branches/version-2_13-dev/data/Smarty/templates/admin/login_frame.tpl =================================================================== --- /branches/version-2_13-dev/data/Smarty/templates/admin/login_frame.tpl (revision 23142) +++ /branches/version-2_13-dev/data/Smarty/templates/admin/login_frame.tpl (revision 23170) @@ -33,8 +33,5 @@ - - - - + 管理機能 Index: /branches/version-2_13-dev/data/Smarty/templates/admin/admin_popup_header.tpl =================================================================== --- /branches/version-2_13-dev/data/Smarty/templates/admin/admin_popup_header.tpl (revision 23153) +++ /branches/version-2_13-dev/data/Smarty/templates/admin/admin_popup_header.tpl (revision 23170) @@ -36,9 +36,6 @@ - - - - - + + Index: /branches/version-2_13-dev/data/Smarty/templates/admin/main_frame.tpl =================================================================== --- /branches/version-2_13-dev/data/Smarty/templates/admin/main_frame.tpl (revision 23142) +++ /branches/version-2_13-dev/data/Smarty/templates/admin/main_frame.tpl (revision 23170) @@ -44,9 +44,6 @@ - - - - - + + <!--{$smarty.const.ADMIN_TITLE}--> Index: /branches/version-2_13-dev/data/Smarty/templates/admin/basis/tax.tpl =================================================================== --- /branches/version-2_13-dev/data/Smarty/templates/admin/basis/tax.tpl (revision 23138) +++ /branches/version-2_13-dev/data/Smarty/templates/admin/basis/tax.tpl (revision 23170) @@ -26,4 +26,5 @@

税率設定

+ Index: /branches/version-2_13-dev/data/class/SC_CartSession.php =================================================================== --- /branches/version-2_13-dev/data/class/SC_CartSession.php (revision 23124) +++ /branches/version-2_13-dev/data/class/SC_CartSession.php (revision 23170) @@ -171,5 +171,5 @@ $incTax = SC_Helper_TaxRule_Ex::sfCalcIncTax($price, $this->cartSession[$productTypeId][$i]['productsClass']['product_id'], - $this->cartSession[$productTypeId][$i]['id'][0], + $this->cartSession[$productTypeId][$i]['productsClass']['product_class_id'], $pref_id, $country_id); @@ -191,5 +191,5 @@ $tax = SC_Helper_TaxRule_Ex::sfTax($price, $this->cartSession[$productTypeId][$i]['productsClass']['product_id'], - $this->cartSession[$productTypeId][$i]['id'][0], + $this->cartSession[$productTypeId][$i]['productsClass']['product_class_id'], $pref_id, $country_id); @@ -416,5 +416,5 @@ $arrTaxRule = SC_Helper_TaxRule_Ex::getTaxRule( $this->cartSession[$productTypeId][$i]['productsClass']['product_id'], - $this->cartSession[$productTypeId][$i]['id'][0], + $this->cartSession[$productTypeId][$i]['productsClass']['product_class_id'], $pref_id, $country_id); Index: /branches/version-2_13-dev/data/class/helper/SC_Helper_TaxRule.php =================================================================== --- /branches/version-2_13-dev/data/class/helper/SC_Helper_TaxRule.php (revision 23124) +++ /branches/version-2_13-dev/data/class/helper/SC_Helper_TaxRule.php (revision 23170) @@ -168,12 +168,24 @@ $table = 'dtb_tax_rule'; $cols = '*'; - $where = '((product_id = 0 OR product_id = ?)' - . ' OR (product_class_id = 0 OR product_class_id = ?))' - . ' AND (pref_id = 0 OR pref_id = ?)' - . ' AND (country_id = 0 OR country_id = ?)' - . ' AND apply_date < CURRENT_TIMESTAMP' - . ' AND del_flg = 0'; - - $arrVal = array($product_id, $product_class_id, $pref_id, $country_id); + + // 商品税率有無設定により分岐 + if(OPTION_PRODUCT_TAX_RULE == 1) { + $where = '((product_id = 0 OR product_id = ?)' + . ' OR (product_class_id = 0 OR product_class_id = ?))' + . ' AND (pref_id = 0 OR pref_id = ?)' + . ' AND (country_id = 0 OR country_id = ?)' + . ' AND apply_date < CURRENT_TIMESTAMP' + . ' AND del_flg = 0'; + $arrVal = array($product_id, $product_class_id, $pref_id, $country_id); + } else { + $where = ' product_id = 0 ' + . ' AND product_class_id = 0 ' + . ' AND (pref_id = 0 OR pref_id = ?)' + . ' AND (country_id = 0 OR country_id = ?)' + . ' AND apply_date < CURRENT_TIMESTAMP' + . ' AND del_flg = 0'; + $arrVal = array($pref_id, $country_id); + } + $order = 'apply_date DESC'; $objQuery->setOrder($order); Index: /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php =================================================================== --- /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (revision 23124) +++ /branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (revision 23170) @@ -367,6 +367,6 @@ $objFormParam->addParam('規格名1', 'classcategory_name1'); $objFormParam->addParam('規格名2', 'classcategory_name2'); - $objFormParam->addParam('税率', 'tax_rate'); - $objFormParam->addParam('課税規則', 'tax_rule'); + $objFormParam->addParam('税率', 'tax_rate', INT_LEN, 'n', array('NUM_CHECK')); + $objFormParam->addParam('課税規則', 'tax_rule', INT_LEN, 'n', array('NUM_CHECK')); $objFormParam->addParam('メモ', 'note', MTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK')); $objFormParam->addParam('削除用項番', 'delete_no', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK')); Index: /branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php =================================================================== --- /branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php (revision 23124) +++ /branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php (revision 23170) @@ -116,5 +116,9 @@ $this->tpl_onload = "alert('登録が完了しました。');"; } + } else { + // エラーが存在する場合、メッセージを表示する為に代入 + $this->arrErr['product_tax_flg'] = $arrErr['product_tax_flg']; } + break; @@ -132,7 +136,11 @@ // 完了メッセージ $this->tpl_onload = "alert('登録が完了しました。');"; + // リロード SC_Response_Ex::reload(); } + } else if(SC_Utils_Ex::isBlank($this->arrErr['tax_rule_id'])) { + // 税率ID以外のエラーの場合、ID情報を引き継ぐ + $this->tpl_tax_rule_id = $tax_rule_id; } @@ -188,4 +196,5 @@ $objFormParam->addParam('消費税率', 'tax_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); $objFormParam->addParam('課税規則', 'calc_rule', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); + // 適用日時 $objFormParam->addParam('適用年', 'apply_date_year', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); @@ -194,5 +203,4 @@ $objFormParam->addParam('適用時', 'apply_date_hour', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); $objFormParam->addParam('適用分', 'apply_date_minutes', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK')); - $objFormParam->addParam('適用日時', 'apply_date_year', 'apply_date_month', 'apply_date_day', INT_LEN, 'n', array("CHECK_DATE")); } @@ -256,4 +264,5 @@ $arrErr = $objFormParam->checkError(); $arrForm = $objFormParam->getHashArray(); + $objErr = new SC_CheckError_Ex($arrForm); // tax_rule_id の正当性チェック @@ -267,16 +276,19 @@ } - if ($arrForm['tax_rule_id'] != '0') { - $apply_date = SC_Utils_Ex::sfGetTimestampistime( - $arrForm['apply_date_year'], - sprintf("%02d", $arrForm['apply_date_month']), - sprintf("%02d", $arrForm['apply_date_day']), - sprintf("%02d", $arrForm['apply_date_hour']), - sprintf("%02d", $arrForm['apply_date_minutes']) - ); - - // 税規約情報読み込み - $arrTaxRuleByTime = $objTaxRule->getTaxRuleByTime($apply_date); - // 編集中のレコード以外に同じ消費税率、課税規則が存在する場合 + // 適用日時チェック + $objErr->doFunc(array('適用日時', 'apply_date_year', 'apply_date_month', 'apply_date_day'), array('CHECK_DATE')); + if (SC_Utils_Ex::isBlank($objErr->arrErr['apply_date_year']) && $arrForm['tax_rule_id'] != '0') { + $apply_date = SC_Utils_Ex::sfGetTimestampistime( + $arrForm['apply_date_year'], + sprintf("%02d", $arrForm['apply_date_month']), + sprintf("%02d", $arrForm['apply_date_day']), + sprintf("%02d", $arrForm['apply_date_hour']), + sprintf("%02d", $arrForm['apply_date_minutes']) + ); + + // 税規約情報読み込み + $arrTaxRuleByTime = $objTaxRule->getTaxRuleByTime($apply_date); + + // 編集中のレコード以外に同じ消費税率、課税規則が存在する場合 if ( !SC_Utils_Ex::isBlank($arrTaxRuleByTime) @@ -287,4 +299,7 @@ } } + if (!SC_Utils_Ex::isBlank($objErr->arrErr)) { + $arrErr = array_merge($arrErr, $objErr->arrErr); + } return $arrErr; Index: /branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_Detail.php =================================================================== --- /branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 23124) +++ /branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 23170) @@ -541,8 +541,9 @@ $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam); if (count($this->arrErr) == 0) { - if ($this->lfRegistFavoriteProduct($this->objFormParam->getValue('favorite_product_id'),$objCustomer->getValue('customer_id'))) { - $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg); - $objPlugin->doAction('LC_Page_Products_Detail_action_add_favorite', array($this)); + if (!$this->lfRegistFavoriteProduct($this->objFormParam->getValue('favorite_product_id'),$objCustomer->getValue('customer_id'))) { + SC_Response_Ex::actionExit(); } + $objPlugin = SC_Helper_Plugin_Ex::getSingletonInstance($this->plugin_activate_flg); + $objPlugin->doAction('LC_Page_Products_Detail_action_add_favorite', array($this)); } }