@@ -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 */ |
@@ -257,7 +257,7 @@ |
||
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | foreach ($readPaths as $readPath) { |
| 260 | - $filePath = $readPath . '/' . $fileName . '.twig'; |
|
| 260 | + $filePath = $readPath.'/'.$fileName.'.twig'; |
|
| 261 | 261 | $fs = new Filesystem(); |
| 262 | 262 | if ($fs->exists($filePath)) { |
| 263 | 263 | return array( |