@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace app\modules\shop\controllers; |
4 | 4 | |
5 | 5 | use app\modules\core\behaviors\DisableRobotIndexBehavior; |
6 | -use app\modules\shop\models\Contragent; |
|
7 | -use app\modules\shop\models\Customer; |
|
8 | 6 | use app\modules\shop\models\Order; |
9 | 7 | use yii\filters\AccessControl; |
10 | 8 | use yii\helpers\Url; |
@@ -8,7 +8,6 @@ |
||
8 | 8 | use yii\base\Action; |
9 | 9 | use yii\web\BadRequestHttpException; |
10 | 10 | use yii\web\Controller; |
11 | -use Yii; |
|
12 | 11 | |
13 | 12 | class PaymentController extends Controller |
14 | 13 | { |
@@ -9,7 +9,6 @@ |
||
9 | 9 | use app\modules\shop\models\DeliveryInformation; |
10 | 10 | use app\modules\shop\models\Order; |
11 | 11 | use app\modules\shop\models\OrderDeliveryInformation; |
12 | -use app\modules\shop\models\OrderStageLeaf; |
|
13 | 12 | use app\modules\shop\models\OrderTransaction; |
14 | 13 | use app\modules\shop\models\PaymentType; |
15 | 14 | use app\properties\HasProperties; |
@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\models; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app; |
6 | 7 | use app\modules\config\models\BaseConfigurationModel; |
7 | -use Yii; |
|
8 | 8 | |
9 | 9 | /** |
10 | 10 | * Class ConfigConfigurationModel represents configuration model for retrieving user input |
@@ -2,13 +2,13 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\models; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\models\Property; |
6 | 7 | use app\models\PropertyGroup; |
7 | 8 | use app\properties\AbstractModel; |
8 | 9 | use app\properties\HasProperties; |
9 | 10 | use app\properties\PropertyValue; |
10 | 11 | use app\properties\traits\PropertyTrait; |
11 | -use Yii; |
|
12 | 12 | |
13 | 13 | /** |
14 | 14 | * This is the model class for table "{{%contragent}}". |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | } |
87 | 87 | |
88 | 88 | /** |
89 | - * @return Order[]|null |
|
89 | + * @return \yii\db\ActiveQuery |
|
90 | 90 | */ |
91 | 91 | public function getOrders() |
92 | 92 | { |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | } |
95 | 95 | |
96 | 96 | /** |
97 | - * @return Customer|null |
|
97 | + * @return \yii\db\ActiveQuery |
|
98 | 98 | */ |
99 | 99 | public function getCustomer() |
100 | 100 | { |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
105 | - * @return DeliveryInformation|null |
|
105 | + * @return \yii\db\ActiveQuery |
|
106 | 106 | */ |
107 | 107 | public function getDeliveryInformation() |
108 | 108 | { |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | /** |
129 | 129 | * @param Customer $customer |
130 | 130 | * @param bool $dummyObject |
131 | - * @return Contragent|null |
|
131 | + * @return Contragent |
|
132 | 132 | */ |
133 | 133 | public static function createEmptyContragent(Customer $customer, $dummyObject = true) |
134 | 134 | { |
@@ -2,6 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\models; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\models\Property; |
6 | 7 | use app\models\PropertyGroup; |
7 | 8 | use app\modules\user\models\User; |
@@ -9,7 +10,6 @@ discard block |
||
9 | 10 | use app\properties\HasProperties; |
10 | 11 | use app\properties\PropertyValue; |
11 | 12 | use app\properties\traits\PropertyTrait; |
12 | -use Yii; |
|
13 | 13 | |
14 | 14 | /** |
15 | 15 | * This is the model class for table "{{%customer}}". |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
106 | - * @return Order[]|null |
|
106 | + * @return \yii\db\ActiveQuery |
|
107 | 107 | */ |
108 | 108 | public function getOrders() |
109 | 109 | { |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | } |
112 | 112 | |
113 | 113 | /** |
114 | - * @return User|null |
|
114 | + * @return \yii\db\ActiveQuery |
|
115 | 115 | */ |
116 | 116 | public function getUser() |
117 | 117 | { |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | } |
120 | 120 | |
121 | 121 | /** |
122 | - * @return Contragent[]|null |
|
122 | + * @return \yii\db\ActiveQuery |
|
123 | 123 | */ |
124 | 124 | public function getContragents() |
125 | 125 | { |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
130 | - * @return Contragent|null |
|
130 | + * @return \yii\db\ActiveQuery |
|
131 | 131 | */ |
132 | 132 | public function getContragent() |
133 | 133 | { |
@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\models; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\models\City; |
6 | 7 | use app\models\Country; |
7 | -use Yii; |
|
8 | 8 | |
9 | 9 | /** |
10 | 10 | * This is the model class for table "{{%delivery_information}}". |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
62 | - * @return Contragent|null |
|
62 | + * @return \yii\db\ActiveQuery |
|
63 | 63 | */ |
64 | 64 | public function getContragent() |
65 | 65 | { |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | } |
68 | 68 | |
69 | 69 | /** |
70 | - * @return Country|null |
|
70 | + * @return \yii\db\ActiveQuery |
|
71 | 71 | */ |
72 | 72 | public function getCountry() |
73 | 73 | { |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
78 | - * @return City|null |
|
78 | + * @return \yii\db\ActiveQuery |
|
79 | 79 | */ |
80 | 80 | public function getCity() |
81 | 81 | { |
@@ -2,12 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace app\modules\shop\models; |
4 | 4 | |
5 | +use Yii; |
|
5 | 6 | use app\modules\core\helpers\EventTriggeringHelper; |
6 | 7 | use app\modules\shop\events\OrderCalculateEvent; |
7 | 8 | use app\modules\shop\helpers\PriceHelper; |
8 | 9 | use app\modules\user\models\User; |
9 | 10 | use app\properties\HasProperties; |
10 | -use Yii; |
|
11 | 11 | use yii\base\Exception; |
12 | 12 | use yii\behaviors\TimestampBehavior; |
13 | 13 | use yii\caching\TagDependency; |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | } |
253 | 253 | |
254 | 254 | /** |
255 | - * @return Customer|null |
|
255 | + * @return \yii\db\ActiveQuery |
|
256 | 256 | */ |
257 | 257 | public function getCustomer() |
258 | 258 | { |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | } |
296 | 296 | |
297 | 297 | /** |
298 | - * @return OrderDeliveryInformation|null |
|
298 | + * @return \yii\db\ActiveQuery |
|
299 | 299 | */ |
300 | 300 | public function getOrderDeliveryInformation() |
301 | 301 | { |
@@ -3,8 +3,8 @@ |
||
3 | 3 | namespace app\modules\shop\models; |
4 | 4 | |
5 | 5 | |
6 | -use app\components\payment\AbstractPayment; |
|
7 | 6 | use Yii; |
7 | +use app\components\payment\AbstractPayment; |
|
8 | 8 | use yii\base\Exception; |
9 | 9 | use yii\base\UnknownClassException; |
10 | 10 | use yii\db\ActiveRecord; |