Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Adyen Magento2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Shared Libs
Adyen Magento2
Commits
2e7b4239
Commit
2e7b4239
authored
May 22, 2019
by
attilak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Klarna line item values
parent
6bd4f125
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
11 deletions
+14
-11
Gateway/Request/CaptureDataBuilder.php
Gateway/Request/CaptureDataBuilder.php
+2
-2
Gateway/Request/CheckoutDataBuilder.php
Gateway/Request/CheckoutDataBuilder.php
+5
-5
Gateway/Request/RefundDataBuilder.php
Gateway/Request/RefundDataBuilder.php
+7
-4
No files found.
Gateway/Request/CaptureDataBuilder.php
View file @
2e7b4239
...
...
@@ -102,7 +102,7 @@ class CaptureDataBuilder implements BuilderInterface
// The latest invoice will contain only the selected items(and quantities) for the (partial) capture
$latestInvoice
=
$invoices
->
getLastItem
();
foreach
(
$latestInvoice
->
getItems
Collection
()
as
$invoiceItem
)
{
foreach
(
$latestInvoice
->
getItems
()
as
$invoiceItem
)
{
++
$count
;
$numberOfItems
=
(
int
)
$invoiceItem
->
getQty
();
$formFields
=
$this
->
adyenHelper
->
createOpenInvoiceLineItem
(
...
...
@@ -113,7 +113,7 @@ class CaptureDataBuilder implements BuilderInterface
$currency
,
$invoiceItem
->
getTaxAmount
(),
$invoiceItem
->
getPriceInclTax
(),
$invoiceItem
->
getTaxPercent
(),
$invoiceItem
->
get
OrderItem
()
->
get
TaxPercent
(),
$numberOfItems
,
$payment
,
$invoiceItem
->
getId
()
...
...
Gateway/Request/CheckoutDataBuilder.php
View file @
2e7b4239
...
...
@@ -219,15 +219,15 @@ class CheckoutDataBuilder implements BuilderInterface
foreach
(
$this
->
quote
->
getAllVisibleItems
()
as
$item
)
{
$numberOfItems
=
(
int
)
$item
->
getQty
Ordered
();
$numberOfItems
=
(
int
)
$item
->
getQty
();
// Summarize the discount amount item by item
$discountAmount
+=
$item
->
getDiscountAmount
();
$priceExcludingTax
=
$item
->
getPriceInclTax
()
-
$item
->
getTaxAmount
();
$formattedPriceExcludingTax
=
$this
->
adyenHelper
->
formatAmount
(
$priceExcludingTax
,
$currency
);
$formattedPriceExcludingTax
=
$this
->
adyenHelper
->
formatAmount
(
$item
->
getPrice
(),
$currency
);
$formattedTaxAmount
=
$this
->
adyenHelper
->
formatAmount
(
$item
->
getTaxAmount
(),
$currency
);
$taxAmount
=
$item
->
getPrice
()
*
(
$item
->
getTaxPercent
()
/
100
);
$formattedTaxAmount
=
$this
->
adyenHelper
->
formatAmount
(
$taxAmount
,
$currency
);
$formattedTaxPercentage
=
$item
->
getTaxPercent
()
*
100
;
$formFields
[
'lineItems'
][]
=
[
...
...
@@ -236,7 +236,7 @@ class CheckoutDataBuilder implements BuilderInterface
'amountExcludingTax'
=>
$formattedPriceExcludingTax
,
'taxAmount'
=>
$formattedTaxAmount
,
'description'
=>
$item
->
getName
(),
'quantity'
=>
$
item
->
getQty
()
,
'quantity'
=>
$
numberOfItems
,
'taxCategory'
=>
$item
->
getProduct
()
->
getAttributeText
(
'tax_class_id'
),
'taxPercentage'
=>
$formattedTaxPercentage
];
...
...
Gateway/Request/RefundDataBuilder.php
View file @
2e7b4239
...
...
@@ -177,7 +177,10 @@ class RefundDataBuilder implements BuilderInterface
return
$result
;
}
/**
* @param \Magento\Payment\Model\InfoInterface $payment
* @return array|mixed
*/
protected
function
getOpenInvoiceData
(
$payment
)
{
$formFields
=
[];
...
...
@@ -185,11 +188,11 @@ class RefundDataBuilder implements BuilderInterface
$currency
=
$payment
->
getOrder
()
->
getOrderCurrencyCode
();
/**
*
Magento\Sales\Model\Order\Creditm
emo
*
@var \Magento\Sales\Model\Order\Creditmemo $creditM
emo
*/
$creditMemo
=
$payment
->
getCreditMemo
();
foreach
(
$creditMemo
->
get
All
Items
()
as
$refundItem
)
{
foreach
(
$creditMemo
->
getItems
()
as
$refundItem
)
{
++
$count
;
$numberOfItems
=
(
int
)
$refundItem
->
getQty
();
...
...
@@ -201,7 +204,7 @@ class RefundDataBuilder implements BuilderInterface
$currency
,
$refundItem
->
getTaxAmount
(),
$refundItem
->
getPriceInclTax
(),
$refundItem
->
getTaxPercent
(),
$refundItem
->
get
OrderItem
()
->
get
TaxPercent
(),
$numberOfItems
,
$payment
,
$refundItem
->
getId
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment