remove extra space

ensure a PIN is set before changing the language
added the profile info on the swa menu template
2024-09-16 17:08:36 +03:00 · 2024-09-16 17:07:33 +03:00 · 2024-09-16 16:57:41 +03:00 · 2024-09-16 16:57:06 +03:00 · 2024-09-16 16:12:41 +03:00 · 2024-09-16 16:07:15 +03:00
53 changed files with 87 additions and 41 deletions
--- a/cmd/africastalking/main.go
+++ b/cmd/africastalking/main.go
@ -116,6 +116,7 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
 	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("set_new_language", ussdHandlers.SetNewLanguage)

 	return ussdHandlers, nil
 }
--- a/cmd/async/main.go
+++ b/cmd/async/main.go
@ -86,6 +86,7 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
 	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("set_new_language", ussdHandlers.SetNewLanguage)

 	return ussdHandlers, nil
 }
--- a/cmd/http/main.go
+++ b/cmd/http/main.go
@ -76,6 +76,7 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
 	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("set_new_language", ussdHandlers.SetNewLanguage)

 	return ussdHandlers, nil
 }
--- a/cmd/main.go
+++ b/cmd/main.go
@ -71,6 +71,7 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, pe *persist.P
 	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
 	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("set_new_language", ussdHandlers.SetNewLanguage)

 	return ussdHandlers, nil
 }
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@ -968,3 +968,22 @@ func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte)

 	return res, nil
 }
+
+// SetNewLanguage sets the new language based on user input
+func (h *Handlers) SetNewLanguage(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+
+	inputStr := string(input)
+
+	switch inputStr {
+	case "0":
+		res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
+		res.Content = "eng"
+	case "1":
+		res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
+		res.Content = "swa"
+	default:
+	}
+
+	return res, nil
+}
--- a/services/registration/back_menu_swa
+++ b/services/registration/back_menu_swa
@ -1 +1 @@
-Rudi
+Rudi
--- a/services/registration/balances
+++ b/services/registration/balances
@ -1 +1 @@
-Balances:
+Balances:
--- a/services/registration/balances_swa
+++ b/services/registration/balances_swa
@ -1 +1 @@
-Salio
+Salio:
--- a/services/registration/change_language
+++ b/services/registration/change_language
@ -0,0 +1 @@
+Select language:
--- a/services/registration/change_language.vis
+++ b/services/registration/change_language.vis
@ -0,0 +1,10 @@
+LOAD reset_account_authorized 0
+LOAD reset_incorrect 0
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH pin_entry flag_account_authorized 0
+MOUT english 0
+MOUT kiswahili 1
+HALT
+INCMP language_changed 0
+INCMP language_changed 1
+INCMP . *
--- a/services/registration/change_language_menu_swa
+++ b/services/registration/change_language_menu_swa
@ -1 +1 @@
-Badili lugha
+Badili lugha
--- a/services/registration/change_language_swa
+++ b/services/registration/change_language_swa
@ -0,0 +1 @@
+Chagua lugha:
--- a/services/registration/change_pin_menu
+++ b/services/registration/change_pin_menu
@ -1 +1 @@
-Change PIN
+Change PIN
--- a/services/registration/change_pin_menu_swa
+++ b/services/registration/change_pin_menu_swa
@ -1 +1 @@
-Badili PIN
+Badili PIN
--- a/services/registration/check_statement_menu
+++ b/services/registration/check_statement_menu
@ -1 +1 @@
-Check statement
+Check statement
--- a/services/registration/community_balance
+++ b/services/registration/community_balance
@ -1,2 +1 @@
-Your community balance is: 0.00SRF
-
+Your community balance is: 0.00SRF
--- a/services/registration/community_balance_menu
+++ b/services/registration/community_balance_menu
@ -1 +1 @@
-Community  balance
+Community balance
--- a/services/registration/edit_name_menu
+++ b/services/registration/edit_name_menu
@ -1 +1 @@
-Edit name
+Edit name
--- a/services/registration/edit_name_menu_swa
+++ b/services/registration/edit_name_menu_swa
@ -1 +1 @@
-Weka jina
+Weka jina
--- a/services/registration/edit_offerings_menu
+++ b/services/registration/edit_offerings_menu
@ -1 +1 @@
-Edit offerings
+Edit offerings
--- a/services/registration/enter_familyname
+++ b/services/registration/enter_familyname
@ -1 +1 @@
-Enter family name:
+Enter family name:
--- a/services/registration/enter_location
+++ b/services/registration/enter_location
@ -1 +1 @@
-Enter your location:
+Enter your location:
--- a/services/registration/enter_name_swa
+++ b/services/registration/enter_name_swa
@ -1 +1 @@
-Weka majina yako ya kwanza:
+Weka majina yako ya kwanza:
--- a/services/registration/female_menu
+++ b/services/registration/female_menu
@ -1 +1 @@
-Female
+Female
--- a/services/registration/guard_pin_menu
+++ b/services/registration/guard_pin_menu
@ -1 +1 @@
-Guard my PIN
+Guard my PIN
--- a/services/registration/guard_pin_menu_swa
+++ b/services/registration/guard_pin_menu_swa
@ -1 +1 @@
-Linda PIN yangu
+Linda PIN yangu
--- a/services/registration/incorrect_date_format
+++ b/services/registration/incorrect_date_format
@ -1,2 +1,2 @@
 The year of birth you entered is invalid.
