Merge branch 'master' into account-statement

2024-11-19 10:33:09 +03:00
parent fc0043e3f6 109a2a2020
commit 6fa0d8e2ff
179 changed files with 3779 additions and 1649 deletions
--- a/services/registration/account_creation.vis
+++ b/services/registration/account_creation.vis
@@ -1,4 +1,4 @@
-RELOAD verify_pin
+RELOAD verify_create_pin
 CATCH create_pin_mismatch flag_pin_mismatch 1
 LOAD quit 0
 HALT
--- a/services/registration/address.vis
+++ b/services/registration/address.vis
@@ -1,6 +1,8 @@
 LOAD check_identifier 0
 RELOAD check_identifier
 MAP check_identifier
+MOUT back 0
 MOUT quit 9
 HALT
+INCMP _ 0
 INCMP quit 9
--- a/services/registration/address_swa
+++ b/services/registration/address_swa
@@ -0,0 +1 @@
+Anwani:{{.check_identifier}}
--- a/services/registration/amount.vis
+++ b/services/registration/amount.vis
@@ -1,14 +1,15 @@
 LOAD reset_transaction_amount 0
 LOAD max_amount 10
+RELOAD max_amount
 MAP max_amount
 MOUT back 0
 HALT
 LOAD validate_amount 64
 RELOAD validate_amount
-CATCH api_failure  flag_api_call_error  1
+CATCH api_failure flag_api_call_error  1
 CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
-LOAD get_recipient 12
+LOAD get_recipient 0
 LOAD get_sender 64
-LOAD get_amount 12
+LOAD get_amount 32
 INCMP transaction_pin *
--- a/services/registration/api_failure.vis
+++ b/services/registration/api_failure.vis
@@ -1,5 +1,5 @@
-MOUT retry 0
+MOUT retry 1
 MOUT quit 9
 HALT
-INCMP _ 0
+INCMP _ 1
 INCMP quit 9
--- a/services/registration/comminity_balance_swa
+++ b/services/registration/comminity_balance_swa
@@ -1 +1 @@
-Salio la kikundi
+{{.fetch_community_balance}}
--- a/services/registration/community_balance
+++ b/services/registration/community_balance
@@ -1 +1 @@
-{{.fetch_custodial_balances}}
+{{.fetch_community_balance}}
--- a/services/registration/community_balance.vis
+++ b/services/registration/community_balance.vis
@@ -1,7 +1,7 @@
 LOAD reset_incorrect 6
-LOAD fetch_custodial_balances 0
+LOAD fetch_community_balance 0
 CATCH api_failure  flag_api_call_error  1
-MAP fetch_custodial_balances
+MAP fetch_community_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
 MOUT back 0
--- a/services/registration/confirm_create_pin.vis
+++ b/services/registration/confirm_create_pin.vis
@@ -1,4 +1,4 @@
-LOAD save_pin 0
+LOAD save_temporary_pin 6
 HALT
-LOAD verify_pin 8
+LOAD verify_create_pin 8
 INCMP account_creation *
--- a/services/registration/confirm_others_new_pin
+++ b/services/registration/confirm_others_new_pin
@@ -0,0 +1 @@
+Please confirm new PIN  for:{{.retrieve_blocked_number}}
--- a/services/registration/confirm_others_new_pin.vis
+++ b/services/registration/confirm_others_new_pin.vis
@@ -0,0 +1,14 @@
+CATCH pin_entry flag_incorrect_pin 1
+RELOAD retrieve_blocked_number
+MAP retrieve_blocked_number
+CATCH invalid_others_pin flag_valid_pin 0
+CATCH pin_reset_result flag_account_authorized 1
+LOAD save_others_temporary_pin 6
+RELOAD save_others_temporary_pin
+MOUT back 0
+HALT 
+INCMP _ 0
+LOAD check_pin_mismatch 0
+RELOAD check_pin_mismatch
+CATCH others_pin_mismatch flag_pin_mismatch 1
+INCMP pin_entry *
--- a/services/registration/confirm_others_new_pin_swa
+++ b/services/registration/confirm_others_new_pin_swa
@@ -0,0 +1 @@
+Tafadhali thibitisha PIN mpya ya: {{.retrieve_blocked_number}}
--- a/services/registration/confirm_pin_change.vis
+++ b/services/registration/confirm_pin_change.vis
@@ -3,5 +3,3 @@ MOUT back 0
 HALT
 INCMP _ 0
 INCMP * pin_reset_success
