From f447738b4967fd104393bb66e467114854e2fd91 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Wed, 30 Nov 2016 14:04:59 +0200 Subject: [PATCH] add variantSku --- controllers/OrderPaymentController.php | 0 models/Category.php | 14 -------------- models/OrderPayment.php | 0 models/OrderPaymentLang.php | 0 models/OrderPaymentSearch.php | 0 models/ProductFrontendSearch.php | 26 ++++++++++++++++---------- views/order-payment/_form.php | 0 views/order-payment/_search.php | 0 views/order-payment/create.php | 0 views/order-payment/index.php | 0 views/order-payment/update.php | 0 views/order-payment/view.php | 0 12 files changed, 16 insertions(+), 24 deletions(-) mode change 100644 => 100755 controllers/OrderPaymentController.php mode change 100644 => 100755 models/OrderPayment.php mode change 100644 => 100755 models/OrderPaymentLang.php mode change 100644 => 100755 models/OrderPaymentSearch.php mode change 100644 => 100755 views/order-payment/_form.php mode change 100644 => 100755 views/order-payment/_search.php mode change 100644 => 100755 views/order-payment/create.php mode change 100644 => 100755 views/order-payment/index.php mode change 100644 => 100755 views/order-payment/update.php mode change 100644 => 100755 views/order-payment/view.php diff --git a/controllers/OrderPaymentController.php b/controllers/OrderPaymentController.php old mode 100644 new mode 100755 index b18a65f..b18a65f --- a/controllers/OrderPaymentController.php +++ b/controllers/OrderPaymentController.php diff --git a/models/Category.php b/models/Category.php index 16bcffd..252bdec 100755 --- a/models/Category.php +++ b/models/Category.php @@ -32,8 +32,6 @@ * @property TaxGroup[] $taxGroups * @property Category[] $siblings * @property Category $parentAR - * @property Category $fullName - * @property Category $name * * From language behavior * * @property CategoryLang $lang * @property CategoryLang[] $langs @@ -92,19 +90,7 @@ } - public function getFullName(){ - if($this->parentAR != null){ - return $this->parentAR->name .' '.$this->name; - } else { - return $this->name; - } - - } - - public function getName(){ - return !empty($this->lang->category_synonym) ?$this->lang->category_synonym : $this->lang->title; - } /** * @inheritdoc diff --git a/models/OrderPayment.php b/models/OrderPayment.php old mode 100644 new mode 100755 index 08c69cc..08c69cc --- a/models/OrderPayment.php +++ b/models/OrderPayment.php diff --git a/models/OrderPaymentLang.php b/models/OrderPaymentLang.php old mode 100644 new mode 100755 index 3c31fa5..3c31fa5 --- a/models/OrderPaymentLang.php +++ b/models/OrderPaymentLang.php diff --git a/models/OrderPaymentSearch.php b/models/OrderPaymentSearch.php old mode 100644 new mode 100755 index da73a4c..da73a4c --- a/models/OrderPaymentSearch.php +++ b/models/OrderPaymentSearch.php diff --git a/models/ProductFrontendSearch.php b/models/ProductFrontendSearch.php index 6cb5082..bcd5d8a 100755 --- a/models/ProductFrontendSearch.php +++ b/models/ProductFrontendSearch.php @@ -59,7 +59,7 @@ * * @param array $params * - * @return ArrayDataProvider + * @return ActiveDataProvider */ public function search($category = null, $params = [], $in_stock = true) { @@ -68,26 +68,26 @@ [ 'attributes' => [ 'name_asc' => [ - 'asc' => [ 'lang.title' => SORT_ASC ], - 'desc' => [ 'lang.title' => SORT_ASC ], + 'asc' => [ 'product_lang.title' => SORT_ASC ], + 'desc' => [ 'product_lang.title' => SORT_ASC ], 'default' => SORT_ASC, 'label' => 'имени от А до Я', ], 'name_desc' => [ - 'asc' => [ 'lang.title' => SORT_DESC ], - 'desc' => [ 'lang.title' => SORT_DESC ], + 'asc' => [ 'product_lang.title' => SORT_DESC ], + 'desc' => [ 'product_lang.title' => SORT_DESC ], 'default' => SORT_DESC, 'label' => 'имени от Я до А', ], 'price_asc' => [ - 'asc' => [ 'enabledVariants.price' => SORT_ASC ], - 'desc' => [ 'enabledVariants.price' => SORT_ASC ], + 'asc' => [ 'product_variant.price' => SORT_ASC ], + 'desc' => [ 'product_variant.price' => SORT_ASC ], 'default' => SORT_ASC, 'label' => 'по цене по возрастанию', ], 'price_desc' => [ - 'asc' => [ 'enabledVariants.price' => SORT_DESC ], - 'desc' => [ 'enabledVariants.price' => SORT_DESC ], + 'asc' => [ 'product_variant.price' => SORT_DESC ], + 'desc' => [ 'product_variant.price' => SORT_DESC ], 'default' => SORT_DESC, 'label' => 'по цене по уменшению', ], @@ -98,7 +98,13 @@ $dataProvider = new ActiveDataProvider( [ 'query' => $this->getSearchQuery($category, $params, $in_stock) - ->with('variant', 'videos'), + ->with('variant', 'videos') + ->groupBy( + [ + 'product_lang.title', + 'product_variant.price', + 'product.id' + ]), 'pagination' => [ 'pageSize' => 12, ], diff --git a/views/order-payment/_form.php b/views/order-payment/_form.php old mode 100644 new mode 100755 index 7bdea8c..7bdea8c --- a/views/order-payment/_form.php +++ b/views/order-payment/_form.php diff --git a/views/order-payment/_search.php b/views/order-payment/_search.php old mode 100644 new mode 100755 index 62879a1..62879a1 --- a/views/order-payment/_search.php +++ b/views/order-payment/_search.php diff --git a/views/order-payment/create.php b/views/order-payment/create.php old mode 100644 new mode 100755 index 053f69c..053f69c --- a/views/order-payment/create.php +++ b/views/order-payment/create.php diff --git a/views/order-payment/index.php b/views/order-payment/index.php old mode 100644 new mode 100755 index 23b3c98..23b3c98 --- a/views/order-payment/index.php +++ b/views/order-payment/index.php diff --git a/views/order-payment/update.php b/views/order-payment/update.php old mode 100644 new mode 100755 index c48d1a7..c48d1a7 --- a/views/order-payment/update.php +++ b/views/order-payment/update.php diff --git a/views/order-payment/view.php b/views/order-payment/view.php old mode 100644 new mode 100755 index 98e37c4..98e37c4 --- a/views/order-payment/view.php +++ b/views/order-payment/view.php -- libgit2 0.21.4