@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | } |
170 | 170 | |
171 | 171 | /** |
172 | - * @return integer |
|
172 | + * @return string|null |
|
173 | 173 | */ |
174 | 174 | public function getPreOrderId() |
175 | 175 | { |
@@ -253,7 +253,7 @@ discard block |
||
253 | 253 | } |
254 | 254 | |
255 | 255 | /** |
256 | - * @return integer |
|
256 | + * @return string |
|
257 | 257 | */ |
258 | 258 | public function getTotalPrice() |
259 | 259 | { |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | /** |
301 | 301 | * 個数の合計を返します。 |
302 | 302 | * |
303 | - * @return mixed |
|
303 | + * @return integer |
|
304 | 304 | */ |
305 | 305 | public function getQuantity() |
306 | 306 | { |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | * |
347 | 347 | * @param \DateTime $createDate |
348 | 348 | * |
349 | - * @return Order |
|
349 | + * @return Cart |
|
350 | 350 | */ |
351 | 351 | public function setCreateDate($createDate) |
352 | 352 | { |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | * |
371 | 371 | * @param \DateTime $updateDate |
372 | 372 | * |
373 | - * @return Order |
|
373 | + * @return Cart |
|
374 | 374 | */ |
375 | 375 | public function setUpdateDate($updateDate) |
376 | 376 | { |
@@ -13,8 +13,8 @@ |
||
13 | 13 | |
14 | 14 | namespace Eccube\Entity; |
15 | 15 | |
16 | -use Doctrine\ORM\Mapping as ORM; |
|
17 | 16 | use Doctrine\Common\Collections\ArrayCollection; |
17 | +use Doctrine\ORM\Mapping as ORM; |
|
18 | 18 | use Eccube\Service\PurchaseFlow\InvalidItemException; |
19 | 19 | use Eccube\Service\PurchaseFlow\ItemCollection; |
20 | 20 |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
99 | - * @return integer |
|
99 | + * @return string |
|
100 | 100 | */ |
101 | 101 | public function getPrice() |
102 | 102 | { |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | } |
117 | 117 | |
118 | 118 | /** |
119 | - * @return integer |
|
119 | + * @return string |
|
120 | 120 | */ |
121 | 121 | public function getQuantity() |
122 | 122 | { |
@@ -199,8 +199,7 @@ |
||
199 | 199 | $this->ProductClass = $ProductClass; |
200 | 200 | |
201 | 201 | $this->product_class_id = is_object($ProductClass) ? |
202 | - $ProductClass->getId() : |
|
203 | - null; |
|
202 | + $ProductClass->getId() : null; |
|
204 | 203 | |
205 | 204 | return $this; |
206 | 205 | } |
@@ -51,7 +51,7 @@ |
||
51 | 51 | |
52 | 52 | /** |
53 | 53 | * @param \Doctrine\ORM\EntityManager $em |
54 | - * @param integer $SortNo |
|
54 | + * @param integer $sortNo |
|
55 | 55 | * |
56 | 56 | * @return \Eccube\Entity\Category |
57 | 57 | */ |
@@ -119,7 +119,7 @@ |
||
119 | 119 | /** |
120 | 120 | * Set backend_name. |
121 | 121 | * |
122 | - * @param string $backend_name |
|
122 | + * @param string $backendName |
|
123 | 123 | * |
124 | 124 | * @return ClassName |
125 | 125 | */ |
@@ -1407,7 +1407,7 @@ |
||
1407 | 1407 | * |
1408 | 1408 | * @param \Eccube\Entity\OrderItem $OrderItem |
1409 | 1409 | * |
1410 | - * @return Shipping |
|
1410 | + * @return Order |
|
1411 | 1411 | */ |
1412 | 1412 | public function addOrderItem(\Eccube\Entity\OrderItem $OrderItem) |
1413 | 1413 | { |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * |
125 | 125 | * @param int $sortNo |
126 | 126 | * |
127 | - * @return Page |
|
127 | + * @return PageLayout |
|
128 | 128 | */ |
129 | 129 | public function setSortNo($sortNo) |
130 | 130 | { |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | /** |
147 | 147 | * Set pageLayout |
148 | 148 | * |
149 | - * @param \Eccube\Entity\Page $page |
|
149 | + * @param \Eccube\Entity\Page $Page |
|
150 | 150 | * |
151 | 151 | * @return PageLayout |
152 | 152 | */ |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | /** |
161 | 161 | * Get pageLayout |
162 | 162 | * |
163 | - * @return \Eccube\Entity\PageLayout |
|
163 | + * @return Page |
|
164 | 164 | */ |
165 | 165 | public function getPage() |
166 | 166 | { |
@@ -379,7 +379,7 @@ |
||
379 | 379 | } |
380 | 380 | |
381 | 381 | /** |
382 | - * @return boolean |
|
382 | + * @return integer |
|
383 | 383 | */ |
384 | 384 | public function isVisible() |
385 | 385 | { |
@@ -85,7 +85,6 @@ discard block |
||
85 | 85 | /** |
86 | 86 | * Set price02 IncTax |
87 | 87 | * |
88 | - * @param string $price02 |
|
89 | 88 | * |
90 | 89 | * @return ProductClass |
91 | 90 | */ |
@@ -137,7 +136,7 @@ discard block |
||
137 | 136 | /** |
138 | 137 | * Get tax_rate |
139 | 138 | * |
140 | - * @return string |
|
139 | + * @return boolean |
|
141 | 140 | */ |
142 | 141 | public function getTaxRate() |
143 | 142 | { |
@@ -1162,7 +1162,7 @@ discard block |
||
1162 | 1162 | * |
1163 | 1163 | * @param string|null $note |
1164 | 1164 | * |
1165 | - * @return Order |
|
1165 | + * @return Shipping |
|
1166 | 1166 | */ |
1167 | 1167 | public function setNote($note = null) |
1168 | 1168 | { |
@@ -1258,7 +1258,7 @@ discard block |
||
1258 | 1258 | * |
1259 | 1259 | * @param \Eccube\Entity\Member|null $creator |
1260 | 1260 | * |
1261 | - * @return Member |
|
1261 | + * @return Shipping |
|
1262 | 1262 | */ |
1263 | 1263 | public function setCreator(\Eccube\Entity\Member $creator = null) |
1264 | 1264 | { |