diff --git a/common/widgets/Mailer.php b/common/widgets/Mailer.php
index 3f377cd..13ab62a 100755
--- a/common/widgets/Mailer.php
+++ b/common/widgets/Mailer.php
@@ -28,7 +28,7 @@ class Mailer extends Widget{
         $mail->CharSet = 'UTF-8';
         $mail->Username = "adwords@artweb.ua";
         $mail->Password = "eks,ybcm5hfp";
-        $mail->SetFrom('dockdep@gmail.com');
+        $mail->SetFrom('rukza4ok@eltrade.com.ua');
         $mail->Subject = $this->subject;
         $mail->MsgHTML($this->render($this->type, ['params' => $this->params]));
         $address = "dockdep@gmail.com";
diff --git a/frontend/controllers/BasketController.php b/frontend/controllers/BasketController.php
index 1f89b8f..9e3863b 100755
--- a/frontend/controllers/BasketController.php
+++ b/frontend/controllers/BasketController.php
@@ -40,7 +40,7 @@ class BasketController extends Controller
                 }
                 $body .= "\n\r";
   
-                    if ($modelOrder->load(Yii::$app->request->post()) && $modelOrder->validate()) {
+                    if ($modelOrder->load(Yii::$app->request->post()) && $modelOrder->save()) {
                         $productV = $_POST['ProductVariant'];
 
                         foreach ($productV as $index=>$row) {
@@ -54,10 +54,20 @@ class BasketController extends Controller
                             /**
                              * Проверяем товар на наличие
                              */
-                            if(!$product->stock > 0 && !$product->price > 0 ){
+
+                            if(!$product->stock > 0 || !$product->price > 0 ){
+
+                                /**
+                                 * Добавляем сообщение об ошибке
+                                 */
                                 \Yii::$app->getSession()->setFlash('error', 'К сожалению товара '.$product->name . ' нет в наличии');
+                                /**
+                                 * Удаляем заказ
+                                 */
+                                $modelOrder->delete();
 
                                 $basket_mods = $modelOrder->getBasketMods();
+
                                 return $this->render('index',[
                                     'modelMod'=>$modelMod,
                                     'basket_mods'=>$basket_mods,
@@ -71,6 +81,7 @@ class BasketController extends Controller
                                 unset($row['id']);
                                 $productV[$index]['img'] =  \common\components\artboximage\ArtboxImageHelper::getImageSrc($product->image->imageUrl, 'list');
                                 $modelOrdersProducts->load($data);
+                                $modelOrdersProducts->validate();
                                 $modelOrdersProducts->save();
                             }
 
@@ -80,7 +91,7 @@ class BasketController extends Controller
                          * Сохраняем заказ
                          */
 
-                        $modelOrder->save();
+
 
                         if(!Yii::$app->user->id && !empty($modelOrder->email)){
                             $modelUser = new Customer();
--
libgit2 0.21.4