Skip to content
This repository was archived by the owner on Feb 20, 2023. It is now read-only.

Commit 19551b0

Browse files
Merge pull request #27 from mageplaza/2.4-develop
2.4 develop
2 parents 2894348 + 4452d15 commit 19551b0

File tree

13 files changed

+195
-192
lines changed

13 files changed

+195
-192
lines changed
Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
---
2-
name: Bug report
3-
about: Technical issue with the extension
4-
labels: 'Issue'
5-
6-
---
7-
8-
<!---
9-
Fields marked with (*) are required. Please don't remove the template.
10-
-->
11-
12-
### Preconditions (*)
13-
<!---
14-
Provide the exact Magento version (example: 2.4.0) and any important information on the environment where bug is reproducible.
15-
-->
16-
1.
17-
2.
18-
19-
### Steps to reproduce (*)
20-
<!---
21-
Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
22-
-->
23-
1.
24-
2.
25-
26-
### Expected result (*)
27-
<!--- Tell us what do you expect to happen. -->
28-
1. [Screenshots, logs or description]
29-
2.
30-
31-
### Actual result (*)
32-
<!--- Tell us what happened instead. Include error messages and issues. -->
33-
1. [Screenshots, logs or description]
34-
2.
1+
---
2+
name: Bug report
3+
about: Technical issue with the extension
4+
labels: 'Issue'
5+
6+
---
7+
8+
<!---
9+
Fields marked with (*) are required. Please don't remove the template.
10+
-->
11+
12+
### Preconditions (*)
13+
<!---
14+
Provide the exact Magento version (example: 2.4.0) and any important information on the environment where bug is reproducible.
15+
-->
16+
1.
17+
2.
18+
19+
### Steps to reproduce (*)
20+
<!---
21+
Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
22+
-->
23+
1.
24+
2.
25+
26+
### Expected result (*)
27+
<!--- Tell us what do you expect to happen. -->
28+
1. [Screenshots, logs or description]
29+
2.
30+
31+
### Actual result (*)
32+
<!--- Tell us what happened instead. Include error messages and issues. -->
33+
1. [Screenshots, logs or description]
34+
2.
Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
---
2-
name: Developer experience issue
3-
about: Issues related to customization, extensibility, modularity
4-
labels: 'Experience'
5-
6-
---
7-
8-
<!---
9-
Fields marked with (*) are required. Please don't remove the template.
10-
-->
11-
12-
### Summary (*)
13-
<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->
14-
15-
### Examples (*)
16-
<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->
17-
18-
### Proposed solution
19-
<!--- Suggest your potential solutions for this issue. -->
1+
---
2+
name: Developer experience issue
3+
about: Issues related to customization, extensibility, modularity
4+
labels: 'Experience'
5+
6+
---
7+
8+
<!---
9+
Fields marked with (*) are required. Please don't remove the template.
10+
-->
11+
12+
### Summary (*)
13+
<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->
14+
15+
### Examples (*)
16+
<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->
17+
18+
### Proposed solution
19+
<!--- Suggest your potential solutions for this issue. -->
Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
---
2-
name: Feature request
3-
about: Request feature for development
4-
labels: 'Feature Request'
5-
6-
---
7-
8-
<!---
9-
Fields marked with (*) are required. Please don't remove the template.
10-
-->
11-
12-
### Description (*)
13-
<!--- Describe the feature you would like to add. -->
14-
15-
### Expected behavior (*)
16-
<!--- What is the expected behavior of this feature? How is it going to work? -->
17-
18-
### Benefits
19-
<!--- How do you think this feature would improve the extension? -->
20-
21-
### Additional information
22-
<!--- What other information can you provide about the desired feature? -->
1+
---
2+
name: Feature request
3+
about: Request feature for development
4+
labels: 'Feature Request'
5+
6+
---
7+
8+
<!---
9+
Fields marked with (*) are required. Please don't remove the template.
10+
-->
11+
12+
### Description (*)
13+
<!--- Describe the feature you would like to add. -->
14+
15+
### Expected behavior (*)
16+
<!--- What is the expected behavior of this feature? How is it going to work? -->
17+
18+
### Benefits
19+
<!--- How do you think this feature would improve the extension? -->
20+
21+
### Additional information
22+
<!--- What other information can you provide about the desired feature? -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<!--- Provide a general summary of the Pull Request in the Title above -->
2-
3-
### Description
4-
<!--- Provide a description of the changes proposed in the pull request -->
5-
6-
### Fixed Issues (if relevant)
7-
<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant -->
8-
1. https://github.com/mageplaza/magento-2-reports/<issue_number>: Issue title
9-
2. ...
10-
11-
### Manual testing scenarios
12-
<!--- Provide a set of unambiguous steps to test the proposed code change -->
13-
1.
14-
2.
15-
16-
### Contribution checklist
17-
- [ ] Pull request has a meaningful description of its purpose
18-
- [ ] All commits are accompanied by meaningful commit messages
19-
- [ ] All new or changed code is covered with unit/integration tests (if applicable)
1+
<!--- Provide a general summary of the Pull Request in the Title above -->
2+
3+
### Description
4+
<!--- Provide a description of the changes proposed in the pull request -->
5+
6+
### Fixed Issues (if relevant)
7+
<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant -->
8+
1. https://github.com/mageplaza/magento-2-reports/<issue_number>: Issue title
9+
2. ...
10+
11+
### Manual testing scenarios
12+
<!--- Provide a set of unambiguous steps to test the proposed code change -->
13+
1.
14+
2.
15+
16+
### Contribution checklist
17+
- [ ] Pull request has a meaningful description of its purpose
18+
- [ ] All commits are accompanied by meaningful commit messages
19+
- [ ] All new or changed code is covered with unit/integration tests (if applicable)

