Commit 1b0bedca by Евгений

Доработал обновление фраз

1 parent 5bee8571
......@@ -61,6 +61,7 @@ class KeywordsUpdate extends Command
$factory->setToken($token);
$goalKeywords = GoalKeyword::getForUpdate($token);
if ($goalKeywords->isEmpty()) continue;
foreach (array_chunk($goalKeywords->pluck('id')->toArray(), 1000) as $items){
GoalKeyword::whereIn('id', $items)
......
......@@ -172,7 +172,7 @@ class AdGroup extends Model
*/
public function scopeForUpdatedSelf($query)
{
return $query->whereNotNull("{$query->getModel()->getTable()}.updated_self");
return $query->whereNotNull("updated_self");
}
/**
......
......@@ -196,6 +196,7 @@ class GoalKeyword extends Pivot
->whereIn('goal_keywords.dictionary_campaign_id', $token->dictionaryCampaignsEnabledForExternalSynchronized->pluck('id'))
->select([
'goal_keywords.id as id',
'goal_keywords.external_id',
'goal_keywords.dictionary_campaign_id as dictionary_campaign_id',
'keywords.keyword as keyword',
'keywords.user_param_1 as user_param_1',
......
......@@ -94,7 +94,6 @@ class UpdateKeywords extends DirectRequest
} else {
$list = $lists[$goalKeyword->dictionary_campaign_id];
}
$data = [
'Id' => $goalKeyword->external_id,
'Keyword' => StrReplaceByVariables::getInstance($goalKeyword->keyword, $list)->get(),
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!