| @@ -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( | 
| @@ -336,10 +336,10 @@ | ||
| 336 | 336 | } | 
| 337 | 337 | } | 
| 338 | 338 |          } else { | 
| 339 | -            $filter = function ($v) { | |
| 339 | +            $filter = function($v) { | |
| 340 | 340 |                  return preg_match('/^ids\d+$/', $v); | 
| 341 | 341 | }; | 
| 342 | -            $map = function ($v) { | |
| 342 | +            $map = function($v) { | |
| 343 | 343 |                  return preg_replace('/[^\d+]/', '', $v); | 
| 344 | 344 | }; | 
| 345 | 345 | $keys = array_keys($request->query->all()); | 
| @@ -65,7 +65,7 @@ | ||
| 65 | 65 | * @param int|null|\Eccube\Entity\ProductClass $ProductClass 商品規格 | 
| 66 | 66 | * @param int|null|\Eccube\Entity\Master\Pref $Pref 都道府県 | 
| 67 | 67 | * @param int|null|\Eccube\Entity\Master\Country $Country 国 | 
| 68 | - * @return \Eccube\Entity\TaxRule 税設定情報 | |
| 68 | + * @return integer 税設定情報 | |
| 69 | 69 | * | 
| 70 | 70 | * @throws NoResultException | 
| 71 | 71 | */ | 
| @@ -32,7 +32,7 @@ | ||
| 32 | 32 | public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias) | 
| 33 | 33 |      { | 
| 34 | 34 |          if ($targetEntity->reflClass->getName() === 'Eccube\Entity\ProductClass') { | 
| 35 | - return $targetTableAlias . '.stock >= 1 OR ' . $targetTableAlias . '.stock_unlimited = 1'; | |
| 35 | + return $targetTableAlias.'.stock >= 1 OR '.$targetTableAlias.'.stock_unlimited = 1'; | |
| 36 | 36 |          } else { | 
| 37 | 37 | return ""; | 
| 38 | 38 | } | 
| @@ -33,12 +33,12 @@ | ||
| 33 | 33 |      { | 
| 34 | 34 | // 決済処理中/購入処理中を除く. | 
| 35 | 35 |          if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Order') { | 
| 36 | - return $targetTableAlias . '.status <> 7 AND ' . $targetTableAlias . '.status <> 8'; | |
| 36 | + return $targetTableAlias.'.status <> 7 AND '.$targetTableAlias.'.status <> 8'; | |
| 37 | 37 | } | 
| 38 | 38 | |
| 39 | 39 | // 決済処理中/購入処理中を除く. | 
| 40 | 40 |          if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Master\OrderStatus') { | 
| 41 | - return $targetTableAlias . '.id <> 7 AND ' . $targetTableAlias . '.id <> 8'; | |
| 41 | + return $targetTableAlias.'.id <> 7 AND '.$targetTableAlias.'.id <> 8'; | |
| 42 | 42 | } | 
| 43 | 43 | |
| 44 | 44 | return ''; | 
| @@ -46,7 +46,7 @@ | ||
| 46 | 46 | public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias) | 
| 47 | 47 |      { | 
| 48 | 48 |          if ($targetEntity->hasField('del_flg') && !in_array($targetEntity->getName(), $this->getExcludes())) { | 
| 49 | - return $targetTableAlias . '.del_flg = 0'; | |
| 49 | + return $targetTableAlias.'.del_flg = 0'; | |
| 50 | 50 |          } else { | 
| 51 | 51 | return ""; | 
| 52 | 52 | } | 
| @@ -148,7 +148,7 @@ | ||
| 148 | 148 | 'required' => false, | 
| 149 | 149 | 'value' => 1, | 
| 150 | 150 | )) | 
| 151 | -            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) { | |
| 151 | +            ->addEventListener(FormEvents::POST_SUBMIT, function($event) { | |
| 152 | 152 | $form = $event->getForm(); | 
| 153 | 153 | $data = $form->getData(); | 
| 154 | 154 | |
| @@ -62,10 +62,10 @@ | ||
| 62 | 62 | } | 
| 63 | 63 | |
| 64 | 64 |          if (empty($options['lastname_name'])) { | 
| 65 | - $options['lastname_name'] = $builder->getName() . '01'; | |
| 65 | + $options['lastname_name'] = $builder->getName().'01'; | |
| 66 | 66 | } | 
| 67 | 67 |          if (empty($options['firstname_name'])) { | 
| 68 | - $options['firstname_name'] = $builder->getName() . '02'; | |
| 68 | + $options['firstname_name'] = $builder->getName().'02'; | |
| 69 | 69 | } | 
| 70 | 70 | |
| 71 | 71 | $builder | 
| @@ -47,7 +47,7 @@ | ||
| 47 | 47 | $app = $this->app; | 
| 48 | 48 | |
| 49 | 49 | $builder | 
| 50 | -            ->addEventListener(FormEvents::POST_SET_DATA, function ($event) use ($app) { | |
| 50 | +            ->addEventListener(FormEvents::POST_SET_DATA, function($event) use ($app) { | |
| 51 | 51 | /** @var \Eccube\Entity\ShipmentItem $data */ | 
| 52 | 52 | $data = $event->getData(); | 
| 53 | 53 | /** @var \Symfony\Component\Form\Form $form */ | 
| @@ -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 | } | 
| @@ -100,14 +100,14 @@ discard block | ||
| 100 | 100 |          if (isset($searchData['name']) && Str::isNotBlank($searchData['name'])) { | 
| 101 | 101 | $qb | 
| 102 | 102 |                  ->andWhere('CONCAT(o.name01, o.name02) LIKE :name') | 
| 103 | -                ->setParameter('name', '%' . $searchData['name'] . '%'); | |
| 103 | +                ->setParameter('name', '%'.$searchData['name'].'%'); | |
| 104 | 104 | } | 
| 105 | 105 | |
| 106 | 106 | // kana | 
| 107 | 107 |          if (isset($searchData['kana']) && Str::isNotBlank($searchData['kana'])) { | 
| 108 | 108 | $qb | 
| 109 | 109 |                  ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana') | 
| 110 | -                ->setParameter('kana', '%' . $searchData['kana'] . '%'); | |
| 110 | +                ->setParameter('kana', '%'.$searchData['kana'].'%'); | |
| 111 | 111 | } | 
| 112 | 112 | |
| 113 | 113 | |
| @@ -244,7 +244,7 @@ discard block | ||
| 244 | 244 | $qb | 
| 245 | 245 |                  ->leftJoin('o.OrderDetails', 'od') | 
| 246 | 246 |                  ->andWhere('od.product_name LIKE :buy_product_name') | 
| 247 | -                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%'); | |
| 247 | +                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%'); | |
| 248 | 248 | } | 
| 249 | 249 | |
| 250 | 250 | // Order By | 
| @@ -270,13 +270,13 @@ discard block | ||
| 270 | 270 |                  ->setParameter('order_id_start', $searchData['order_id_start']); | 
| 271 | 271 | } | 
| 272 | 272 | // multi | 
| 273 | -        if (isset( $searchData['multi']) && Str::isNotBlank($searchData['multi'])) { | |
| 273 | +        if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) { | |
| 274 | 274 |              $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null; | 
| 275 | 275 | $qb | 
| 276 | -                ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' . | |
| 276 | +                ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '. | |
| 277 | 277 | 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti') | 
| 278 | 278 |                  ->setParameter('multi', $multi) | 
| 279 | -                ->setParameter('likemulti', '%' . $searchData['multi'] . '%'); | |
| 279 | +                ->setParameter('likemulti', '%'.$searchData['multi'].'%'); | |
| 280 | 280 | } | 
| 281 | 281 | |
| 282 | 282 | // order_id_end | 
| @@ -313,28 +313,28 @@ discard block | ||
| 313 | 313 |          if (isset($searchData['name']) && Str::isNotBlank($searchData['name'])) { | 
| 314 | 314 | $qb | 
| 315 | 315 |                  ->andWhere('CONCAT(o.name01, o.name02) LIKE :name') | 
| 316 | -                ->setParameter('name', '%' . $searchData['name'] . '%'); | |
| 316 | +                ->setParameter('name', '%'.$searchData['name'].'%'); | |
| 317 | 317 | } | 
| 318 | 318 | |
| 319 | 319 | // kana | 
| 320 | 320 |          if (isset($searchData['kana']) && Str::isNotBlank($searchData['kana'])) { | 
| 321 | 321 | $qb | 
| 322 | 322 |                  ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana') | 
| 323 | -                ->setParameter('kana', '%' . $searchData['kana'] . '%'); | |
| 323 | +                ->setParameter('kana', '%'.$searchData['kana'].'%'); | |
| 324 | 324 | } | 
| 325 | 325 | |
| 326 | 326 | |
| 327 | 327 |          if (isset($searchData['email']) && Str::isNotBlank($searchData['email'])) { | 
| 328 | 328 | $qb | 
| 329 | 329 |                  ->andWhere('o.email like :email') | 
| 330 | -                ->setParameter('email', '%' . $searchData['email'] . '%'); | |
| 330 | +                ->setParameter('email', '%'.$searchData['email'].'%'); | |
| 331 | 331 | } | 
| 332 | 332 | |
| 333 | 333 | // tel | 
| 334 | 334 |          if (isset($searchData['tel']) && Str::isNotBlank($searchData['tel'])) { | 
| 335 | 335 | $qb | 
| 336 | 336 |                  ->andWhere('CONCAT(o.tel01, o.tel02, o.tel03) LIKE :tel') | 
| 337 | -                ->setParameter('tel', '%' . $searchData['tel'] . '%'); | |
| 337 | +                ->setParameter('tel', '%'.$searchData['tel'].'%'); | |
| 338 | 338 | } | 
| 339 | 339 | |
| 340 | 340 | // sex | 
| @@ -446,7 +446,7 @@ discard block | ||
| 446 | 446 | $qb | 
| 447 | 447 |                  ->leftJoin('o.OrderDetails', 'od') | 
| 448 | 448 |                  ->andWhere('od.product_name LIKE :buy_product_name') | 
| 449 | -                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%'); | |
| 449 | +                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%'); | |
| 450 | 450 | } | 
| 451 | 451 | |
| 452 | 452 | // Order By |