@@ -25,11 +25,6 @@ |
||
| 25 | 25 | |
| 26 | 26 | use Eccube\Application\ApplicationTrait; |
| 27 | 27 | use Eccube\Common\Constant; |
| 28 | -use Monolog\Formatter\LineFormatter; |
|
| 29 | -use Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy; |
|
| 30 | -use Monolog\Handler\FingersCrossedHandler; |
|
| 31 | -use Monolog\Handler\RotatingFileHandler; |
|
| 32 | -use Monolog\Logger; |
|
| 33 | 28 | use Symfony\Component\EventDispatcher\EventDispatcher; |
| 34 | 29 | use Symfony\Component\Finder\Finder; |
| 35 | 30 | use Symfony\Component\HttpFoundation\Request; |
@@ -24,7 +24,6 @@ |
||
| 24 | 24 | |
| 25 | 25 | namespace Eccube\Command; |
| 26 | 26 | |
| 27 | -use Symfony\Component\Console\Input\InputArgument; |
|
| 28 | 27 | use Symfony\Component\Console\Input\InputInterface; |
| 29 | 28 | use Symfony\Component\Console\Output\OutputInterface; |
| 30 | 29 | use Symfony\Component\Console\Input\InputOption; |
@@ -198,6 +198,9 @@ discard block |
||
| 198 | 198 | return $orderArray; |
| 199 | 199 | } |
| 200 | 200 | |
| 201 | + /** |
|
| 202 | + * @param \DateTime $dateTime |
|
| 203 | + */ |
|
| 201 | 204 | protected function getSalesByMonth($em, $dateTime, array $excludes) |
| 202 | 205 | { |
| 203 | 206 | // concat... for pgsql |
@@ -229,6 +232,9 @@ discard block |
||
| 229 | 232 | return $result; |
| 230 | 233 | } |
| 231 | 234 | |
| 235 | + /** |
|
| 236 | + * @param \DateTime $dateTime |
|
| 237 | + */ |
|
| 232 | 238 | protected function getSalesByDay($em, $dateTime, array $excludes) |
| 233 | 239 | { |
| 234 | 240 | // concat... for pgsql |
@@ -23,7 +23,6 @@ |
||
| 23 | 23 | |
| 24 | 24 | namespace Eccube\Controller\Admin\Setting\System; |
| 25 | 25 | |
| 26 | -use Doctrine\Common\Util\Debug; |
|
| 27 | 26 | use Eccube\Application; |
| 28 | 27 | use Eccube\Controller\AbstractController; |
| 29 | 28 | use Symfony\Component\HttpFoundation\Request; |
@@ -230,6 +230,10 @@ discard block |
||
| 230 | 230 | return $str; |
| 231 | 231 | } |
| 232 | 232 | |
| 233 | + /** |
|
| 234 | + * @param string $topDir |
|
| 235 | + * @param Request $request |
|
| 236 | + */ |
|
| 233 | 237 | private function getTree($topDir, $request) |
| 234 | 238 | { |
| 235 | 239 | $finder = Finder::create()->in($topDir) |
@@ -267,6 +271,10 @@ discard block |
||
| 267 | 271 | return $tree; |
| 268 | 272 | } |
| 269 | 273 | |
| 274 | + /** |
|
| 275 | + * @param Application $app |
|
| 276 | + * @param string $nowDir |
|
| 277 | + */ |
|
| 270 | 278 | private function getFileList($app, $nowDir) |
| 271 | 279 | { |
| 272 | 280 | $topDir = $app['config']['user_data_realdir']; |
@@ -326,6 +334,9 @@ discard block |
||
| 326 | 334 | return (strpos($targetDir, $topDir) === 0); |
| 327 | 335 | } |
| 328 | 336 | |
| 337 | + /** |
|
| 338 | + * @return string |
|
| 339 | + */ |
|
| 329 | 340 | private function convertStrFromServer($target) |
| 330 | 341 | { |
| 331 | 342 | if ($this->encode == self::SJIS) { |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | /** |
| 378 | 378 | * フォームからの入直内容に基づいて、受注情報の再計算を行う |
| 379 | 379 | * |
| 380 | - * @param $app |
|
| 380 | + * @param Application $app |
|
| 381 | 381 | * @param $Order |
| 382 | 382 | */ |
| 383 | 383 | protected function calculate($app, \Eccube\Entity\Order $Order) |
@@ -471,7 +471,7 @@ discard block |
||
| 471 | 471 | * - 受注ステータスが入金済に設定された場合に入金日を更新 |
| 472 | 472 | * |
| 473 | 473 | * |
| 474 | - * @param $app |
|
| 474 | + * @param Application $app |
|
| 475 | 475 | * @param $TargetOrder |
| 476 | 476 | * @param $OriginOrder |
| 477 | 477 | */ |
@@ -259,6 +259,9 @@ |
||
| 259 | 259 | } |
| 260 | 260 | |
| 261 | 261 | |
| 262 | + /** |
|
| 263 | + * @param Application $app |
|
| 264 | + */ |
|
| 262 | 265 | private function createBody($app, $header, $footer, $Order) |
| 263 | 266 | { |
| 264 | 267 | return $app->renderView('Mail/order.twig', array( |
@@ -583,6 +583,8 @@ discard block |
||
| 583 | 583 | /** |
| 584 | 584 | * 登録、更新時のエラー画面表示 |
| 585 | 585 | * |
| 586 | + * @param Application $app |
|
| 587 | + * @param string $twig |
|
| 586 | 588 | */ |
| 587 | 589 | protected function render($app, $form, $headers, $twig) |
| 588 | 590 | { |
@@ -615,6 +617,7 @@ discard block |
||
| 615 | 617 | * アップロードされたCSVファイルの行ごとの処理 |
| 616 | 618 | * |
| 617 | 619 | * @param $formFile |
| 620 | + * @param Application $app |
|
| 618 | 621 | * @return CsvImportService |
| 619 | 622 | */ |
| 620 | 623 | protected function getImportData($app, $formFile) |
@@ -682,6 +685,8 @@ discard block |
||
| 682 | 685 | |
| 683 | 686 | /** |
| 684 | 687 | * 商品カテゴリの削除、登録 |
| 688 | + * @param Application $app |
|
| 689 | + * @param CsvImportService $data |
|
| 685 | 690 | */ |
| 686 | 691 | protected function createProductCategory($row, Product $Product, $app, $data) |
| 687 | 692 | { |
@@ -725,6 +730,8 @@ discard block |
||
| 725 | 730 | |
| 726 | 731 | /** |
| 727 | 732 | * 商品規格分類1、商品規格分類2がnullとなる商品規格情報を作成 |
| 733 | + * @param Application $app |
|
| 734 | + * @param CsvImportService $data |
|
| 728 | 735 | */ |
| 729 | 736 | protected function createProductClass($row, Product $Product, $app, $data, $ClassCategory1 = null, $ClassCategory2 = null) |
| 730 | 737 | { |
@@ -866,6 +873,8 @@ discard block |
||
| 866 | 873 | |
| 867 | 874 | /** |
| 868 | 875 | * 商品規格情報を更新 |
| 876 | + * @param Application $app |
|
| 877 | + * @param CsvImportService $data |
|
| 869 | 878 | */ |
| 870 | 879 | protected function updateProductClass($row, Product $Product, ProductClass $ProductClass, $app, $data) |
| 871 | 880 | { |
@@ -1012,6 +1021,7 @@ discard block |
||
| 1012 | 1021 | /** |
| 1013 | 1022 | * 登録、更新時のエラー画面表示 |
| 1014 | 1023 | * |
| 1024 | + * @param string $message |
|
| 1015 | 1025 | */ |
| 1016 | 1026 | protected function addErrors($message) |
| 1017 | 1027 | { |
@@ -430,6 +430,9 @@ discard block |
||
| 430 | 430 | /** |
| 431 | 431 | * 登録、更新時のエラー画面表示 |
| 432 | 432 | * |
| 433 | + * @param Application $app |
|
| 434 | + * @param boolean $not_product_class |
|
| 435 | + * @param \Symfony\Component\Form\Form $classForm |
|
| 433 | 436 | */ |
| 434 | 437 | protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null) |
| 435 | 438 | { |
@@ -479,6 +482,7 @@ discard block |
||
| 479 | 482 | |
| 480 | 483 | /** |
| 481 | 484 | * 規格1と規格2を組み合わせた商品規格を作成 |
| 485 | + * @param Application $app |
|
| 482 | 486 | */ |
| 483 | 487 | private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null) |
| 484 | 488 | { |
@@ -566,6 +570,7 @@ discard block |
||
| 566 | 570 | * |
| 567 | 571 | * @param $productClassDest コピー先となる商品規格 |
| 568 | 572 | * @param $productClassOrig コピー元となる商品規格 |
| 573 | + * @param Application $app |
|
| 569 | 574 | */ |
| 570 | 575 | private function setDefualtProductClass($app, $productClassDest, $productClassOrig) { |
| 571 | 576 | $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate()); |
@@ -607,6 +612,7 @@ discard block |
||
| 607 | 612 | * 商品規格を登録 |
| 608 | 613 | * |
| 609 | 614 | * @param $ProductClasses 登録される商品規格 |
| 615 | + * @param Application $app |
|
| 610 | 616 | */ |
| 611 | 617 | private function insertProductClass($app, $Product, $ProductClasses) { |
| 612 | 618 | |
@@ -659,7 +665,6 @@ discard block |
||
| 659 | 665 | /** |
| 660 | 666 | * 規格の分類判定 |
| 661 | 667 | * |
| 662 | - * @param Eccube\Entity\ClassName $ClassesName |
|
| 663 | 668 | * @return boolean |
| 664 | 669 | */ |
| 665 | 670 | private function isValiedCategory($class_name) |
@@ -24,12 +24,10 @@ |
||
| 24 | 24 | |
| 25 | 25 | namespace Eccube\Controller\Admin\Product; |
| 26 | 26 | |
| 27 | -use Doctrine\ORM\EntityManagerInterface; |
|
| 28 | 27 | use Symfony\Component\Form\FormError; |
| 29 | 28 | use Symfony\Component\HttpFoundation\Request; |
| 30 | 29 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
| 31 | 30 | use Symfony\Component\Validator\Constraints as Assert; |
| 32 | - |
|
| 33 | 31 | use Eccube\Application; |
| 34 | 32 | use Eccube\Common\Constant; |
| 35 | 33 | use Eccube\Entity\ClassName; |
@@ -23,7 +23,6 @@ |
||
| 23 | 23 | |
| 24 | 24 | namespace Eccube\Controller\Admin\Setting\System; |
| 25 | 25 | |
| 26 | -use Doctrine\Common\Util\Debug; |
|
| 27 | 26 | use Eccube\Application; |
| 28 | 27 | use Eccube\Controller\AbstractController; |
| 29 | 28 | use Symfony\Component\HttpFoundation\Request; |