-
-
--- a/services/registration/create_pin.vis
+++ b/services/registration/create_pin.vis
@@ -2,8 +2,8 @@ LOAD create_account 0
 CATCH account_creation_failed flag_account_creation_failed 1
 MOUT exit 0
 HALT
-LOAD save_pin 0
-RELOAD save_pin
+LOAD save_temporary_pin 6
+RELOAD save_temporary_pin
 CATCH . flag_incorrect_pin 1
 INCMP quit 0
 INCMP confirm_create_pin *
--- a/services/registration/edit_family_name
+++ b/services/registration/edit_family_name
@@ -0,0 +1,2 @@
+Current family name: {{.get_current_profile_info}}
+Enter family name:
--- a/services/registration/edit_family_name.vis
+++ b/services/registration/edit_family_name.vis
@@ -1,9 +1,10 @@
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_familyname 0
-RELOAD save_familyname
+CATCH update_familyname flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
 MOUT back 0
 HALT
+LOAD save_familyname 0
 RELOAD save_familyname
 INCMP _ 0
 INCMP pin_entry *
--- a/services/registration/edit_family_name_menu
+++ b/services/registration/edit_family_name_menu
--- a/services/registration/edit_family_name_menu_swa
+++ b/services/registration/edit_family_name_menu_swa
--- a/services/registration/edit_family_name_swa
+++ b/services/registration/edit_family_name_swa
@@ -0,0 +1,2 @@
+Jina la familia la sasa: {{.get_current_profile_info}}
+Weka jina la familia
--- a/services/registration/edit_first_name
+++ b/services/registration/edit_first_name
@@ -0,0 +1,2 @@
+Current name: {{.get_current_profile_info}}
+Enter your first names:
--- a/services/registration/edit_first_name.vis
+++ b/services/registration/edit_first_name.vis
@@ -0,0 +1,11 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_firstname flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
+MAP get_current_profile_info
+MOUT back 0
+HALT
+LOAD save_firstname 0
+RELOAD save_firstname
+INCMP _ 0
+INCMP pin_entry *
--- a/services/registration/edit_first_name_menu
+++ b/services/registration/edit_first_name_menu
--- a/services/registration/edit_first_name_menu_swa
+++ b/services/registration/edit_first_name_menu_swa
--- a/services/registration/edit_first_name_swa
+++ b/services/registration/edit_first_name_swa
@@ -0,0 +1,2 @@
+Jina la kwanza la sasa {{.get_current_profile_info}}
+Weka majina yako ya kwanza:
--- a/services/registration/edit_location
+++ b/services/registration/edit_location
@@ -0,0 +1,2 @@
+Current location: {{.get_current_profile_info}}
+Enter your location:
--- a/services/registration/enter_location.vis
+++ b/services/registration/enter_location.vis
@@ -1,8 +1,10 @@
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_location 0
+CATCH update_location flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
 MOUT back 0
 HALT
+LOAD save_location 0
 RELOAD save_location
 INCMP _ 0
 INCMP pin_entry *
--- a/services/registration/edit_location_swa
+++ b/services/registration/edit_location_swa
@@ -0,0 +1,2 @@
+Eneo la sasa {{.get_current_profile_info}}
+Weka eneo:
--- a/services/registration/edit_offerings
+++ b/services/registration/edit_offerings
@@ -0,0 +1,2 @@
+Current offerings: {{.get_current_profile_info}}
+Enter the services or goods you offer: 
--- a/services/registration/enter_offerings.vis
+++ b/services/registration/enter_offerings.vis
@@ -1,5 +1,7 @@
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
+CATCH update_offerings flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
 LOAD save_offerings 0
 MOUT back 0
 HALT
