|
@@ 266-276 (lines=11) @@
|
| 263 |
|
if ($ProductClasses->count() < 1) { |
| 264 |
|
// 規格分類1(ID)がセットされていると規格なし商品、規格あり商品を作成 |
| 265 |
|
$ProductClassOrg = $this->createProductClass($row, $Product, $data, $headerByKey); |
| 266 |
|
if ($this->BaseInfo->isOptionProductDeliveryFee()) { |
| 267 |
|
if (isset($row[$headerByKey['delivery_fee']]) && StringUtil::isBlank($row[$headerByKey['delivery_fee']])) { |
| 268 |
|
$deliveryFee = str_replace(',', '', $row[$headerByKey['delivery_fee']]); |
| 269 |
|
if (preg_match('/^\d+$/', $deliveryFee) && $deliveryFee >= 0) { |
| 270 |
|
$ProductClassOrg->setDeliveryFee($deliveryFee); |
| 271 |
|
} else { |
| 272 |
|
$message = trans('csvimportcontroller.great_than_zero', ['%line%' => $line, '%name%' => $headerByKey['delivery_fee']]); |
| 273 |
|
$this->addErrors($message); |
| 274 |
|
} |
| 275 |
|
} |
| 276 |
|
} |
| 277 |
|
|
| 278 |
|
if (isset($row[$headerByKey['class_category1']]) && StringUtil::isNotBlank($row[$headerByKey['class_category1']])) { |
| 279 |
|
if (isset($row[$headerByKey['class_category2']]) && $row[$headerByKey['class_category1']] == $row[$headerByKey['class_category2']]) { |
|
@@ 359-370 (lines=12) @@
|
| 356 |
|
) { |
| 357 |
|
$this->updateProductClass($row, $Product, $pc, $data, $headerByKey); |
| 358 |
|
|
| 359 |
|
if ($this->BaseInfo->isOptionProductDeliveryFee()) { |
| 360 |
|
$headerByKey['delivery_fee'] = trans('csvimport.label.delivery_fee'); |
| 361 |
|
if (isset($row[$headerByKey['delivery_fee']]) && StringUtil::isNotBlank($row[$headerByKey['delivery_fee']])) { |
| 362 |
|
$deliveryFee = str_replace(',', '', $row[$headerByKey['delivery_fee']]); |
| 363 |
|
if (preg_match('/^\d+$/', $deliveryFee) && $deliveryFee >= 0) { |
| 364 |
|
$pc->setDeliveryFee($deliveryFee); |
| 365 |
|
} else { |
| 366 |
|
$message = trans('csvimportcontroller.great_than_zero', ['%line%' => $line, '%name%' => $headerByKey['delivery_fee']]); |
| 367 |
|
$this->addErrors($message); |
| 368 |
|
} |
| 369 |
|
} |
| 370 |
|
} |
| 371 |
|
$flag = true; |
| 372 |
|
break; |
| 373 |
|
} |
|
@@ 445-455 (lines=11) @@
|
| 442 |
|
} |
| 443 |
|
$ProductClass = $this->createProductClass($row, $Product, $data, $headerByKey, $ClassCategory1, $ClassCategory2); |
| 444 |
|
|
| 445 |
|
if ($this->BaseInfo->isOptionProductDeliveryFee()) { |
| 446 |
|
if (isset($row[$headerByKey['delivery_fee']]) && StringUtil::isNotBlank($row[$headerByKey['delivery_fee']])) { |
| 447 |
|
$deliveryFee = str_replace(',', '', $row[$headerByKey['delivery_fee']]); |
| 448 |
|
if (preg_match('/^\d+$/', $deliveryFee) && $deliveryFee >= 0) { |
| 449 |
|
$ProductClass->setDeliveryFee($deliveryFee); |
| 450 |
|
} else { |
| 451 |
|
$message = trans('csvimportcontroller.great_than_zero', ['%line%' => $line, '%name%' => $headerByKey['delivery_fee']]); |
| 452 |
|
$this->addErrors($message); |
| 453 |
|
} |
| 454 |
|
} |
| 455 |
|
} |
| 456 |
|
$Product->addProductClass($ProductClass); |
| 457 |
|
} |
| 458 |
|
} |