From 2d95a1ff688eeb829df57f6eb5fee4da271c5dff Mon Sep 17 00:00:00 2001 From: wsajosh Date: Mon, 3 Jun 2024 13:35:54 +0100 Subject: [PATCH] 20.6.3 SHQ23-2640 Remove trailing comma from stress address --- .gitlab-ci.yml | 48 ++++++++++++++++++++++++ CHANGELOG-PUBLIC.MD | 4 ++ CHANGELOG.MD | 4 ++ README.md | 7 ++++ composer.json | 2 +- src/composer.json | 2 +- src/view/frontend/web/js/autocomplete.js | 2 +- 7 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..ed92a1a --- /dev/null +++ b/.gitlab-ci.yml @@ -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: "git@github.com: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 + diff --git a/CHANGELOG-PUBLIC.MD b/CHANGELOG-PUBLIC.MD index 44c5f22..ed715b0 100644 --- a/CHANGELOG-PUBLIC.MD +++ b/CHANGELOG-PUBLIC.MD @@ -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 + + diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 44c5f22..ed715b0 100755 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -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 + + diff --git a/README.md b/README.md index 537fab8..466f48b 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/composer.json b/composer.json index 41d6862..f56132e 100755 --- a/composer.json +++ b/composer.json @@ -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" diff --git a/src/composer.json b/src/composer.json index a19dd16..0282d02 100755 --- a/src/composer.json +++ b/src/composer.json @@ -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" diff --git a/src/view/frontend/web/js/autocomplete.js b/src/view/frontend/web/js/autocomplete.js index 97040af..1879d82 100644 --- a/src/view/frontend/web/js/autocomplete.js +++ b/src/view/frontend/web/js/autocomplete.js @@ -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 }