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

商品CSV登録 販売制限数、通常価格の未指定の場合を追加 #5316

Merged
merged 2 commits into from
Apr 4, 2022
Merged

商品CSV登録 販売制限数、通常価格の未指定の場合を追加 #5316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4990945
商品CSV登録 販売制限数、通常価格の未指定の場合を追加
watarukashii Mar 2, 2022
b5a4740
商品CSV登録 販売制限数、通常価格　列はあるが空欄の場合に更新する
watarukashii Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Eccube/Controller/Admin/Product/CsvImportController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1348,6 +1348,8 @@ protected function updateProductClass($row, Product $Product, ProductClass $Prod
$message = trans('admin.common.csv_invalid_greater_than_zero', ['%line%' => $line, '%name%' => $headerByKey['sale_limit']]);
$this->addErrors($message);
}
} else {
chihiro-adachi marked this conversation as resolved.
Show resolved Hide resolved
$ProductClass->setSaleLimit(null);
}

if (isset($row[$headerByKey['price01']]) && $row[$headerByKey['price01']] != '') {
Expand All @@ -1359,6 +1361,8 @@ protected function updateProductClass($row, Product $Product, ProductClass $Prod
$message = trans('admin.common.csv_invalid_greater_than_zero', ['%line%' => $line, '%name%' => $headerByKey['price01']]);
$this->addErrors($message);
}
} else {
$ProductClass->setPrice01(null);
}

if (!isset($row[$headerByKey['price02']]) || $row[$headerByKey['price02']] == '') {
Expand Down
4 changes: 2 additions & 2 deletions src/Eccube/Resource/locale/messages.ja.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,11 +744,11 @@ admin.product.product_csv.stock_description: 在庫数無制限フラグが0の
admin.product.product_csv.stock_unlimited_col: 在庫数無制限フラグ
admin.product.product_csv.stock_unlimited_description: '0:制限 1: 無制限を指定します。'
admin.product.product_csv.sale_limit_col: 販売制限数
admin.product.product_csv.sale_limit_description: 1以上の数値を設定
admin.product.product_csv.sale_limit_description: 1以上の数値を設定します。未指定の場合、販売制限数なしとして扱います。
admin.product.product_csv.normal_price_col: 通常価格
admin.product.product_csv.normal_price_description: 0以上の数値を設定
admin.product.product_csv.sale_price_col: 販売価格
admin.product.product_csv.sale_price_description: 0以上の数値を設定
admin.product.product_csv.sale_price_description: 0以上の数値を設定します。未指定の場合、非表示として扱います。
admin.product.product_csv.delivery_fee_col: 送料
admin.product.product_csv.delivery_fee_description: 商品ごとの送料設定が有効の場合、0以上の数値を設定
admin.product.product_csv.tax_rate_col: 税率
Expand Down