Skip to content

Commit

Permalink
20.6.3 SHQ23-2640 Remove trailing comma from stress address
Browse files Browse the repository at this point in the history
  • Loading branch information
wsajosh committed Jun 3, 2024
1 parent 42dcbb2 commit 2d95a1f
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 3 deletions.
48 changes: 48 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
include:
- project: ShipperHQ/DevOps/GitLabTemplates
ref: INFRA-672
file: /magento/release.gitlab-ci.yml

stages:
- tag
- release to GitLab
- release to GitHub

# Denote whether to build major, minor or patch release
major release:
stage: tag
variables:
VERSION_INCREMENT: "major"
extends:
- .m2_module_release

minor release:
stage: tag
variables:
VERSION_INCREMENT: "minor"
extends:
- .m2_module_release

patch release:
stage: tag
variables:
VERSION_INCREMENT: "patch"
extends:
- .m2_module_release

# Build public release
build release to GitHub:
stage: release to GitHub
variables:
GITHUB_REPO: "[email protected]:shipperhq/module-address-autocomplete.git"
when: on_success
needs:
- job: major release
optional: true
- job: minor release
optional: true
- job: patch release
optional: true
extends:
- .m2_public_release

4 changes: 4 additions & 0 deletions CHANGELOG-PUBLIC.MD
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,7 @@ MNB-2364 Resolve issue with Montreal not being populated as city
SHQ23-326 Fix issue with formatting of US addresses containing an apartment or suite number


## 20.6.3 (2024-06-03)
SHQ23-2640 Remove trailing comma from stress address


4 changes: 4 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,7 @@ MNB-2364 Resolve issue with Montreal not being populated as city
SHQ23-326 Fix issue with formatting of US addresses containing an apartment or suite number


## 20.6.3 (2024-06-03)
SHQ23-2640 Remove trailing comma from stress address


7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,15 @@ Compatibility
-------------
This module supports and is tested against the following Magento versions:

* 2.4.7-beta1
* 2.4.6-p1
* 2.4.6
* 2.4.5-p3
* 2.4.5-p2
* 2.4.5-p1
* 2.4.5
* 2.4.4-p4
* 2.4.4-p3
* 2.4.4-p2
* 2.4.4-p1
* 2.4.4
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "shipperhq/module-address-autocomplete",
"description": "ShipperHQ Address Autocomplete Tool",
"type": "magento2-module",
"version": "20.6.2",
"version": "20.6.3",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
2 changes: 1 addition & 1 deletion src/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "shipperhq/module-address-autocomplete",
"description": "ShipperHQ Address Autocomplete Tool",
"type": "magento2-module",
"version": "20.6.2",
"version": "20.6.3",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
2 changes: 1 addition & 1 deletion src/view/frontend/web/js/autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ define(
var domID = uiRegistry.get('checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset.street').elems()[0].uid;
var streetString = street.join(' ');

if (countryId === 'US') {
if (countryId === 'US' && subpremise !== '') {
streetString += ', ' + subpremise
}

Expand Down

0 comments on commit 2d95a1f

Please sign in to comment.