Skip to content

Commit 2b350bb

Browse files
guz-antonguz-anton
committed
Merge remote-tracking branch 'vanilla/develop' into MAGETWO-43201
2 parents bc9b1c0 + 46dc2c0 commit 2b350bb

File tree

153 files changed

+935
-383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+935
-383
lines changed

‎app/code/Magento/Backend/i18n/de_DE.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/en_US.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/es_ES.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/fr_FR.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/nl_NL.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/pt_BR.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Backend/i18n/zh_Hans_CN.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,3 +606,11 @@ Tags,Tags
606606
Options,Options
607607
"Magento Admin","Magento Admin"
608608
"Community Edition","Community Edition"
609+
Marketing,Marketing
610+
Communications,Communications
611+
"SEO & Search","SEO & Search"
612+
"User Content","User Content"
613+
"Data Transfer","Data Transfer"
614+
"Import History","Import History"
615+
Extensions,Extensions
616+
"Web Setup Wizard","Web Setup Wizard"

‎app/code/Magento/Catalog/Api/Data/ProductWebsiteLinkInterface.php

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Catalog\Api\Data;
8+
9+
/**
10+
* @api
11+
*/
12+
interface ProductWebsiteLinkInterface
13+
{
14+
/**
15+
* @return string
16+
*/
17+
public function getSku();
18+
19+
/**
20+
* @param string $sku
21+
* @return $this
22+
*/
23+
public function setSku($sku);
24+
25+
/**
26+
* Get website ids
27+
*
28+
* @return int
29+
*/
30+
public function getWebsiteId();
31+
32+
/**
33+
* Set website id
34+
*
35+
* @param int $websiteId
36+
* @return $this
37+
*/
38+
public function setWebsiteId($websiteId);
39+
}

‎app/code/Magento/Catalog/Api/ProductWebsiteLinkRepositoryInterface.php

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Catalog\Api;
8+
9+
interface ProductWebsiteLinkRepositoryInterface
10+
{
11+
/**
12+
* Assign a product to the website
13+
*
14+
* @param \Magento\Catalog\Api\Data\ProductWebsiteLinkInterface $productWebsiteLink
15+
* @return bool will returned True if website successfully assigned to product
16+
*
17+
* @throws \Magento\Framework\Exception\CouldNotSaveException
18+
* @throws \Magento\Framework\Exception\InputException
19+
*/
20+
public function save(Data\ProductWebsiteLinkInterface $productWebsiteLink);
21+
22+
/**
23+
* Remove the website assignment from the product
24+
*
25+
* @param \Magento\Catalog\Api\Data\ProductWebsiteLinkInterface $productWebsiteLink
26+
* @return bool will returned True if website successfully unassigned from product
27+
*
28+
* @throws \Magento\Framework\Exception\CouldNotSaveException
29+
*/
30+
public function delete(Data\ProductWebsiteLinkInterface $productWebsiteLink);
31+
32+
/**
33+
* Remove the website assignment from the product by product sku
34+
*
35+
* @param string $sku
36+
* @param int $websiteId
37+
* @return bool will returned True if website successfully unassigned from product
38+
*
39+
* @throws \Magento\Framework\Exception\CouldNotSaveException
40+
*/
41+
public function deleteById($sku, $websiteId);
42+
}

‎app/code/Magento/Catalog/Model/ProductWebsiteLink.php

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Catalog\Model;
8+
9+
class ProductWebsiteLink extends \Magento\Framework\Api\AbstractSimpleObject implements
10+
\Magento\Catalog\Api\Data\ProductWebsiteLinkInterface
11+
{
12+
/**#@+
13+
* Field names
14+
*/
15+
const KEY_SKU = 'sku';
16+
const WEBSITE_ID = 'website_id';
17+
/**#@-*/
18+
19+
/**
20+
* {@inheritdoc}
21+
*/
22+
public function getSku()
23+
{
24+
return $this->_get(self::KEY_SKU);
25+
}
26+
27+
/**
28+
* {@inheritdoc}
29+
*/
30+
public function getWebsiteId()
31+
{
32+
return $this->_get(self::WEBSITE_ID);
33+
}
34+
35+
/**
36+
* @param string $sku
37+
* @return $this
38+
*/
39+
public function setSku($sku)
40+
{
41+
return $this->setData(self::KEY_SKU, $sku);
42+
}
43+
44+
/**
45+
* {@inheritdoc}
46+
*/
47+
public function setWebsiteId($websiteId)
48+
{
49+
return $this->setData(self::WEBSITE_ID, $websiteId);
50+
}
51+
}

0 commit comments

Comments
 (0)