@@ -6,10 +6,10 @@ |
||
| 6 | 6 | use Page\Admin\FileManagePage; |
| 7 | 7 | use Page\Admin\LayoutEditPage; |
| 8 | 8 | use Page\Admin\LayoutManagePage; |
| 9 | -use Page\Admin\NewsManagePage; |
|
| 10 | 9 | use Page\Admin\NewsEditPage; |
| 11 | -use Page\Admin\PageManagePage; |
|
| 10 | +use Page\Admin\NewsManagePage; |
|
| 12 | 11 | use Page\Admin\PageEditPage; |
| 12 | +use Page\Admin\PageManagePage; |
|
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | 15 | * @group admin |
@@ -2,14 +2,14 @@ |
||
| 2 | 2 | |
| 3 | 3 | use Codeception\Util\Fixtures; |
| 4 | 4 | use Page\Front\CartPage; |
| 5 | +use Page\Front\CustomerAddressAddPage; |
|
| 6 | +use Page\Front\MultipleShippingPage; |
|
| 5 | 7 | use Page\Front\ProductDetailPage; |
| 6 | 8 | use Page\Front\ShippingEditPage; |
| 7 | 9 | use Page\Front\ShoppingCompletePage; |
| 8 | 10 | use Page\Front\ShoppingConfirmPage; |
| 9 | 11 | use Page\Front\ShoppingLoginPage; |
| 10 | 12 | use Page\Front\ShoppingPage; |
| 11 | -use Page\Front\MultipleShippingPage; |
|
| 12 | -use Page\Front\CustomerAddressAddPage; |
|
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | 15 | * @group front |
@@ -461,11 +461,11 @@ discard block |
||
| 461 | 461 | |
| 462 | 462 | // 名前を比較してお届け先が上下どちらに表示されるか判断 |
| 463 | 463 | $compared = strnatcmp($customer->getName01(), $nameSei); |
| 464 | - if($compared === 0) { |
|
| 464 | + if ($compared === 0) { |
|
| 465 | 465 | $compared = strnatcmp($customer->getName02(), $nameMei); |
| 466 | 466 | } |
| 467 | 467 | // 上下それぞれで名前、商品個数を設定 |
| 468 | - if($compared < 0) { |
|
| 468 | + if ($compared < 0) { |
|
| 469 | 469 | $quantity1 = $shipping1_quantity; |
| 470 | 470 | $quantity2 = $shipping2_quantity; |
| 471 | 471 | $name1 = $customer->getName01(); |
@@ -666,11 +666,11 @@ discard block |
||
| 666 | 666 | |
| 667 | 667 | // 名前を比較してお届け先が上下どちらに表示されるか判断 |
| 668 | 668 | $compared = strnatcmp($customer->getName01(), $nameSei); |
| 669 | - if($compared === 0) { |
|
| 669 | + if ($compared === 0) { |
|
| 670 | 670 | $compared = strnatcmp($customer->getName02(), $nameMei); |
| 671 | 671 | } |
| 672 | 672 | // 上下それぞれで名前、商品個数を設定 |
| 673 | - if($compared < 0) { |
|
| 673 | + if ($compared < 0) { |
|
| 674 | 674 | $quantity1 = $shipping1_quantity; |
| 675 | 675 | $quantity2 = $shipping2_quantity; |
| 676 | 676 | $name1 = $customer->getName01(); |
@@ -826,11 +826,11 @@ discard block |
||
| 826 | 826 | |
| 827 | 827 | // 名前を比較してお届け先が上下どちらに表示されるか判断 |
| 828 | 828 | $compared = strnatcmp($customer->getName01(), $nameSei); |
| 829 | - if($compared === 0) { |
|
| 829 | + if ($compared === 0) { |
|
| 830 | 830 | $compared = strnatcmp($customer->getName02(), $nameMei); |
| 831 | 831 | } |
| 832 | 832 | // 上下それぞれで名前、商品個数を設定 |
| 833 | - if($compared < 0) { |
|
| 833 | + if ($compared < 0) { |
|
| 834 | 834 | $quantity1 = $shipping1_quantity; |
| 835 | 835 | $quantity2 = $shipping2_quantity; |
| 836 | 836 | $name1 = $customer->getName01(); |
@@ -14,22 +14,22 @@ |
||
| 14 | 14 | namespace Eccube\Controller\Admin\Content; |
| 15 | 15 | |
| 16 | 16 | use Eccube\Controller\AbstractController; |
| 17 | +use Eccube\Util\FilesystemUtil; |
|
| 18 | +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
| 17 | 19 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 18 | 20 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 19 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
| 21 | +use Symfony\Component\Filesystem\Exception\IOException; |
|
| 20 | 22 | use Symfony\Component\Filesystem\Filesystem; |
| 21 | 23 | use Symfony\Component\Finder\Finder; |
| 22 | 24 | use Symfony\Component\Form\Extension\Core\Type\FileType; |
| 23 | 25 | use Symfony\Component\Form\Extension\Core\Type\FormType; |
| 24 | 26 | use Symfony\Component\Form\Extension\Core\Type\TextType; |
| 25 | 27 | use Symfony\Component\HttpFoundation\BinaryFileResponse; |
| 28 | +use Symfony\Component\HttpFoundation\File\Exception\FileException; |
|
| 26 | 29 | use Symfony\Component\HttpFoundation\Request; |
| 27 | 30 | use Symfony\Component\HttpFoundation\ResponseHeaderBag; |
| 28 | 31 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
| 29 | -use Symfony\Component\HttpFoundation\File\Exception\FileException; |
|
| 30 | 32 | use Symfony\Component\Validator\Constraints as Assert; |
| 31 | -use Eccube\Util\FilesystemUtil; |
|
| 32 | -use Symfony\Component\Filesystem\Exception\IOException; |
|
| 33 | 33 | |
| 34 | 34 | class FileController extends AbstractController |
| 35 | 35 | { |
@@ -17,7 +17,14 @@ discard block |
||
| 17 | 17 | use Eccube\Common\Constant; |
| 18 | 18 | use Eccube\Controller\AbstractController; |
| 19 | 19 | use Eccube\Entity\BaseInfo; |
| 20 | +use Eccube\Entity\ExportCsvRow; |
|
| 20 | 21 | use Eccube\Entity\Master\CsvType; |
| 22 | +use Eccube\Entity\Master\ProductStatus; |
|
| 23 | +use Eccube\Entity\Product; |
|
| 24 | +use Eccube\Entity\ProductCategory; |
|
| 25 | +use Eccube\Entity\ProductClass; |
|
| 26 | +use Eccube\Entity\ProductImage; |
|
| 27 | +use Eccube\Entity\ProductStock; |
|
| 21 | 28 | use Eccube\Entity\ProductTag; |
| 22 | 29 | use Eccube\Event\EccubeEvents; |
| 23 | 30 | use Eccube\Event\EventArgs; |
@@ -32,28 +39,21 @@ discard block |
||
| 32 | 39 | use Eccube\Repository\TagRepository; |
| 33 | 40 | use Eccube\Repository\TaxRuleRepository; |
| 34 | 41 | use Eccube\Service\CsvExportService; |
| 42 | +use Eccube\Util\FormUtil; |
|
| 35 | 43 | use Knp\Component\Pager\Paginator; |
| 36 | 44 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
| 37 | 45 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; |
| 38 | 46 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 39 | 47 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 40 | -use Eccube\Util\FormUtil; |
|
| 41 | 48 | use Symfony\Component\Filesystem\Filesystem; |
| 42 | 49 | use Symfony\Component\HttpFoundation\File\File; |
| 43 | 50 | use Symfony\Component\HttpFoundation\JsonResponse; |
| 51 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
| 44 | 52 | use Symfony\Component\HttpFoundation\Request; |
| 45 | 53 | use Symfony\Component\HttpFoundation\StreamedResponse; |
| 46 | 54 | use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; |
| 47 | 55 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
| 48 | 56 | use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException; |
| 49 | -use Eccube\Entity\Product; |
|
| 50 | -use Eccube\Entity\ProductClass; |
|
| 51 | -use Eccube\Entity\Master\ProductStatus; |
|
| 52 | -use Eccube\Entity\ProductStock; |
|
| 53 | -use Eccube\Entity\ProductImage; |
|
| 54 | -use Eccube\Entity\ProductCategory; |
|
| 55 | -use Eccube\Entity\ExportCsvRow; |
|
| 56 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
| 57 | 57 | |
| 58 | 58 | class ProductController extends AbstractController |
| 59 | 59 | { |
@@ -26,11 +26,11 @@ |
||
| 26 | 26 | use Eccube\Repository\Master\OrderItemTypeRepository; |
| 27 | 27 | use Eccube\Repository\Master\PrefRepository; |
| 28 | 28 | use Eccube\Repository\OrderRepository; |
| 29 | +use Eccube\Service\CartService; |
|
| 30 | +use Eccube\Service\OrderHelper; |
|
| 29 | 31 | use Eccube\Service\PurchaseFlow\PurchaseContext; |
| 30 | 32 | use Eccube\Service\PurchaseFlow\PurchaseFlow; |
| 31 | 33 | use Eccube\Service\ShoppingService; |
| 32 | -use Eccube\Service\CartService; |
|
| 33 | -use Eccube\Service\OrderHelper; |
|
| 34 | 34 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 35 | 35 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 36 | 36 | use Symfony\Component\Form\Extension\Core\Type\CollectionType; |
@@ -438,6 +438,9 @@ |
||
| 438 | 438 | return $user; |
| 439 | 439 | } |
| 440 | 440 | |
| 441 | + /** |
|
| 442 | + * @param string $allocatedId |
|
| 443 | + */ |
|
| 441 | 444 | protected function createCartKey($allocatedId, Customer $Customer = null) |
| 442 | 445 | { |
| 443 | 446 | if ($Customer instanceof Customer) { |
@@ -13,6 +13,7 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | namespace Eccube\Service; |
| 15 | 15 | |
| 16 | +use Doctrine\ORM\EntityManagerInterface; |
|
| 16 | 17 | use Doctrine\ORM\UnitOfWork; |
| 17 | 18 | use Eccube\Entity\Cart; |
| 18 | 19 | use Eccube\Entity\CartItem; |
@@ -20,15 +21,14 @@ discard block |
||
| 20 | 21 | use Eccube\Entity\ItemHolderInterface; |
| 21 | 22 | use Eccube\Entity\ProductClass; |
| 22 | 23 | use Eccube\Repository\CartRepository; |
| 23 | -use Eccube\Repository\ProductClassRepository; |
|
| 24 | 24 | use Eccube\Repository\OrderRepository; |
| 25 | +use Eccube\Repository\ProductClassRepository; |
|
| 25 | 26 | use Eccube\Service\Cart\CartItemAllocator; |
| 26 | 27 | use Eccube\Service\Cart\CartItemComparator; |
| 27 | 28 | use Eccube\Util\StringUtil; |
| 28 | 29 | use Symfony\Component\HttpFoundation\Session\SessionInterface; |
| 29 | 30 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
| 30 | 31 | use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; |
| 31 | -use Doctrine\ORM\EntityManagerInterface; |
|
| 32 | 32 | |
| 33 | 33 | class CartService |
| 34 | 34 | { |
@@ -16,7 +16,10 @@ discard block |
||
| 16 | 16 | use Doctrine\Common\Collections\ArrayCollection; |
| 17 | 17 | use Doctrine\Common\Util\ClassUtils; |
| 18 | 18 | use Doctrine\ORM\EntityManagerInterface; |
| 19 | +use Doctrine\ORM\QueryBuilder; |
|
| 19 | 20 | use Eccube\Common\EccubeConfig; |
| 21 | +use Eccube\Entity\Csv; |
|
| 22 | +use Eccube\Entity\Master\CsvType; |
|
| 20 | 23 | use Eccube\Form\Type\Admin\SearchProductType; |
| 21 | 24 | use Eccube\Form\Type\Admin\SearchShippingType; |
| 22 | 25 | use Eccube\Repository\CsvRepository; |
@@ -29,9 +32,6 @@ discard block |
||
| 29 | 32 | use Eccube\Util\FormUtil; |
| 30 | 33 | use Symfony\Component\Form\FormFactoryInterface; |
| 31 | 34 | use Symfony\Component\HttpFoundation\Request; |
| 32 | -use Doctrine\ORM\QueryBuilder; |
|
| 33 | -use Eccube\Entity\Master\CsvType; |
|
| 34 | -use Eccube\Entity\Csv; |
|
| 35 | 35 | |
| 36 | 36 | class CsvExportService |
| 37 | 37 | { |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | * @param string $path path to tar.gz/zip plugin file |
| 148 | 148 | * @param int $source |
| 149 | 149 | * |
| 150 | - * @return mixed |
|
| 150 | + * @return boolean |
|
| 151 | 151 | * |
| 152 | 152 | * @throws PluginException |
| 153 | 153 | * @throws \Exception |
@@ -274,8 +274,8 @@ discard block |
||
| 274 | 274 | } |
| 275 | 275 | |
| 276 | 276 | /** |
| 277 | - * @param $archive |
|
| 278 | - * @param $dir |
|
| 277 | + * @param string $archive |
|
| 278 | + * @param string $dir |
|
| 279 | 279 | * |
| 280 | 280 | * @throws PluginException |
| 281 | 281 | */ |
@@ -344,6 +344,9 @@ discard block |
||
| 344 | 344 | } |
| 345 | 345 | } |
| 346 | 346 | |
| 347 | + /** |
|
| 348 | + * @param string $yml |
|
| 349 | + */ |
|
| 347 | 350 | public function readYml($yml) |
| 348 | 351 | { |
| 349 | 352 | if (file_exists($yml)) { |
@@ -361,6 +364,9 @@ discard block |
||
| 361 | 364 | // ディレクトリ名などに使われれるので厳しめ |
| 362 | 365 | } |
| 363 | 366 | |
| 367 | + /** |
|
| 368 | + * @param string $path |
|
| 369 | + */ |
|
| 364 | 370 | public function deleteFile($path) |
| 365 | 371 | { |
| 366 | 372 | $f = new Filesystem(); |
@@ -381,7 +387,7 @@ discard block |
||
| 381 | 387 | } |
| 382 | 388 | |
| 383 | 389 | /** |
| 384 | - * @param $d |
|
| 390 | + * @param string $d |
|
| 385 | 391 | * |
| 386 | 392 | * @throws PluginException |
| 387 | 393 | */ |
@@ -456,7 +462,7 @@ discard block |
||
| 456 | 462 | |
| 457 | 463 | /** |
| 458 | 464 | * @param $meta |
| 459 | - * @param $method |
|
| 465 | + * @param string $method |
|
| 460 | 466 | */ |
| 461 | 467 | public function callPluginManagerMethod($meta, $method) |
| 462 | 468 | { |
@@ -997,7 +1003,7 @@ discard block |
||
| 997 | 1003 | * [プラグインコード]/Resource/assets |
| 998 | 1004 | * 配下に置かれているファイルが所定の位置へコピーされる |
| 999 | 1005 | * |
| 1000 | - * @param $pluginBaseDir |
|
| 1006 | + * @param string $pluginBaseDir |
|
| 1001 | 1007 | * @param $pluginCode |
| 1002 | 1008 | */ |
| 1003 | 1009 | public function copyAssets($pluginBaseDir, $pluginCode) |
@@ -1033,7 +1039,7 @@ discard block |
||
| 1033 | 1039 | * @param string $pluginVersion |
| 1034 | 1040 | * @param string $remoteVersion |
| 1035 | 1041 | * |
| 1036 | - * @return mixed |
|
| 1042 | + * @return boolean |
|
| 1037 | 1043 | */ |
| 1038 | 1044 | public function isUpdate($pluginVersion, $remoteVersion) |
| 1039 | 1045 | { |