diff --git a/controllers/VariantController.php b/controllers/VariantController.php index 4d326e3..01c0879 100755 --- a/controllers/VariantController.php +++ b/controllers/VariantController.php @@ -232,26 +232,20 @@ $productStocks = $sorted_array; $stock_names = array_keys($productStocks); $stocks = Stock::find() - ->joinWith('lang') - ->where([ 'stock_lang.title' => $stock_names ]) + ->where([ 'stock.title' => $stock_names ]) ->indexBy(function($row) { /** * @var Stock $row */ - return $row->lang->title; + return $row->title; }) ->all(); foreach ($productStocks as $stockName => $quantity) { $quantity = (int) $quantity; if (!array_key_exists($stockName, $stocks)) { $stock = new Stock(); - $stock->generateLangs(); - foreach ($stock->modelLangs as $modelLang) { - $modelLang->title = $stockName; - } - if (!$stock->save() || !$stock->transactionStatus) { - continue; - } + $stock->title = $stockName; + $stock->save(); } else { $stock = $stocks[ $stockName ]; } diff --git a/models/Import.php b/models/Import.php index 3199caf..7a35fef 100755 --- a/models/Import.php +++ b/models/Import.php @@ -168,13 +168,12 @@ // ===== Set stock ==== if ($city_name) { if (( $stock = Stock::find() - ->joinWith('lang') - ->filterWhere([ 'stock_lang.title' => trim($city_name) ]) + ->filterWhere([ 'stock.title' => trim($city_name) ]) ->one() ) === null ) { // Create stock $stock = new Stock(); - $stock->lang->title = trim($city_name); + $stock->title = trim($city_name); $stock->save(false); } diff --git a/models/ProductStock.php b/models/ProductStock.php index 8785cbc..c33d930 100755 --- a/models/ProductStock.php +++ b/models/ProductStock.php @@ -101,7 +101,7 @@ if (!empty( $this->title )) { return $this->title; } elseif (!empty( $this->stock )) { - return $this->stock->lang->title; + return $this->stock->title; } else { return ''; } -- libgit2 0.21.4