Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents 2ad65823 04c33f07
Showing 3 changed files with 130 additions and 6 deletions Show diff stats
helpers/ProductHelper.php
models/Category.php
models/ProductFrontendSearch.php
@@ -4,6 +4,8 @@
     use artweb\artbox\ecommerce\models\Category;
     use artweb\artbox\ecommerce\models\Product;
+    use yii\base\InvalidConfigException;
+    use yii\base\InvalidParamException;
     use yii\base\Object;
     use Yii;
     use yii\db\ActiveQuery;
@@ -23,7 +25,7 @@
         }
         /**
-         * Add $product_id to last products in session. Limit 16 products.
+         * Add $product_id to last products in session.
          *
          * @param int $product_id
          */
@@ -32,9 +34,6 @@
             $last_products = self::getLastProducts();
             if (!in_array($product_id, $last_products)) {
                 $last_products[] = intval($product_id);
-                if (count($last_products) > 16) {
-                    array_shift($last_products);
-                }
                 Yii::$app->session->set('last_products', $last_products);
             }
         }
@@ -52,7 +51,17 @@
             $last_products = Yii::$app->session->get('last_products', []);
             if ($as_object) {
                 $last_products = Product::find()
-                                        ->joinWith([ 'variant' ])
+                                        ->innerJoinWith(
+                                            [
+                                                'enabledVariants' => function ($query) {
+                                                    /**
+                                                     * @var ActiveQuery $query
+                                                     */
+                                                    $query->joinWith('lang')
+                                                        ->with('images');
+                                                },
+                                            ]
+                                        )
                                         ->where([ 'product.id' => $last_products ])
                                         ->andWhere(
                                             [
@@ -66,6 +75,19 @@
             }
             return array_reverse($last_products);
         }
+
+
+        public static function trueWordForm($num, $form_for_1, $form_for_2, $form_for_5){
+            $num = abs($num) % 100;
+            $num_x = $num % 10;
+            if ($num > 10 && $num < 20)
+                return $form_for_5;
+            if ($num_x > 1 && $num_x < 5)
+                return $form_for_2;
+            if ($num_x == 1)
+                return $form_for_1;
+            return $form_for_5;
+        }
         /**
          * Get special Products array with ProductVariants, which are in stock
@@ -181,4 +203,95 @@
         {
             return \Yii::$app->session->get('last_category_id');
         }
+        
+        /**
+         * Group Product[] by Categories
+         * Array of categories with 2 levels:
+         * <code>
+         * [
+         *  'parent_id' => [
+         *      'id',
+         *      'name',
+         *      'count',
+         *      'children' => [
+         *          'id' => [
+         *              'id',
+         *              'name',
+         *              'count',
+         *          ]
+         *      ]
+         *  ]
+         * ]
+         * </code>
+         *
+         * @param Product[] $products
+         *
+         * @return array
+         * @throws InvalidConfigException
+         */
+        public static function groupByCategories(array $products): array
+        {
+            $categoryList = [];
+            foreach ($products as $product) {
+                if (!( $product instanceof Product )) {
+                    throw new InvalidParamException('$products must be array of ' . Product::className());
+                }
+                foreach ($product->categories as $category) {
+                    /**
+                     * @var Category|null $parentCategory
+                     */
+                    $parentCategory = $category->parentAR;
+                    /* If category has parent add current category to parents children array,
+                    else create current category as root category */
+                    if ($parentCategory) {
+                        /* If parent category already in $categoryList search current category in its array,
+                        else create it in $categoryList and add current category to it */
+                        if (array_key_exists($parentCategory->id, $categoryList)) {
+                            /* If current category already in parent category array increament count by 1,
+                            else add current category to parent category children array */
+                            if (array_key_exists($category->id, $categoryList[ $parentCategory->id ][ 'children' ])) {
+                                $categoryList[ $parentCategory->id ][ 'children' ][ $category->id ][ 'count' ] += 1;
+                            } else {
+                                $categoryList[ $parentCategory->id ][ 'children' ][ $category->id ] = [
+                                    'id'    => $category->id,
+                                    'name'  => $category->lang->title,
+                                    'alias' => $category->lang->alias,
+                                    'count' => 1,
+                                ];
+                            }
+                        } else {
+                            $categoryList[ $parentCategory->id ] = [
+                                'id'       => $parentCategory->id,
+                                'name'     => $parentCategory->lang->title,
+                                'alias'    => $parentCategory->lang->alias,
+                                'children' => [
+                                    $category->id => [
+                                        'id'    => $category->id,
+                                        'name'  => $category->lang->title,
+                                        'alias' => $category->lang->alias,
+                                        'count' => 1,
+                                    ],
+                                ],
+                                'count'    => 0,
+                            ];
+                        }
+                    } else {
+                        /* If current category already in $categoryList increment its count by 1,
+                        else add it to $categoryList */
+                        if (array_key_exists($category->id, $categoryList)) {
+                            $categoryList[ $category->id ][ 'count' ] += 1;
+                        } else {
+                            $categoryList[ $category->id ] = [
+                                'id'       => $category->id,
+                                'name'     => $category->lang->title,
+                                'alias'    => $category->lang->alias,
+                                'count'    => 1,
+                                'children' => [],
+                            ];
+                        }
+                    }
+                }
+            }
+            return $categoryList;
+        }
     }
 \ No newline at end of file
@@ -31,6 +31,7 @@
      * @property Brand[]           $brands
      * @property TaxGroup[]        $taxGroups
      * @property Category[]        $siblings
+     * @property Category          $parentAR
      *       * From language behavior *
      * @property CategoryLang      $lang
      * @property CategoryLang[]    $langs
@@ -334,4 +335,14 @@
                             ]
                         );
         }
+        
+        /**
+         * Return Active query to obtain parent category
+         *
+         * @return ActiveQuery
+         */
+        public function getParentAR()
+        {
+            return $this->hasOne(self::className(), [ 'id' => 'parent_id' ]);
+        }
     }
@@ -98,7 +98,7 @@
             $dataProvider = new ArrayDataProvider(
                 [
                     'allModels'  => $this->getSearchQuery($category, $params, $in_stock)
-                                         ->with('variant')->all(),
+                                         ->with('variant', 'videos')->all(),
                     'pagination' => [
                         'pageSize' => 10,
                     ],