Completed
Pull Request — experimental/3.1 (#2688)
by
unknown
108:36 queued 101:10
created
src/Eccube/Repository/OrderRepository.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -277,8 +277,8 @@
 block discarded – undo
277 277
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
278 278
             $qb
279 279
                 ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' .
280
-                           'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR ' .
281
-                           'o.code LIKE :likemulti')
280
+                            'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR ' .
281
+                            'o.code LIKE :likemulti')
282 282
                 ->setParameter('multi', $multi)
283 283
                 ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
284 284
         }
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -109,14 +109,14 @@  discard block
 block discarded – undo
109 109
         if (isset($searchData['name']) && StringUtil::isNotBlank($searchData['name'])) {
110 110
             $qb
111 111
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :name')
112
-                ->setParameter('name', '%' . $searchData['name'] . '%');
112
+                ->setParameter('name', '%'.$searchData['name'].'%');
113 113
         }
114 114
 
115 115
         // kana
116 116
         if (isset($searchData['kana']) && StringUtil::isNotBlank($searchData['kana'])) {
117 117
             $qb
118 118
                 ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana')
119
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
119
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
120 120
         }
121 121
 
122 122
         // email
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
             $qb
248 248
                 ->leftJoin('o.OrderItems', 'oi')
249 249
                 ->andWhere('oi.product_name LIKE :buy_product_name')
250
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
250
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
251 251
         }
252 252
 
253 253
         // Order By
@@ -273,14 +273,14 @@  discard block
 block discarded – undo
273 273
                 ->setParameter('order_id_start', $searchData['order_id_start']);
274 274
         }
275 275
         // multi
276
-        if (isset( $searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
276
+        if (isset($searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
277 277
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
278 278
             $qb
279
-                ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' .
280
-                           'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR ' .
279
+                ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '.
280
+                           'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti OR '.
281 281
                            'o.code LIKE :likemulti')
282 282
                 ->setParameter('multi', $multi)
283
-                ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
283
+                ->setParameter('likemulti', '%'.$searchData['multi'].'%');
284 284
         }
285 285
 
286 286
         // order_id_end
@@ -317,21 +317,21 @@  discard block
 block discarded – undo
317 317
         if (isset($searchData['name']) && StringUtil::isNotBlank($searchData['name'])) {
318 318
             $qb
319 319
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :name')
320
-                ->setParameter('name', '%' . $searchData['name'] . '%');
320
+                ->setParameter('name', '%'.$searchData['name'].'%');
321 321
         }
322 322
 
323 323
         // kana
324 324
         if (isset($searchData['kana']) && StringUtil::isNotBlank($searchData['kana'])) {
325 325
             $qb
326 326
                 ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana')
327
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
327
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
328 328
         }
329 329
 
330 330
         // email
331 331
         if (isset($searchData['email']) && StringUtil::isNotBlank($searchData['email'])) {
332 332
             $qb
333 333
                 ->andWhere('o.email like :email')
334
-                ->setParameter('email', '%' . $searchData['email'] . '%');
334
+                ->setParameter('email', '%'.$searchData['email'].'%');
335 335
         }
336 336
 
337 337
         // tel
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
             $tel = preg_replace('/[^0-9]/ ', '', $searchData['tel']);
340 340
             $qb
341 341
                 ->andWhere('CONCAT(o.tel01, o.tel02, o.tel03) LIKE :tel')
342
-                ->setParameter('tel', '%' . $tel . '%');
342
+                ->setParameter('tel', '%'.$tel.'%');
343 343
         }
344 344
 
345 345
         // sex
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
443 443
             $qb
444 444
                 ->leftJoin('o.OrderItems', 'oi')
445 445
                 ->andWhere('oi.product_name LIKE :buy_product_name')
446
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
446
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
447 447
         }
448 448
 
449 449
         // Order By
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/PurchaseFlowServiceProvider.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -17,11 +17,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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']);
Please login to merge, or discard this patch.