Skip to content

Commit

Permalink
Merge pull request #114 from lovata/develop
Browse files Browse the repository at this point in the history
Release version 1.13.1
  • Loading branch information
kharanenka authored Oct 16, 2018
2 parents 7d12c5c + 16a65b2 commit 5057ed2
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
7 changes: 7 additions & 0 deletions classes/item/OfferItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@
* @see \Lovata\PropertiesShopaholic\Classes\Event\OfferModelHandler::extendOfferItem
* @property array $property_value_array
* @property \Lovata\PropertiesShopaholic\Classes\Collection\PropertyCollection|\Lovata\PropertiesShopaholic\Classes\Item\PropertyItem[] $property
*
* Discounts for Shopaholic
* @property string $discount_price
* @property float $discount_price_value
* @property int $discount_id
* @property float $discount_value
* @property string $discount_type
*/
class OfferItem extends ElementItem
{
Expand Down
4 changes: 4 additions & 0 deletions models/PromoBlock.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@
* @property \October\Rain\Database\Collection|\Lovata\CampaignsShopaholic\Models\Campaign[] $campaign
* @method static \October\Rain\Database\Relations\BelongsToMany|\Lovata\CampaignsShopaholic\Models\Campaign campaign()
*
* Coupons for Shopaholic
* @property \October\Rain\Database\Collection|\Lovata\CouponsShopaholic\Models\CouponGroup[] $coupon_group
* @method static \October\Rain\Database\Relations\BelongsToMany|\Lovata\CouponsShopaholic\Models\CouponGroup coupon_group()
*
* @method static $this active()
* @method static $this hidden()
* @method static $this notHidden()
Expand Down
4 changes: 3 additions & 1 deletion updates/version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,6 @@
1.13.0:
- 'Added PromoBlock model. Promo blocks are sections of content that you can place throughout your eCommerce website and advertise products, offers, discounts, campaigns, and other activity. Added PromoBlockData, PromoBlockPage, PromoBlockList components. Added PromoBlockItem, PromoBlockCollection classes.'
- create_table_promo_block.php
- create_table_promo_block_relation.php
- create_table_promo_block_relation.php
1.13.1:
- 'Added annotations for integration with Coupons for Shopaholic, Discounts for Shopaholic, Campaigns for Shopaholic plugins.'

0 comments on commit 5057ed2

Please sign in to comment.