Skip to content

Commit

Permalink
V7 (#121)
Browse files Browse the repository at this point in the history
* Fix issue MAG-5 due to APi uris changes

* Feature jira 21

* gitignore for netbeans

* Issue MAG 21 for old oyst modules versions
  • Loading branch information
mbouchotoyst authored Jan 4, 2019
1 parent fd63ef3 commit 5d1b7e5
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
/bin
tests/Oyst/settings.json
src/Config/parameters_api.yml
composer.lock
composer.lock
/nbproject/private/
31 changes: 30 additions & 1 deletion src/Classes/OneClickOrderCartEstimate.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@ class OneClickOrderCartEstimate implements OystArrayInterface
*/
private $discountCouponError;

/**
* Optional
*
* Newsletter Optin
*
* @var string
*/
private $newsletterOptin;

/**
* Constructs a OneClickShipmentCalculation instance.
*
Expand Down Expand Up @@ -178,6 +187,26 @@ public function setMessage($message)
return $this;
}

/**
* @return string
*/
public function getNewsletterOptin()
{
return $this->newsletterOptin;
}

/**
* @param string $newsletterOptin
*
* @return $this
*/
public function setNewsletterOptin($newsletterOptin)
{
$this->newsletterOptin = $newsletterOptin;

return $this;
}

/**
* @return OystPrice
*/
Expand Down Expand Up @@ -337,7 +366,7 @@ public function toArray()
'merchant_discounts' => $oystCollectionHelper->collectionToArray($this->merchantDiscounts),
'message' => $this->message,
'discount_coupon_error' => $this->discountCouponError,
'newsletter_optin' => null,
'newsletter_optin' => $this->newsletterOptin,
);

return $oneClickOrderCartEstimate;
Expand Down

0 comments on commit 5d1b7e5

Please sign in to comment.