--- a/services/registration/edit_offerings_swa
+++ b/services/registration/edit_offerings_swa
@@ -0,0 +1,2 @@
+Unachouza kwa sasa: {{.get_current_profile_info}}
+Weka unachouza
--- a/services/registration/edit_profile.vis
+++ b/services/registration/edit_profile.vis
@@ -2,8 +2,8 @@ LOAD reset_account_authorized 16
 RELOAD reset_account_authorized
 LOAD reset_allow_update 0
 RELOAD reset_allow_update
-MOUT edit_name 1
-MOUT edit_familyname 2
+MOUT edit_first_name 1
+MOUT edit_family_name 2
 MOUT edit_gender 3
 MOUT edit_yob 4
 MOUT edit_location 5
@@ -12,10 +12,10 @@ MOUT view 7
 MOUT back 0
 HALT
 INCMP my_account 0
-INCMP enter_name 1
-INCMP enter_familyname 2
+INCMP edit_first_name 1
+INCMP edit_family_name 2
 INCMP select_gender 3
-INCMP enter_yob 4
-INCMP enter_location 5
-INCMP enter_offerings 6
+INCMP edit_yob 4
+INCMP edit_location 5
+INCMP edit_offerings 6
 INCMP view_profile 7
--- a/services/registration/edit_yob
+++ b/services/registration/edit_yob
@@ -0,0 +1,2 @@
+Current year of birth: {{.get_current_profile_info}}
+Enter your year of birth
--- a/services/registration/enter_yob.vis
+++ b/services/registration/enter_yob.vis
@@ -1,10 +1,14 @@
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_yob 0
+CATCH update_yob flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
+MAP get_current_profile_info
 MOUT back 0
 HALT
-LOAD verify_yob 0
+LOAD verify_yob 6
+RELOAD verify_yob
 CATCH incorrect_date_format flag_incorrect_date_format 1
+LOAD save_yob 0
 RELOAD save_yob
 INCMP _ 0
 INCMP pin_entry *
--- a/services/registration/edit_yob_swa
+++ b/services/registration/edit_yob_swa
@@ -0,0 +1,2 @@
+Mwaka wa sasa wa kuzaliwa {{.get_current_profile_info}}
+Weka mwaka wa kuzaliwa
--- a/services/registration/enter_familyname
+++ b/services/registration/enter_familyname
@@ -1 +0,0 @@
-Enter family name:
--- a/services/registration/enter_familyname_swa
+++ b/services/registration/enter_familyname_swa
@@ -1 +0,0 @@
-Weka jina la familia
--- a/services/registration/enter_location
+++ b/services/registration/enter_location
@@ -1 +0,0 @@
-Enter your location:
--- a/services/registration/enter_location_swa
+++ b/services/registration/enter_location_swa
@@ -1 +0,0 @@
-Weka eneo:
--- a/services/registration/enter_name
+++ b/services/registration/enter_name
@@ -1 +0,0 @@
-Enter your first names:
--- a/services/registration/enter_name.vis
+++ b/services/registration/enter_name.vis
@@ -1,12 +0,0 @@
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
-LOAD save_firstname 0
-RELOAD save_firstname 
-MOUT back 0
-HALT
-RELOAD save_firstname
-INCMP _ 0
-INCMP pin_entry *
-
-
-
--- a/services/registration/enter_name_swa
+++ b/services/registration/enter_name_swa
@@ -1 +0,0 @@
-Weka majina yako ya kwanza:
--- a/services/registration/enter_offerings
+++ b/services/registration/enter_offerings
@@ -1 +0,0 @@
-Enter the services or goods you offer: 
--- a/services/registration/enter_offerings_swa
+++ b/services/registration/enter_offerings_swa
@@ -1 +0,0 @@
-Weka unachouza
--- a/services/registration/enter_other_number
+++ b/services/registration/enter_other_number
@@ -0,0 +1 @@
+Enter other's phone number:
--- a/services/registration/enter_other_number.vis
+++ b/services/registration/enter_other_number.vis
@@ -0,0 +1,7 @@
+CATCH no_admin_privilege flag_admin_privilege  0
+LOAD reset_account_authorized 0
+RELOAD reset_account_authorized
+MOUT back 0
+HALT
+INCMP _ 0
+INCMP enter_others_new_pin *
--- a/services/registration/enter_other_number_swa
+++ b/services/registration/enter_other_number_swa
@@ -0,0 +1 @@
+Weka nambari ya simu ili kutuma ombi la kubadilisha nambari ya siri:
--- a/services/registration/enter_others_new_pin
+++ b/services/registration/enter_others_new_pin
@@ -0,0 +1 @@
+Please enter new PIN for: {{.retrieve_blocked_number}}
--- a/services/registration/enter_others_new_pin.vis
+++ b/services/registration/enter_others_new_pin.vis
@@ -0,0 +1,12 @@
+LOAD validate_blocked_number 6
+RELOAD validate_blocked_number
+CATCH unregistered_number flag_unregistered_number 1
+LOAD retrieve_blocked_number 0
+RELOAD retrieve_blocked_number
+MAP retrieve_blocked_number
+MOUT back 0
+HALT 
+LOAD verify_new_pin 6
+RELOAD verify_new_pin
+INCMP _ 0
+INCMP * confirm_others_new_pin
--- a/services/registration/enter_others_new_pin_swa
+++ b/services/registration/enter_others_new_pin_swa
@@ -0,0 +1 @@
+Tafadhali weka PIN mpya ya: {{.retrieve_blocked_number}}
--- a/services/registration/enter_yob
+++ b/services/registration/enter_yob
@@ -1 +0,0 @@
-Enter your year of birth
--- a/services/registration/enter_yob_swa
+++ b/services/registration/enter_yob_swa
@@ -1 +0,0 @@
-Weka mwaka wa kuzaliwa
--- a/services/registration/guard_pin_menu
+++ b/services/registration/guard_pin_menu
@@ -1 +0,0 @@
-Guard my PIN
--- a/services/registration/guard_pin_menu_swa
+++ b/services/registration/guard_pin_menu_swa
@@ -1 +0,0 @@
-Linda PIN yangu
--- a/services/registration/incorrect_date_format.vis
+++ b/services/registration/incorrect_date_format.vis
@@ -2,5 +2,5 @@ LOAD reset_incorrect_date_format 8
 MOUT retry 1
 MOUT quit 9
 HALT
