Merge branch 'FearlessKiwis-MAGETWO-32896-Sales-Immut-2' into develop

Author: Yu Tang

app/code/Magento/CheckoutAgreements/Api/Data/AgreementInterface.php

@@ -7,41 +7,93 @@
 
 interface AgreementInterface
 {
+    /**#@+
+     * Constants for keys of data array. Identical to the name of the getter in snake case
+     */
+    const AGREEMENT_ID = 'agreement_id';
+    const NAME = 'name';
+    const CONTENT = 'content';
+    const CONTENT_HEIGHT = 'content_height';
+    const CHECKBOX_TEXT = 'checkbox_text';
+    const IS_ACTIVE = 'is_active';
+    const IS_HTML = 'is_html';
+    /**#@-*/
+
     /**
      * Returns the agreement ID.
      *
      * @return int Agreement ID.
      */
     public function getAgreementId();
 
+    /**
+     * Sets the agreement ID.
+     *
+     * @param int $id
+     * @return $this
+     */
+    public function setAgreementId($id);
+
     /**
      * Returns the agreement name.
      *
      * @return string Agreement name.
      */
     public function getName();
 
+    /**
+     * Sets the agreement name.
+     *
+     * @param string $name
+     * @return $this
+     */
+    public function setName($name);
+
     /**
      * Returns the agreement content.
      *
      * @return string Agreement content.
      */
     public function getContent();
 
+    /**
+     * Sets the agreement content.
+     *
+     * @param string $content
+     * @return $this
+     */
+    public function setContent($content);
+
     /**
      * Returns the agreement content height, which is an optional CSS property.
      *
      * @return string|null Agreement content height. Otherwise, null.
      */
     public function getContentHeight();
 
+    /**
+     * Sets the agreement content height, which is an optional CSS property.
+     *
+     * @param string|null $height
+     * @return $this
+     */
+    public function setContentHeight($height);
+
     /**
      * Returns the agreement checkbox text.
      *
      * @return string Agreement checkbox text.
      */
     public function getCheckboxText();
 
+    /**
+     * Sets the agreement checkbox text.
+     *
+     * @param string $text
+     * @return $this
+     */
+    public function setCheckboxText($text);
+
     /**
      * Returns the agreement status.
      *
@@ -50,6 +102,14 @@ public function getCheckboxText();
      */
     public function getIsActive();
 
+    /**
+     * Sets the agreement status.
+     *
+     * @param bool $status
+     * @return $this
+     */
+    public function setIsActive($status);
+
     /**
      * Returns the agreement content type.
      *
@@ -58,4 +118,14 @@ public function getIsActive();
      * @SuppressWarnings(PHPMD.BooleanGetMethodName)
      */
     public function getIsHtml();
+
+    /**
+     * Sets the agreement content type.
+     * * true - HTML
+     * * false - plain text
+     *
+     * @param bool $isHtml
+     * @return $this
+     */
+    public function setIsHtml($isHtml);
 }

app/code/Magento/CheckoutAgreements/Model/Agreement.php

@@ -70,55 +70,111 @@ public function beforeSave()
      */
     public function getAgreementId()
     {
-        return $this->getData('agreement_id');
+        return $this->getData(self::AGREEMENT_ID);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setAgreementId($id)
+    {
+        return $this->setData(self::AGREEMENT_ID, $id);
     }
 
     /**
      * @inheritdoc
      */
     public function getName()
     {
-        return $this->getData('name');
+        return $this->getData(self::NAME);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setName($name)
+    {
+        return $this->setData(self::NAME, $name);
     }
 
     /**
      * @inheritdoc
      */
     public function getContent()
     {
-        return $this->getData('content');
+        return $this->getData(self::CONTENT);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setContent($content)
+    {
+        return $this->setData(self::CONTENT, $content);
     }
 
     /**
      * @inheritdoc
      */
     public function getContentHeight()
     {
-        return $this->getData('content_height');
+        return $this->getData(self::CONTENT_HEIGHT);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setContentHeight($height)
+    {
+        return $this->setData(self::CONTENT_HEIGHT, $height);
     }
 
     /**
      * @inheritdoc
      */
     public function getCheckboxText()
     {
-        return $this->getData('checkbox_text');
+        return $this->getData(self::CHECKBOX_TEXT);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setCheckboxText($text)
+    {
+        return $this->setData(self::CHECKBOX_TEXT, $text);
     }
 
     /**
      * @inheritdoc
      */
     public function getIsActive()
     {
-        return $this->getData('is_active');
+        return $this->getData(self::IS_ACTIVE);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsActive($status)
+    {
+        return $this->setData(self::IS_ACTIVE, $status);
     }
 
     /**
      * @inheritdoc
      */
     public function getIsHtml()
     {
-        return $this->getData('is_html');
+        return $this->getData(self::IS_HTML);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setIsHtml($isHtml)
+    {
+        return $this->setData(self::IS_HTML, $isHtml);
     }
     //@codeCoverageIgnoreEnd
 }

app/code/Magento/GiftMessage/Api/Data/MessageInterface.php

@@ -7,38 +7,88 @@
 
 interface MessageInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
+    /**#@+
+     * Constants for keys of data array. Identical to the name of the getter in snake case
+     */
+    const GIFT_MESSAGE_ID = 'gift_message_id';
+    const CUSTOMER_ID = 'customer_id';
+    const SENDER = 'sender';
+    const RECIPIENT = 'recipient';
+    const MESSAGE = 'message';
+    /**#@-*/
+
     /**
      * Returns the gift message ID.
      *
      * @return int|null Gift message ID. Otherwise, null.
      */
     public function getGiftMessageId();
 
+    /**
+     * Sets the gift message ID.
+     *
+     * @param int|null $id
+     * @return $this
+     */
+    public function setGiftMessageId($id);
+
     /**
      * Returns the customer ID.
      *
      * @return int|null Customer ID. Otherwise, null.
      */
     public function getCustomerId();
 
+    /**
+     * Sets the customer ID.
+     *
+     * @param int|null $id
+     * @return $this
+     */
+    public function setCustomerId($id);
+
     /**
      * Returns the sender name.
      *
      * @return string Sender name.
      */
     public function getSender();
 
+    /**
+     * Sets the sender name.
+     *
+     * @param string $sender
+     * @return $this
+     */
+    public function setSender($sender);
+
     /**
      * Returns the recipient name.
      *
      * @return string Recipient name.
      */
     public function getRecipient();
 
+    /**
+     * Gets the recipient name.
+     *
+     * @param string $recipient
+     * @return $this
+     */
+    public function setRecipient($recipient);
+
     /**
      * Returns the message text.
      *
      * @return string Message text.
      */
     public function getMessage();
+
+    /**
+     * Sets the message text.
+     *
+     * @param string $message
+     * @return $this
+     */
+    public function setMessage($message);
 }