From 28227a9699a2c96e3cd46f539b44ef3c3f8f902c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Tr=C3=B6sken?= Date: Tue, 13 Nov 2018 13:50:57 +0100 Subject: [PATCH 1/5] [ETS-76] Fix dob whitespace error --- Controller/backend/RpayRatepayOrderDetail.php | 4 +-- .../payment_rpay_part/RatePAYFormElements.tpl | 27 +++---------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/Controller/backend/RpayRatepayOrderDetail.php b/Controller/backend/RpayRatepayOrderDetail.php index 0306cd9e..1e60276c 100755 --- a/Controller/backend/RpayRatepayOrderDetail.php +++ b/Controller/backend/RpayRatepayOrderDetail.php @@ -64,7 +64,7 @@ public function initPositionsAction() $sqlCountEntries = " SELECT `id`, COUNT(*) AS 'count', SUM(`quantity`) AS 'quantity' FROM `s_order_details` - WHERE `orderID`=? + WHERE `orderID`=? AND `articleordernumber`=? GROUP BY `id` "; @@ -630,7 +630,7 @@ private function insertNewPositionsToOrder($articleOrderNumbers, $orderId) $articleBinds = array_map(function ($item) { return '?'; }, $articleOrderNumbers); - $orderDetailIdsQuery = 'SELECT `id` FROM `s_order_details` + $orderDetailIdsQuery = 'SELECT `id` FROM `s_order_details` WHERE `orderID`=? AND `articleordernumber` IN (' . join(', ', $articleBinds) . ')'; try { diff --git a/Views/responsive/frontend/payment_rpay_part/RatePAYFormElements.tpl b/Views/responsive/frontend/payment_rpay_part/RatePAYFormElements.tpl index da6e3c21..2d3af7f5 100755 --- a/Views/responsive/frontend/payment_rpay_part/RatePAYFormElements.tpl +++ b/Views/responsive/frontend/payment_rpay_part/RatePAYFormElements.tpl @@ -23,14 +23,7 @@ placeholder="Tag" required="required" aria-required="true" - value=" - {if $sUserData.billingaddress.birthday} - {$sUserData.billingaddress.birthday|date_format:"%e"} - {/if} - {if $sUserData.additional.user.birthday} - {$sUserData.additional.user.birthday|date_format:"%e"} - {/if}" - /> + value="{if $sUserData.billingaddress.birthday}{$sUserData.billingaddress.birthday|date_format:'%d'}{/if}{if $sUserData.additional.user.birthday}{$sUserData.additional.user.birthday|date_format:'%d'}{/if}"/>
@@ -46,14 +39,7 @@ placeholder="Monat" required="required" aria-required="true" - value=" - {if $sUserData.billingaddress.birthday} - {$sUserData.billingaddress.birthday|date_format:"%m"} - {/if} - {if $sUserData.additional.user.birthday} - {$sUserData.additional.user.birthday|date_format:"%m"} - {/if}" - /> + value="{if $sUserData.billingaddress.birthday}{$sUserData.billingaddress.birthday|date_format:'%m'}{/if}{if $sUserData.additional.user.birthday}{$sUserData.additional.user.birthday|date_format:'%m'}{/if}"/>
@@ -69,14 +55,7 @@ placeholder="Jahr" required="required" aria-required="true" - value=" - {if $sUserData.billingaddress.birthday} - {$sUserData.billingaddress.birthday|date_format:"%Y"} - {/if} - {if $sUserData.additional.user.birthday} - {$sUserData.additional.user.birthday|date_format:"%Y"} - {/if}" - /> + value="{if $sUserData.billingaddress.birthday}{$sUserData.billingaddress.birthday|date_format:'%Y'}{/if}{if $sUserData.additional.user.birthday}{$sUserData.additional.user.birthday|date_format:'%Y'}{/if}"/>

{s namespace=RatePAY name=dob_info}Sie müssen mindestens 18 Jahre alt sein, um per {$sPayment.description} bezahlen zu können.{/s}