-INCMP enter_yob 1
+INCMP _ 1
 INCMP quit 9
--- a/services/registration/invalid_others_pin
+++ b/services/registration/invalid_others_pin
@@ -0,0 +1 @@
+The PIN you have entered is invalid.Please try a 4 digit number instead.
--- a/services/registration/invalid_others_pin.vis
+++ b/services/registration/invalid_others_pin.vis
@@ -0,0 +1,5 @@
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP enter_others_new_pin 1
+INCMP quit 9
--- a/services/registration/invalid_recipient
+++ b/services/registration/invalid_recipient
@@ -1 +1 @@
-{{.validate_recipient}} is not registered or invalid, please try again:
+{{.validate_recipient}} is invalid, please try again:
--- a/services/registration/invalid_recipient_swa
+++ b/services/registration/invalid_recipient_swa
@@ -1 +1 @@
-{{.validate_recipient}} haijasajiliwa au sio sahihi, tafadhali weka tena:
+{{.validate_recipient}} sio sahihi, tafadhali weka tena:
--- a/services/registration/invite_menu
+++ b/services/registration/invite_menu
@@ -0,0 +1 @@
+Invite to Sarafu Network
--- a/services/registration/invite_menu_swa
+++ b/services/registration/invite_menu_swa
@@ -0,0 +1 @@
+Karibisha kwa matandao wa Sarafu
--- a/services/registration/invite_recipient
+++ b/services/registration/invite_recipient
@@ -0,0 +1 @@
+{{.validate_recipient}} is not registered, please try again:
--- a/services/registration/invite_recipient.vis
+++ b/services/registration/invite_recipient.vis
@@ -0,0 +1,8 @@
+MAP validate_recipient
+MOUT retry 1
+MOUT invite 2
+MOUT quit 9
+HALT
+INCMP _ 1
+INCMP invite_result 2
+INCMP quit 9
--- a/services/registration/invite_recipient_swa
+++ b/services/registration/invite_recipient_swa
@@ -0,0 +1 @@
+{{.validate_recipient}} haijasajiliwa, tafadhali weka tena:
--- a/services/registration/invite_result.vis
+++ b/services/registration/invite_result.vis
@@ -0,0 +1,2 @@
+LOAD invite_valid_recipient 0
+HALT
--- a/services/registration/locale/swa/default.po
+++ b/services/registration/locale/swa/default.po
@@ -1,12 +1,26 @@
 msgid "Your account balance is %s"
 msgstr "Salio lako ni %s"

