@@ -94,15 +94,15 @@ |
||
94 | 94 | $this->entityManager->flush(); |
95 | 95 | |
96 | 96 | $event = new EventArgs( |
97 | - [ |
|
97 | + [ |
|
98 | 98 | 'form' => $form, |
99 | 99 | 'BaseInfo' => $this->BaseInfo, |
100 | - ], |
|
101 | - $request |
|
100 | + ], |
|
101 | + $request |
|
102 | 102 | ); |
103 | 103 | $this->eventDispatcher->dispatch( |
104 | - EccubeEvents::ADMIN_SETTING_SHOP_SHOP_INDEX_COMPLETE, |
|
105 | - $event |
|
104 | + EccubeEvents::ADMIN_SETTING_SHOP_SHOP_INDEX_COMPLETE, |
|
105 | + $event |
|
106 | 106 | ); |
107 | 107 | |
108 | 108 | $cacheUtil->clearCache(); |
@@ -148,7 +148,7 @@ |
||
148 | 148 | $entity = new $entityName(); |
149 | 149 | $sortNo = 0; |
150 | 150 | $ids = array_map( |
151 | - function ($v) { |
|
151 | + function($v) { |
|
152 | 152 | return $v['id']; |
153 | 153 | }, |
154 | 154 | $data['data'] |
@@ -68,7 +68,7 @@ |
||
68 | 68 | $env = file_get_contents($envFile); |
69 | 69 | |
70 | 70 | $adminAllowHosts = \json_encode( |
71 | - array_filter(\explode("\n", StringUtil::convertLineFeed($data['admin_allow_hosts'])), function ($str) { |
|
71 | + array_filter(\explode("\n", StringUtil::convertLineFeed($data['admin_allow_hosts'])), function($str) { |
|
72 | 72 | return StringUtil::isNotBlank($str); |
73 | 73 | }) |
74 | 74 | ); |
@@ -108,7 +108,7 @@ |
||
108 | 108 | if ($Product->hasProductClass()) { |
109 | 109 | // 規格ありの商品は編集画面を表示する. |
110 | 110 | $ProductClasses = $Product->getProductClasses() |
111 | - ->filter(function ($pc) { |
|
111 | + ->filter(function($pc) { |
|
112 | 112 | return $pc->getClassCategory1() !== null; |
113 | 113 | }); |
114 | 114 |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | $em->getConfiguration()->setSQLLogger(null); |
289 | 289 | |
290 | 290 | $response = new StreamedResponse(); |
291 | - $response->setCallback(function () use ($request) { |
|
291 | + $response->setCallback(function() use ($request) { |
|
292 | 292 | // CSV種別を元に初期化. |
293 | 293 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_CATEGORY); |
294 | 294 | |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | |
302 | 302 | // データ行の出力. |
303 | 303 | $this->csvExportService->setExportQueryBuilder($qb); |
304 | - $this->csvExportService->exportData(function ($entity, $csvService) use ($request) { |
|
304 | + $this->csvExportService->exportData(function($entity, $csvService) use ($request) { |
|
305 | 305 | $Csvs = $csvService->getCsvs(); |
306 | 306 | |
307 | 307 | /** @var $Category \Eccube\Entity\Category */ |
@@ -178,13 +178,13 @@ |
||
178 | 178 | if ($form->get('notify_email')->getData()) { |
179 | 179 | try { |
180 | 180 | $this->mailService->sendShippingNotifyMail( |
181 | - $TargetShipping |
|
181 | + $TargetShipping |
|
182 | 182 | ); |
183 | 183 | } catch (\Exception $e) { |
184 | 184 | log_error('メール通知エラー', [$TargetShipping->getId(), $e]); |
185 | 185 | $this->addError( |
186 | - 'admin.shipping.edit.shipped_mail_failed', |
|
187 | - 'admin' |
|
186 | + 'admin.shipping.edit.shipped_mail_failed', |
|
187 | + 'admin' |
|
188 | 188 | ); |
189 | 189 | } |
190 | 190 | } |
@@ -505,8 +505,8 @@ discard block |
||
505 | 505 | if ($flowResult->hasWarning()) { |
506 | 506 | foreach ($flowResult->getWarning() as $warning) { |
507 | 507 | $msg = $this->translator->trans('admin.order.index.bulk_warning', [ |
508 | - '%orderId%' => $Order->getId(), |
|
509 | - '%message%' => $warning->getMessage(), |
|
508 | + '%orderId%' => $Order->getId(), |
|
509 | + '%message%' => $warning->getMessage(), |
|
510 | 510 | ]); |
511 | 511 | $this->addWarning($msg, 'admin'); |
512 | 512 | } |
@@ -515,8 +515,8 @@ discard block |
||
515 | 515 | if ($flowResult->hasError()) { |
516 | 516 | foreach ($flowResult->getErrors() as $error) { |
517 | 517 | $msg = $this->translator->trans('admin.order.index.bulk_error', [ |
518 | - '%orderId%' => $Order->getId(), |
|
519 | - '%message%' => $error->getMessage(), |
|
518 | + '%orderId%' => $Order->getId(), |
|
519 | + '%message%' => $error->getMessage(), |
|
520 | 520 | ]); |
521 | 521 | $this->addError($msg, 'admin'); |
522 | 522 | } |
@@ -527,8 +527,8 @@ discard block |
||
527 | 527 | $this->purchaseFlow->purchase($Order, $purchaseContext); |
528 | 528 | } catch (PurchaseException $e) { |
529 | 529 | $msg = $this->translator->trans('admin.order.index.bulk_error', [ |
530 | - '%orderId%' => $Order->getId(), |
|
531 | - '%message%' => $e->getMessage(), |
|
530 | + '%orderId%' => $Order->getId(), |
|
531 | + '%message%' => $e->getMessage(), |
|
532 | 532 | ]); |
533 | 533 | $this->addError($msg, 'admin'); |
534 | 534 | continue; |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | $em->getConfiguration()->setSQLLogger(null); |
320 | 320 | |
321 | 321 | $response = new StreamedResponse(); |
322 | - $response->setCallback(function () use ($request) { |
|
322 | + $response->setCallback(function() use ($request) { |
|
323 | 323 | // CSV種別を元に初期化. |
324 | 324 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_ORDER); |
325 | 325 | |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | |
333 | 333 | // データ行の出力. |
334 | 334 | $this->csvExportService->setExportQueryBuilder($qb); |
335 | - $this->csvExportService->exportData(function ($entity, $csvService) use ($request) { |
|
335 | + $this->csvExportService->exportData(function($entity, $csvService) use ($request) { |
|
336 | 336 | $Csvs = $csvService->getCsvs(); |
337 | 337 | |
338 | 338 | $Order = $entity; |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | $em->getConfiguration()->setSQLLogger(null); |
402 | 402 | |
403 | 403 | $response = new StreamedResponse(); |
404 | - $response->setCallback(function () use ($request) { |
|
404 | + $response->setCallback(function() use ($request) { |
|
405 | 405 | // CSV種別を元に初期化. |
406 | 406 | $this->csvExportService->initCsvType(CsvType::CSV_TYPE_SHIPPING); |
407 | 407 | |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | |
415 | 415 | // データ行の出力. |
416 | 416 | $this->csvExportService->setExportQueryBuilder($qb); |
417 | - $this->csvExportService->exportData(function ($entity, $csvService) use ($request) { |
|
417 | + $this->csvExportService->exportData(function($entity, $csvService) use ($request) { |
|
418 | 418 | /** @var Csv[] $Csvs */ |
419 | 419 | $Csvs = $csvService->getCsvs(); |
420 | 420 |
@@ -718,12 +718,12 @@ |
||
718 | 718 | $builder = $this->formFactory->createBuilder(OrderType::class, $Order); |
719 | 719 | |
720 | 720 | $event = new EventArgs( |
721 | - [ |
|
722 | - 'builder' => $builder, |
|
723 | - 'Order' => $Order, |
|
724 | - ], |
|
725 | - $request |
|
726 | - ); |
|
721 | + [ |
|
722 | + 'builder' => $builder, |
|
723 | + 'Order' => $Order, |
|
724 | + ], |
|
725 | + $request |
|
726 | + ); |
|
727 | 727 | $this->eventDispatcher->dispatch(EccubeEvents::FRONT_SHOPPING_INDEX_INITIALIZE, $event); |
728 | 728 | |
729 | 729 | $form = $builder->getForm(); |
@@ -877,7 +877,7 @@ |
||
877 | 877 | if ($dispatcher instanceof Response |
878 | 878 | && ($dispatcher->isRedirection() || $dispatcher->getContent()) |
879 | 879 | ) { // $paymentMethod->apply() が Response を返した場合は画面遷移 |
880 | - return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御? |
|
880 | + return $dispatcher; // 画面遷移したいパターンが複数ある場合はどうする? 引数で制御? |
|
881 | 881 | } |
882 | 882 | $PaymentResult = $paymentService->doCheckout($paymentMethod); // 決済実行 |
883 | 883 | if (!$PaymentResult->isSuccess()) { |
@@ -17,11 +17,11 @@ discard block |
||
17 | 17 | { |
18 | 18 | public function register(Container $app) |
19 | 19 | { |
20 | - $app['eccube.purchase.context'] = $app->protect(function (ItemHolderInterface $origin = null, Customer $user = null) { |
|
20 | + $app['eccube.purchase.context'] = $app->protect(function(ItemHolderInterface $origin = null, Customer $user = null) { |
|
21 | 21 | return new PurchaseContext($origin, $user); |
22 | 22 | }); |
23 | 23 | |
24 | - $app['eccube.purchase.flow.cart.item_processors'] = function (Container $app) { |
|
24 | + $app['eccube.purchase.flow.cart.item_processors'] = function(Container $app) { |
|
25 | 25 | $processors = new ArrayCollection(); |
26 | 26 | $processors[] = new Processor\DisplayStatusValidator(); |
27 | 27 | $processors[] = new Processor\SaleLimitValidator(); |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | return $processors; |
32 | 32 | }; |
33 | 33 | |
34 | - $app['eccube.purchase.flow.cart.holder_processors'] = function (Container $app) { |
|
34 | + $app['eccube.purchase.flow.cart.holder_processors'] = function(Container $app) { |
|
35 | 35 | $processors = new ArrayCollection(); |
36 | 36 | $processors[] = new Processor\PaymentProcessor($app[DeliveryRepository::class]); |
37 | 37 | $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']); |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | return $processors; |
42 | 42 | }; |
43 | 43 | |
44 | - $app['eccube.purchase.flow.cart'] = function (Container $app) { |
|
44 | + $app['eccube.purchase.flow.cart'] = function(Container $app) { |
|
45 | 45 | $flow = new PurchaseFlow(); |
46 | 46 | $flow->setItemProcessors($app['eccube.purchase.flow.cart.item_processors']); |
47 | 47 | $flow->setItemHolderProcessors($app['eccube.purchase.flow.cart.holder_processors']); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | return $flow; |
50 | 50 | }; |
51 | 51 | |
52 | - $app['eccube.purchase.flow.shopping.item_processors'] = function (Container $app) { |
|
52 | + $app['eccube.purchase.flow.shopping.item_processors'] = function(Container $app) { |
|
53 | 53 | $processors = new ArrayCollection(); |
54 | 54 | $processors[] = new Processor\StockValidator(); |
55 | 55 | $processors[] = new Processor\DisplayStatusValidator(); |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | return $processors; |
58 | 58 | }; |
59 | 59 | |
60 | - $app['eccube.purchase.flow.shopping.holder_processors'] = function (Container $app) { |
|
60 | + $app['eccube.purchase.flow.shopping.holder_processors'] = function(Container $app) { |
|
61 | 61 | $processors = new ArrayCollection(); |
62 | 62 | $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']); |
63 | 63 | $processors[] = new Processor\DeliveryFeeProcessor($app['orm.em']); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | return $processors; |
72 | 72 | }; |
73 | 73 | |
74 | - $app['eccube.purchase.flow.shopping.purchase'] = function (Container $app) { |
|
74 | + $app['eccube.purchase.flow.shopping.purchase'] = function(Container $app) { |
|
75 | 75 | $processors = new ArrayCollection(); |
76 | 76 | if ($app[BaseInfo::class]->isOptionPoint()) { |
77 | 77 | $processors[] = new Processor\UsePointToCustomerPurchaseProcessor(); |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | return $processors; |
82 | 82 | }; |
83 | 83 | |
84 | - $app['eccube.purchase.flow.shopping'] = function (Container $app) { |
|
84 | + $app['eccube.purchase.flow.shopping'] = function(Container $app) { |
|
85 | 85 | $flow = new PurchaseFlow(); |
86 | 86 | $flow->setItemProcessors($app['eccube.purchase.flow.shopping.item_processors']); |
87 | 87 | $flow->setItemHolderProcessors($app['eccube.purchase.flow.shopping.holder_processors']); |
@@ -90,14 +90,14 @@ discard block |
||
90 | 90 | return $flow; |
91 | 91 | }; |
92 | 92 | |
93 | - $app['eccube.purchase.flow.order.item_processors'] = function (Container $app) { |
|
93 | + $app['eccube.purchase.flow.order.item_processors'] = function(Container $app) { |
|
94 | 94 | $processors = new ArrayCollection(); |
95 | 95 | $processors[] = new Processor\StockValidator(); |
96 | 96 | |
97 | 97 | return $processors; |
98 | 98 | }; |
99 | 99 | |
100 | - $app['eccube.purchase.flow.order.holder_processors'] = function (Container $app) { |
|
100 | + $app['eccube.purchase.flow.order.holder_processors'] = function(Container $app) { |
|
101 | 101 | $processors = new ArrayCollection(); |
102 | 102 | $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']); |
103 | 103 | $processors[] = new Processor\UpdateDatePurchaseProcessor($app['config']); |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | return $processors; |
111 | 111 | }; |
112 | 112 | |
113 | - $app['eccube.purchase.flow.order.purchase'] = function (Container $app) { |
|
113 | + $app['eccube.purchase.flow.order.purchase'] = function(Container $app) { |
|
114 | 114 | $processors = new ArrayCollection(); |
115 | 115 | $processors[] = new Processor\AdminOrderRegisterPurchaseProcessor($app); |
116 | 116 | $processors[] = new Processor\OrderCodePurchaseProcessor($app['orm.em'], $app['config']['order_code']); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | return $processors; |
119 | 119 | }; |
120 | 120 | |
121 | - $app['eccube.purchase.flow.order'] = function (Container $app) { |
|
121 | + $app['eccube.purchase.flow.order'] = function(Container $app) { |
|
122 | 122 | $flow = new PurchaseFlow(); |
123 | 123 | $flow->setItemProcessors($app['eccube.purchase.flow.order.item_processors']); |
124 | 124 | $flow->setItemHolderProcessors($app['eccube.purchase.flow.order.holder_processors']); |