From 8fbe486838b6d5645175d7d5baa734aee8dc2231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Tr=C3=B6sken?= Date: Thu, 22 Nov 2018 15:05:51 +0100 Subject: [PATCH 2/5] Fix tax rate on delivery costs for ch orders --- .../view/detail/articlemanagement/ratepaydelivery.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 558ba5ac..8648c6d3 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 @@ -327,6 +327,7 @@ Ext.define('Shopware.apps.Order.view.detail.ratepaydelivery', { 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(); @@ -339,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'] = row.tax_rate; + item['taxRate'] = firstArticle.raw.taxId; item['maxQuantity'] = row.quantity; item['quantity'] = row.quantityDeliver; item['delivered'] = row.delivered; @@ -374,6 +375,7 @@ Ext.define('Shopware.apps.Order.view.detail.ratepaydelivery', { 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(); @@ -389,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'] = row.tax_rate; + item['taxRate'] = firstArticle.raw.taxId; item['quantity'] = row.quantity - row.quantityDeliver - row.cancelled - row.delivered; item['delivered'] = row.delivered; item['returned'] = row.returned; @@ -423,6 +425,7 @@ Ext.define('Shopware.apps.Order.view.detail.ratepaydelivery', { 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(); @@ -438,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'] = row.tax_rate; + item['taxRate'] = firstArticle.raw.taxId; item['quantity'] = row.quantity - row.quantityDeliver - row.cancelled - row.delivered; item['delivered'] = row.delivered; item['returned'] = row.returned; From 14ea27289c8c81077e9f0c01a93391dff765f9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Tr=C3=B6sken?= Date: Thu, 22 Nov 2018 15:10:00 +0100 Subject: [PATCH 3/5] [ETS-81] Fix Delivery Cost tax id --- README.md | 6 +++++- plugin.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d2a447eb..6153f58f 100755 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ |------|---------- |Author | Annegret Seufert |Shop Version | `5.1.x` - `5.5.x` -|Version | `5.3.1` +|Version | `5.3.2` |Link | http://www.ratepay.com |Mail | integration@ratepay.com |Full Documentation | https://ratepay.gitbook.io/shopware/ @@ -24,6 +24,10 @@ ## Changelog +### Version 5.3.2 - Released 2018-11-23 +* Fix whitespaces in date of birth fields +* Fix incorrect tax-id for delivery cost items + ### Version 5.3.1 - Released 2018-11-12 * Fix unregistered templates/controllers after update * Fix incorrect tax-id for debit/credit items diff --git a/plugin.json b/plugin.json index fe8a257e..334e5748 100644 --- a/plugin.json +++ b/plugin.json @@ -10,7 +10,7 @@ "author": "RatePAY GmbH", "supplier": "RatePAY GmbH", "description": "

RatePAY Payment plugin for Shopware Community Edition Version 5

  • RatePAY Payment Module
  • Payment means: Invoice, Direct Debit (ELV), Rate
  • Cancellations, Returns, etc. can be created from an additional tab in the order detail view
  • Integrated support for multishops
  • Improved payment form with visual feedback for your customers
  • Supported Languages: German, English
  • Backend Log with custom View accessible from your shop backend
", - "currentVersion": "5.3.1", + "currentVersion": "5.3.2", "payment_confirm": true, "compatibility": { "minimumVersion": "5.0.0", From 4128731df49d1610b4975eb157ff39087b8d68bd Mon Sep 17 00:00:00 2001 From: Eduardo Iriarte Date: Mon, 26 Nov 2018 10:32:03 +0100 Subject: [PATCH 4/5] [Versioning] set correct release date --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6153f58f..96188548 100755 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ ## Changelog -### Version 5.3.2 - Released 2018-11-23 +### Version 5.3.2 - Released 2018-11-26 * Fix whitespaces in date of birth fields * Fix incorrect tax-id for delivery cost items From 835b30d6ff4b5a306abf6c11f70ae14797d8f1b7 Mon Sep 17 00:00:00 2001 From: Eduardo Iriarte Date: Mon, 26 Nov 2018 14:58:01 +0100 Subject: [PATCH 5/5] [ETS-81] Fix Tax-Rates on shipping/return/cancel events --- .../view/detail/articlemanagement/ratepaydelivery.js | 6 +++--- .../order/view/detail/articlemanagement/ratepayretoure.js | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) 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;