Administrator / test_1

Commit e147d39127620e8971a0035fe9a6a3bde6530784

Authored by Administrator
2 parents 5e9f3657 a58f01f1

Merge remote-tracking branch 'origin/master'

Showing 2 changed files with 6 additions and 1 deletions   Show diff stats
Inline Side-by-side
common/models/GoodsView.php
  Show/Hide comments   View file @e147d39
@@ -30,6 +30,9 @@ class GoodsView extends \backend\components\base\BaseActiveRecord @@ -30,6 +30,9 @@ class GoodsView extends \backend\components\base\BaseActiveRecord
30 /** 30 /**
31 * @inheritdoc 31 * @inheritdoc
32 */ 32 */
  33 + public $price_currency_id;
  34 + public $price_margin_id;
  35 +
33 public static function tableName() 36 public static function tableName()
34 { 37 {
35 return '{{%goods_view}}'; 38 return '{{%goods_view}}';
@@ -75,6 +78,8 @@ class GoodsView extends \backend\components\base\BaseActiveRecord @@ -75,6 +78,8 @@ class GoodsView extends \backend\components\base\BaseActiveRecord
75 } 78 }
76 79
77 80
  81 +
  82 +
78 public function attributeLabels() 83 public function attributeLabels()
79 { 84 {
80 return [ 85 return [
frontend/controllers/GoodsController.php
  Show/Hide comments   View file @e147d39
@@ -26,7 +26,7 @@ class GoodsController extends Controller { @@ -26,7 +26,7 @@ class GoodsController extends Controller {
26 Yii::$app->session->setFlash('price_margin_id', 1); 26 Yii::$app->session->setFlash('price_margin_id', 1);
27 27
28 $searchModel = new GoodsViewSearch(); 28 $searchModel = new GoodsViewSearch();
29 - $goods_provider = $searchModel->searchCrosses($arr); 29 + $goods_provider = $searchModel->search($arr);
30 30
31 31
32 //$cross_arr = DetailsCrosses::find()->select('ARTICLE, BRAND')->where(['CROSS_ARTICLE' => '0092S40090', 'CROSS_BRAND' => 'BOSCH'])->asArray()->all(); 32 //$cross_arr = DetailsCrosses::find()->select('ARTICLE, BRAND')->where(['CROSS_ARTICLE' => '0092S40090', 'CROSS_BRAND' => 'BOSCH'])->asArray()->all();