Skip to content

Commit

Permalink
minor #10679 Change channel code to name (AdamKasp)
Browse files Browse the repository at this point in the history
This PR was merged into the 1.7-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | master
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| License         | MIT

To make channel fields consistent with the rest of the system, I changed channel code to channel name
<!--
 - Bug fixes must be submitted against the 1.4 or 1.5 branch (the lowest possible)
 - Features and deprecations must be submitted against the master branch
 - Make sure that the correct base branch is set
-->
![Screenshot 2019-09-18 at 15 36 21](https://user-images.githubusercontent.com/29897151/65153680-7a7ced80-da2a-11e9-9e4c-c922133ecc18.png)
![Screenshot 2019-09-18 at 15 36 35](https://user-images.githubusercontent.com/29897151/65153681-7a7ced80-da2a-11e9-99f2-0c862dba6b02.png)
![Screenshot 2019-09-18 at 15 36 45](https://user-images.githubusercontent.com/29897151/65153682-7a7ced80-da2a-11e9-83bf-1707fd5f0442.png)


Commits
-------

55d046d Change channel code to name
  • Loading branch information
GSadee authored Sep 19, 2019
2 parents aa370fc + 55d046d commit 586ea72
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function shipmentOfOrderShouldBe(
];

if ($channel !== null) {
$parameters = ['channel' => $channel->getCode()];
$parameters = ['channel' => $channel->getName()];
}

Assert::true($this->indexPage->isSingleResourceOnPage($parameters));
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<span class="ui small horizontal circular label" style="background-color: {{ data.color }}"></span> {{ data.code }}
<span class="ui small horizontal circular label" style="background-color: {{ data.color }}"></span> {{ data.name }}

0 comments on commit 586ea72

Please sign in to comment.