Merge pull request #93 from lovata/develop

Release version 1.11.2
oc-shopaholic · Jul 11, 2018 · 0079b38 · 0079b38
2 parents 280ffe9 + 5b981e3
commit 0079b38
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 101 deletions.
diff --git a/classes/event/BrandModelHandler.php b/classes/event/BrandModelHandler.php
@@ -13,20 +13,9 @@
  */
 class BrandModelHandler extends ModelHandler
 {
-    /** @var  BrandListStore */
-    protected $obListStore;
-
     /** @var Brand */
     protected $obElement;
 
-    /**
-     * BrandModelHandler constructor.
-     */
-    public function __construct()
-    {
-        $this->obListStore = BrandListStore::instance();
-    }
-
     /**
      * Add listeners
      * @param \Illuminate\Events\Dispatcher $obEvent
@@ -56,7 +45,7 @@ protected function afterSave()
     {
         parent::afterSave();
 
-        $this->checkFieldChanges('active', $this->obListStore->active);
+        $this->checkFieldChanges('active', BrandListStore::instance()->active);
     }
 
     /**
@@ -68,7 +57,7 @@ protected function afterDelete()
         $this->clearSortingList();
 
         if ($this->obElement->active) {
-            $this->obListStore->active->clear();
+            BrandListStore::instance()->active->clear();
         }
     }
 
@@ -77,7 +66,7 @@ protected function afterDelete()
      */
     protected function clearSortingList()
     {
-        $this->obListStore->sorting->clear();
+        BrandListStore::instance()->sorting->clear();
     }
 
     /**

diff --git a/classes/event/CategoryModelHandler.php b/classes/event/CategoryModelHandler.php
@@ -16,17 +16,6 @@ class CategoryModelHandler extends ModelHandler
     /** @var  Category */
     protected $obElement;
 
-    /** @var  CategoryListStore */
-    protected $obListStore;
-
-    /**
-     * CategoryModelHandler constructor.
-     */
-    public function __construct()
-    {
-        $this->obListStore = CategoryListStore::instance();
-    }
-
     /**
      * Add listeners
      * @param \Illuminate\Events\Dispatcher $obEvent
@@ -36,7 +25,7 @@ public function subscribe($obEvent)
         parent::subscribe($obEvent);
 
         $obEvent->listen('shopaholic.category.update.sorting', function () {
-            $this->obListStore->top_level->clear();
+            CategoryListStore::instance()->top_level->clear();
 
             //Get category ID list
             $arCategoryIDList = Category::lists('id');
@@ -57,9 +46,9 @@ public function subscribe($obEvent)
     protected function afterSave()
     {
         parent::afterSave();
-        $this->obListStore->top_level->clear();
+        CategoryListStore::instance()->top_level->clear();
 
-        $this->checkFieldChanges('active', $this->obListStore->active);
+        $this->checkFieldChanges('active', CategoryListStore::instance()->active);
     }
 
     /**
@@ -68,15 +57,15 @@ protected function afterSave()
     protected function afterDelete()
     {
         parent::afterDelete();
-        $this->obListStore->top_level->clear();
+        CategoryListStore::instance()->top_level->clear();
 
         //Clear parent item cache
         if (!empty($this->obElement->parent_id)) {
             CategoryItem::clearCache($this->obElement->parent_id);
         }
 
         if ($this->obElement->active) {
-            $this->obListStore->active->clear();
+            CategoryListStore::instance()->active->clear();
         }
     }
 

diff --git a/classes/event/OfferModelHandler.php b/classes/event/OfferModelHandler.php
@@ -21,12 +21,6 @@ class OfferModelHandler extends ModelHandler
     /** @var  Offer */
     protected $obElement;
 
-    /** @var  ProductListStore */
-    protected $obProductListStore;
-
-    /** @var  OfferListStore */
-    protected $obListStore;
-
     /**
      * After save event handler
      */
@@ -50,7 +44,7 @@ protected function afterDelete()
         if ($this->obElement->active) {
             $this->clearProductActiveList();
             $this->clearProductItemCache($this->obElement->product_id);
-            $this->obListStore->active->clear();
+            OfferListStore::instance()->active->clear();
         }
 
         //Get product object
@@ -60,8 +54,8 @@ protected function afterDelete()
         }
 
         //Clear sorting product list by offer price
