@@ -348,7 +348,7 @@ |
||
348 | 348 | } |
349 | 349 | |
350 | 350 | /** |
351 | - * @return boolean |
|
351 | + * @return integer |
|
352 | 352 | */ |
353 | 353 | public function isVisible() |
354 | 354 | { |
@@ -161,6 +161,9 @@ |
||
161 | 161 | return empty($tables) ? false : true; |
162 | 162 | } |
163 | 163 | |
164 | + /** |
|
165 | + * @param string $pluginDir |
|
166 | + */ |
|
164 | 167 | protected function getPluginDirectories($pluginDir) |
165 | 168 | { |
166 | 169 | $finder = (new Finder()) |
@@ -32,11 +32,17 @@ |
||
32 | 32 | $this->message = $message; |
33 | 33 | } |
34 | 34 | |
35 | + /** |
|
36 | + * @param string $message |
|
37 | + */ |
|
35 | 38 | public static function warn($message) |
36 | 39 | { |
37 | 40 | return new self(self::WARNING, $message); |
38 | 41 | } |
39 | 42 | |
43 | + /** |
|
44 | + * @param string $message |
|
45 | + */ |
|
40 | 46 | public static function error($message) |
41 | 47 | { |
42 | 48 | return new self(self::ERROR, $message); |
@@ -33,19 +33,19 @@ |
||
33 | 33 | use Eccube\Repository\OrderRepository; |
34 | 34 | use Eccube\Repository\PaymentRepository; |
35 | 35 | use Eccube\Service\CsvExportService; |
36 | +use Eccube\Service\OrderStateMachine; |
|
36 | 37 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
37 | 38 | use Eccube\Service\PurchaseFlow\PurchaseException; |
38 | 39 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
39 | -use Eccube\Service\OrderStateMachine; |
|
40 | 40 | use Eccube\Util\FormUtil; |
41 | 41 | use Knp\Component\Pager\PaginatorInterface; |
42 | 42 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
43 | 43 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
44 | 44 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
45 | -use Symfony\Component\HttpFoundation\Response; |
|
45 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
46 | 46 | use Symfony\Component\HttpFoundation\Request; |
47 | +use Symfony\Component\HttpFoundation\Response; |
|
47 | 48 | use Symfony\Component\HttpFoundation\StreamedResponse; |
48 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
49 | 49 | use Symfony\Component\Validator\Constraints as Assert; |
50 | 50 | use Symfony\Component\Validator\Validator\ValidatorInterface; |
51 | 51 |
@@ -15,7 +15,6 @@ |
||
15 | 15 | |
16 | 16 | use Eccube\Common\Constant; |
17 | 17 | use Eccube\Controller\AbstractController; |
18 | -use Eccube\Entity\Master\ShippingStatus; |
|
19 | 18 | use Eccube\Entity\OrderItem; |
20 | 19 | use Eccube\Entity\Shipping; |
21 | 20 | use Eccube\Event\EccubeEvents; |
@@ -1323,7 +1323,7 @@ |
||
1323 | 1323 | * |
1324 | 1324 | * @param \Eccube\Entity\Shipping $Shipping |
1325 | 1325 | * |
1326 | - * @return Shipping |
|
1326 | + * @return Order |
|
1327 | 1327 | */ |
1328 | 1328 | public function addShipping(\Eccube\Entity\Shipping $Shipping) |
1329 | 1329 | { |
@@ -537,7 +537,7 @@ |
||
537 | 537 | /** |
538 | 538 | * ステータスごとの受注件数を取得する. |
539 | 539 | * |
540 | - * @param $OrderStatusOrId |
|
540 | + * @param integer $OrderStatusOrId |
|
541 | 541 | * |
542 | 542 | * @return int |
543 | 543 | * |