Merge branch 'master' into swahili-templates-menu

update test data file
Merge pull request 'api-error-fix' (#161 ) from api-error-fix into master
2024-11-05 13:25:49 +03:00 · 2024-11-05 10:49:08 +03:00 · 2024-11-05 00:18:04 +01:00 · 2024-11-04 17:56:25 +03:00 · 2024-11-04 17:38:55 +03:00 · 2024-11-04 16:06:33 +03:00
21 changed files with 28 additions and 12 deletions
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -1254,7 +1254,8 @@ func (h *Handlers) SetDefaultVoucher(ctx context.Context, sym string, input []by
 			// Fetch vouchers from the API using the public key
 			vouchersResp, err := h.accountService.FetchVouchers(ctx, string(publicKey))
 			if err != nil {
-				return res, err
+				res.FlagSet = append(res.FlagSet, flag_no_active_voucher)
+				return res, nil
 			}

 			// Return if there is no voucher
--- a/menutraversal_test/group_test.json
+++ b/menutraversal_test/group_test.json
@@ -54,7 +54,7 @@
                },
                {
                    "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
                },
                {
                    "input": "1",
@@ -95,7 +95,7 @@
                },
                {
                    "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
                },
                {
                    "input": "1",
@@ -141,7 +141,7 @@
                },
                {
                    "input": "1235",
-                    "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                    "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
                },
                {
                    "input": "1",
--- a/menutraversal_test/test_setup.json
+++ b/menutraversal_test/test_setup.json
@@ -23,7 +23,7 @@
                    },
                    {
                        "input": "1111",
-                        "expectedContent": "The PIN is not a match. Try again\n1:retry\n9:Quit"
+                        "expectedContent": "The PIN is not a match. Try again\n1:Retry\n9:Quit"
                    },
                    {
                        "input": "1",
@@ -65,7 +65,7 @@
                    },
                    {
                        "input": "000",
-                        "expectedContent": "000 is not registered or invalid, please try again:\n1:retry\n9:Quit"
+                        "expectedContent": "000 is not registered or invalid, please try again:\n1:Retry\n9:Quit"
                    },
                    {
                        "input": "1",
@@ -77,7 +77,7 @@
                    },
                    {
                        "input": "10000000",
-                        "expectedContent": "Amount 10000000 is invalid, please try again:\n1:retry\n9:Quit"
+                        "expectedContent": "Amount 10000000 is invalid, please try again:\n1:Retry\n9:Quit"
                    },
                    {
                        "input": "1",
@@ -89,7 +89,7 @@
                    },
                    {
                        "input": "1222",
-                        "expectedContent": "Incorrect pin\n1:retry\n9:Quit"
+                        "expectedContent": "Incorrect pin\n1:Retry\n9:Quit"
                    },
                    {
                        "input": "1",
@@ -140,7 +140,7 @@
                    },
                    {
                        "input": "6",
-                        "expectedContent": "Address: {public_key}\n9:Quit"
+                        "expectedContent": "Address: {public_key}\n0:Back\n9:Quit"
                    },
                    {
                        "input": "9",
--- a/remote/accountservice.go
+++ b/remote/accountservice.go
@@ -202,7 +202,6 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
 	if len(okResponse.Result) == 0 {
 		return nil, errors.New("Empty api result")
 	}
-	return &okResponse, nil

 	v, err := json.Marshal(okResponse.Result)
 	if err != nil {
--- 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/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/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_swa
+++ b/services/registration/enter_others_new_pin_swa
@@ -0,0 +1 @@
+Tafadhali weka PIN mpya ya: {{.retrieve_blocked_number}}
--- 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
@@ -1 +1 @@
-You need a voucher to send
+You need a voucher to proceed
--- a/services/registration/no_voucher_swa
+++ b/services/registration/no_voucher_swa
@@ -1 +1 @@
-Unahitaji sarafu kutuma
+Unahitaji sarafu kuendelea
--- 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_reset_mismatch_swa
+++ b/services/registration/pin_reset_mismatch_swa
@@ -0,0 +1 @@
+PIN uliyoweka hailingani.Jaribu tena.
--- 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/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_voucher.vis
+++ b/services/registration/select_voucher.vis
@@ -1,3 +1,4 @@
+CATCH no_voucher flag_no_active_voucher 1
 LOAD get_vouchers 0
 MAP get_vouchers
 MOUT back 0
--- a/services/registration/select_voucher_menu_swa
+++ b/services/registration/select_voucher_menu_swa
@@ -0,0 +1 @@
+Chagua Sarafu
--- a/services/registration/unregistered_number_swa
+++ b/services/registration/unregistered_number_swa
@@ -0,0 +1 @@
+Nambari uliyoingiza haijasajiliwa na Sarafu au sio sahihi.
--- a/services/registration/voucher_details_menu_swa
+++ b/services/registration/voucher_details_menu_swa
@@ -0,0 +1 @@
+Maelezo ya Sarafu
Author	SHA1	Message	Date
Carlosokumu	7676cfd40c	Merge branch 'master' into swahili-templates-menu	2024-11-05 13:25:49 +03:00
Carlosokumu	4e350aa25a	update test data file	2024-11-05 10:49:08 +03:00
lash	859de0513a	Merge pull request 'api-error-fix' (#161 ) from api-error-fix into master Reviewed-on: #161	2024-11-05 00:18:04 +01:00
alfred-mk	266d3d06c3	Check the flag_no_active_voucher before proceeding	2024-11-04 17:56:25 +03:00
alfred-mk	92ea3df4aa	Removeearly return statement	2024-11-04 17:38:55 +03:00
Carlosokumu	c46c31ea36	ensure swahili translation	2024-11-04 16:06:33 +03:00
Carlosokumu	da91eed9d4	add retry menu option	2024-11-04 15:55:58 +03:00
lash	e2b28a31b2	Merge pull request 'lash/export-to-term' (#157 ) from lash/export-to-term into master Reviewed-on: #157	2024-11-04 13:54:58 +01:00
Carlosokumu	2b865a365b	add back option to view address	2024-11-04 15:24:51 +03:00
Carlosokumu	c77558689a	ensure swahlili menu template	2024-11-04 15:24:22 +03:00
Carlosokumu	a9641fd70d	ensure swahili menu template	2024-11-04 15:24:01 +03:00
				`@@ -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 @@`
				`Tafadhali weka PIN mpya ya: {{.retrieve_blocked_number}}`
				`@@ -0,0 +1 @@`
				`Ombi la kuweka upya PIN ya {{.retrieve_blocked_number}} limefanikiwa`
				`@@ -0,0 +1 @@`
				`Nambari uliyoingiza haijasajiliwa na Sarafu au sio sahihi.`