Skip to content

Commit bdc1020

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into ACQE-functional-deployment-version7
2 parents 3c02526 + be4c332 commit bdc1020

File tree

160 files changed

+628
-776
lines changed

Some content is hidden

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

160 files changed

+628
-776
lines changed

‎app/code/Magento/Multishipping/Block/Checkout/Shipping.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -15,7 +15,6 @@
1515
* Mustishipping checkout shipping
1616
*
1717
* @api
18-
* @author Magento Core Team <core@magentocommerce.com>
1918
* @since 100.0.2
2019
*/
2120
class Shipping extends \Magento\Sales\Block\Items\AbstractItems

‎app/code/Magento/Multishipping/Block/Checkout/State.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Multishipping checkout state
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Multishipping\Block\Checkout;
1311

@@ -33,6 +31,8 @@ public function __construct(
3331
}
3432

3533
/**
34+
* Retrieve available checkout steps
35+
*
3636
* @return array
3737
*/
3838
public function getSteps()

‎app/code/Magento/Multishipping/Block/Checkout/Success.php‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Multishipping checkout success information
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Multishipping\Block\Checkout;
1311

@@ -32,6 +30,8 @@ public function __construct(
3230
}
3331

3432
/**
33+
* Get Order Ids
34+
*
3535
* @return array|bool|string
3636
*/
3737
public function getOrderIds()
@@ -44,6 +44,8 @@ public function getOrderIds()
4444
}
4545

4646
/**
47+
* Get order Url
48+
*
4749
* @param int $orderId
4850
* @return string
4951
*/
@@ -53,6 +55,8 @@ public function getViewOrderUrl($orderId)
5355
}
5456

5557
/**
58+
* Get continue Url
59+
*
5660
* @return string
5761
*/
5862
public function getContinueUrl()

‎app/code/Magento/Multishipping/Helper/Url.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Multi Shipping urls helper
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Multishipping\Helper;
1311

‎app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping/State.php‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Multishipping\Model\Checkout\Type\Multishipping;
77

@@ -11,21 +11,21 @@
1111
/**
1212
* Multishipping checkout state model
1313
*
14-
* @author Magento Core Team <core@magentocommerce.com>
14+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
1515
*/
1616
class State extends \Magento\Framework\DataObject
1717
{
18-
const STEP_SELECT_ADDRESSES = 'multishipping_addresses';
18+
public const STEP_SELECT_ADDRESSES = 'multishipping_addresses';
1919

20-
const STEP_SHIPPING = 'multishipping_shipping';
20+
public const STEP_SHIPPING = 'multishipping_shipping';
2121

22-
const STEP_BILLING = 'multishipping_billing';
22+
public const STEP_BILLING = 'multishipping_billing';
2323

24-
const STEP_OVERVIEW = 'multishipping_overview';
24+
public const STEP_OVERVIEW = 'multishipping_overview';
2525

26-
const STEP_SUCCESS = 'multishipping_success';
26+
public const STEP_SUCCESS = 'multishipping_success';
2727

28-
const STEP_RESULTS = 'multishipping_results';
28+
public const STEP_RESULTS = 'multishipping_results';
2929

3030
/**
3131
* Allow steps array
@@ -107,6 +107,8 @@ public function getActiveStep()
107107
}
108108

109109
/**
110+
* Setup Checkout step
111+
*
110112
* @param string $step
111113
* @return $this
112114
*/
@@ -171,34 +173,41 @@ public function unsCompleteStep($step)
171173
return $this;
172174
}
173175

176+
// phpcs:disable
174177
/**
178+
*
175179
* @return bool
176180
*/
177181
public function canSelectAddresses()
178182
{
183+
return false;
179184
}
180185

181186
/**
182187
* @return bool
183188
*/
184189
public function canInputShipping()
185190
{
191+
return false;
186192
}
187193

188194
/**
189195
* @return bool
190196
*/
191197
public function canSeeOverview()
192198
{
199+
return false;
193200
}
194201

195202
/**
196203
* @return bool
197204
*/
198205
public function canSuccess()
199206
{
207+
return false;
200208
}
201209

210+
// phpcs:enable
202211
/**
203212
* Retrieve checkout session
204213
*

‎app/code/Magento/Newsletter/Block/Adminhtml/Problem.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Newsletter\Block\Adminhtml;
77

@@ -11,7 +11,6 @@
1111
* Newsletter problem block template.
1212
*
1313
* @api
14-
* @author Magento Core Team <core@magentocommerce.com>
1514
* @since 100.0.2
1615
*/
1716
class Problem extends \Magento\Backend\Block\Template

‎app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Filter/Checkbox.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Newsletter subscribers grid filter checkbox
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Newsletter\Block\Adminhtml\Problem\Grid\Filter;
1311

‎app/code/Magento/Newsletter/Block/Adminhtml/Problem/Grid/Renderer/Checkbox.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Newsletter subscribers grid checkbox item renderer
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Newsletter\Block\Adminhtml\Problem\Grid\Renderer;
1311

‎app/code/Magento/Newsletter/Block/Adminhtml/Queue/Edit/Form.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
namespace Magento\Newsletter\Block\Adminhtml\Queue\Edit;
@@ -10,8 +10,6 @@
1010

1111
/**
1212
* Newsletter queue edit form
13-
*
14-
* @author Magento Core Team <core@magentocommerce.com>
1513
*/
1614
class Form extends \Magento\Backend\Block\Widget\Form\Generic
1715
{

‎app/code/Magento/Newsletter/Block/Adminhtml/Queue/Grid/Renderer/Action.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
/**
88
* Newsletter queue grid block action item renderer
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
119
*/
1210
namespace Magento\Newsletter\Block\Adminhtml\Queue\Grid\Renderer;
1311

0 commit comments

Comments
 (0)