EC-CUBE / ec-cube

src/Eccube/Form/Type/Admin/OrderType.php

Spacing +8 added lines, -10 removed lines

@@ -234,13 +234,13 @@ 
                     '\Eccube\Entity\Customer'
                 )));
 
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($BaseInfo) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($BaseInfo) {
 
             $data = $event->getData();
             $orderDetails = &$data['OrderDetails'];
 
             // 数量0フィルター
-            $quantityFilter = function ($v) {
+            $quantityFilter = function($v) {
                 return !(isset($v['quantity']) && preg_match('/^0+$/', trim($v['quantity'])));
             };
 
@@ -249,10 +249,9 @@ 
                 $shippings = &$data['Shippings'];
 
                 // 数量を抽出
-                $getQuantity = function ($v) {
+                $getQuantity = function($v) {
                     return (isset($v['quantity']) && preg_match('/^\d+$/', trim($v['quantity']))) ?
-                        trim($v['quantity']) :
-                        0;
+                        trim($v['quantity']) : 0;
                 };
 
                 foreach ($shippings as &$shipping) {
@@ -268,7 +267,7 @@ 
                         $orderDetail['quantity'] = 0;
 
                         // 受注詳細と同じ商品規格のみ抽出
-                        $productClassFilter = function ($v) use ($orderDetail) {
+                        $productClassFilter = function($v) use ($orderDetail) {
                             return $orderDetail['ProductClass'] === $v['ProductClass'];
                         };
 
@@ -277,10 +276,9 @@ 
                             if (!empty($shipping['ShipmentItems'])) {
 
                                 // 同じ商品規格の受注詳細の価格を適用
-                                $applyPrice = function (&$v) use ($orderDetail) {
+                                $applyPrice = function(&$v) use ($orderDetail) {
                                     $v['price'] = ($v['ProductClass'] === $orderDetail['ProductClass']) ?
-                                        $orderDetail['price'] :
-                                        $v['price'];
+                                        $orderDetail['price'] : $v['price'];
                                 };
                                 array_walk($shipping['ShipmentItems'], $applyPrice);
 
@@ -300,7 +298,7 @@ 
 
             $event->setData($data);
         });
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
             $form = $event->getForm();
             $orderDetails = $form['OrderDetails']->getData();
             if (empty($orderDetails) || count($orderDetails) < 1) {

src/Eccube/Form/Type/Admin/OrderDetailType.php

Spacing +5 added lines, -9 removed lines

@@ -110,7 +110,7 @@ 
                 )));
 
         $app = $this->app;
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
             // モーダルからのPOST時に、金額等をセットする.
             if ('modal' === $app['request']->get('modal')) {
                 $data = $event->getData();
@@ -127,17 +127,13 @@ 
                     $data['product_name'] = $Product->getName();
                     $data['product_code'] = $ProductClass->getCode();
                     $data['class_name1'] = $ProductClass->hasClassCategory1() ?
-                        $ProductClass->getClassCategory1()->getClassName() :
-                        null;
+                        $ProductClass->getClassCategory1()->getClassName() : null;
                     $data['class_name2'] = $ProductClass->hasClassCategory2() ?
-                        $ProductClass->getClassCategory2()->getClassName() :
-                        null;
+                        $ProductClass->getClassCategory2()->getClassName() : null;
                     $data['class_category_name1'] = $ProductClass->hasClassCategory1() ?
-                        $ProductClass->getClassCategory1()->getName() :
-                        null;
+                        $ProductClass->getClassCategory1()->getName() : null;
                     $data['class_category_name2'] = $ProductClass->hasClassCategory2() ?
-                        $ProductClass->getClassCategory2()->getName() :
-                        null;
+                        $ProductClass->getClassCategory2()->getName() : null;
                     $data['tax_rule'] = $TaxRule->getCalcRule()->getId();
                     $data['price'] = $ProductClass->getPrice02();
                     $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];

src/Eccube/Form/Type/Admin/ShipmentItemType.php

Spacing +5 added lines, -9 removed lines

@@ -110,7 +110,7 @@ 
                 )));
 
         $app = $this->app;
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
             // モーダルからのPOST時に、金額等をセットする.
             if ('modal' === $app['request']->get('modal')) {
                 $data = $event->getData();
@@ -127,17 +127,13 @@ 
                     $data['product_name'] = $Product->getName();
                     $data['product_code'] = $ProductClass->getCode();
                     $data['class_name1'] = $ProductClass->hasClassCategory1() ?
-                        $ProductClass->getClassCategory1()->getClassName() :
-                        null;
+                        $ProductClass->getClassCategory1()->getClassName() : null;
                     $data['class_name2'] = $ProductClass->hasClassCategory2() ?
-                        $ProductClass->getClassCategory2()->getClassName() :
-                        null;
+                        $ProductClass->getClassCategory2()->getClassName() : null;
                     $data['class_category_name1'] = $ProductClass->hasClassCategory1() ?
-                        $ProductClass->getClassCategory1()->getName() :
-                        null;
+                        $ProductClass->getClassCategory1()->getName() : null;
                     $data['class_category_name2'] = $ProductClass->hasClassCategory2() ?
-                        $ProductClass->getClassCategory2()->getName() :
-                        null;
+                        $ProductClass->getClassCategory2()->getName() : null;
                     $data['tax_rule'] = $TaxRule->getCalcRule()->getId();
                     $data['price'] = $ProductClass->getPrice02();
                     $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];