-Please try again.
+Please try again.
--- a/services/registration/incorrect_pin
+++ b/services/registration/incorrect_pin
@ -1 +1 @@
-Incorrect  pin
+Incorrect pin
--- a/services/registration/language_changed
+++ b/services/registration/language_changed
@ -0,0 +1 @@
+Your language change request was successful.
--- a/services/registration/language_changed.vis
+++ b/services/registration/language_changed.vis
@ -0,0 +1,6 @@
+LOAD set_new_language 6
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP ^ 0
+INCMP quit 9
--- a/services/registration/language_changed_swa
+++ b/services/registration/language_changed_swa
@ -0,0 +1 @@
+Ombi lako la kubadilisha lugha limefanikiwa.
--- a/services/registration/my_account.vis
+++ b/services/registration/my_account.vis
@ -9,6 +9,7 @@ MOUT back 0
 HALT
 INCMP _ 0
 INCMP edit_profile 1
+INCMP change_language 2
 INCMP balances 3
 INCMP pin_management 5
 INCMP address 6
--- a/services/registration/my_address_menu_swa
+++ b/services/registration/my_address_menu_swa
@ -1 +1 @@
-Anwani yangu
+Anwani yangu
--- a/services/registration/my_balance_swa
+++ b/services/registration/my_balance_swa
@ -1 +1 @@
-Salio lako ni: 0.00 SRF
+Salio lako ni: 0.00 SRF
--- a/services/registration/no_menu
+++ b/services/registration/no_menu
@ -1 +1 @@
-no
+no
--- a/services/registration/no_menu_swa
+++ b/services/registration/no_menu_swa
@ -1 +1 @@
-la
+la
--- a/services/registration/pin_entry_swa
+++ b/services/registration/pin_entry_swa
@ -1 +1 @@
-Tafadhali weka PIN yako
+Tafadhali weka PIN yako
--- a/services/registration/pin_management
+++ b/services/registration/pin_management
@ -1 +1 @@
-PIN Management
+PIN Management
--- a/services/registration/profile_menu
+++ b/services/registration/profile_menu
@ -1 +1 @@
-Profile
+Profile
--- a/services/registration/profile_menu_swa
+++ b/services/registration/profile_menu_swa
@ -1 +1 @@
-Wasifu  wangu
+Wasifu wangu
--- a/services/registration/quit_menu
+++ b/services/registration/quit_menu
@ -0,0 +1 @@
+Quit
--- a/services/registration/quit_menu_swa
+++ b/services/registration/quit_menu_swa
@ -0,0 +1 @@
+Ondoka
--- a/services/registration/reset_pin_menu_swa
+++ b/services/registration/reset_pin_menu_swa
@ -1 +1 @@
-Badili PIN ya mwenzio
+Badili PIN ya mwenzio
--- a/services/registration/send
+++ b/services/registration/send
@ -1 +1 @@
-Enter recipient's phone number:
+Enter recipient's phone number:
--- a/services/registration/transaction_pin
+++ b/services/registration/transaction_pin
@ -1,2 +1,2 @@
 {{.get_recipient}} will receive {{.validate_amount}} from {{.get_sender}}
-Please enter your PIN to confirm:
+Please enter your PIN to confirm:
--- a/services/registration/unspecified_menu
+++ b/services/registration/unspecified_menu
@ -1 +1 @@
-Unspecified
+Unspecified
--- a/services/registration/update_success
+++ b/services/registration/update_success
@ -1 +1 @@
-Profile updated successfully
+Profile updated successfully
--- a/services/registration/update_success_swa
+++ b/services/registration/update_success_swa
@ -1 +1 @@
-Akaunti  imeupdatiwa
+Akaunti imeupdatiwa
--- a/services/registration/view_profile
+++ b/services/registration/view_profile
@ -1,2 +1,2 @@
-My profile: 
-{{.get_profile_info}} 
+My profile:
+{{.get_profile_info}}
--- a/services/registration/view_profile_swa
+++ b/services/registration/view_profile_swa
@ -1 +1,2 @@
-Wasifu wangu
+Wasifu wangu:
+{{.get_profile_info}}
--- a/services/registration/view_swa
+++ b/services/registration/view_swa
@ -1 +1 @@
-Angalia Wasifu
+Angalia Wasifu
--- a/services/registration/yes_menu
+++ b/services/registration/yes_menu
@ -1 +1 @@
-yes
+yes
--- a/services/registration/yes_menu_swa
+++ b/services/registration/yes_menu_swa
@ -1 +1 @@
-ndio
+ndio
Author	SHA1	Message	Date
alfred-mk	ca81b041f1	remove extra space	2024-09-16 17:08:36 +03:00
alfred-mk	fe7c04c0dd	ensure a PIN is set before changing the language	2024-09-16 17:07:33 +03:00
alfred-mk	89da7fc741	added the profile info on the swa menu template	2024-09-16 16:57:41 +03:00
alfred-mk	9953ae3e56	remove new lines on templates and menus to clean up the empty spaces on the menu	2024-09-16 16:57:06 +03:00
alfred-mk	ea68edff3d	added quit menu to handle eng and swa	2024-09-16 16:12:41 +03:00
alfred-mk	1e99db2bd7	add the change_language functionality to the account menu	2024-09-16 16:07:15 +03:00
alfred-mk	b7783073cf	change language	2024-09-16 16:06:36 +03:00
alfred-mk	6437d2e4df	added change_language node and templates	2024-09-16 16:05:39 +03:00
alfred-mk	353c38be46	added the SetNewLanguage function	2024-09-16 16:03:16 +03:00
				`@ -0,0 +1 @@`
				`Your language change request was successful.`
				`@ -0,0 +1 @@`
				`Ombi lako la kubadilisha lugha limefanikiwa.`