Merge pull request #42 in DEV-MO/shopware5-module from release/5.3.2 …

…to master * commit '835b30d6ff4b5a306abf6c11f70ae14797d8f1b7': [ETS-81] Fix Tax-Rates on shipping/return/cancel events [Versioning] set correct release date [ETS-81] Fix Delivery Cost tax id Fix tax rate on delivery costs for ch orders [ETS-76] Fix dob whitespace error
ratepay · Nov 26, 2018 · 4c65165 · 4c65165
2 parents addf294 + 835b30d
commit 4c65165
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 33 deletions.
diff --git 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/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 | [email protected]
 |Full Documentation | https://ratepay.gitbook.io/shopware/
@@ -24,6 +24,10 @@
 
 ## Changelog
 
+### Version 5.3.2 - Released 2018-11-26
+* 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/...d/rpay_ratepay_orderdetail/backend/order/view/detail/articlemanagement/ratepaydelivery.js b/...d/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.taxRate;
             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.taxRate;
             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.taxRate;
             item['quantity'] = row.quantity - row.quantityDeliver - row.cancelled - row.delivered;
             item['delivered'] = row.delivered;
             item['returned'] = row.returned;

diff --git a/...nd/rpay_ratepay_orderdetail/backend/order/view/detail/articlemanagement/ratepayretoure.js b/...nd/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;

diff --git 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}"/>
             </div>
 
             <div class="rp-birthmonth field--select">
@@ -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}"/>
             </div>
 
             <div class="rp-birthyear field--select">
@@ -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}"/>
             </div>
             <br style="clear: both">
             <p><small>{s namespace=RatePAY name=dob_info}Sie müssen mindestens 18 Jahre alt sein, um per {$sPayment.description} bezahlen zu können.{/s}</small></p>

diff --git a/plugin.json b/plugin.json
@@ -10,7 +10,7 @@
     "author": "RatePAY GmbH",
     "supplier": "RatePAY GmbH",
     "description": "<h2>RatePAY Payment plugin for Shopware Community Edition Version 5</h2><ul><li style='list-style: inherit;'>RatePAY Payment Module</li><li style='list-style: inherit;'>Payment means: Invoice, Direct Debit (ELV), Rate</li><li style='list-style: inherit;'>Cancellations, Returns, etc. can be created from an additional tab in the order detail view</li><li style='list-style: inherit;'>Integrated support for multishops</li><li style='list-style: inherit;'>Improved payment form with visual feedback for your customers</li><li style='list-style: inherit;'>Supported Languages: German, English</li><li style='list-style: inherit;'>Backend Log with custom View accessible from your shop backend</li></ul>",
-    "currentVersion": "5.3.1",
+    "currentVersion": "5.3.2",
     "payment_confirm": true,
     "compatibility": {
         "minimumVersion": "5.0.0",