-        $this->obProductListStore->sorting->clear(ProductListStore::SORT_PRICE_ASC);
-        $this->obProductListStore->sorting->clear(ProductListStore::SORT_PRICE_DESC);
+        ProductListStore::instance()->sorting->clear(ProductListStore::SORT_PRICE_ASC);
+        ProductListStore::instance()->sorting->clear(ProductListStore::SORT_PRICE_DESC);
     }
 
     /**
@@ -104,8 +98,8 @@ protected function checkProductIDField()
     protected function checkPriceField()
     {
         if ($this->obElement->getOriginal('price') != $this->obElement->price_value) {
-            $this->obListStore->sorting->clear(OfferListStore::SORT_PRICE_ASC);
-            $this->obListStore->sorting->clear(OfferListStore::SORT_PRICE_DESC);
+            OfferListStore::instance()->sorting->clear(OfferListStore::SORT_PRICE_ASC);
+            OfferListStore::instance()->sorting->clear(OfferListStore::SORT_PRICE_DESC);
         }
 
         $bNeedUpdateFlag =
@@ -126,8 +120,8 @@ protected function checkPriceField()
             return;
         }
 
-        $this->obProductListStore->sorting->clear(ProductListStore::SORT_PRICE_ASC);
-        $this->obProductListStore->sorting->clear(ProductListStore::SORT_PRICE_DESC);
+        ProductListStore::instance()->sorting->clear(ProductListStore::SORT_PRICE_ASC);
+        ProductListStore::instance()->sorting->clear(ProductListStore::SORT_PRICE_DESC);
     }
 
     /**
@@ -141,7 +135,7 @@ protected function checkActiveField()
         }
 
         $this->clearProductActiveList();
-        $this->obListStore->active->clear();
+        OfferListStore::instance()->active->clear();
 
         $obProduct = $this->obElement->product;
         if (empty($obProduct)) {
@@ -167,16 +161,7 @@ protected function clearProductActiveList()
             return;
         }
 
-        $this->obProductListStore->active->clear();
-    }
-
-    /**
-     * Init store objects
-     */
-    protected function init()
-    {
-        $this->obProductListStore = ProductListStore::instance();
-        $this->obListStore = OfferListStore::instance();
+        ProductListStore::instance()->active->clear();
     }
 
     /**

diff --git a/classes/event/ProductModelHandler.php b/classes/event/ProductModelHandler.php
@@ -18,12 +18,6 @@ class ProductModelHandler extends ModelHandler
     /** @var  Product */
     protected $obElement;
 
