diff --git a/config/utilities.php b/config/utilities.php index 7e021dd..0d7ce10 100644 --- a/config/utilities.php +++ b/config/utilities.php @@ -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', @@ -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, + ], + ]; diff --git a/src/Helpers/IdNumberHelper.php b/src/Helpers/IdNumberHelper.php index e493a4d..a677bbd 100644 --- a/src/Helpers/IdNumberHelper.php +++ b/src/Helpers/IdNumberHelper.php @@ -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 @@ -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 @@ -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);