Merge pull request #24 from koala-framework/fixes

Fixes

KwcShop/Kwc/Shop/Cart/Checkout/Payment/Abstract/Mail/Paragraphs/Products/Component.php

@@ -17,6 +17,7 @@ public function getTemplateVars(Kwf_Component_Renderer_Abstract $renderer)
             $order = $renderer->getRecipient();
             $ret['items'] = $order->getProductsData();
             foreach ($ret['items'] as &$r) {
+                if (!isset($r->additionalOrderData[0])) continue; // vouchers don't have additionalOrderData
                 $r->additionalOrderData[0]['name'] = $this->getData()->trlStaticExecute($r->additionalOrderData[0]['name']);
             }
 

KwcShop/Kwc/Shop/Cart/Checkout/Payment/PayPal/Cancel/ContentSender.php

@@ -10,7 +10,7 @@ public function sendContent($includeMaster)
                 ->getReferencedModel('Order')->getCartOrder();
             $db = Kwf_Registry::get('db');
             $db->query(
-                "UPDATE `KwcShop_Kwc_Shop_orders` SET `status` = 'cart' WHERE `id` = {$db->quote($order->id)} AND `status` = 'processing'"
+                "UPDATE `kwc_shop_orders` SET `status` = 'cart' WHERE `id` = {$db->quote($order->id)} AND `status` = 'processing'"
             );
             unset($session->paypalCartId);
         }

KwcShop/Kwc/Shop/Cart/Checkout/Payment/PayPal/Confirm/Component.php

@@ -9,7 +9,7 @@ public function processInput($data)
             $db = Kwf_Registry::get('db');
 
             $date = date('Y-m-d H:i:s');
-            $sql = "UPDATE `KwcShop_Kwc_Shop_orders` SET
+            $sql = "UPDATE `kwc_shop_orders` SET
               `payment_component_id` = {$db->quote($this->getData()->parent->componentId)},
               `checkout_component_id` = {$db->quote($this->getData()->parent->parent->componentId)},
               `cart_component_class` = {$db->quote($this->getData()->parent->parent->parent->componentClass)},

KwcShop/Kwc/Shop/Cart/Checkout/Payment/PayPal/ConfirmLink/Component.js

@@ -1,18 +1,17 @@
-var onReady = require('kwf/commonjs/on-ready-ext2');
+var onReady = require('kwf/commonjs/on-ready');
+var $ = require('jQuery');
 
-onReady.onRender('.kwcClass', function(el, config) {
-    var form = el.child('form');
-    form.on('submit', function(e) {
+onReady.onRender('.kwcClass', function(el) {
+    var form = el.find('form');
+    form.one('submit', function(e) {
         e.preventDefault();
-        el.child('.process').show();
+        el.find('.kwcBem__process').show();
         form.hide();
-        Ext2.Ajax.request({
-            url: config.controllerUrl,
-            params: config.params,
-            callback: function(response, options) {
-                this.dom.submit();
-            },
-            scope: form
-        });
-    }, this);
+        var config = el.data('options');
+        $.post(config.controllerUrl, config.params)
+            .done(function (response) {
+                form.submit();
+            });
+    });
 });
+

KwcShop/Kwc/Shop/Cart/Checkout/Payment/PayPal/ConfirmLink/Component.twig

@@ -0,0 +1,6 @@
+<div class="{{ rootElementClass }}" data-options="{{ options|json_encode }}">
+    <input type="hidden" value="{{ options|json_encode }}">
+    {{ paypalButton|raw }}
+    <div class="{{ 'process'|bemClass }}"></div>
+    <div class="{{ 'error'|bemClass }}"></div>
+</div>