diff --git a/Views/backend/rpay_ratepay_orderdetail/backend/order/view/detail/articlemanagement/ratepaydelivery.js b/Views/backend/rpay_ratepay_orderdetail/backend/order/view/detail/articlemanagement/ratepaydelivery.js index 8648c6d3..89837499 100755 --- a/Views/backend/rpay_ratepay_orderdetail/backend/order/view/detail/articlemanagement/ratepaydelivery.js +++ b/Views/backend/rpay_ratepay_orderdetail/backend/order/view/detail/articlemanagement/ratepaydelivery.js @@ -340,7 +340,7 @@ Ext.define('Shopware.apps.Order.view.detail.ratepaydelivery', { item['articlenumber'] = row.articleordernumber; item['name'] = row.name; item['price'] = row.price; - item['taxRate'] = firstArticle.raw.taxId; + item['taxRate'] = firstArticle.raw.taxRate; item['maxQuantity'] = row.quantity; item['quantity'] = row.quantityDeliver; item['delivered'] = row.delivered; @@ -391,7 +391,7 @@ Ext.define('Shopware.apps.Order.view.detail.ratepaydelivery', { item['articlenumber'] = row.articleordernumber; item['name'] = row.name; item['price'] = row.price; - item['taxRate'] = firstArticle.raw.taxId; + item['taxRate'] = firstArticle.raw.taxRate; item['quantity'] = row.quantity - row.quantityDeliver - row.cancelled - row.delivered; item['delivered'] = row.delivered; item['returned'] = row.returned; @@ -441,7 +441,7 @@ Ext.define('Shopware.apps.Order.view.detail.ratepaydelivery', { item['articlenumber'] = row.articleordernumber; item['name'] = row.name; item['price'] = row.price; - item['taxRate'] = firstArticle.raw.taxId; + item['taxRate'] = firstArticle.raw.taxRate; item['quantity'] = row.quantity - row.quantityDeliver - row.cancelled - row.delivered; item['delivered'] = row.delivered; item['returned'] = row.returned; diff --git a/Views/backend/rpay_ratepay_orderdetail/backend/order/view/detail/articlemanagement/ratepayretoure.js b/Views/backend/rpay_ratepay_orderdetail/backend/order/view/detail/articlemanagement/ratepayretoure.js index 1020d2a5..224e65ff 100755 --- a/Views/backend/rpay_ratepay_orderdetail/backend/order/view/detail/articlemanagement/ratepayretoure.js +++ b/Views/backend/rpay_ratepay_orderdetail/backend/order/view/detail/articlemanagement/ratepayretoure.js @@ -143,6 +143,8 @@ Ext.define('Shopware.apps.Order.view.detail.ratepayretoure', { var items = new Array(); var id = me.record.get('id'); var error = false; + + var firstArticle = me.record.getPositions().data.items[0]; for (i = 0; i < me.store.data.items.length; i++) { var row = me.store.data.items[i].data; var item = new Object(); @@ -158,7 +160,7 @@ Ext.define('Shopware.apps.Order.view.detail.ratepayretoure', { item['articlenumber'] = row.articleordernumber; item['name'] = row.name; item['price'] = row.price; - item['taxRate'] = row.tax_rate; + item['taxRate'] = firstArticle.raw.taxRate; // row.tax_rate; item['quantity'] = row.delivered - row.returned - row.quantityReturn; item['delivered'] = row.delivered; item['returned'] = row.returned; @@ -199,6 +201,8 @@ Ext.define('Shopware.apps.Order.view.detail.ratepayretoure', { var items = new Array(); var id = me.record.get('id'); var error = false; + + var firstArticle = me.record.getPositions().data.items[0]; for (i = 0; i < me.store.data.items.length; i++) { var row = me.store.data.items[i].data; var item = new Object(); @@ -211,7 +215,7 @@ Ext.define('Shopware.apps.Order.view.detail.ratepayretoure', { item['articlenumber'] = row.articleordernumber; item['name'] = row.name; item['price'] = row.price; - item['taxRate'] = row.tax_rate; + item['taxRate'] = firstArticle.raw.taxRate; // row.tax_rate; item['quantity'] = row.delivered - row.returned - row.quantityReturn; item['delivered'] = row.delivered; item['returned'] = row.returned;