Skip to content

Gender code configurable #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ettiennelouw merged 5 commits into from
Dec 11, 2023
Merged

Gender code configurable #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
910f7fc
Added config value for get gender code from id number.
ettiennelouw Dec 11, 2023
749f971
Fix styling
ettiennelouw Dec 11, 2023
d3375a2
Merge branch 'main' into Fixes-to-id-number-helper
ettiennelouw Dec 11, 2023
08da486
Removed limit ending characters
ettiennelouw Dec 11, 2023
556c7c3
Merge branch 'Fixes-to-id-number-helper' of github.com:PropaySystems/…
ettiennelouw Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions config/utilities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,26 @@
// config for PropaySystems/Utilities
return [

/*
|--------------------------------------------------------------------------
| Translation Helper
|--------------------------------------------------------------------------
|
| Set the default path for the translation files
|
*/
'translation_helper' => [
'path' => env('TRANSLATION_HELPER_PATH', 'db'),
],

/*
|--------------------------------------------------------------------------
| Save To Upper
|--------------------------------------------------------------------------
|
| Exclude fields when converting to uppercase
|
*/
'save_to_upper' => [
'exclusions' => [
'email',
Expand All @@ -19,8 +35,30 @@
],
],

/*
|--------------------------------------------------------------------------
| Trigger
|--------------------------------------------------------------------------
|
| Enable or disable database triggers
|
*/
'trigger' => [
'enable_trigger' => env('ENABLE_TRIGGER', false),
],

/*
|--------------------------------------------------------------------------
| Gender Code
|--------------------------------------------------------------------------
|
| This gender code is used mostly in the id number helper.
|
*/
'gender' => [
'male' => 1,
'female' => 2,
'unknown' => 3,
],

];
8 changes: 3 additions & 5 deletions src/Helpers/IdNumberHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static function generateFakeId(): string
$totalMod = ($total % 10);
$lastDigit = 10 - $totalMod;

return Str::limit($tempId.$lastDigit, 13);
return Str::limit($tempId.$lastDigit, 13, '');
}

public static function generateDateOfBirth(): string
Expand All @@ -99,9 +99,9 @@ public static function generateDateOfBirth(): string
);
}

public static function getGenderCode($idNumber): string
public static function getGenderCode($idNumber): int
{
return (substr($idNumber, 6, 4) < 5000) ? 'female' : 'male';
return (substr($idNumber, 6, 4) < 5000) ? config('utilities.gender.female') : config('utilities.gender.male');
}

public static function getBirthDate($idNumber): string
Expand All @@ -111,8 +111,6 @@ public static function getBirthDate($idNumber): string
$birthYear = substr($idNumber, 0, 2);
if ($birthYear < date('y')) {
$default_century = '20';
} else {
$default_century = '19';
}

$year = $default_century.substr($idNumber, 0, 2);
Expand Down