Skip to content

Commit 76df56f

Browse files
committed
Patched test-cases and fixed NETSTANDARD1_1 branch in RussiaPaymentOrder
1 parent 2bc17df commit 76df56f

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

QRCoder/PayloadGenerator.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2488,7 +2488,11 @@ public override string ToString()
24882488
#if NETSTANDARD1_1
24892489
optionalFieldsList = oFields.GetType().GetRuntimeProperties()
24902490
.Where(field => field.GetValue(oFields) != null)
2491-
.Select(field => $"{field.Name}={field.GetValue(oFields)}")
2491+
.Select(field => {
2492+
var objValue = field.GetValue(oFields, null);
2493+
var value = field.GetType().Equals(typeof(DateTime)) ? ((DateTime)objValue).ToString("dd.MM.YYYY") : objValue.ToString();
2494+
return $"{field.Name}={value}";
2495+
})
24922496
.ToList();
24932497
#else
24942498
optionalFieldsList = oFields.GetType().GetProperties()

QRCoderTests/PayloadGeneratorTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3092,7 +3092,7 @@ public void russiapayment_generator_can_generate_payload_some_additional_fields(
30923092

30933093
generator
30943094
.ToString()
3095-
.ShouldBe($"ST00012|Name={name}|PersonalAcc={account}|BankName={bankName}|BIC={bic}|CorrespAcc=0|Sum={optionalFields.Sum}|LastName={optionalFields.LastName}|FirstName={optionalFields.FirstName}");
3095+
.ShouldBe($"ST00012|Name={name}|PersonalAcc={account}|BankName={bankName}|BIC={bic}|CorrespAcc={correspAcc}|Sum={optionalFields.Sum}|LastName={optionalFields.LastName}|FirstName={optionalFields.FirstName}");
30963096
}
30973097

30983098
[Fact]
@@ -3116,7 +3116,7 @@ public void russiapayment_generator_can_generate_payload_all_additional_fields()
31163116

31173117
generator
31183118
.ToString()
3119-
.ShouldBe($"ST00012|Name={name}|PersonalAcc={account}|BankName={bankName}|BIC={bic}|CorrespAcc=0|Sum={optionalFields.Sum}|LastName={optionalFields.LastName}|FirstName={optionalFields.FirstName}");
3119+
.ShouldBe($"ST00012|Name={name}|PersonalAcc={account}|BankName={bankName}|BIC={bic}|CorrespAcc={correspAcc}|Sum={optionalFields.Sum}|LastName={optionalFields.LastName}|FirstName={optionalFields.FirstName}");
31203120
}
31213121
}
31223122
}

0 commit comments

Comments
 (0)