Skip to content

Fix get-param for skeeks-redirect and add search to V3-artikul #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SimonovaNelya wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix get-param for skeeks-redirect and add search to V3-artikul #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35f8405
Merge pull request #1 from v3project/master
SimonovaNelya Mar 5, 2018
ed97ef5
Fix get-param for skeeks-redirect and add search to V3-artikul.
Mar 5, 2018
8c76fa5
Fix get-param for skeeks-redirect and add search to V3-artikul.
Mar 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 66 additions & 36 deletions src/components/V3toysComponent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @copyright 2010 SkeekS (СкикС)
* @date 16.07.2016
*/

namespace v3toys\skeeks\components;

use skeeks\cms\backend\BackendComponent;
Expand Down Expand Up @@ -38,29 +37,47 @@ public function getV3toysIdByCmsElement($cmsContentElement)
* @var $element V3toysProductContentElement
*/
$element = V3toysProductContentElement::findOne($cmsContentElement->id);
return (int)$element->v3toysProductProperty->v3toys_id;
return (int) $element->v3toysProductProperty->v3toys_id;
}

/**
* @param \yii\base\Application $application
*/
public function bootstrap($application)
{
if ($application instanceof Application) {
$application->on(Application::EVENT_BEFORE_REQUEST, function ($e) {

//Поисковые запросы К11111
if (!isset(\Yii::$app->cmsSearch)) {
if ($application instanceof Application)
{
$application->on(Application::EVENT_BEFORE_REQUEST, function($e)
{

//Поисковые запросы К11111 и A22221
if (!isset(\Yii::$app->cmsSearch))
{
return false;
}

$query = trim(\Yii::$app->cmsSearch->searchQuery);
$matches = [];
if (preg_match('/s*[KkКк]\s*(\d+)\s*$/', $query, $matches)) {
if (preg_match('/s*[KkКк]\s*(\d+)\s*$/', $query, $matches))
{
if (isset($matches[1]))
{
$query = \v3toys\skeeks\models\V3toysProductContentElement::find()
->joinWith('v3toysProductProperty as p')
->andWhere(['p.v3toys_id' => $matches[1]])
;
if ($element = $query->one())
{
\Yii::$app->response->redirect($element->url);
//\Yii::$app->end();
}
}
}
if (preg_match('/s*[AaАа]\s*(\d+)\s*$/', $query, $matches)) {
if (isset($matches[1])) {
$query = \v3toys\skeeks\models\V3toysProductContentElement::find()
->joinWith('v3toysProductProperty as p')
->andWhere(['p.v3toys_id' => $matches[1]]);
->andWhere(['p.sku' => $matches[1]]);
if ($element = $query->one()) {
\Yii::$app->response->redirect($element->url);
//\Yii::$app->end();
Expand All @@ -70,26 +87,31 @@ public function bootstrap($application)
});


Event::on(Controller::class, Controller::EVENT_BEFORE_ACTION, function ($e) {
if (!BackendComponent::getCurrent()) {
Event::on(Controller::class, Controller::EVENT_BEFORE_ACTION, function($e) {
if (!BackendComponent::getCurrent())
{
\Yii::$app->cms->descriptor->homepage = 'система управления сайтом';
}

$this->initDefaultCanUrl();
});


$application->on(Application::EVENT_AFTER_REQUEST, function ($e) {
$application->on(Application::EVENT_AFTER_REQUEST, function($e)
{

if ($this->isTrigerEventCanUrl()) {
if ($this->isTrigerEventCanUrl())
{
\Yii::$app->canurl->event_after_request($e);
}


});

$application->view->on(View::EVENT_END_PAGE, function ($e) {
if ($this->isTrigerEventCanUrl()) {
$application->view->on(View::EVENT_END_PAGE, function($e)
{
if ($this->isTrigerEventCanUrl())
{
\Yii::$app->canurl->event_end_page($e);
}
});
Expand All @@ -98,59 +120,67 @@ public function bootstrap($application)

public function initDefaultCanUrl()
{
if (\Yii::$app->requestedRoute) {
$requestedUrl = Url::to(ArrayHelper::merge(["/" . \Yii::$app->requestedRoute],
(array)\Yii::$app->request->queryParams));
if (\Yii::$app->requestedRoute)
{
$requestedUrl = Url::to(ArrayHelper::merge(["/" . \Yii::$app->requestedRoute], (array) \Yii::$app->request->queryParams));
$autoPath = ArrayHelper::getValue(parse_url($requestedUrl), 'path');
\Yii::$app->canurl->path = $autoPath;
} else {
if (\Yii::$app->cms->currentTree) {
\Yii::$app->canurl->path = \Yii::$app->cms->currentTree->url;
} else {
//print_r(\Yii::$app->request);
}
} else if (\Yii::$app->cms->currentTree)
{
\Yii::$app->canurl->path = \Yii::$app->cms->currentTree->url;
} else
{
//print_r(\Yii::$app->request);
}

\Yii::$app->canurl->SETcore_params([]);
\Yii::$app->canurl->SETimportant_params([]);

if (in_array(\Yii::$app->controller->action->uniqueId, ['cms/tree/view', 'savedFilters/saved-filters/view'])) {
if (in_array(\Yii::$app->controller->action->uniqueId, ['cms/tree/view', 'savedFilters/saved-filters/view']))
{
\Yii::$app->canurl->ADDminor_params(['per-page' => null]);
\Yii::$app->canurl->ADDminor_params(['page' => null]);
\Yii::$app->canurl->ADDimportant_pnames(['ProductFilters']);
\Yii::$app->canurl->ADDimportant_pnames(['SearchProductsModel']);
\Yii::$app->canurl->ADDimportant_pnames(['SearchRelatedPropertiesModel']);
}

if (\Yii::$app->controller->action->uniqueId == 'v3toys/cart/finish') {
if (\Yii::$app->controller->action->uniqueId == 'v3toys/cart/finish')
{
\Yii::$app->canurl->ADDimportant_pnames(['key']);
}

if (\Yii::$app->controller->action->uniqueId == 'cmsSearch/result/index') {
if (\Yii::$app->controller->action->uniqueId == 'externallinks/redirect/redirect')
{
\Yii::$app->canurl->ADDimportant_pnames(['url']);
}

if (\Yii::$app->controller->action->uniqueId == 'cmsSearch/result/index')
{
\Yii::$app->canurl->ADDimportant_pnames(['q']);
}
}


public function isTrigerEventCanUrl()
{
if (BackendComponent::getCurrent()) {
if (BackendComponent::getCurrent())
{
return false;
}

if (\Yii::$app->controller && \Yii::$app->controller->uniqueId == 'cms/imaging') {
if (\Yii::$app->controller && \Yii::$app->controller->uniqueId == 'cms/imaging')
{
return false;
}

if (\Yii::$app->controller && \Yii::$app->controller->module->id == 'gii') {
if (\Yii::$app->controller && \Yii::$app->controller->uniqueId == 'debug/default')
{
return false;
}

if (\Yii::$app->controller && \Yii::$app->controller->uniqueId == 'debug/default') {
return false;
}

if (!\Yii::$app->requestedRoute) {

if (!\Yii::$app->requestedRoute)
{
return false;
}

Expand Down