Skip to content

Commit 2d95a1f

Browse files
committed
20.6.3 SHQ23-2640 Remove trailing comma from stress address
1 parent 42dcbb2 commit 2d95a1f

File tree

7 files changed

+66
-3
lines changed

7 files changed

+66
-3
lines changed

.gitlab-ci.yml

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
include:
2+
- project: ShipperHQ/DevOps/GitLabTemplates
3+
ref: INFRA-672
4+
file: /magento/release.gitlab-ci.yml
5+
6+
stages:
7+
- tag
8+
- release to GitLab
9+
- release to GitHub
10+
11+
# Denote whether to build major, minor or patch release
12+
major release:
13+
stage: tag
14+
variables:
15+
VERSION_INCREMENT: "major"
16+
extends:
17+
- .m2_module_release
18+
19+
minor release:
20+
stage: tag
21+
variables:
22+
VERSION_INCREMENT: "minor"
23+
extends:
24+
- .m2_module_release
25+
26+
patch release:
27+
stage: tag
28+
variables:
29+
VERSION_INCREMENT: "patch"
30+
extends:
31+
- .m2_module_release
32+
33+
# Build public release
34+
build release to GitHub:
35+
stage: release to GitHub
36+
variables:
37+
GITHUB_REPO: "[email protected]:shipperhq/module-address-autocomplete.git"
38+
when: on_success
39+
needs:
40+
- job: major release
41+
optional: true
42+
- job: minor release
43+
optional: true
44+
- job: patch release
45+
optional: true
46+
extends:
47+
- .m2_public_release
48+

CHANGELOG-PUBLIC.MD

+4
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,7 @@ MNB-2364 Resolve issue with Montreal not being populated as city
8181
SHQ23-326 Fix issue with formatting of US addresses containing an apartment or suite number
8282

8383

84+
## 20.6.3 (2024-06-03)
85+
SHQ23-2640 Remove trailing comma from stress address
86+
87+

CHANGELOG.MD

+4
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,7 @@ MNB-2364 Resolve issue with Montreal not being populated as city
8181
SHQ23-326 Fix issue with formatting of US addresses containing an apartment or suite number
8282

8383

84+
## 20.6.3 (2024-06-03)
85+
SHQ23-2640 Remove trailing comma from stress address
86+
87+

README.md

+7
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,15 @@ Compatibility
2323
-------------
2424
This module supports and is tested against the following Magento versions:
2525

26+
* 2.4.7-beta1
27+
* 2.4.6-p1
28+
* 2.4.6
29+
* 2.4.5-p3
30+
* 2.4.5-p2
2631
* 2.4.5-p1
2732
* 2.4.5
33+
* 2.4.4-p4
34+
* 2.4.4-p3
2835
* 2.4.4-p2
2936
* 2.4.4-p1
3037
* 2.4.4

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "shipperhq/module-address-autocomplete",
33
"description": "ShipperHQ Address Autocomplete Tool",
44
"type": "magento2-module",
5-
"version": "20.6.2",
5+
"version": "20.6.3",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"

src/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "shipperhq/module-address-autocomplete",
33
"description": "ShipperHQ Address Autocomplete Tool",
44
"type": "magento2-module",
5-
"version": "20.6.2",
5+
"version": "20.6.3",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"

src/view/frontend/web/js/autocomplete.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ define(
187187
var domID = uiRegistry.get('checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset.street').elems()[0].uid;
188188
var streetString = street.join(' ');
189189

190-
if (countryId === 'US') {
190+
if (countryId === 'US' && subpremise !== '') {
191191
streetString += ', ' + subpremise
192192
}
193193

0 commit comments

Comments
 (0)