Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents 9580e548 04e8796d
Showing 4 changed files with 21 additions and 5 deletions Show diff stats
models/Basket.php
models/Product.php
models/ProductLang.php
views/manage/_form_language.php
@@ -33,7 +33,7 @@
             }
             parent::__construct($config);
         }
-    
+        
         /**
          * Increment product variant with $product_variant_id count by 1
          *
@@ -56,8 +56,8 @@
                     ];
                 }
             }
-            if($data[$product_variant_id]['count'] <= 0) {
-                unset($data[$product_variant_id]);
+            if ($data[ $product_variant_id ][ 'count' ] <= 0) {
+                unset( $data[ $product_variant_id ] );
             }
             $this->setData($data);
         }
@@ -155,7 +155,7 @@
             $models = $this->findModels(array_keys($data));
             $sum = 0;
             foreach ($models as $model) {
-                $sum += $model->price * $data[$model->id]['count'];
+                $sum += $model->price * $data[ $model->id ][ 'count' ];
             }
             return $sum;
         }
@@ -175,6 +175,13 @@
              */
             $model = ProductVariant::find()
                                    ->where([ 'product_variant.id' => $product_variant_id ])
+                                   ->andWhere(
+                                       [
+                                           '>',
+                                           'product_variant.stock',
+                                           0,
+                                       ]
+                                   )
                                    ->joinWith('lang')
                                    ->one();
             if (empty( $model )) {
@@ -364,6 +364,11 @@
             }
         }
  
+        public function getTaxOption()
+        {
+//            return $this->getOptions()->innerJoinWith('taxGroup')->where([''])
+        }
+        
         /**
          * Get Product name concatenated with Brand name
          *
@@ -11,6 +11,7 @@
      * @property integer  $product_id
      * @property integer  $language_id
      * @property string   $title
+     * @property string   $meta_title
      * @property string   $description
      * @property string   $alias
      * @property Language $language
@@ -61,6 +62,7 @@
                 [
                     [
                         'title',
+                        'meta_title',
                         'alias',
                     ],
                     'string',
@@ -106,6 +108,7 @@
                 'title'        => Yii::t('app', 'Name'),
                 'description' => Yii::t('app', 'Description'),
                 'alias'       => Yii::t('app', 'Alias'),
+                'meta_title'  => Yii::t('app', 'Meta Title'),
             ];
         }
  
@@ -25,4 +25,5 @@
                  'filebrowserUploadUrl' => Yii::$app->getUrlManager()
                                                     ->createUrl('file/uploader/images-upload'),
              ]),
-         ]) ?>
 \ No newline at end of file
+         ]) ?>
+<?= $form->field($model_lang, '[' . $language->id . ']meta_title') ?>