Merge pull request #238 from oc-shopaholic/develop

Release version 1.24.2
oc-shopaholic · Jan 8, 2020 · 8c6bcf6 · 8c6bcf6
2 parents 0d3711c + 141edc1
commit 8c6bcf6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/classes/collection/OfferCollection.php b/classes/collection/OfferCollection.php
@@ -16,7 +16,7 @@
  * @method $this filterByQuantity()
  * @method $this filterByProperty(array $arFilterList, \Lovata\FilterShopaholic\Classes\Collection\FilterPropertyCollection $obPropertyList)
  *
- * Digital products for Shopaholic
+ * Subscriptions for Shopaholic
  * @method $this sortByPeriod()
  */
 class OfferCollection extends ElementCollection

diff --git a/classes/item/OfferItem.php b/classes/item/OfferItem.php
@@ -74,9 +74,9 @@
  * @property float                                                                                                                       $discount_value
  * @property string                                                                                                                      $discount_type
  *
- * Digital products for Shopaholic
- * @property int                                                                                                                         $digital_product_period_id
- * @property \Lovata\DigitalProductsShopaholic\Classes\Item\DigitalProductPeriodItem                                                     $digital_product_period
+ * Subscriptions for Shopaholic
+ * @property int                                                                                                                         $subscription_period_id
+ * @property \Lovata\SubscriptionsShopaholic\Classes\Item\SubscriptionPeriodItem                                                         $subscription_period
  *
  * YandexMarket for Shopaholic
  * @property \System\Models\File                                                                                                         $preview_image_yandex

diff --git a/models/Offer.php b/models/Offer.php
@@ -91,10 +91,10 @@
  * @property \October\Rain\Database\Collection|\Lovata\CampaignsShopaholic\Models\Campaign[]               $campaign
  * @method static \October\Rain\Database\Relations\BelongsToMany|\Lovata\CampaignsShopaholic\Models\Campaign campaign()
  *
- * Digital product for Shopaholic
- * @property int                                                                                           $digital_product_period_id
- * @property \Lovata\DigitalProductsShopaholic\Models\DigitalProductPeriod                                 $digital_product_period
- * @method static \October\Rain\Database\Relations\BelongsTo|\Lovata\DigitalProductsShopaholic\Models\DigitalProductPeriod digital_product_period()
+ * Subscriptions for Shopaholic
+ * @property int                                                                                           $subscription_period_id
+ * @property \Lovata\SubscriptionsShopaholic\Models\SubscriptionPeriod                                     $subscription_period
+ * @method static \October\Rain\Database\Relations\BelongsTo|\Lovata\SubscriptionsShopaholic\Models\SubscriptionPeriod subscription_period()
  *
  * YandexMarket for Shopaholic
  * @property \System\Models\File                                                                           $preview_image_yandex

diff --git a/models/Product.php b/models/Product.php
@@ -101,8 +101,8 @@
  * @property \October\Rain\Database\Collection|\Lovata\LabelsShopaholic\Models\Label[]                 $label
  * @method static \October\Rain\Database\Relations\BelongsToMany|\Lovata\LabelsShopaholic\Models\Label label()
  *
- * Digital products for Shopaholic
- * @property bool                                                                                      $is_digital_product
+ * Subscriptions for Shopaholic
+ * @property bool                                                                                      $is_subscription
  *
  * YandexMarket for Shopaholic
  * @property \System\Models\File                                                                       $preview_image_yandex

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -103,10 +103,12 @@
 1.22.5:
     - 'Fixed bug with deactivating items in import from XML files.'
 1.23.0:
-    - 'Added ability to show catalog with active price type. Added annotations for integration with Digital product for Shopaholic plugin.'
+    - 'Added ability to show catalog with active price type. Added annotations for integration with Subscriptions for Shopaholic plugin.'
 1.23.1:
     - 'Added step attribute to offer price field in backend view'
 1.24.0:
     - 'Added support of wildcard params to CategoryPage component. Requires Toolbox plugin version 1.26.0 and later'
 1.24.1:
-    - 'Fixed support of wildcard params in CategoryPage component. Requires Toolbox plugin version 1.26.1 and later'
+    - 'Fixed support of wildcard params in CategoryPage component. Requires Toolbox plugin version 1.26.1 and later'
+1.24.2:
+    - 'Added annotations for Subscriptions for Shopaholic plugin.'