Skip to content

Commit

Permalink
Merge branch '1.6' into 2.0
Browse files Browse the repository at this point in the history
* 1.6:
  Update PR template
  Generate changelog for v1.6.0
  Add note about Sylius 1.14 in the UPGRADE file
  Improve installation guide
  Fix installation guide routes importing step
  • Loading branch information
GSadee committed Dec 12, 2024
2 parents da56808 + bee0b74 commit 329ec7c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
| Q | A
| --------------- | -----
| Branch? | 1.4 (security fixes), 1.5 (bug fixes, improvements), 1.6 (new features)
| Branch? | 1.5 (security fixes), 1.6 (bug fixes, improvements), 2.0 (new features)
| Bug fix? | no/yes
| New feature? | no/yes
| Related tickets | fixes #X, partially #Y, mentioned in #Z
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ From Administrator's point of view, every Refund request results in creating two

## Installation

#### Beware!

This installation instruction assumes that you're using Symfony Flex. If you don't, take a look at the
[legacy installation instruction](docs/legacy_installation.md). However, we strongly encourage you to use
Symfony Flex, it's much quicker!

1. Require plugin with composer:

```bash
Expand Down Expand Up @@ -70,12 +76,6 @@ From Administrator's point of view, every Refund request results in creating two
WKHTMLTOPDF_PATH=/usr/local/bin/wkhtmltopdf # Change this! :)
```
#### Beware!
This installation instruction assumes that you're using Symfony Flex. If you don't, take a look at the
[legacy installation instruction](docs/legacy_installation.md). However, we strongly encourage you to use
Symfony Flex, it's much quicker! :)

## Extension points
Refund Plugin is strongly based on both commands and events. Let's take RefundUnitsAction as an example. The whole
Expand Down
2 changes: 1 addition & 1 deletion docs/legacy_installation.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### Legacy installation (without SymfonyFlex)
### Legacy installation (without Symfony Flex)

1. Require plugin with composer:

Expand Down

0 comments on commit 329ec7c

Please sign in to comment.