Skip to content

Commit

Permalink
Merge pull request #10 from maximequeneau/master
Browse files Browse the repository at this point in the history
Fix issue #3 and #5
  • Loading branch information
romainruaud committed Jun 6, 2019
2 parents 62fc635 + 6e205f3 commit dce6dd5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Api/Data/GiftRuleSearchResultsInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ interface GiftRuleSearchResultsInterface extends SearchResultsInterface
/**
* Get giftrule items.
*
* @return GiftRuleInterface[]
* @return GiftRuleInterface
*/
public function getItems();

/**
* Set giftrule items.
*
* @param GiftRuleInterface[] $items Gift rule interface
* @param GiftRuleInterface $items Gift rule interface
* @return $this
*/
public function setItems(array $items);
Expand Down
2 changes: 1 addition & 1 deletion etc/extension_attributes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
<extension_attributes for="Magento\SalesRule\Api\Data\RuleInterface">
<attribute code="gift_rule" type="Smile\GiftSalesRule\Api\Data\GiftRuleInterface[]" />
<attribute code="gift_rule" type="Smile\GiftSalesRule\Api\Data\GiftRuleInterface" />
</extension_attributes>
</config>
2 changes: 1 addition & 1 deletion view/adminhtml/ui_component/sales_rule_form.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<rule name="required-entry" xsi:type="boolean">true</rule>
</validation>
<dataType>text</dataType>
<label translate="true">Maximum number product offered</label>
<label translate="true">Maximum number of products offered</label>
<dataScope>extension_attributes.gift_rule.maximum_number_product</dataScope>
<visible>false</visible>
</settings>
Expand Down

0 comments on commit dce6dd5

Please sign in to comment.