Skip to content

fix(cli): honor merchant context fallback #40

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
matoous merged 1 commit into from
Mar 26, 2026
Merged

fix(cli): honor merchant context fallback #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions internal/commands/payouts/payouts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@ func NewCommand() *cli.Command {
Action: listPayouts,
Flags: []cli.Flag{
&cli.StringFlag{
Name: "merchant-code",
Usage: "Merchant code whose payouts should be listed.",
Sources: cli.EnvVars("SUMUP_MERCHANT_CODE"),
Required: true,
Name: "merchant-code",
Usage: "Merchant code whose payouts should be listed. Falls back to context.",
Sources: cli.EnvVars("SUMUP_MERCHANT_CODE"),
},
&cli.StringFlag{
Name: "start-date",
Expand Down Expand Up @@ -61,6 +60,10 @@ func listPayouts(ctx context.Context, cmd *cli.Command) error {
if err != nil {
return err
}
merchantCode, err := app.GetMerchantCode(cmd, "merchant-code")
if err != nil {
return err
}
startDate, err := parseDateArg(cmd.String("start-date"))
if err != nil {
return err
Expand All @@ -85,7 +88,7 @@ func listPayouts(ctx context.Context, cmd *cli.Command) error {
params.Order = &order
}

payoutList, err := appCtx.Client.Payouts.List(ctx, cmd.String("merchant-code"), params)
payoutList, err := appCtx.Client.Payouts.List(ctx, merchantCode, params)
if err != nil {
return fmt.Errorf("list payouts: %w", err)
}
Expand Down
65 changes: 40 additions & 25 deletions internal/commands/readers/readers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ func NewCommand() *cli.Command {
Action: listReaders,
Flags: []cli.Flag{
&cli.StringFlag{
Name: "merchant-code",
Usage: "Merchant code whose readers should be listed.",
Sources: cli.EnvVars("SUMUP_MERCHANT_CODE"),
Required: true,
Name: "merchant-code",
Usage: "Merchant code whose readers should be listed. Falls back to context.",
Sources: cli.EnvVars("SUMUP_MERCHANT_CODE"),
},
},
},
Expand All @@ -44,10 +43,9 @@ func NewCommand() *cli.Command {
Action: addReader,
Flags: []cli.Flag{
&cli.StringFlag{
Name: "merchant-code",
Usage: "Merchant code that will own the new reader.",
Sources: cli.EnvVars("SUMUP_MERCHANT_CODE"),
Required: true,
Name: "merchant-code",
Usage: "Merchant code that will own the new reader. Falls back to context.",
Sources: cli.EnvVars("SUMUP_MERCHANT_CODE"),
},
&cli.StringFlag{
Name: "pairing-code",
Expand All @@ -68,10 +66,9 @@ func NewCommand() *cli.Command {
ArgsUsage: "<reader-id>",
Flags: []cli.Flag{
&cli.StringFlag{
Name: "merchant-code",
Usage: "Merchant code that owns the reader.",
Sources: cli.EnvVars("SUMUP_MERCHANT_CODE"),
Required: true,
Name: "merchant-code",
Usage: "Merchant code that owns the reader. Falls back to context.",
Sources: cli.EnvVars("SUMUP_MERCHANT_CODE"),
},
},
},
Expand All @@ -82,10 +79,9 @@ func NewCommand() *cli.Command {
ArgsUsage: "<reader-id>",
Flags: []cli.Flag{
&cli.StringFlag{
Name: "merchant-code",
Usage: "Merchant code that owns the reader.",
Sources: cli.EnvVars("SUMUP_MERCHANT_CODE"),
Required: true,
Name: "merchant-code",
Usage: "Merchant code that owns the reader. Falls back to context.",
Sources: cli.EnvVars("SUMUP_MERCHANT_CODE"),
},
},
},
Expand All @@ -96,10 +92,9 @@ func NewCommand() *cli.Command {
ArgsUsage: "<reader-id>",
Flags: []cli.Flag{
&cli.StringFlag{
Name: "merchant-code",
Usage: "Merchant code that owns the reader.",
Sources: cli.EnvVars("SUMUP_MERCHANT_CODE"),
Required: true,
Name: "merchant-code",
Usage: "Merchant code that owns the reader. Falls back to context.",
Sources: cli.EnvVars("SUMUP_MERCHANT_CODE"),
},
&cli.StringFlag{
Name: "amount",
Expand Down Expand Up @@ -163,7 +158,11 @@ func listReaders(ctx context.Context, cmd *cli.Command) error {
if err != nil {
return err
}
response, err := appCtx.Client.Readers.List(ctx, cmd.String("merchant-code"))
merchantCode, err := app.GetMerchantCode(cmd, "merchant-code")
if err != nil {
return err
}
response, err := appCtx.Client.Readers.List(ctx, merchantCode)
if err != nil {
return fmt.Errorf("list readers: %w", err)
}
Expand Down Expand Up @@ -198,12 +197,16 @@ func addReader(ctx context.Context, cmd *cli.Command) error {
if err != nil {
return err
}
merchantCode, err := app.GetMerchantCode(cmd, "merchant-code")
if err != nil {
return err
}
body := sumup.ReadersCreateParams{
PairingCode: sumup.ReaderPairingCode(cmd.String("pairing-code")),
Name: sumup.ReaderName(cmd.String("name")),
}

reader, err := appCtx.Client.Readers.Create(ctx, cmd.String("merchant-code"), body)
reader, err := appCtx.Client.Readers.Create(ctx, merchantCode, body)
if pErr := new(sumup.Problem); errors.As(err, &pErr) {
return fmt.Errorf("create reader: %v %v", *pErr.Detail, *pErr.Title)
} else if err != nil {
Expand All @@ -230,12 +233,16 @@ func deleteReader(ctx context.Context, cmd *cli.Command) error {
if err != nil {
return err
}
merchantCode, err := app.GetMerchantCode(cmd, "merchant-code")
if err != nil {
return err
}
readerID, err := util.RequireSingleArg(cmd, "reader ID")
if err != nil {
return err
}

err = appCtx.Client.Readers.Delete(ctx, cmd.String("merchant-code"), sumup.ReaderID(readerID))
err = appCtx.Client.Readers.Delete(ctx, merchantCode, sumup.ReaderID(readerID))
if err != nil {
return fmt.Errorf("delete reader: %w", err)
}
Expand All @@ -253,6 +260,10 @@ func readerCheckout(ctx context.Context, cmd *cli.Command) error {
if err != nil {
return err
}
merchantCode, err := app.GetMerchantCode(cmd, "merchant-code")
if err != nil {
return err
}
readerID, err := util.RequireSingleArg(cmd, "reader ID")
if err != nil {
return err
Expand Down Expand Up @@ -310,7 +321,7 @@ func readerCheckout(ctx context.Context, cmd *cli.Command) error {
body.Affiliate = nullable.Value(*affiliate)
}

response, err := appCtx.Client.Readers.CreateCheckout(ctx, cmd.String("merchant-code"), readerID, body)
response, err := appCtx.Client.Readers.CreateCheckout(ctx, merchantCode, readerID, body)
if err != nil {
return fmt.Errorf("trigger reader checkout: %w", err)
}
Expand All @@ -336,12 +347,16 @@ func readerStatus(ctx context.Context, cmd *cli.Command) error {
if err != nil {
return err
}
merchantCode, err := app.GetMerchantCode(cmd, "merchant-code")
if err != nil {
return err
}
readerID, err := util.RequireSingleArg(cmd, "reader ID")
if err != nil {
return err
}

response, err := appCtx.Client.Readers.GetStatus(ctx, cmd.String("merchant-code"), readerID, sumup.ReadersGetStatusParams{})
response, err := appCtx.Client.Readers.GetStatus(ctx, merchantCode, readerID, sumup.ReadersGetStatusParams{})
if err != nil {
return fmt.Errorf("get reader status: %w", err)
}
Expand Down