Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

商品規格ごとの税率設定を削除 #301

Merged
merged 8 commits into from Sep 17, 2019
+59 −69
Merged

商品規格ごとの税率設定を削除 #301

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
67b44f0
商品規格ごとの税率設定を削除
nanasess Aug 21, 2019
99e9a5c
PR へのリンク追加
nanasess Aug 21, 2019
6af3e1e
Merge remote-tracking branch 'upstream/improve/php7' into improve/pro…
nanasess Aug 22, 2019
9eacae9
確認画面の対応
nanasess Aug 23, 2019
15c3eab
product_class_id は 0 を渡すよう修正
nanasess Aug 23, 2019
ef4e5ea
Install to dpkg
nanasess Sep 13, 2019
4d5c88c
受注管理画面の対応
nanasess Sep 17, 2019
deb171d
Merge pull request #311 from nanasess/install-dpkg
nanasess Sep 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions data/Smarty/templates/admin/products/product.tpl
View file
Open in desktop
Expand Up @@ -213,22 +213,22 @@
<span class="attention"> (半角数字で入力)</span>
</td>
</tr>
<!--{if $smarty.const.OPTION_PRODUCT_TAX_RULE ==1}-->
<tr>
<th>消費税率<span class="attention"> *</span></th>
<th>在庫数<span class="attention"> *</span></th>
<td>
<span class="attention"><!--{$arrErr.tax_rate}--></span>
<input type="text" name="tax_rate" value="<!--{$arrForm.tax_rate|h}-->" size="6" class="box6" maxlength="<!--{$smarty.const.PERCENTAGE_LEN}-->" style="<!--{if $arrErr.tax_rate != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"/>%
<span class="attention">(半角数字で入力)</span>
<span class="attention"><!--{$arrErr.stock}--></span>
<input type="text" name="stock" value="<!--{$arrForm.stock|h}-->" size="6" class="box6" maxlength="<!--{$smarty.const.AMOUNT_LEN}-->" style="<!--{if $arrErr.stock != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"/>
<input type="checkbox" name="stock_unlimited" value="1" <!--{if $arrForm.stock_unlimited == "1"}-->checked<!--{/if}--> onclick="eccube.checkStockLimit('<!--{$smarty.const.DISABLED_RGB}-->');"/>無制限
</td>
</tr>
<!--{/if}-->
<!--{if $smarty.const.OPTION_PRODUCT_TAX_RULE ==1}-->
<tr>
<th>在庫数<span class="attention"> *</span></th>
<th>消費税率<span class="attention"> *</span></th>
<td>
<span class="attention"><!--{$arrErr.stock}--></span>
<input type="text" name="stock" value="<!--{$arrForm.stock|h}-->" size="6" class="box6" maxlength="<!--{$smarty.const.AMOUNT_LEN}-->" style="<!--{if $arrErr.stock != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"/>
<input type="checkbox" name="stock_unlimited" value="1" <!--{if $arrForm.stock_unlimited == "1"}-->checked<!--{/if}--> onclick="eccube.checkStockLimit('<!--{$smarty.const.DISABLED_RGB}-->');"/>無制限
<span class="attention"><!--{$arrErr.tax_rate}--></span>
<input type="text" name="tax_rate" value="<!--{$arrForm.tax_rate|h}-->" size="6" class="box6" maxlength="<!--{$smarty.const.PERCENTAGE_LEN}-->" style="<!--{if $arrErr.tax_rate != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"/>%
<span class="attention">(半角数字で入力)</span>
</td>
</tr>
<!--{/if}-->
Expand Down
12 changes: 0 additions & 12 deletions data/Smarty/templates/admin/products/product_class.tpl
View file
Open in desktop
Expand Up @@ -203,9 +203,6 @@
<th>在庫数<span class="attention">*</span></th>
<th><!--{$smarty.const.NORMAL_PRICE_TITLE}-->(円)</th>
<th><!--{$smarty.const.SALE_PRICE_TITLE}-->(円)<span class="attention">*</span></th>
<!--{if $smarty.const.OPTION_PRODUCT_TAX_RULE}-->
<th>消費税率(%)<span class="attention">*</span></th>
<!--{/if}-->
<th>商品種別<span class="attention">*</span></th>
<th>ダウンロード<br />ファイル名<span class="red"><br />上限<!--{$smarty.const.STEXT_LEN}-->文字</span></th>
<th>ダウンロード商品用<br />ファイル</th>
Expand Down Expand Up @@ -276,15 +273,6 @@
<!--{/if}-->
<input type="text" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" size="6" class="box6" maxlength="<!--{$arrForm[$key].length}-->" <!--{if $arrErr[$key][$index] != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> id="<!--{$key}-->_<!--{$index}-->" />
</td>
<!--{if $smarty.const.OPTION_PRODUCT_TAX_RULE}-->
<td class="center">
<!--{assign var=key value="tax_rate"}-->
<!--{if $arrErr[$key][$index]}-->
<span class="attention"><!--{$arrErr[$key][$index]}--></span>
<!--{/if}-->
<input type="text" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" size="6" class="box6" maxlength="<!--{$arrForm[$key].length}-->" <!--{if $arrErr[$key][$index] != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> id="<!--{$key}-->_<!--{$index}-->" />
</td>
<!--{/if}-->
<td class="class-product-type">
<!--{assign var=key value="product_type_id"}-->
<!--{if $arrErr[$key][$index]}-->
Expand Down
4 changes: 2 additions & 2 deletions data/class/helper/SC_Helper_TaxRule.php
View file
Open in desktop
Expand Up @@ -113,7 +113,7 @@ public static function calcTax ($price, $tax, $calc_rule, $tax_adjust = 0)
* 現在有効な税率設定情報を返す
*
* @param int $product_id 商品ID
* @param int $product_class_id 商品規格ID
* @param int $product_class_id 商品規格ID(商品規格ごとの税率設定は廃止のため常に0)
* @param int $pref_id 都道府県ID
* @param int $country_id 国ID
* @return integer 税設定情報
Expand Down Expand Up @@ -243,7 +243,7 @@ public static function setTaxRuleForProduct($tax_rate, $product_id = 0, $product
// 課税規則は基本設定のものを使用
$calc_rule = $arrRet['calc_rule'];
// 日付は登録時点を設定
$apply_date = date('Y/m/d H:i:s');
$apply_date = 'CURRENT_TIMESTAMP';
// 税情報を設定
SC_Helper_TaxRule_Ex::setTaxRule($calc_rule, $tax_rate, $apply_date, NULL, $tax_adjust, $product_id, $product_class_id, $pref_id, $country_id);
}
Expand Down
16 changes: 10 additions & 6 deletions data/class/pages/admin/products/LC_Page_Admin_Products_Product.php
View file
Open in desktop
Expand Up @@ -315,6 +315,9 @@ public function lfInitFormParam(&$objFormParam, $arrPost)
$objFormParam->addParam('公開・非公開', 'status', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('商品ステータス', 'product_status', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));

