@@ -274,22 +274,22 @@ |
||
274 | 274 | ]; |
275 | 275 | if($class_category_id2) |
276 | 276 | { |
277 | - $class_categories[$class_category_id1]['#'.$class_category_id2] = [ |
|
278 | - 'classcategory_id2' => $class_category_id2, |
|
279 | - 'name' => $class_category_name2, |
|
280 | - 'stock_find' => $ProductClass->getStockFind(), |
|
281 | - 'price01' => $ProductClass->getPrice01() === null ? '' : number_format($ProductClass->getPrice01()), |
|
282 | - 'price02' => number_format($ProductClass->getPrice02()), |
|
283 | - 'price01_inc_tax' => $ProductClass->getPrice01() === null ? '' : number_format($ProductClass->getPrice01IncTax()), |
|
284 | - 'price02_inc_tax' => number_format($ProductClass->getPrice02IncTax()), |
|
285 | - 'price01_with_currency' => $ProductClass->getPrice01() === null ? '' : $this->getPriceFilter($ProductClass->getPrice01()), |
|
286 | - 'price02_with_currency' => $this->getPriceFilter($ProductClass->getPrice02()), |
|
287 | - 'price01_inc_tax_with_currency' => $ProductClass->getPrice01() === null ? '' : $this->getPriceFilter($ProductClass->getPrice01IncTax()), |
|
288 | - 'price02_inc_tax_with_currency' => $this->getPriceFilter($ProductClass->getPrice02IncTax()), |
|
289 | - 'product_class_id' => (string) $ProductClass->getId(), |
|
290 | - 'product_code' => $ProductClass->getCode() === null ? '' : $ProductClass->getCode(), |
|
291 | - 'sale_type' => (string) $ProductClass->getSaleType()->getId(), |
|
292 | - ]; |
|
277 | + $class_categories[$class_category_id1]['#'.$class_category_id2] = [ |
|
278 | + 'classcategory_id2' => $class_category_id2, |
|
279 | + 'name' => $class_category_name2, |
|
280 | + 'stock_find' => $ProductClass->getStockFind(), |
|
281 | + 'price01' => $ProductClass->getPrice01() === null ? '' : number_format($ProductClass->getPrice01()), |
|
282 | + 'price02' => number_format($ProductClass->getPrice02()), |
|
283 | + 'price01_inc_tax' => $ProductClass->getPrice01() === null ? '' : number_format($ProductClass->getPrice01IncTax()), |
|
284 | + 'price02_inc_tax' => number_format($ProductClass->getPrice02IncTax()), |
|
285 | + 'price01_with_currency' => $ProductClass->getPrice01() === null ? '' : $this->getPriceFilter($ProductClass->getPrice01()), |
|
286 | + 'price02_with_currency' => $this->getPriceFilter($ProductClass->getPrice02()), |
|
287 | + 'price01_inc_tax_with_currency' => $ProductClass->getPrice01() === null ? '' : $this->getPriceFilter($ProductClass->getPrice01IncTax()), |
|
288 | + 'price02_inc_tax_with_currency' => $this->getPriceFilter($ProductClass->getPrice02IncTax()), |
|
289 | + 'product_class_id' => (string) $ProductClass->getId(), |
|
290 | + 'product_code' => $ProductClass->getCode() === null ? '' : $ProductClass->getCode(), |
|
291 | + 'sale_type' => (string) $ProductClass->getSaleType()->getId(), |
|
292 | + ]; |
|
293 | 293 | } |
294 | 294 | } |
295 | 295 |
@@ -272,7 +272,7 @@ |
||
272 | 272 | 'name' => trans('common.select'), |
273 | 273 | 'product_class_id' => '', |
274 | 274 | ]; |
275 | - if($class_category_id2) |
|
275 | + if ($class_category_id2) |
|
276 | 276 | { |
277 | 277 | $class_categories[$class_category_id1]['#'.$class_category_id2] = [ |
278 | 278 | 'classcategory_id2' => $class_category_id2, |