-msgid "Your request has been sent. %s will receive %s from %s."
-msgstr "Ombi lako limetumwa. %s atapokea %s kutoka kwa %s."
+msgid "Your request has been sent. %s will receive %s %s from %s."
+msgstr "Ombi lako limetumwa. %s atapokea %s %s kutoka kwa %s."

 msgid "Thank you for using Sarafu. Goodbye!"
 msgstr "Asante kwa kutumia huduma ya Sarafu. Kwaheri!"

-
 msgid "For more help,please call: 0757628885"
 msgstr "Kwa usaidizi zaidi,piga: 0757628885"
+
+msgid "Balance: %s\n"
+msgstr "Salio: %s\n"
+
+msid "Your invite request for %s to Sarafu Network failed. Please try again later."
+msgstr "Ombi lako la kumwalika %s kwa matandao wa Sarafu halikufaulu. Tafadhali jaribu tena baadaye."
+
+msgid "Your invitation to %s to join Sarafu Network has been sent."
+msgstr "Ombi lako la kumwalika %s kwa matandao wa Sarafu limetumwa."
+
+msgid "Your request failed. Please try again later."
+msgstr "Ombi lako halikufaulu. Tafadhali jaribu tena baadaye."
+
+msgid "Community Balance: 0.00"
+msgid "Salio la Kikundi: 0.00"
--- a/services/registration/main
+++ b/services/registration/main
@@ -1 +1 @@
-Balance: {{.check_balance}}
+{{.check_balance}}
--- a/services/registration/main.vis
+++ b/services/registration/main.vis
@@ -1,5 +1,9 @@
+LOAD set_default_voucher 8
+RELOAD set_default_voucher
 LOAD check_balance 64
 RELOAD check_balance
+LOAD check_vouchers 10
+RELOAD check_vouchers
 CATCH api_failure  flag_api_call_error  1
 MAP check_balance
 MOUT send 1
@@ -9,7 +13,7 @@ MOUT help 4
 MOUT quit 9
 HALT
 INCMP send 1
-INCMP quit 2
+INCMP my_vouchers 2
 INCMP my_account 3
 INCMP help 4
 INCMP quit 9
--- a/services/registration/main_swa
+++ b/services/registration/main_swa
@@ -1 +1 @@
-Salio: {{.check_balance}}
+{{.check_balance}}
--- a/services/registration/my_balance
+++ b/services/registration/my_balance
@@ -1 +1 @@
-{{.fetch_custodial_balances}}
+{{.check_balance}}
--- a/services/registration/my_balance.vis
+++ b/services/registration/my_balance.vis
@@ -1,7 +1,7 @@
 LOAD reset_incorrect 6
-LOAD fetch_custodial_balances 0
+LOAD check_balance 0
 CATCH api_failure  flag_api_call_error  1
-MAP fetch_custodial_balances
+MAP check_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
 MOUT back 0