if (OPTION_PRODUCT_TAX_RULE) {
$objFormParam->addParam('消費税率', 'tax_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
}
if (!$arrPost['has_product_class']) {
// 新規登録, 規格なし商品の編集の場合
$objFormParam->addParam('商品種別', 'product_type_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
Expand All @@ -325,9 +328,10 @@ public function lfInitFormParam(&$objFormParam, $arrPost)
$objFormParam->addParam('商品コード', 'product_code', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam(NORMAL_PRICE_TITLE, 'price01', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK', 'ZERO_START'));
$objFormParam->addParam(SALE_PRICE_TITLE, 'price02', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK', 'ZERO_START'));
if (OPTION_PRODUCT_TAX_RULE) {
$objFormParam->addParam('消費税率', 'tax_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
}
// 商品規格ごとの税率設定は廃止
// if (OPTION_PRODUCT_TAX_RULE) {
// $objFormParam->addParam('消費税率', 'tax_rate', PERCENTAGE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
// }
$objFormParam->addParam('在庫数', 'stock', AMOUNT_LEN, 'n', array('SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK', 'ZERO_START'));
$objFormParam->addParam('在庫無制限', 'stock_unlimited', INT_LEN, 'n', array('SPTAB_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK'));
}
Expand Down Expand Up @@ -600,7 +604,7 @@ public function lfSetViewParam_InputPage(&$objUpFile, &$objDownFile, &$arrForm)
if ($arrForm['product_id'] == '') {
$arrRet = SC_Helper_TaxRule_Ex::getTaxRule();
} else {
$arrRet = SC_Helper_TaxRule_Ex::getTaxRule($arrForm['product_id'], $arrForm['product_class_id']);
$arrRet = SC_Helper_TaxRule_Ex::getTaxRule($arrForm['product_id']);
}
$arrForm['tax_rate'] = $arrRet['tax_rate'];
}
Expand Down Expand Up @@ -1132,8 +1136,8 @@ public function lfRegistProduct(&$objUpFile, &$objDownFile, $arrList)
$objProduct->setProductStatus($product_id, $arrList['product_status']);

// 税情報設定
if (OPTION_PRODUCT_TAX_RULE && !$objDb->sfHasProductClass($product_id)) {
SC_Helper_TaxRule_Ex::setTaxRuleForProduct($arrList['tax_rate'], $arrList['product_id'], $arrList['product_class_id']);
if (OPTION_PRODUCT_TAX_RULE) {
SC_Helper_TaxRule_Ex::setTaxRuleForProduct($arrList['tax_rate'], $arrList['product_id'], 0);
}

// 関連商品登録
Expand Down
32 changes: 17 additions & 15 deletions data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
View file
Open in desktop
Expand Up @@ -197,9 +197,10 @@ public function initParam(&$objFormParam)
$objFormParam->addParam('在庫数', 'stock_unlimited', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam(NORMAL_PRICE_TITLE, 'price01', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam(SALE_PRICE_TITLE, 'price02', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
if (OPTION_PRODUCT_TAX_RULE) {
$objFormParam->addParam('消費税率', 'tax_rate', PERCENTAGE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
}
// 商品規格ごとの税率設定は廃止
// if (OPTION_PRODUCT_TAX_RULE) {
// $objFormParam->addParam('消費税率', 'tax_rate', PERCENTAGE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
// }
$objFormParam->addParam('商品種別', 'product_type_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('削除フラグ', 'del_flg', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('ダウンロード販売用ファイル名', 'down_filename', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
Expand Down Expand Up @@ -278,10 +279,10 @@ public function registerProductClass($arrList, $product_id, $total)

$objQuery->insert('dtb_products_class', $arrPC);

// 税情報登録/更新
if (OPTION_PRODUCT_TAX_RULE) {
SC_Helper_TaxRule_Ex::setTaxRuleForProduct($arrList['tax_rate'][$i], $arrPC['product_id'], $arrPC['product_class_id']);
}
// 商品規格ごとの税率設定は廃止
// if (OPTION_PRODUCT_TAX_RULE) {
// SC_Helper_TaxRule_Ex::setTaxRuleForProduct($arrList['tax_rate'][$i], $arrPC['product_id'], $arrPC['product_class_id']);
// }
}

// 規格無し用の商品規格を非表示に
Expand Down Expand Up @@ -352,9 +353,10 @@ public function lfCheckProductsClass(&$objFormParam)
/*
* 消費税率の必須チェック
*/
if (OPTION_PRODUCT_TAX_RULE && SC_Utils_Ex::isBlank($arrValues['tax_rate'][$i])) {
$arrErr['tax_rate'][$i] = '※ 消費税率が入力されていません。<br />';
}
// 商品規格ごとの税率設定は廃止
// if (OPTION_PRODUCT_TAX_RULE && SC_Utils_Ex::isBlank($arrValues['tax_rate'][$i])) {
// $arrErr['tax_rate'][$i] = '※ 消費税率が入力されていません。<br />';
// }
/*
* 商品種別の必須チェック
*/
Expand Down Expand Up @@ -498,11 +500,11 @@ public function doPreEdit(&$objFormParam)
$arrValues['del_flg'] = '0';
}

// 消費税率を設定
if (OPTION_PRODUCT_TAX_RULE) {
$arrRet = SC_Helper_TaxRule_Ex::getTaxRule($arrValues['product_id'], $arrValues['product_class_id']);
$arrValues['tax_rate'] = $arrRet['tax_rate'];
}
// 商品規格ごとの税率設定は廃止
// if (OPTION_PRODUCT_TAX_RULE) {
// $arrRet = SC_Helper_TaxRule_Ex::getTaxRule($arrValues['product_id'], $arrValues['product_class_id']);
// $arrValues['tax_rate'] = $arrRet['tax_rate'];
// }

$arrMergeProductsClass[] = $arrValues;
}
Expand Down