Skip to content

Commit

Permalink
ACP-3558 Merchant payment expense support. (#11048)
Browse files Browse the repository at this point in the history
ACP-3558 Merchant payment expense support.
  • Loading branch information
abitskil authored Sep 5, 2024
1 parent 6107b66 commit 38db1dc
Show file tree
Hide file tree
Showing 33 changed files with 1,578 additions and 2,931 deletions.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"spryker/oms": "*",
"spryker/propel": "*",
"spryker/ramsey-uuid": "*",
"spryker/store": "*",
"spryker/testify": "*"
},
"suggest": {
Expand Down
95 changes: 91 additions & 4 deletions psalm-report.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@
<property name="canceledAmount" type="int"/>
<property name="idSalesOrderItem" type="int"/>
<property name="orderItemReference" type="string" strict="true"/>
<property name="stateHistory" type="ItemState[]" singular="stateHistory"/>
<property name="state" type="ItemState"/>
</transfer>

<transfer name="Order">
<property name="orderReference" type="string"/>
<property name="expenses" type="Expense[]" singular="expense"/>
<property name="idSalesOrder" type="int"/>
<property name="items" type="Item[]" singular="item"/>
<property name="store" type="string"/>
</transfer>

<transfer name="PaymentTransmissionResponse">
Expand All @@ -24,7 +27,8 @@
<property name="transferId" type="string"/>
<property name="failureMessage" type="string"/>
<property name="amount" type="string"/>
<property name="orderItems" type="OrderItem[]" singular="orderItem"/>
<property name="orderItems" type="OrderItem[]" singular="orderItem" deprecated="Use {@link \Generated\Shared\Transfer\PaymentTransmissionResponseTransfer::PAYMENT_TRANSMISSION_ITEMS} instead."/>
<property name="paymentTransmissionItems" type="PaymentTransmissionItem[]" singular="paymentTransmissionItem"/>
</transfer>

<transfer name="PaymentTransmissionResponseCollection">
Expand Down Expand Up @@ -100,6 +104,9 @@
<property name="idSalesExpense" type="int"/>
<property name="sumPriceToPayAggregation" type="int"/>
<property name="uuid" type="string"/>
<property name="refundableAmount" type="int"/>
<property name="type" type="string"/>
<property name="canceledAmount" type="int"/>
</transfer>

<transfer name="PaymentMethodAppConfiguration" strict="true">
Expand All @@ -117,10 +124,11 @@
<property name="failureMessage" type="string"/>
</transfer>

<transfer name="OrderExpense">
<transfer name="OrderExpense" deprecated="Use `PaymentTransmissionItem` instead.">
<property name="merchantReference" type="string"/>
<property name="orderReference" type="string"/>
<property name="expenseReference" type="string" description="UUID of the spy_sales_expense"/>
<property name="transferId" type="string"/>
<property name="itemReference" type="string" description="UUID of the spy_sales_expense"/>
<property name="amount" type="string" description="Amount in lowest denominator (cents, YEN). When negative money has to be refunded, when positive money has to be transferred."/>
</transfer>

Expand All @@ -142,6 +150,7 @@
<transfer name="SalesPaymentMerchantPayoutConditions" strict="true">
<property name="orderReferences" type="string[]" singular="orderReference"/>
<property name="merchantReferences" type="string[]" singular="merchantReference"/>
<property name="itemReferences" type="string[]" singular="itemReference"/>
<property name="isSuccessful" type="bool"/>
</transfer>

Expand Down Expand Up @@ -195,4 +204,19 @@
<property name="previousPage" type="int"/>
</transfer>

<transfer name="ItemState">
<property name="name" type="string"/>
</transfer>

<transfer name="PaymentTransmissionItem">
<property name="transferId" type="string" description="The ID returned from the Platform implementation"/>
<property name="type" type="string" description="Indicates whether the item is an order item or an order expense. Can be 'order-item', 'order-expense', or any additional type."/>
<property name="merchantReference" type="string"/>
<property name="orderReference" type="string"/>
<property name="itemReference" type="string" description="UUID of the sales_order_item or spy_sales_expense"/>
<property name="amount" type="string" description="Amount in lowest denominator (cents, YEN). When negative money has to be refunded, when positive money has to be transferred."/>
<property name="isSuccessful" type="bool"/>
<property name="failureMessage" type="string"/>
</transfer>

</transfers>

This file was deleted.

Loading

0 comments on commit 38db1dc

Please sign in to comment.