--- a/services/registration/my_vouchers
+++ b/services/registration/my_vouchers
@@ -0,0 +1 @@
+My vouchers
--- a/services/registration/my_vouchers.vis
+++ b/services/registration/my_vouchers.vis
@@ -0,0 +1,9 @@
+LOAD reset_account_authorized 16
+RELOAD reset_account_authorized
+MOUT select_voucher 1
+MOUT voucher_details 2
+MOUT back 0
+HALT
+INCMP _ 0
+INCMP select_voucher 1
+INCMP voucher_details 2
--- a/services/registration/no_admin_privilege
+++ b/services/registration/no_admin_privilege
@@ -0,0 +1 @@
+You do not have privileges to perform this action
--- a/services/registration/no_admin_privilege.vis
+++ b/services/registration/no_admin_privilege.vis
@@ -0,0 +1,5 @@
+MOUT quit 9
+MOUT back 0
+HALT
+INCMP pin_management 0
+INCMP quit 9
--- a/services/registration/no_admin_privilege_swa
+++ b/services/registration/no_admin_privilege_swa
@@ -0,0 +1 @@
+Huna mapendeleo ya kufanya kitendo hiki
--- a/services/registration/no_voucher
+++ b/services/registration/no_voucher
@@ -0,0 +1 @@
+You need a voucher to proceed
--- a/services/registration/no_voucher.vis
+++ b/services/registration/no_voucher.vis
@@ -0,0 +1,5 @@
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP ^ 0
+INCMP quit 9
--- a/services/registration/no_voucher_swa
+++ b/services/registration/no_voucher_swa
@@ -0,0 +1 @@
+Unahitaji sarafu kuendelea
--- a/services/registration/others_pin_mismatch
+++ b/services/registration/others_pin_mismatch
@@ -0,0 +1 @@
+The PIN you have entered is not a match
--- a/services/registration/others_pin_mismatch.vis
+++ b/services/registration/others_pin_mismatch.vis
@@ -0,0 +1,5 @@
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP _ 1
+INCMP quit 9
--- a/services/registration/others_pin_mismatch_swa
+++ b/services/registration/others_pin_mismatch_swa
@@ -0,0 +1 @@
+PIN uliyoweka hailingani.Jaribu tena.
--- a/services/registration/pin_management.vis
+++ b/services/registration/pin_management.vis
@@ -1,8 +1,8 @@
 MOUT change_pin 1
 MOUT reset_pin 2
-MOUT guard_pin 3
 MOUT back 0
 HALT
-INCMP _ 0
+INCMP my_account 0
 INCMP old_pin  1
-
+INCMP enter_other_number 2
+INCMP . *
--- a/services/registration/pin_reset_mismatch_swa
+++ b/services/registration/pin_reset_mismatch_swa
@@ -0,0 +1 @@
+PIN uliyoweka hailingani.Jaribu tena.
--- a/services/registration/pin_reset_result
+++ b/services/registration/pin_reset_result
@@ -0,0 +1 @@
+PIN reset request for {{.retrieve_blocked_number}} was successful
--- a/services/registration/pin_reset_result.vis
+++ b/services/registration/pin_reset_result.vis
@@ -0,0 +1,8 @@
+LOAD retrieve_blocked_number 0
+MAP retrieve_blocked_number
+LOAD reset_others_pin 6
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP pin_management 0
+INCMP quit  9
--- a/services/registration/pin_reset_result_swa
+++ b/services/registration/pin_reset_result_swa
@@ -0,0 +1 @@
+Ombi la kuweka upya PIN ya {{.retrieve_blocked_number}} limefanikiwa
--- a/services/registration/pin_reset_success.vis
+++ b/services/registration/pin_reset_success.vis
@@ -6,5 +6,3 @@ MOUT quit 9
 HALT
 INCMP main 0
 INCMP quit 9
-
-
--- a/services/registration/pp.csv
+++ b/services/registration/pp.csv
@@ -14,4 +14,8 @@ flag,flag_valid_pin,20,this is set when the given PIN is valid
 flag,flag_allow_update,21,this is set to allow a user to update their profile data
 flag,flag_single_edit,22,this is set to allow a user to edit a single profile item such as year of birth
 flag,flag_incorrect_date_format,23,this is set when the given year of birth is invalid
-flag,flag_api_call_error,25,this is set when communication  to an external service fails
+flag,flag_incorrect_voucher,24,this is set when the selected voucher is invalid
+flag,flag_api_call_error,25,this is set when communication to an external service fails
+flag,flag_no_active_voucher,26,this is set when a user does not have an active voucher
+flag,flag_admin_privilege,27,this is set when a user has admin privileges.
+flag,flag_unregistered_number,28,this is set when an unregistered phonenumber tries to perform an action
--- a/services/registration/retry_menu
+++ b/services/registration/retry_menu
@@ -0,0 +1 @@
+Retry
--- a/services/registration/retry_menu_swa
+++ b/services/registration/retry_menu_swa
@@ -0,0 +1 @@
+Jaribu tena
--- a/services/registration/select_gender
+++ b/services/registration/select_gender
@@ -1 +1,2 @@
+Current gender: {{.get_current_profile_info}}
 Select gender: 