-    /** @var  ProductListStore */
-    protected $obListStore;
-
-    /** @var  BrandListStore */
-    protected $obBrandListStore;
-
     /**
      * Add listeners
      * @param \Illuminate\Events\Dispatcher $obEvent
@@ -49,8 +43,8 @@ protected function afterCreate()
     {
         parent::afterCreate();
 
-        $this->obListStore->sorting->clear(ProductListStore::SORT_NEW);
-        $this->obListStore->sorting->clear(ProductListStore::SORT_NO);
+        ProductListStore::instance()->sorting->clear(ProductListStore::SORT_NEW);
+        ProductListStore::instance()->sorting->clear(ProductListStore::SORT_NO);
     }
 
     /**
@@ -77,18 +71,18 @@ protected function afterDelete()
         $this->processOfferAfterDelete();
         parent::afterDelete();
 
-        $this->obListStore->category->clear($this->obElement->category_id);
-        $this->obBrandListStore->category->clear($this->obElement->category_id);
+        ProductListStore::instance()->category->clear($this->obElement->category_id);
+        BrandListStore::instance()->category->clear($this->obElement->category_id);
 
-        $this->obListStore->brand->clear($this->obElement->brand_id);
+        ProductListStore::instance()->brand->clear($this->obElement->brand_id);
 
-        $this->obListStore->sorting->clear(ProductListStore::SORT_PRICE_ASC);
-        $this->obListStore->sorting->clear(ProductListStore::SORT_PRICE_DESC);
-        $this->obListStore->sorting->clear(ProductListStore::SORT_NEW);
-        $this->obListStore->sorting->clear(ProductListStore::SORT_NO);
+        ProductListStore::instance()->sorting->clear(ProductListStore::SORT_PRICE_ASC);
+        ProductListStore::instance()->sorting->clear(ProductListStore::SORT_PRICE_DESC);
+        ProductListStore::instance()->sorting->clear(ProductListStore::SORT_NEW);
+        ProductListStore::instance()->sorting->clear(ProductListStore::SORT_NO);
 
         if ($this->obElement->active) {
-            $this->obListStore->active->clear();
+            ProductListStore::instance()->active->clear();
         }
     }
 
@@ -118,7 +112,7 @@ protected function checkActiveField()
             return;
         }
 
-        $this->obListStore->active->clear();
+        ProductListStore::instance()->active->clear();
 
         $this->clearCategoryProductCount($this->obElement->category_id);
 
@@ -144,11 +138,11 @@ protected function checkCategoryIDField()
         }
 
         //Update product ID cache list for category
-        $this->obListStore->category->clear($this->obElement->category_id);
-        $this->obListStore->category->clear((int) $this->obElement->getOriginal('category_id'));
+        ProductListStore::instance()->category->clear($this->obElement->category_id);
+        ProductListStore::instance()->category->clear((int) $this->obElement->getOriginal('category_id'));
 
-        $this->obBrandListStore->category->clear($this->obElement->category_id);
-        $this->obBrandListStore->category->clear((int) $this->obElement->getOriginal('category_id'));
+        BrandListStore::instance()->category->clear($this->obElement->category_id);
+        BrandListStore::instance()->category->clear((int) $this->obElement->getOriginal('category_id'));
 
         $this->clearCategoryProductCount($this->obElement->category_id);
         $this->clearCategoryProductCount((int) $this->obElement->getOriginal('category_id'));
@@ -165,8 +159,8 @@ protected function checkBrandIDField()
         }
 
         //Update product ID cache list for brand
-        $this->obListStore->brand->clear($this->obElement->brand_id);
-        $this->obListStore->brand->clear((int) $this->obElement->getOriginal('brand_id'));
+        ProductListStore::instance()->brand->clear($this->obElement->brand_id);
+        ProductListStore::instance()->brand->clear((int) $this->obElement->getOriginal('brand_id'));
     }
 
     /**
@@ -199,8 +193,8 @@ protected function checkAdditionalCategoryList()
         //Clear product list cache by category ID
         foreach ($arCategoryIDList as $iCategoryID) {
 
-            $this->obListStore->category->clear($iCategoryID);
-            $this->obBrandListStore->category->clear($iCategoryID);
+            ProductListStore::instance()->category->clear($iCategoryID);
+            BrandListStore::instance()->category->clear($iCategoryID);
 
             $this->clearCategoryProductCount($iCategoryID);
         }
@@ -218,15 +212,6 @@ protected function clearCategoryProductCount($iCategoryID)
         }
     }
 
-    /**
-     * Init store objects
-     */
-    protected function init()
-    {
-        $this->obListStore = ProductListStore::instance();
-        $this->obBrandListStore = BrandListStore::instance();
-    }
-
     /**
      * Get model class name
      * @return string

diff --git a/classes/item/CategoryItem.php b/classes/item/CategoryItem.php
@@ -44,11 +44,12 @@
  * Properties for Shopaholic
  * @see     \Lovata\PropertiesShopaholic\Classes\Event\CategoryModelHandler::extendCategoryItem
  *
- * @method addProductPropertyIDList()
+ * @property array                                                                                                                             $property_set_id
+ * @property \Lovata\PropertiesShopaholic\Classes\Collection\PropertySetCollection|\Lovata\PropertiesShopaholic\Classes\Item\PropertySetItem[] $property_set
+ *
  * @property array                                                                                                                         $product_property_list
  * @property \Lovata\PropertiesShopaholic\Classes\Collection\PropertyCollection|\Lovata\PropertiesShopaholic\Classes\Item\PropertyItem[]   $product_property
  *
- * @method addOfferPropertyIDList()
  * @property array                                                                                                                         $offer_property_list
  * @property \Lovata\PropertiesShopaholic\Classes\Collection\PropertyCollection|\Lovata\PropertiesShopaholic\Classes\Item\PropertyItem[]   $offer_property
  *
@@ -209,12 +210,7 @@ protected function getProductCountAttribute()
             }
         }
 
-        $obProductCollection = ProductCollection::make()->saved(self::class.'_active');
-        if (empty($obProductCollection)) {
-            $obProductCollection = ProductCollection::make()->active()->save(self::class.'_active');
-        }
-
-        $iProductCount += $obProductCollection->category($this->id)->count();
+        $iProductCount += ProductCollection::make()->active()->category($this->id)->count();
 
         CCache::forever($arCacheTag, $sCacheKey, $iProductCount);
         $this->setAttribute('product_count', $iProductCount);

diff --git a/classes/item/OfferItem.php b/classes/item/OfferItem.php
@@ -38,6 +38,7 @@
  *
  * Properties for Shopaholic
  * @see \Lovata\PropertiesShopaholic\Classes\Event\OfferModelHandler::extendOfferItem
+ * @property array       $property_value_array
  * @property \Lovata\PropertiesShopaholic\Classes\Collection\PropertyCollection|\Lovata\PropertiesShopaholic\Classes\Item\PropertyItem[] $property
  */
 class OfferItem extends ElementItem

