@@ -48,6 +48,6 @@ |
||
48 | 48 | { |
49 | 49 | // $options = $this->eccubeConfig['doctrine_cache']; |
50 | 50 | // return $options['result_cache']['lifetime']; |
51 | - return 0; // FIXME |
|
51 | + return 0; // FIXME |
|
52 | 52 | } |
53 | 53 | } |
@@ -55,7 +55,7 @@ |
||
55 | 55 | $multi = preg_match('/^\d{0,10}$/', $searchData['multi']) ? $searchData['multi'] : null; |
56 | 56 | $qb |
57 | 57 | ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR '. |
58 | - 's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti') |
|
58 | + 's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti') |
|
59 | 59 | ->setParameter('multi', $multi) |
60 | 60 | ->setParameter('likemulti', '%'.$searchData['multi'].'%'); |
61 | 61 | } |
@@ -13,10 +13,10 @@ |
||
13 | 13 | |
14 | 14 | namespace Eccube\Repository; |
15 | 15 | |
16 | +use Doctrine\ORM\QueryBuilder; |
|
16 | 17 | use Eccube\Entity\Shipping; |
17 | 18 | use Eccube\Util\StringUtil; |
18 | 19 | use Symfony\Bridge\Doctrine\RegistryInterface; |
19 | -use Doctrine\ORM\QueryBuilder; |
|
20 | 20 | |
21 | 21 | /** |
22 | 22 | * ShippingRepository |
@@ -62,11 +62,11 @@ discard block |
||
62 | 62 | |
63 | 63 | $qb = $this->createQueryBuilder('e'); |
64 | 64 | $qb->andWhere("e.priority >= $range_end ") |
65 | - ->andWhere("e.priority <= $range_start ") |
|
66 | - ->andWhere('e.event = :event') |
|
67 | - ->setParameter('event', $event) |
|
68 | - ->setMaxResults(1) |
|
69 | - ->orderBy('e.priority', 'ASC'); |
|
65 | + ->andWhere("e.priority <= $range_start ") |
|
66 | + ->andWhere('e.event = :event') |
|
67 | + ->setParameter('event', $event) |
|
68 | + ->setMaxResults(1) |
|
69 | + ->orderBy('e.priority', 'ASC'); |
|
70 | 70 | |
71 | 71 | $result = $qb->getQuery()->getResult(); |
72 | 72 | if (count($result)) { |
@@ -83,13 +83,13 @@ discard block |
||
83 | 83 | $qb = $this->createQueryBuilder('e'); |
84 | 84 | |
85 | 85 | $qb->andWhere("e.priority >= $range_end ") |
86 | - ->andWhere("e.priority <= $range_start ") |
|
87 | - ->andWhere('e.priority '.($up ? '>' : '<').' :pri') |
|
88 | - ->andWhere('e.event = :event') |
|
89 | - ->setParameter('event', $pluginEventHandler->getEvent()) |
|
90 | - ->setParameter('pri', $pluginEventHandler->getPriority()) |
|
91 | - ->setMaxResults(1) |
|
92 | - ->orderBy('e.priority', ($up ? 'ASC' : 'DESC')); |
|
86 | + ->andWhere("e.priority <= $range_start ") |
|
87 | + ->andWhere('e.priority '.($up ? '>' : '<').' :pri') |
|
88 | + ->andWhere('e.event = :event') |
|
89 | + ->setParameter('event', $pluginEventHandler->getEvent()) |
|
90 | + ->setParameter('pri', $pluginEventHandler->getPriority()) |
|
91 | + ->setMaxResults(1) |
|
92 | + ->orderBy('e.priority', ($up ? 'ASC' : 'DESC')); |
|
93 | 93 | |
94 | 94 | $result = $qb->getQuery()->getResult(); |
95 | 95 |
@@ -287,8 +287,8 @@ |
||
287 | 287 | $multi = preg_match('/^\d{0,10}$/', $searchData['multi']) ? $searchData['multi'] : null; |
288 | 288 | $qb |
289 | 289 | ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '. |
290 | - 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR '. |
|
291 | - 'o.order_code LIKE :likemulti') |
|
290 | + 'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR '. |
|
291 | + 'o.order_code LIKE :likemulti') |
|
292 | 292 | ->setParameter('multi', $multi) |
293 | 293 | ->setParameter('likemulti', '%'.$searchData['multi'].'%'); |
294 | 294 | } |
@@ -15,8 +15,8 @@ |
||
15 | 15 | |
16 | 16 | use Doctrine\ORM\QueryBuilder; |
17 | 17 | use Eccube\Doctrine\Query\Queries; |
18 | -use Eccube\Entity\Order; |
|
19 | 18 | use Eccube\Entity\Master\OrderStatus; |
19 | +use Eccube\Entity\Order; |
|
20 | 20 | use Eccube\Util\StringUtil; |
21 | 21 | use Symfony\Bridge\Doctrine\RegistryInterface; |
22 | 22 |
@@ -495,8 +495,8 @@ discard block |
||
495 | 495 | if ($flowResult->hasWarning()) { |
496 | 496 | foreach ($flowResult->getWarning() as $warning) { |
497 | 497 | $msg = $this->translator->trans('admin.order.index.bulk_warning', [ |
498 | - '%orderId%' => $Order->getId(), |
|
499 | - '%message%' => $warning->getMessage(), |
|
498 | + '%orderId%' => $Order->getId(), |
|
499 | + '%message%' => $warning->getMessage(), |
|
500 | 500 | ]); |
501 | 501 | $this->addWarning($msg, 'admin'); |
502 | 502 | } |
@@ -505,8 +505,8 @@ discard block |
||
505 | 505 | if ($flowResult->hasError()) { |
506 | 506 | foreach ($flowResult->getErrors() as $error) { |
507 | 507 | $msg = $this->translator->trans('admin.order.index.bulk_error', [ |
508 | - '%orderId%' => $Order->getId(), |
|
509 | - '%message%' => $error->getMessage(), |
|
508 | + '%orderId%' => $Order->getId(), |
|
509 | + '%message%' => $error->getMessage(), |
|
510 | 510 | ]); |
511 | 511 | $this->addError($msg, 'admin'); |
512 | 512 | } |
@@ -517,8 +517,8 @@ discard block |
||
517 | 517 | $this->purchaseFlow->purchase($Order, $purchaseContext); |
518 | 518 | } catch (PurchaseException $e) { |
519 | 519 | $msg = $this->translator->trans('admin.order.index.bulk_error', [ |
520 | - '%orderId%' => $Order->getId(), |
|
521 | - '%message%' => $e->getMessage(), |
|
520 | + '%orderId%' => $Order->getId(), |
|
521 | + '%message%' => $e->getMessage(), |
|
522 | 522 | ]); |
523 | 523 | $this->addError($msg, 'admin'); |
524 | 524 | continue; |
@@ -17,6 +17,8 @@ discard block |
||
17 | 17 | use Eccube\Controller\AbstractController; |
18 | 18 | use Eccube\Entity\Csv; |
19 | 19 | use Eccube\Entity\Master\CsvType; |
20 | +use Eccube\Entity\Master\OrderStatus; |
|
21 | +use Eccube\Entity\Order; |
|
20 | 22 | use Eccube\Entity\OrderItem; |
21 | 23 | use Eccube\Entity\Shipping; |
22 | 24 | use Eccube\Event\EccubeEvents; |
@@ -30,19 +32,17 @@ discard block |
||
30 | 32 | use Eccube\Repository\OrderRepository; |
31 | 33 | use Eccube\Repository\PaymentRepository; |
32 | 34 | use Eccube\Service\CsvExportService; |
35 | +use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
36 | +use Eccube\Service\PurchaseFlow\PurchaseException; |
|
37 | +use Eccube\Service\PurchaseFlow\PurchaseFlow; |
|
33 | 38 | use Eccube\Util\FormUtil; |
34 | 39 | use Knp\Component\Pager\PaginatorInterface; |
35 | 40 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
36 | 41 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
37 | 42 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
43 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
38 | 44 | use Symfony\Component\HttpFoundation\Request; |
39 | 45 | use Symfony\Component\HttpFoundation\StreamedResponse; |
40 | -use Eccube\Entity\Master\OrderStatus; |
|
41 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
42 | -use Eccube\Entity\Order; |
|
43 | -use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
44 | -use Eccube\Service\PurchaseFlow\PurchaseFlow; |
|
45 | -use Eccube\Service\PurchaseFlow\PurchaseException; |
|
46 | 46 | |
47 | 47 | class OrderController extends AbstractController |
48 | 48 | { |
@@ -189,13 +189,13 @@ |
||
189 | 189 | if ($form->get('notify_email')->getData()) { |
190 | 190 | try { |
191 | 191 | $this->mailService->sendShippingNotifyMail( |
192 | - $TargetShipping |
|
192 | + $TargetShipping |
|
193 | 193 | ); |
194 | 194 | } catch (\Exception $e) { |
195 | 195 | log_error('メール通知エラー', [$TargetShipping->getId(), $e]); |
196 | 196 | $this->addError( |
197 | - 'admin.shipping.edit.shipped_mail_failed', |
|
198 | - 'admin' |
|
197 | + 'admin.shipping.edit.shipped_mail_failed', |
|
198 | + 'admin' |
|
199 | 199 | ); |
200 | 200 | } |
201 | 201 | } |
@@ -24,6 +24,7 @@ discard block |
||
24 | 24 | use Eccube\Repository\Master\ShippingStatusRepository; |
25 | 25 | use Eccube\Repository\OrderItemRepository; |
26 | 26 | use Eccube\Repository\ShippingRepository; |
27 | +use Eccube\Service\MailService; |
|
27 | 28 | use Eccube\Service\TaxRuleService; |
28 | 29 | use Knp\Component\Pager\PaginatorInterface; |
29 | 30 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
@@ -32,7 +33,6 @@ discard block |
||
32 | 33 | use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; |
33 | 34 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
34 | 35 | use Symfony\Component\Serializer\SerializerInterface; |
35 | -use Eccube\Service\MailService; |
|
36 | 36 | |
37 | 37 | class EditController extends AbstractController |
38 | 38 | { |
@@ -502,7 +502,7 @@ |
||
502 | 502 | { |
503 | 503 | $curl = curl_init($url); |
504 | 504 | |
505 | - $options = [ // オプション配列 |
|
505 | + $options = [// オプション配列 |
|
506 | 506 | //HEADER |
507 | 507 | CURLOPT_HTTPHEADER => [ |
508 | 508 | 'Authorization: '.base64_encode($authKey), |
@@ -84,15 +84,15 @@ |
||
84 | 84 | $this->entityManager->flush(); |
85 | 85 | |
86 | 86 | $event = new EventArgs( |
87 | - [ |
|
87 | + [ |
|
88 | 88 | 'form' => $form, |
89 | 89 | 'BaseInfo' => $this->BaseInfo, |
90 | - ], |
|
91 | - $request |
|
90 | + ], |
|
91 | + $request |
|
92 | 92 | ); |
93 | 93 | $this->eventDispatcher->dispatch( |
94 | - EccubeEvents::ADMIN_SETTING_SHOP_SHOP_INDEX_COMPLETE, |
|
95 | - $event |
|
94 | + EccubeEvents::ADMIN_SETTING_SHOP_SHOP_INDEX_COMPLETE, |
|
95 | + $event |
|
96 | 96 | ); |
97 | 97 | |
98 | 98 | $cacheUtil->clearCache(); |
@@ -374,7 +374,7 @@ |
||
374 | 374 | |
375 | 375 | $findPlugins = Fixtures::get('findPlugins'); |
376 | 376 | $Plugins = $findPlugins(); |
377 | - if (is_array($Plugins) && count($Plugins) > 0 ) { |
|
377 | + if (is_array($Plugins) && count($Plugins) > 0) { |
|
378 | 378 | $I->getScenario()->skip('プラグインのアンインストールが必要なため、テストをスキップします'); |
379 | 379 | } |
380 | 380 |