Skip to content

Commit b6b0382

Browse files
author
Yu Tang
committed
Merge branch 'FearlessKiwis-MAGETWO-34719-tech-debt-data-api-interface-clean-up' into develop
2 parents efe6c9a + 9788f6d commit b6b0382

File tree

68 files changed

+549
-418
lines changed

Some content is hidden

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

68 files changed

+549
-418
lines changed

app/code/Magento/GoogleShopping/Model/Attribute/Tax.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Magento\Framework\Parse\Zip;
99
use Magento\Store\Model\Store;
1010
use Magento\Tax\Api\Data\TaxClassKeyInterface;
11+
use Magento\Tax\Model\TaxClass\Key;
1112

1213
/**
1314
* Tax attribute model
@@ -179,8 +180,8 @@ public function convertAttribute($product, $entry)
179180
'code' => $product->getSku(),
180181
'type' => 'product',
181182
'tax_class_key' => [
182-
TaxClassKeyInterface::KEY_TYPE => TaxClassKeyInterface::TYPE_ID,
183-
TaxClassKeyInterface::KEY_VALUE => $product->getTaxClassId(),
183+
Key::KEY_TYPE => TaxClassKeyInterface::TYPE_ID,
184+
Key::KEY_VALUE => $product->getTaxClassId(),
184185
],
185186
'unit_price' => $product->getPrice(),
186187
'quantity' => 1,
@@ -204,8 +205,8 @@ public function convertAttribute($product, $entry)
204205
'billing_address' => $billingAddressDataArray,
205206
'shipping_address' => $shippingAddressDataArray,
206207
'customer_tax_class_key' => [
207-
TaxClassKeyInterface::KEY_TYPE => TaxClassKeyInterface::TYPE_ID,
208-
TaxClassKeyInterface::KEY_VALUE => $defaultCustomerTaxClassId,
208+
Key::KEY_TYPE => TaxClassKeyInterface::TYPE_ID,
209+
Key::KEY_VALUE => $defaultCustomerTaxClassId,
209210
],
210211
'items' => [
211212
$quoteDetailsItemDataArray,

app/code/Magento/Sales/Api/Data/CreditmemoCommentInterface.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ public function getComment();
5757
*/
5858
public function getCreatedAt();
5959

60+
/**
61+
* Sets the credit memo created-at timestamp.
62+
*
63+
* @param string $createdAt timestamp
64+
* @return $this
65+
*/
66+
public function setCreatedAt($createdAt);
67+
6068
/**
6169
* Gets the credit memo ID.
6270
*

app/code/Magento/Sales/Api/Data/CreditmemoInterface.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,15 @@ public function getBillingAddressId();
383383
* @return string Credit memo created-at timestamp.
384384
*/
385385
public function getCreatedAt();
386+
387+
/**
388+
* Sets the credit memo created-at timestamp.
389+
*
390+
* @param string $createdAt timestamp
391+
* @return $this
392+
*/
393+
public function setCreatedAt($createdAt);
394+
386395
/**
387396
* Gets the credit memo status.
388397
*

app/code/Magento/Sales/Api/Data/InvoiceCommentInterface.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ public function getComment();
5555
*/
5656
public function getCreatedAt();
5757

58+
/**
59+
* Sets the created-at timestamp for the invoice.
60+
*
61+
* @param string $createdAt timestamp
62+
* @return $this
63+
*/
64+
public function setCreatedAt($createdAt);
65+
5866
/**
5967
* Gets the ID for the invoice.
6068
*

app/code/Magento/Sales/Api/Data/InvoiceInterface.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,14 @@ public function getCanVoidFlag();
319319
*/
320320
public function getCreatedAt();
321321

322+
/**
323+
* Sets the created-at timestamp for the invoice.
324+
*
325+
* @param string $createdAt timestamp
326+
* @return $this
327+
*/
328+
public function setCreatedAt($createdAt);
329+
322330
/**
323331
* Gets the discount amount for the invoice.
324332
*

app/code/Magento/Sales/Api/Data/OrderInterface.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,14 @@ public function getCouponCode();
914914
*/
915915
public function getCreatedAt();
916916

917+
/**
918+
* Sets the created-at timestamp for the order.
919+
*
920+
* @param string $createdAt timestamp
921+
* @return $this
922+
*/
923+
public function setCreatedAt($createdAt);
924+
917925
/**
918926
* Gets the customer date-of-birth (DOB) for the order.
919927
*

app/code/Magento/Sales/Api/Data/OrderItemInterface.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,14 @@ public function getBaseWeeeTaxRowDisposition();
578578
*/
579579
public function getCreatedAt();
580580

581+
/**
582+
* Sets the created-at timestamp for the order item.
583+
*
584+
* @param string $createdAt timestamp
585+
* @return $this
586+
*/
587+
public function setCreatedAt($createdAt);
588+
581589
/**
582590
* Gets the description for the order item.
583591
*

app/code/Magento/Sales/Api/Data/OrderStatusHistoryInterface.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@ public function getComment();
6464
*/
6565
public function getCreatedAt();
6666

67+
/**
68+
* Sets the created-at timestamp for the order status history.
69+
*
70+
* @param string $createdAt timestamp
71+
* @return $this
72+
*/
73+
public function setCreatedAt($createdAt);
74+
6775
/**
6876
* Gets the ID for the order status history.
6977
*

app/code/Magento/Sales/Api/Data/ShipmentCommentInterface.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ public function getComment();
5555
*/
5656
public function getCreatedAt();
5757

58+
/**
59+
* Sets the created-at timestamp for the shipment comment.
60+
*
61+
* @param string $createdAt timestamp
62+
* @return $this
63+
*/
64+
public function setCreatedAt($createdAt);
65+
5866
/**
5967
* Gets the ID for the shipment comment.
6068
*

app/code/Magento/Sales/Api/Data/ShipmentInterface.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@ public function getBillingAddressId();
103103
*/
104104
public function getCreatedAt();
105105

106+
/**
107+
* Sets the created-at timestamp for the shipment.
108+
*
109+
* @param string $createdAt timestamp
110+
* @return $this
111+
*/
112+
public function setCreatedAt($createdAt);
113+
106114
/**
107115
* Gets the customer ID for the shipment.
108116
*

0 commit comments

Comments
 (0)