@@ -2,10 +2,10 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace app\modules\shop\controllers; |
| 4 | 4 | |
| 5 | -use app\components\SearchModel; |
|
| 5 | +use Yii; |
|
| 6 | 6 | use app\backend\components\BackendController; |
| 7 | +use app\components\SearchModel; |
|
| 7 | 8 | use app\modules\shop\models\PaymentType; |
| 8 | -use Yii; |
|
| 9 | 9 | use yii\filters\AccessControl; |
| 10 | 10 | use yii\filters\VerbFilter; |
| 11 | 11 | use yii\web\NotFoundHttpException; |
@@ -111,7 +111,7 @@ |
||
| 111 | 111 | * Deletes an existing PaymentType model. |
| 112 | 112 | * If deletion is successful, the browser will be redirected to the 'index' page. |
| 113 | 113 | * @param string $id |
| 114 | - * @return mixed |
|
| 114 | + * @return \yii\web\Response |
|
| 115 | 115 | */ |
| 116 | 116 | public function actionDelete($id) |
| 117 | 117 | { |
@@ -2,14 +2,14 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace app\modules\shop\controllers; |
| 4 | 4 | |
| 5 | +use Yii; |
|
| 5 | 6 | use app\backend\components\BackendController; |
| 6 | 7 | use app\models\Object; |
| 7 | 8 | use app\models\PrefilteredPages; |
| 8 | -use app\modules\shop\models\Product; |
|
| 9 | 9 | use app\models\Property; |
| 10 | 10 | use app\models\PropertyGroup; |
| 11 | 11 | use app\models\PropertyStaticValues; |
| 12 | -use Yii; |
|
| 12 | +use app\modules\shop\models\Product; |
|
| 13 | 13 | use yii\db\Query; |
| 14 | 14 | use yii\filters\AccessControl; |
| 15 | 15 | use yii\helpers\Url; |
@@ -2,14 +2,14 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace app\modules\shop\controllers; |
| 4 | 4 | |
| 5 | +use Yii; |
|
| 5 | 6 | use app\backend\components\BackendController; |
| 6 | 7 | use app\components\SearchModel; |
| 7 | 8 | use app\modules\shop\models\ShippingOption; |
| 8 | -use Yii; |
|
| 9 | 9 | use yii\filters\AccessControl; |
| 10 | 10 | use yii\filters\VerbFilter; |
| 11 | -use yii\web\NotFoundHttpException; |
|
| 12 | 11 | use yii\helpers\Url; |
| 12 | +use yii\web\NotFoundHttpException; |
|
| 13 | 13 | |
| 14 | 14 | /** |
| 15 | 15 | * ShippingOptionController implements the CRUD actions for ShippingOption model. |
@@ -113,7 +113,7 @@ |
||
| 113 | 113 | * Deletes an existing ShippingOption model. |
| 114 | 114 | * If deletion is successful, the browser will be redirected to the 'index' page. |
| 115 | 115 | * @param string $id |
| 116 | - * @return mixed |
|
| 116 | + * @return \yii\web\Response |
|
| 117 | 117 | */ |
| 118 | 118 | public function actionDelete($id) |
| 119 | 119 | { |
@@ -91,7 +91,7 @@ |
||
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | /** |
| 94 | - * @return Response |
|
| 94 | + * @return integer |
|
| 95 | 95 | * @throws HttpException |
| 96 | 96 | */ |
| 97 | 97 | public function actionSavePropertyUnit() |
@@ -2,14 +2,14 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace app\modules\shop\controllers; |
| 4 | 4 | |
| 5 | +use Yii; |
|
| 5 | 6 | use app\backend\components\BackendController; |
| 7 | +use app\backgroundtasks\helpers\BackgroundTasks; |
|
| 6 | 8 | use app\components\Helper; |
| 9 | +use app\models\Property; |
|
| 7 | 10 | use app\modules\shop\models\Yml; |
| 8 | -use app\backgroundtasks\helpers\BackgroundTasks; |
|
| 9 | -use Yii; |
|
| 10 | 11 | use yii\filters\AccessControl; |
| 11 | 12 | use yii\helpers\Json; |
| 12 | -use app\models\Property; |
|
| 13 | 13 | use yii\web\HttpException; |
| 14 | 14 | use yii\web\Response; |
| 15 | 15 | |
@@ -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; |
@@ -79,6 +79,9 @@ discard block |
||
| 79 | 79 | return $this->redirect(Url::previous('__shopCabinetUpdateReturnUrl')); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | + /** |
|
| 83 | + * @param Customer $customer |
|
| 84 | + */ |
|
| 82 | 85 | private function updateCustomer($customer) |
| 83 | 86 | { |
| 84 | 87 | if ($customer === null) { |
@@ -89,6 +92,9 @@ discard block |
||
| 89 | 92 | } |
| 90 | 93 | } |
| 91 | 94 | |
| 95 | + /** |
|
| 96 | + * @param Contragent $contragent |
|
| 97 | + */ |
|
| 92 | 98 | private function updateContragent($contragent) |
| 93 | 99 | { |
| 94 | 100 | if ($contragent === null) { |
@@ -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 | { |