Merge pull request #25 from organisationsnummer/fix-plus

Allow + characters in enskild firma
organisationsnummer · Feb 20, 2024 · 81f697f · 81f697f
2 parents 4a30f3e + f9ee43a
commit 81f697f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -11,7 +11,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.12.x, 1.18.x]
+        go-version: [1.12.x, 1.22.x]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:

diff --git a/organisationsnummer.go b/organisationsnummer.go
@@ -158,8 +158,13 @@ func (o *Organisationsnummer) Format(separator ...bool) string {
 	var number = o.number
 
 	if o.IsPersonnummer() {
+		if len(separator) > 0 && separator[0] {
+			f, _ := o.personnummer.Format(false)
+			return f
+		}
+
 		f, _ := o.personnummer.Format(true)
-		number = f[2:]
+		return f[2:]
 	}
 
 	if len(separator) > 0 && separator[0] {