diff --git a/classes/item/ProductItem.php b/classes/item/ProductItem.php
@@ -40,6 +40,7 @@
  *
  * Properties for Shopaholic
  * @see     \Lovata\PropertiesShopaholic\Classes\Event\ProductModelHandler::extendProductItem
+ * @property array                                                   $property_value_array
  * @property \Lovata\PropertiesShopaholic\Classes\Collection\PropertyCollection|\Lovata\PropertiesShopaholic\Classes\Item\PropertyItem[] $property
  *
  * Reviews for Shopaholic

diff --git a/classes/store/product/ListByCategoryStore.php b/classes/store/product/ListByCategoryStore.php
@@ -1,6 +1,7 @@
 <?php namespace Lovata\Shopaholic\Classes\Store\Product;
 
 use DB;
+use Event;
 use Lovata\Toolbox\Classes\Store\AbstractStoreWithParam;
 
 use Lovata\Shopaholic\Models\Product;
@@ -14,6 +15,17 @@ class ListByCategoryStore extends AbstractStoreWithParam
 {
     protected static $instance;
 
+    /**
+     * Clear element ID list
+     * @param string $sFilterValue
+     */
+    public function clear($sFilterValue)
+    {
+        parent::clear($sFilterValue);
+
+        Event::fire('shopaholic.product.category.clear', [$sFilterValue]);
+    }
+
     /**
      * Get ID list from database
      * @return array

diff --git a/models/Category.php b/models/Category.php
@@ -55,11 +55,11 @@
  * Properties for Shopaholic
  * @see \Lovata\PropertiesShopaholic\Classes\Event\CategoryModelHandler::addModelRelationConfig
  *
- * @property \October\Rain\Database\Collection|\Lovata\PropertiesShopaholic\Models\Property[] $product_property
- * @method static \October\Rain\Database\Relations\BelongsToMany|\Lovata\PropertiesShopaholic\Models\Property product_property()
+ * @property \October\Rain\Database\Collection|\Lovata\PropertiesShopaholic\Models\PropertySet[] $property_set
+ * @method static \October\Rain\Database\Relations\BelongsToMany|\Lovata\PropertiesShopaholic\Models\PropertySet property_set()
  *
+ * @property \October\Rain\Database\Collection|\Lovata\PropertiesShopaholic\Models\Property[] $product_property
  * @property \October\Rain\Database\Collection|\Lovata\PropertiesShopaholic\Models\Property[] $offer_property
- * @method static \October\Rain\Database\Relations\BelongsToMany|\Lovata\PropertiesShopaholic\Models\Property offer_property()
  *
  * @method static $this getByParentID(int $iParentID)
  */
@@ -105,6 +105,8 @@ class Category extends Model
     ];
     public $hasMany = ['product' => Product::class];
 
+    public $appends = [];
+    public $purgeable = [];
     public $fillable = [
         'active',
         'name',