@@ -4,25 +4,17 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Doctrine\Common\Collections\ArrayCollection; |
| 6 | 6 | use Eccube\Application; |
| 7 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache; |
|
| 8 | 7 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
| 9 | 8 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; |
| 10 | 9 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
| 11 | 10 | use Symfony\Component\HttpFoundation\Request; |
| 12 | - |
|
| 13 | -use Eccube\Common\Constant; |
|
| 14 | -use Eccube\Controller\AbstractController; |
|
| 15 | 11 | use Eccube\Entity\Shipping; |
| 16 | -use Eccube\Entity\Master\CsvType; |
|
| 17 | 12 | use Eccube\Event\EccubeEvents; |
| 18 | 13 | use Eccube\Event\EventArgs; |
| 19 | -use Eccube\Form\Type\AddCartType; |
|
| 20 | -use Eccube\Form\Type\Admin\SearchOrderType; |
|
| 21 | 14 | use Eccube\Form\Type\Admin\ShippingType; |
| 22 | 15 | use Eccube\Form\Type\Admin\SearchCustomerType; |
| 23 | 16 | use Eccube\Form\Type\Admin\SearchProductType; |
| 24 | 17 | use Eccube\Form\Type\Admin\ShipmentItemType; |
| 25 | -use Symfony\Component\HttpFoundation\StreamedResponse; |
|
| 26 | 18 | |
| 27 | 19 | /** |
| 28 | 20 | * // FIXME UrlGenerator で {_admin} を認識しない問題あり |
@@ -35,7 +35,6 @@ |
||
| 35 | 35 | use Symfony\Component\Form\AbstractType; |
| 36 | 36 | use Symfony\Component\Form\Extension\Core\Type\CollectionType; |
| 37 | 37 | use Symfony\Component\Form\Extension\Core\Type\EmailType; |
| 38 | -use Symfony\Component\Form\Extension\Core\Type\FormType; |
|
| 39 | 38 | use Symfony\Component\Form\Extension\Core\Type\HiddenType; |
| 40 | 39 | use Symfony\Component\Form\Extension\Core\Type\MoneyType; |
| 41 | 40 | use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
@@ -45,10 +45,10 @@ |
||
| 45 | 45 | public function hasProductByName($productName) |
| 46 | 46 | { |
| 47 | 47 | $ShipmentItems = array_filter($this->getArrayCopy(), |
| 48 | - function ($ShipmentItem) use ($productName) { |
|
| 49 | - /* @var ShipmentItem $ShipmentItem */ |
|
| 50 | - return $ShipmentItem->getProductName() == $productName; |
|
| 51 | - }); |
|
| 48 | + function ($ShipmentItem) use ($productName) { |
|
| 49 | + /* @var ShipmentItem $ShipmentItem */ |
|
| 50 | + return $ShipmentItem->getProductName() == $productName; |
|
| 51 | + }); |
|
| 52 | 52 | return !empty($ShipmentItems); |
| 53 | 53 | } |
| 54 | 54 | // map, filter, reduce も実装したい |
@@ -274,7 +274,7 @@ |
||
| 274 | 274 | $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null; |
| 275 | 275 | $qb |
| 276 | 276 | ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' . |
| 277 | - 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') |
|
| 277 | + 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') |
|
| 278 | 278 | ->setParameter('multi', $multi) |
| 279 | 279 | ->setParameter('likemulti', '%' . $searchData['multi'] . '%'); |
| 280 | 280 | } |