@@ -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 |
@@ -24,7 +24,6 @@ |
||
| 24 | 24 | |
| 25 | 25 | namespace Eccube\Controller\Admin; |
| 26 | 26 | |
| 27 | -use Doctrine\Common\Util\Debug; |
|
| 28 | 27 | use Doctrine\ORM\NoResultException; |
| 29 | 28 | use Doctrine\ORM\Query\ResultSetMapping; |
| 30 | 29 | use Eccube\Application; |
@@ -27,7 +27,6 @@ |
||
| 27 | 27 | use Eccube\Application; |
| 28 | 28 | use Eccube\Controller\AbstractController; |
| 29 | 29 | use Eccube\Entity\Master\DeviceType; |
| 30 | -use Symfony\Component\Finder\Finder; |
|
| 31 | 30 | use Symfony\Component\Filesystem\Filesystem; |
| 32 | 31 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
| 33 | 32 | |
@@ -218,6 +218,10 @@ discard block |
||
| 218 | 218 | return $str; |
| 219 | 219 | } |
| 220 | 220 | |
| 221 | + /** |
|
| 222 | + * @param string $topDir |
|
| 223 | + * @param Request $request |
|
| 224 | + */ |
|
| 221 | 225 | private function getTree($topDir, $request) |
| 222 | 226 | { |
| 223 | 227 | $finder = Finder::create()->in($topDir) |
@@ -255,6 +259,10 @@ discard block |
||
| 255 | 259 | return $tree; |
| 256 | 260 | } |
| 257 | 261 | |
| 262 | + /** |
|
| 263 | + * @param Application $app |
|
| 264 | + * @param string $nowDir |
|
| 265 | + */ |
|
| 258 | 266 | private function getFileList($app, $nowDir) |
| 259 | 267 | { |
| 260 | 268 | $topDir = $app['config']['user_data_realdir']; |
@@ -23,7 +23,6 @@ |
||
| 23 | 23 | |
| 24 | 24 | namespace Eccube\Controller\Admin\Customer; |
| 25 | 25 | |
| 26 | -use Doctrine\Common\Util\Debug; |
|
| 27 | 26 | use Eccube\Application; |
| 28 | 27 | use Eccube\Controller\AbstractController; |
| 29 | 28 | use Eccube\Common\Constant; |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | /** |
| 369 | 369 | * フォームからの入直内容に基づいて、受注情報の再計算を行う |
| 370 | 370 | * |
| 371 | - * @param $app |
|
| 371 | + * @param Application $app |
|
| 372 | 372 | * @param $Order |
| 373 | 373 | */ |
| 374 | 374 | protected function calculate($app, \Eccube\Entity\Order $Order) |
@@ -462,7 +462,7 @@ discard block |
||
| 462 | 462 | * - 受注ステータスが入金済に設定された場合に入金日を更新 |
| 463 | 463 | * |
| 464 | 464 | * |
| 465 | - * @param $app |
|
| 465 | + * @param Application $app |
|
| 466 | 466 | * @param $TargetOrder |
| 467 | 467 | * @param $OriginOrder |
| 468 | 468 | */ |
@@ -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 | { |
@@ -857,6 +864,8 @@ discard block |
||
| 857 | 864 | |
| 858 | 865 | /** |
| 859 | 866 | * 商品規格情報を更新 |
| 867 | + * @param Application $app |
|
| 868 | + * @param CsvImportService $data |
|
| 860 | 869 | */ |
| 861 | 870 | protected function updateProductClass($row, Product $Product, ProductClass $ProductClass, $app, $data) |
| 862 | 871 | { |
@@ -1003,6 +1012,7 @@ discard block |
||
| 1003 | 1012 | /** |
| 1004 | 1013 | * 登録、更新時のエラー画面表示 |
| 1005 | 1014 | * |
| 1015 | + * @param string $message |
|
| 1006 | 1016 | */ |
| 1007 | 1017 | protected function addErrors($message) |
| 1008 | 1018 | { |
@@ -429,6 +429,9 @@ discard block |
||
| 429 | 429 | /** |
| 430 | 430 | * 登録、更新時のエラー画面表示 |
| 431 | 431 | * |
| 432 | + * @param Application $app |
|
| 433 | + * @param boolean $not_product_class |
|
| 434 | + * @param \Symfony\Component\Form\Form $classForm |
|
| 432 | 435 | */ |
| 433 | 436 | protected function render($app, $Product, $ProductClass, $not_product_class, $classForm, $error = null) |
| 434 | 437 | { |
@@ -477,6 +480,7 @@ discard block |
||
| 477 | 480 | |
| 478 | 481 | /** |
| 479 | 482 | * 規格1と規格2を組み合わせた商品規格を作成 |
| 483 | + * @param Application $app |
|
| 480 | 484 | */ |
| 481 | 485 | private function createProductClasses($app, Product $Product, ClassName $ClassName1 = null, ClassName $ClassName2 = null) |
| 482 | 486 | { |
@@ -564,6 +568,7 @@ discard block |
||
| 564 | 568 | * |
| 565 | 569 | * @param $productClassDest コピー先となる商品規格 |
| 566 | 570 | * @param $productClassOrig コピー元となる商品規格 |
| 571 | + * @param Application $app |
|
| 567 | 572 | */ |
| 568 | 573 | private function setDefualtProductClass($app, $productClassDest, $productClassOrig) { |
| 569 | 574 | $productClassDest->setDeliveryDate($productClassOrig->getDeliveryDate()); |
@@ -605,6 +610,7 @@ discard block |
||
| 605 | 610 | * 商品規格を登録 |
| 606 | 611 | * |
| 607 | 612 | * @param $ProductClasses 登録される商品規格 |
| 613 | + * @param Application $app |
|
| 608 | 614 | */ |
| 609 | 615 | private function insertProductClass($app, $Product, $ProductClasses) { |
| 610 | 616 | |
@@ -657,7 +663,6 @@ discard block |
||
| 657 | 663 | /** |
| 658 | 664 | * 規格の分類判定 |
| 659 | 665 | * |
| 660 | - * @param Eccube\Entity\ClassName $ClassesName |
|
| 661 | 666 | * @return boolean |
| 662 | 667 | */ |
| 663 | 668 | 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; |