@@ -25,8 +25,8 @@ |
||
25 | 25 | use Eccube\Util\CacheUtil; |
26 | 26 | use Eccube\Util\StringUtil; |
27 | 27 | use Symfony\Component\DependencyInjection\ContainerInterface; |
28 | -use Symfony\Component\Finder\Finder; |
|
29 | 28 | use Symfony\Component\Filesystem\Filesystem; |
29 | +use Symfony\Component\Finder\Finder; |
|
30 | 30 | |
31 | 31 | class PluginService |
32 | 32 | { |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | /** |
97 | 97 | * 金額をポイントに変換する. |
98 | 98 | * |
99 | - * @param $price |
|
99 | + * @param double $price |
|
100 | 100 | * |
101 | 101 | * @return float ポイント |
102 | 102 | * |
@@ -152,6 +152,9 @@ discard block |
||
152 | 152 | } |
153 | 153 | } |
154 | 154 | |
155 | + /** |
|
156 | + * @param integer $point |
|
157 | + */ |
|
155 | 158 | public function prepare(ItemHolderInterface $itemHolder, $point) |
156 | 159 | { |
157 | 160 | // ユーザの保有ポイントを減算 |
@@ -159,6 +162,9 @@ discard block |
||
159 | 162 | $Customer->setPoint($Customer->getPoint() - $point); |
160 | 163 | } |
161 | 164 | |
165 | + /** |
|
166 | + * @param integer $point |
|
167 | + */ |
|
162 | 168 | public function rollback(ItemHolderInterface $itemHolder, $point) |
163 | 169 | { |
164 | 170 | // 利用したポイントをユーザに戻す. |
@@ -13,18 +13,18 @@ |
||
13 | 13 | |
14 | 14 | namespace Eccube\Service\PurchaseFlow\Processor; |
15 | 15 | |
16 | -use Eccube\Service\PurchaseFlow\ItemHolderPreprocessor; |
|
17 | 16 | use Eccube\Entity\ItemHolderInterface; |
18 | -use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
19 | -use Eccube\Entity\OrderItem; |
|
20 | -use Eccube\Repository\Master\OrderItemTypeRepository; |
|
21 | -use Eccube\Repository\Master\TaxDisplayTypeRepository; |
|
22 | 17 | use Eccube\Entity\Master\OrderItemType; |
23 | 18 | use Eccube\Entity\Master\TaxDisplayType; |
19 | +use Eccube\Entity\Master\TaxType; |
|
24 | 20 | use Eccube\Entity\Order; |
21 | +use Eccube\Entity\OrderItem; |
|
25 | 22 | use Eccube\Entity\Payment; |
23 | +use Eccube\Repository\Master\OrderItemTypeRepository; |
|
24 | +use Eccube\Repository\Master\TaxDisplayTypeRepository; |
|
26 | 25 | use Eccube\Repository\Master\TaxTypeRepository; |
27 | -use Eccube\Entity\Master\TaxType; |
|
26 | +use Eccube\Service\PurchaseFlow\ItemHolderPreprocessor; |
|
27 | +use Eccube\Service\PurchaseFlow\PurchaseContext; |
|
28 | 28 | |
29 | 29 | class PaymentChargePreprocessor implements ItemHolderPreprocessor |
30 | 30 | { |
@@ -19,7 +19,7 @@ |
||
19 | 19 | { |
20 | 20 | /** |
21 | 21 | * @param ProductClass $ProductClass |
22 | - * @param $errorCode |
|
22 | + * @param string $errorCode |
|
23 | 23 | * |
24 | 24 | * @throws InvalidItemException |
25 | 25 | */ |
@@ -47,7 +47,6 @@ discard block |
||
47 | 47 | * @param callable $callback Metadata を生成した後に実行されるコールバック関数 |
48 | 48 | * @param array $generatedFiles Proxy ファイルパスの配列 |
49 | 49 | * @param string $proxiesDirectory Proxy ファイルを格納したディレクトリ |
50 | - * @param bool $saveMode UpdateSchema を即時実行する場合 true |
|
51 | 50 | * @param string $outputDir Metadata の出力先ディレクトリ |
52 | 51 | */ |
53 | 52 | public function executeCallback(callable $callback, $generatedFiles, $proxiesDirectory, $outputDir = null) |
@@ -110,7 +109,7 @@ discard block |
||
110 | 109 | /** |
111 | 110 | * ネームスペースに含まれるEntityのテーブルを削除する |
112 | 111 | * |
113 | - * @param $targetNamespace string 削除対象のネームスペース |
|
112 | + * @param string $targetNamespace string 削除対象のネームスペース |
|
114 | 113 | */ |
115 | 114 | public function dropTable($targetNamespace) |
116 | 115 | { |
@@ -18,8 +18,8 @@ |
||
18 | 18 | use Doctrine\ORM\Tools\SchemaTool; |
19 | 19 | use Eccube\Doctrine\ORM\Mapping\Driver\ReloadSafeAnnotationDriver; |
20 | 20 | use Eccube\Util\StringUtil; |
21 | -use Symfony\Component\Finder\Finder; |
|
22 | 21 | use Symfony\Component\Filesystem\Filesystem; |
22 | +use Symfony\Component\Finder\Finder; |
|
23 | 23 | |
24 | 24 | class SchemaService |
25 | 25 | { |
@@ -14,11 +14,11 @@ |
||
14 | 14 | namespace Eccube\Service; |
15 | 15 | |
16 | 16 | use Doctrine\ORM\EntityManagerInterface; |
17 | +use Symfony\Component\DependencyInjection\ContainerInterface; |
|
17 | 18 | use Symfony\Component\EventDispatcher\EventSubscriberInterface; |
18 | 19 | use Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector; |
19 | -use Symfony\Component\DependencyInjection\ContainerInterface; |
|
20 | -use Symfony\Component\HttpKernel\KernelEvents; |
|
21 | 20 | use Symfony\Component\HttpKernel\Event\PostResponseEvent; |
21 | +use Symfony\Component\HttpKernel\KernelEvents; |
|
22 | 22 | |
23 | 23 | class SystemService implements EventSubscriberInterface |
24 | 24 | { |
@@ -355,7 +355,7 @@ |
||
355 | 355 | * |
356 | 356 | * @param null $currency |
357 | 357 | * |
358 | - * @return bool|string |
|
358 | + * @return string|null |
|
359 | 359 | */ |
360 | 360 | public function getCurrencySymbol($currency = null) |
361 | 361 | { |
@@ -126,14 +126,14 @@ |
||
126 | 126 | setcookie($this->sessionName, '', 0, ini_get('session.cookie_path'), ini_get('session.cookie_domain'), filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN), filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN)); |
127 | 127 | } else { |
128 | 128 | setcookie($this->sessionName, '', |
129 | - [ |
|
130 | - 'expires' => 0, |
|
131 | - 'path' => $this->getCookiePath(), |
|
132 | - 'domain' => ini_get('session.cookie_domain'), |
|
133 | - 'secure' => filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN), |
|
134 | - 'httponly' => filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN), |
|
135 | - 'samesite' => $this->getCookieSameSite(), |
|
136 | - ] |
|
129 | + [ |
|
130 | + 'expires' => 0, |
|
131 | + 'path' => $this->getCookiePath(), |
|
132 | + 'domain' => ini_get('session.cookie_domain'), |
|
133 | + 'secure' => filter_var(ini_get('session.cookie_secure'), FILTER_VALIDATE_BOOLEAN), |
|
134 | + 'httponly' => filter_var(ini_get('session.cookie_httponly'), FILTER_VALIDATE_BOOLEAN), |
|
135 | + 'samesite' => $this->getCookieSameSite(), |
|
136 | + ] |
|
137 | 137 | ); |
138 | 138 | } |
139 | 139 | } |
@@ -83,7 +83,7 @@ |
||
83 | 83 | } elseif ($item->isProduct()) { |
84 | 84 | // ポイント = 単価 * ポイント付与率 * 数量 |
85 | 85 | $point = round($item->getPrice() * ($pointRate / 100)) * $item->getQuantity(); |
86 | - } elseif($item->isDiscount()) { |
|
86 | + } elseif ($item->isDiscount()) { |
|
87 | 87 | $point = round($item->getPrice() * ($pointRate / 100)) * $item->getQuantity(); |
88 | 88 | } |
89 | 89 |