paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

show the payment status in the command view

Browse Source
This commit is contained in:
Paul Schneider
2017-07-07 01:22:45 +02:00
parent c82a88f6a9
commit 98bfd50ca9
6 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Yavsc/Helpers/BillingHelpers.cs
View File

@ -20,9 +20,10 @@ namespace Yavsc.Helpers
return bill;
}
public static FileInfo GetBillInfo(string billingcode, long id)
public static FileInfo GetBillInfo(string billingcode, long id, bool acquitted = false)
{
var filename = $"facture-{billingcode}-{id}.pdf";
var suffix = acquitted ? "-ack":null;
var filename = $"facture-{billingcode}-{id}{suffix}.pdf";
return new FileInfo(Path.Combine(Startup.UserBillsDirName, filename));
}
}

3
Yavsc/Helpers/PayPalHelpers.cs
View File

@ -170,8 +170,5 @@ namespace Yavsc.Helpers
};
}
public static bool IsSuccess(this PayPalPayment info) {
return info.State == PayPal.PayPalAPIInterfaceService.Model.PaymentStatusCodeType.COMPLETED.ToString();
}
}
}

1
Yavsc/Models/Payment/PaypalPayment.cs
View File

@ -45,6 +45,7 @@ namespace Yavsc.Models.Payment {
public string State { get; set; }
public bool IsOk() { return State == "SUCCESS"; }
public virtual List<HyperLink> Links { get; set; }
}
}

7
Yavsc/Views/Shared/Components/PayPalButton/Default.cshtml
View File

@ -13,7 +13,12 @@
</text>
}
<text> :
</text><a asp-controller="Manage" asp-action="PaymentInfo" asp-route-id="@Model.Regularisation.CreationToken">@Model.Regularisation.CreationToken</a>
</text>
<label>
<input type="checkbox" checked="@Model.Regularisation.IsOk()" disabled/>
<a asp-controller="Manage" asp-action="PaymentInfo" asp-route-id="@Model.Regularisation.CreationToken">@Model.Regularisation.CreationToken</a>
</label>
} else {
<div id="paypalzone"></div>

2
Yavsc/Views/Shared/DisplayTemplates/HairCutQuery.cshtml
View File

@ -3,7 +3,7 @@
var paid = false;
if (Model.PaymentId!=null) {
if (Model.Regularisation!=null) {
if (Model.Regularisation.IsSuccess()) {
if (Model.Regularisation.IsOk()) {
paid=true;
}
}

5
Yavsc/Yavsc.csproj
View File

@ -1202,6 +1202,11 @@
<Content Include="Helpers\BillingHelpers.cs" />
<Content Include="ApiControllers\BillingController.cs" />
<Content Include="Models\Payment\PaypalPayment.cs" />
<Content Include="ViewModels\PayPal\PaymentInfo.cs" />
<Content Include="Helpers\PayPalHelpers.cs" />
<Content Include="Views\Shared\DisplayTemplates\HairCutQuery.cshtml" />
<Content Include="Views\Shared\Components\PayPalButton\Default.cshtml" />
<Content Include="wwwroot\fonts\glyphicons-halflings-regular.svg" />
</ItemGroup>
<Import Project="../Yavsc.Abstract/Yavsc.Abstract.csproj" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />