14.06.16

Administrator
1 parent 49c47c76
Showing 7 changed files with 60 additions and 33 deletions Show diff stats
backend/views/seo/index.php
common/modules/product/models/Category.php
common/modules/product/models/Product.php
common/widgets/Mailer.php
frontend/controllers/BasketController.php
frontend/views/basket/index.php
frontend/views/iam/share.php
@@ -27,8 +27,6 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'seo_id',
             'url:url',
             'meta',
-            'title',
-            'description',
             'h1',
             // 'seo_text:ntext',
@@ -8,7 +8,6 @@ use common\components\artboxtree\ArtboxTreeHelper;
 use common\modules\relation\relationBehavior;
 use common\modules\rubrication\behaviors\ArtboxSynonymBehavior;
 use Yii;
-use yii\base\ErrorException;
 /**
  * This is the model class for table "category".
@@ -29,7 +28,6 @@ use yii\base\ErrorException;
  * @property boolean $populary
  *
  * @property CategoryName $categoryName
- * @property Product[] $products
  * @property ProductUnit $productUnit
  * @property CategoryName[] $categoryNames
  * @property ProductCategory[] $productCategories
@@ -205,12 +203,4 @@ class Category extends \yii\db\ActiveRecord
         }
         return false;
     }
-
-    public function beforeDelete()
-    {
-        if ( ($count = $this->getProducts()->count()) > 0) {
-            throw new ErrorException('С категорией "'. $this->name .'" связанно <strong>'. $count .'</strong> товаров. Удаление невозможно.');
-            return false;
-        }
-    }
 }
@@ -233,20 +233,7 @@ class Product extends \yii\db\ActiveRecord
     public function getOptions() {
         return $this->hasMany(TaxOption::className(), ['tax_option_id' => 'option_id'])->viaTable('product_option', ['product_id' => 'product_id']);
-    }
-
-    public function getProperties() {
-        $groups = $options = [];
-        foreach ($this->options as $option) {
-            $options[$option->tax_group_id][] = $option;
-        }
-        foreach (TaxGroup::find()->where(['tax_group_id' => array_keys($options)])->all() as $group) {
-            if (!empty($options[$group->tax_group_id])) {
-                $group->_options = $options[$group->tax_group_id];
-                $groups[] = $group;
-            }
-        }
-        return $groups;
+//        return $this->getRelations('product_option');
     }
     public function getStocks() {
@@ -387,4 +374,18 @@ class Product extends \yii\db\ActiveRecord
         }
         return $op;
     }
+
+    public function getProperties() {
+        $groups = $options = [];
+        foreach ($this->options as $option) {
+            $options[$option->tax_group_id][] = $option;
+        }
+        foreach (TaxGroup::find()->where(['tax_group_id' => array_keys($options)])->all() as $group) {
+            if (!empty($options[$group->tax_group_id])) {
+                $group->_options = $options[$group->tax_group_id];
+                $groups[] = $group;
+            }
+        }
+        return $groups;
+    }
 }
@@ -41,7 +41,7 @@ class Mailer extends Widget{
             return 'Mailer Error: ' . $mail->ErrorInfo;
         } else {
-            \Yii::$app->getSession()->setFlash('success', 'Мастер-приемщик свяжется с вами в ближайшее время');
+
             return 'Message has been sent';
         }
     }
@@ -40,20 +40,48 @@ class BasketController extends Controller
                 }
                 $body .= "\n\r";
-                    if ($modelOrder->load(Yii::$app->request->post()) && $modelOrder->save()) {
+                    if ($modelOrder->load(Yii::$app->request->post()) && $modelOrder->validate()) {
                         $productV = $_POST['ProductVariant'];
                         foreach ($productV as $index=>$row) {
                             $modelOrdersProducts = new OrdersProducts();
                             $mod_id = $row['id'];
-                            unset($row['id']);
+
                             $data['OrdersProducts'] = $row;
                             $data['OrdersProducts']['mod_id'] = $mod_id;
                             $data['OrdersProducts']['order_id'] = $modelOrder->id;
-                            $productV[$index]['img'] =  \common\components\artboximage\ArtboxImageHelper::getImageSrc(ProductVariant::findOne($mod_id)->image->imageUrl, 'list');
-                            $modelOrdersProducts->load($data);
-                            $modelOrdersProducts->save();
+                            $product = ProductVariant::findOne($mod_id);
+                            /**
+                             * Проверяем товар на наличие
+                             */
+                            if(!$product->stock > 0 && !$product->price > 0 ){
+                                \Yii::$app->getSession()->setFlash('error', 'К сожалению товара '.$product->name . ' нет в наличии');
+
+                                $basket_mods = $modelOrder->getBasketMods();
+                                return $this->render('index',[
+                                    'modelMod'=>$modelMod,
+                                    'basket_mods'=>$basket_mods,
+                                    'modelOrder'=>$modelOrder,
+                                ]);
+                            }else {
+
+                                /**
+                                 * Удаляем товар с массива и сохраняем в заказ
+                                 */
+                                unset($row['id']);
+                                $productV[$index]['img'] =  \common\components\artboximage\ArtboxImageHelper::getImageSrc($product->image->imageUrl, 'list');
+                                $modelOrdersProducts->load($data);
+                                $modelOrdersProducts->save();
+                            }
+
                         }
+
+                        /**
+                         * Сохраняем заказ
+                         */
+
+                        $modelOrder->save();
+
                         if(!Yii::$app->user->id && !empty($modelOrder->email)){
                             $modelUser = new Customer();
                             $modelUser->role = 'person';
@@ -65,6 +93,10 @@ class BasketController extends Controller
                             $modelUser->save();
                         }
                         $order = clone $modelOrder;
+                        /**
+                         * Чистим сессию корзины
+                         */
+
                         $modelOrder->clearBasket();
                         Mailer::widget(
@@ -41,7 +41,12 @@ $(&#39;#orders-delivery input[type=\&quot;radio\&quot;]&#39;).click(function(){
     <h1 class="basket_title_">Корзина</h1>
 <div class="ten"></div>
-
+    <?php if ($flash = Yii::$app->session->getFlash ('success')): ?>
+        <div class="alert-success"><?= $flash ?></div>
+    <?php endif; ?>
+    <?php if ($flash = Yii::$app->session->getFlash ('error')): ?>
+        <div class="alert-error"><?= $flash ?></div>
+    <?php endif; ?>
 <?php $form = ActiveForm::begin(['enableClientScript' => false]); ?>
 <div class="rightbar basket_rightbar">
  <div class="form-order">
@@ -46,6 +46,7 @@ $this-&gt;registerJs(&quot;
 						<div class="orders_view">
 							<?foreach($_items as $item_p):if(!empty($item_p->product)):?>
+								<?= print_r($item_p->product); die(); ?>
 								<div class="order">
 									<div><a href="<?=Url::to(['iam/share','deleteID'=>$item_p->id])?>" class="delete_button"></a></div>
 									<div class="pixbox"><a href="<?=Url::to(['catalog/product', 'product' => $item_p->product])?>">