Skip to content

Commit 55d63cc

Browse files
author
Yu Tang
committed
Merge branch 'FearlessKiwis-MAGETWO-32896-Quote-Immutability' into develop
Conflicts: app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php
2 parents b126c9d + 6dd05c1 commit 55d63cc

30 files changed

+2504
-427
lines changed

app/code/Magento/Quote/Api/Data/AddressInterface.php

Lines changed: 157 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ interface AddressInterface extends \Magento\Framework\Api\ExtensibleDataInterfac
1616

1717
const KEY_ID = 'id';
1818

19-
const REGION_ID = 'region_id';
19+
const KEY_REGION_ID = 'region_id';
2020

21-
const REGION_CODE = 'region_code';
21+
const KEY_REGION_CODE = 'region_code';
2222

23-
const REGION = 'region';
23+
const KEY_REGION = 'region';
2424

2525
const KEY_CUSTOMER_ID = 'customer_id';
2626

@@ -57,129 +57,281 @@ interface AddressInterface extends \Magento\Framework\Api\ExtensibleDataInterfac
5757
*/
5858
public function getId();
5959

60+
/**
61+
* Set id
62+
*
63+
* @param int $id
64+
* @return $this
65+
*/
66+
public function setId($id);
67+
6068
/**
6169
* Get region name
6270
*
6371
* @return string
6472
*/
6573
public function getRegion();
6674

75+
/**
76+
* Set region name
77+
*
78+
* @param string $region
79+
* @return $this
80+
*/
81+
public function setRegion($region);
82+
6783
/**
6884
* Get region id
6985
*
70-
* @return string
86+
* @return int
7187
*/
7288
public function getRegionId();
7389

90+
/**
91+
* Set region id
92+
*
93+
* @param int $regionId
94+
* @return $this
95+
*/
96+
public function setRegionId($regionId);
97+
7498
/**
7599
* Get region code
76100
*
77101
* @return string
78102
*/
79103
public function getRegionCode();
80104

105+
/**
106+
* Set region code
107+
*
108+
* @param string $regionCode
109+
* @return $this
110+
*/
111+
public function setRegionCode($regionCode);
112+
81113
/**
82114
* Get country id
83115
*
84116
* @return string
85117
*/
86118
public function getCountryId();
87119

120+
/**
121+
* Set country id
122+
*
123+
* @param string $countryId
124+
* @return $this
125+
*/
126+
public function setCountryId($countryId);
127+
88128
/**
89129
* Get street
90130
*
91131
* @return string[]
92132
*/
93133
public function getStreet();
94134

135+
/**
136+
* Set street
137+
*
138+
* @param string|string[] $street
139+
* @return $this
140+
*/
141+
public function setStreet($street);
142+
95143
/**
96144
* Get company
97145
*
98146
* @return string|null
99147
*/
100148
public function getCompany();
101149

150+
/**
151+
* Set company
152+
*
153+
* @param string $company
154+
* @return $this
155+
*/
156+
public function setCompany($company);
157+
102158
/**
103159
* Get telephone number
104160
*
105161
* @return string
106162
*/
107163
public function getTelephone();
108164

165+
/**
166+
* Set telephone number
167+
*
168+
* @param string $telephone
169+
* @return $this
170+
*/
171+
public function setTelephone($telephone);
172+
109173
/**
110174
* Get fax number
111175
*
112176
* @return string|null
113177
*/
114178
public function getFax();
115179

180+
/**
181+
* Set fax number
182+
*
183+
* @param string $fax
184+
* @return $this
185+
*/
186+
public function setFax($fax);
187+
116188
/**
117189
* Get postcode
118190
*
119191
* @return string
120192
*/
121193
public function getPostcode();
122194

195+
/**
196+
* Set postcode
197+
*
198+
* @param string $postcode
199+
* @return $this
200+
*/
201+
public function setPostcode($postcode);
202+
123203
/**
124204
* Get city name
125205
*
126206
* @return string
127207
*/
128208
public function getCity();
129209

210+
/**
211+
* Set city name
212+
*
213+
* @param string $city
214+
* @return $this
215+
*/
216+
public function setCity($city);
217+
130218
/**
131219
* Get first name
132220
*
133221
* @return string
134222
*/
135223
public function getFirstname();
136224

225+
/**
226+
* Set first name
227+
*
228+
* @param string $firstname
229+
* @return $this
230+
*/
231+
public function setFirstname($firstname);
232+
137233
/**
138234
* Get last name
139235
*
140236
* @return string
141237
*/
142238
public function getLastname();
143239

240+
/**
241+
* Set last name
242+
*
243+
* @param string $lastname
244+
* @return $this
245+
*/
246+
public function setLastname($lastname);
247+
144248
/**
145249
* Get middle name
146250
*
147251
* @return string|null
148252
*/
149253
public function getMiddlename();
150254

255+
/**
256+
* Set middle name
257+
*
258+
* @param string $middlename
259+
* @return $this
260+
*/
261+
public function setMiddlename($middlename);
262+
151263
/**
152264
* Get prefix
153265
*
154266
* @return string|null
155267
*/
156268
public function getPrefix();
157269

270+
/**
271+
* Set prefix
272+
*
273+
* @param string $prefix
274+
* @return $this
275+
*/
276+
public function setPrefix($prefix);
277+
158278
/**
159279
* Get suffix
160280
*
161281
* @return string|null
162282
*/
163283
public function getSuffix();
164284

285+
/**
286+
* Set suffix
287+
*
288+
* @param string $suffix
289+
* @return $this|null
290+
*/
291+
public function setSuffix($suffix);
292+
165293
/**
166294
* Get Vat id
167295
*
168296
* @return string|null
169297
*/
170298
public function getVatId();
171299

300+
/**
301+
* Set Vat id
302+
*
303+
* @param string $vatId
304+
* @return $this
305+
*/
306+
public function setVatId($vatId);
307+
172308
/**
173309
* Get customer id
174310
*
175-
* @return string|null
311+
* @return int|null
176312
*/
177313
public function getCustomerId();
178314

315+
/**
316+
* Set customer id
317+
*
318+
* @param int $customerId
319+
* @return $this
320+
*/
321+
public function setCustomerId($customerId);
322+
179323
/**
180324
* Get billing/shipping email
181325
*
182326
* @return string
183327
*/
184328
public function getEmail();
329+
330+
/**
331+
* Set billing/shipping email
332+
*
333+
* @param string $email
334+
* @return $this
335+
*/
336+
public function setEmail($email);
185337
}

0 commit comments

Comments
 (0)