.github/no-response.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# Configuration for probot-no-response - https://github.com/probot/no-response
2-
3-
# Number of days of inactivity before an Issue is closed for lack of response
4-
daysUntilClose: 7
5-
# Label requiring a response
6-
responseRequiredLabel: waiting-customer-response
7-
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
8-
closeComment: >
9-
This issue has been automatically closed because there has been no response
10-
to our request for more information from the original author. With only the
11-
information that is currently in the issue, we don't have enough information
12-
to take action. Please reach out if you have or find the answers we need so
13-
that we can investigate further.
1+
# Configuration for probot-no-response - https://github.com/probot/no-response
2+
3+
# Number of days of inactivity before an Issue is closed for lack of response
4+
daysUntilClose: 7
5+
# Label requiring a response
6+
responseRequiredLabel: waiting-customer-response
7+
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
8+
closeComment: >
9+
This issue has been automatically closed because there has been no response
10+
to our request for more information from the original author. With only the
11+
information that is currently in the issue, we don't have enough information
12+
to take action. Please reach out if you have or find the answers we need so
13+
that we can investigate further.

Helper/Data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function getBccTo($store = null)
6262
*/
6363
public function isEnabledAttachPdf($store = null)
6464
{
65-
return (bool) $this->getConfigGeneral('is_enabled_attach_pdf', $store);
65+
return (bool)$this->getConfigGeneral('is_enabled_attach_pdf', $store);
6666
}
6767

6868
/**
@@ -84,7 +84,7 @@ public function getAttachPdf($store = null)
8484
*/
8585
public function isEnabledAttachTac($store = null)
8686
{
87-
return (bool) $this->getConfigGeneral('is_enabled_attach_tac', $store);
87+
return (bool)$this->getConfigGeneral('is_enabled_attach_tac', $store);
8888
}
8989

9090
/**

Mail/EmailMessage.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function __construct(
8989
$encoding = ''
9090
) {
9191
$this->message = new ZendMessage();
92-
$mimeMessage = new ZendMimeMessage();
92+
$mimeMessage = new ZendMimeMessage();
9393
$mimeMessage->setParts($body->getParts());
9494
$this->message->setBody($mimeMessage);
9595
if ($encoding) {
@@ -198,7 +198,7 @@ public function getSender()
198198
return $this->addressFactory->create(
199199
[
200200
'email' => $zendSender->getEmail(),
201-
'name' => $zendSender->getName()
201+
'name' => $zendSender->getName()
202202
]
203203
);
204204
}
@@ -260,7 +260,7 @@ private function convertAddressListToAddressArray(AddressList $addressList)
260260
$this->addressFactory->create(
261261
[
262262
'email' => $address->getEmail(),
263-
'name' => $address->getName()
263+
'name' => $address->getName()
264264
]
265265
);
266266
}

Mail/Transport.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function __construct(
7777
ScopeConfigInterface $scopeConfig,
7878
$parameters = null
7979
) {
80-
$this->isSetReturnPath = (int) $scopeConfig->getValue(
80+
$this->isSetReturnPath = (int)$scopeConfig->getValue(
8181
self::XML_PATH_SENDING_SET_RETURN_PATH,
8282
ScopeInterface::SCOPE_STORE
8383
);
@@ -87,7 +87,7 @@ public function __construct(
8787
);
8888

8989
$this->zendTransport = new Sendmail($parameters);
90-
$this->message = $message;
90+
$this->message = $message;
9191
}
9292

9393
/**

Model/Config/Source/AttachPdf.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
*/
3030
class AttachPdf implements OptionSourceInterface
3131
{
32-
const INVOICE = 'invoice';
33-
const SHIPMENT = 'shipment';
32+
const INVOICE = 'invoice';
33+
const SHIPMENT = 'shipment';
3434
const CREDIT_MEMO = 'creditmemo';
3535

3636
/**
@@ -41,8 +41,8 @@ class AttachPdf implements OptionSourceInterface
4141
public static function getOptionArray()
4242
{
4343
return [
44-
self::INVOICE => __('Invoice'),
45-
self::SHIPMENT => __('Shipment'),
44+
self::INVOICE => __('Invoice'),
45+
self::SHIPMENT => __('Shipment'),
4646
self::CREDIT_MEMO => __('Credit Memo')
4747
];
4848
}

Model/Config/Source/AttachTaC.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
*/
3030
class AttachTaC implements OptionSourceInterface
3131
{
32-
const ORDER = 'order';
33-
const INVOICE = 'invoice';
34-
const SHIPMENT = 'shipment';
32+
const ORDER = 'order';
33+
const INVOICE = 'invoice';
34+
const SHIPMENT = 'shipment';
3535
const CREDIT_MEMO = 'creditmemo';
3636

3737
/**
@@ -42,9 +42,9 @@ class AttachTaC implements OptionSourceInterface
4242
public static function getOptionArray()
4343
{
4444
return [
45-
self::ORDER => __('Order'),
46-
self::INVOICE => __('Invoice'),
47-
self::SHIPMENT => __('Shipment'),
45+
self::ORDER => __('Order'),
46+
self::INVOICE => __('Invoice'),
47+
self::SHIPMENT => __('Shipment'),
4848
self::CREDIT_MEMO => __('Credit Memo')
4949
];
5050
}

0 commit comments

Comments
 (0)