--- a/services/registration/select_gender.vis
+++ b/services/registration/select_gender.vis
@@ -1,5 +1,7 @@
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH profile_update_success flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
 MOUT male 1
 MOUT female 2
 MOUT unspecified 3
@@ -9,7 +11,3 @@ INCMP _ 0
 INCMP set_male 1
 INCMP set_female 2
 INCMP set_unspecified 3
-
-
-
-
--- a/services/registration/select_gender_swa
+++ b/services/registration/select_gender_swa
@@ -1 +1,2 @@
+Jinsia ya sasa {{.get_current_profile_info}}
 Chagua jinsia
--- a/services/registration/select_voucher
+++ b/services/registration/select_voucher
@@ -0,0 +1,2 @@
+Select number or symbol from your vouchers:
+{{.get_vouchers}}
--- a/services/registration/select_voucher.vis
+++ b/services/registration/select_voucher.vis
@@ -0,0 +1,16 @@
+CATCH no_voucher flag_no_active_voucher 1
+LOAD get_vouchers 0
+MAP get_vouchers
+MOUT back 0
+MOUT quit 99
+MNEXT next 11
+MPREV prev 22
+HALT
+LOAD view_voucher 80
+RELOAD view_voucher
+CATCH . flag_incorrect_voucher 1
+INCMP _ 0
+INCMP quit 99
+INCMP > 11
+INCMP < 22
+INCMP view_voucher *
--- a/services/registration/select_voucher_menu
+++ b/services/registration/select_voucher_menu
@@ -0,0 +1 @@
+Select voucher
--- a/services/registration/select_voucher_menu_swa
+++ b/services/registration/select_voucher_menu_swa
@@ -0,0 +1 @@
+Chagua Sarafu
--- a/services/registration/select_voucher_swa
+++ b/services/registration/select_voucher_swa
@@ -0,0 +1,2 @@
+Chagua nambari au ishara kutoka kwa salio zako:
+{{.get_vouchers}}
--- a/services/registration/send.vis
+++ b/services/registration/send.vis
@@ -1,8 +1,11 @@
 LOAD transaction_reset 0
+RELOAD transaction_reset
+CATCH no_voucher flag_no_active_voucher 1
 MOUT back 0
 HALT
 LOAD validate_recipient 20
 RELOAD validate_recipient
 CATCH invalid_recipient flag_invalid_recipient 1
+CATCH invite_recipient flag_invalid_recipient_with_invite 1
 INCMP _ 0
 INCMP amount *
--- a/services/registration/set_female.vis
+++ b/services/registration/set_female.vis
@@ -1,4 +1,4 @@
 LOAD save_gender 0
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH profile_update_success flag_allow_update 1
+CATCH update_gender flag_allow_update 1
 MOVE pin_entry
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`Please confirm new PIN for:{{.retrieve_blocked_number}}`
				`@@ -0,0 +1 @@`
				`Tafadhali thibitisha PIN mpya ya: {{.retrieve_blocked_number}}`
				`@@ -0,0 +1 @@`
				`Weka nambari ya simu ili kutuma ombi la kubadilisha nambari ya siri:`
				`@@ -0,0 +1 @@`
				`Please enter new PIN for: {{.retrieve_blocked_number}}`
				`@@ -0,0 +1 @@`
				`Tafadhali weka PIN mpya ya: {{.retrieve_blocked_number}}`
				`@@ -0,0 +1 @@`
				`The PIN you have entered is invalid.Please try a 4 digit number instead.`
				`@@ -0,0 +1 @@`
				`{{.validate_recipient}} is not registered, please try again:`
				`@@ -0,0 +1 @@`
				`{{.validate_recipient}} haijasajiliwa, tafadhali weka tena:`
				`@@ -0,0 +1 @@`
				`You do not have privileges to perform this action`
				`@@ -0,0 +1 @@`
				`PIN reset request for {{.retrieve_blocked_number}} was successful`