Commit 1e943c2bbdd75a9daaf637f2b806467a139c84b6
1 parent
464d2610
add variantSku
Showing
3 changed files
with
7 additions
and
14 deletions
Show diff stats
controllers/VariantController.php
| @@ -232,26 +232,20 @@ | @@ -232,26 +232,20 @@ | ||
| 232 | $productStocks = $sorted_array; | 232 | $productStocks = $sorted_array; |
| 233 | $stock_names = array_keys($productStocks); | 233 | $stock_names = array_keys($productStocks); |
| 234 | $stocks = Stock::find() | 234 | $stocks = Stock::find() |
| 235 | - ->joinWith('lang') | ||
| 236 | - ->where([ 'stock_lang.title' => $stock_names ]) | 235 | + ->where([ 'stock.title' => $stock_names ]) |
| 237 | ->indexBy(function($row) { | 236 | ->indexBy(function($row) { |
| 238 | /** | 237 | /** |
| 239 | * @var Stock $row | 238 | * @var Stock $row |
| 240 | */ | 239 | */ |
| 241 | - return $row->lang->title; | 240 | + return $row->title; |
| 242 | }) | 241 | }) |
| 243 | ->all(); | 242 | ->all(); |
| 244 | foreach ($productStocks as $stockName => $quantity) { | 243 | foreach ($productStocks as $stockName => $quantity) { |
| 245 | $quantity = (int) $quantity; | 244 | $quantity = (int) $quantity; |
| 246 | if (!array_key_exists($stockName, $stocks)) { | 245 | if (!array_key_exists($stockName, $stocks)) { |
| 247 | $stock = new Stock(); | 246 | $stock = new Stock(); |
| 248 | - $stock->generateLangs(); | ||
| 249 | - foreach ($stock->modelLangs as $modelLang) { | ||
| 250 | - $modelLang->title = $stockName; | ||
| 251 | - } | ||
| 252 | - if (!$stock->save() || !$stock->transactionStatus) { | ||
| 253 | - continue; | ||
| 254 | - } | 247 | + $stock->title = $stockName; |
| 248 | + $stock->save(); | ||
| 255 | } else { | 249 | } else { |
| 256 | $stock = $stocks[ $stockName ]; | 250 | $stock = $stocks[ $stockName ]; |
| 257 | } | 251 | } |
models/Import.php
| @@ -168,13 +168,12 @@ | @@ -168,13 +168,12 @@ | ||
| 168 | // ===== Set stock ==== | 168 | // ===== Set stock ==== |
| 169 | if ($city_name) { | 169 | if ($city_name) { |
| 170 | if (( $stock = Stock::find() | 170 | if (( $stock = Stock::find() |
| 171 | - ->joinWith('lang') | ||
| 172 | - ->filterWhere([ 'stock_lang.title' => trim($city_name) ]) | 171 | + ->filterWhere([ 'stock.title' => trim($city_name) ]) |
| 173 | ->one() ) === null | 172 | ->one() ) === null |
| 174 | ) { | 173 | ) { |
| 175 | // Create stock | 174 | // Create stock |
| 176 | $stock = new Stock(); | 175 | $stock = new Stock(); |
| 177 | - $stock->lang->title = trim($city_name); | 176 | + $stock->title = trim($city_name); |
| 178 | $stock->save(false); | 177 | $stock->save(false); |
| 179 | } | 178 | } |
| 180 | 179 |
models/ProductStock.php
| @@ -101,7 +101,7 @@ | @@ -101,7 +101,7 @@ | ||
| 101 | if (!empty( $this->title )) { | 101 | if (!empty( $this->title )) { |
| 102 | return $this->title; | 102 | return $this->title; |
| 103 | } elseif (!empty( $this->stock )) { | 103 | } elseif (!empty( $this->stock )) { |
| 104 | - return $this->stock->lang->title; | 104 | + return $this->stock->title; |
| 105 | } else { | 105 | } else { |
| 106 | return ''; | 106 | return ''; |
| 107 | } | 107 | } |