Skip to content

Commit

Permalink
Merge pull request #13 from maximequeneau/master
Browse files Browse the repository at this point in the history
[save] Fix conflict with Magento_Reward module
  • Loading branch information
maximequeneau committed Jun 18, 2019
2 parents 895e4c7 + a599fa4 commit cc24427
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions etc/di.xml
Expand Up @@ -70,13 +70,13 @@
<argument name="extensionActions" xsi:type="array">
<item name="Magento\SalesRule\Api\Data\RuleInterface" xsi:type="array">
<item name="create" xsi:type="array">
<item name="create_reward" xsi:type="string">Smile\GiftSalesRule\Model\SalesRule\SaveHandler</item>
<item name="create_gift_rule" xsi:type="string">Smile\GiftSalesRule\Model\SalesRule\SaveHandler</item>
</item>
<item name="update" xsi:type="array">
<item name="update_reward" xsi:type="string">Smile\GiftSalesRule\Model\SalesRule\SaveHandler</item>
<item name="update_gift_rule" xsi:type="string">Smile\GiftSalesRule\Model\SalesRule\SaveHandler</item>
</item>
<item name="read" xsi:type="array">
<item name="read_reward" xsi:type="string">Smile\GiftSalesRule\Model\SalesRule\ReadHandler</item>
<item name="read_gift_rule" xsi:type="string">Smile\GiftSalesRule\Model\SalesRule\ReadHandler</item>
</item>
</item>
</argument>
Expand Down

0 comments on commit cc24427

Please sign in to comment.