refine payout handling

Author: matthiaszimmermann

contracts/components/Product.sol

@@ -194,15 +194,33 @@ abstract contract Product is
             data);
     }
 
-    function _processPayout(
+    function _newPayout(
         bytes32 processId,
-        uint256 payoutId,
-        bool isComplete,
+        uint256 amount,
         bytes memory data
     )
         internal
+        returns(uint256 payoutId)
+    {
+        payoutId = _productService.newPayout(processId, amount, data);
+    }
+
+    function _processPayout(
+        bytes32 processId,
+        uint256 payoutId
+    )
+        internal
+        returns(
+            bool success,
+            uint256 feeAmount,
+            uint256 netPayoutAmount
+        )
     {
-        _productService.processPayout(processId, payoutId, isComplete, data);
+        (
+            success,
+            feeAmount,
+            netPayoutAmount
+        ) = _productService.processPayout(processId, payoutId);
     }
 
     function _request(

contracts/modules/IPolicy.sol

@@ -56,7 +56,7 @@ interface IPolicy {
     enum PolicyFlowState {Started, Paused, Finished}
     enum ApplicationState {Applied, Revoked, Underwritten, Declined}
     enum PolicyState {Active, Expired, Closed}
-    enum ClaimState {Applied, Confirmed, Declined}
+    enum ClaimState {Applied, Confirmed, Declined, Closed}
     enum PayoutState {Expected, PaidOut}
 
     // Objects
@@ -84,15 +84,14 @@ interface IPolicy {
         uint256 premiumPaidAmount;
         uint256 claimsCount;
         uint256 openClaimsCount;
-        uint256 payoutsCount;
-        uint256 openPayoutsCount;
         uint256 createdAt;
         uint256 updatedAt;
     }
 
     struct Claim {
         ClaimState state;
         uint256 claimAmount;
+        uint256 paidAmount;
         bytes data;
         uint256 createdAt;
         uint256 updatedAt;

contracts/modules/ITreasury.sol

@@ -61,6 +61,13 @@ interface ITreasury {
             uint256 netPremiumAmount
         );
 
+    function processPayout(bytes32 processId, uint256 payoutId) external 
+        returns(
+            bool success,
+            uint256 feeAmount,
+            uint256 netPayoutAmount
+        );
+    
     function processCapital(uint256 bundleId, uint256 capitalAmount) external 
         returns(
             bool success,

contracts/services/IProductService.sol

@@ -40,12 +40,18 @@ interface IProductService {
         bytes calldata data
     ) external returns(uint256 payoutId);
 
-    function processPayout(
+    function newPayout(
         bytes32 processId, 
-        uint256 payoutId, 
-        bool isComplete, 
+        uint256 amount,
         bytes calldata data
-    ) external;
+    ) external returns(uint256 payoutId);
+
+    function processPayout(bytes32 processId, uint256 payoutId) external
+        returns(
+            bool success,
+            uint256 feeAmount,
+            uint256 netPayoutAmount
+        );
 
     function request(
         bytes32 processId,