Merge branch 'dev'

bin/controls/PaymentDisplay.js

@@ -292,9 +292,9 @@ define('package/quiqqer/payment-amazon/bin/controls/PaymentDisplay', [
                 Options.amazonOrderReferenceId = this.$orderReferenceId;
             }
 
-            if (!this.$PayBtn) {
-                var PayBtnElm = this.getElm().getElement('#quiqqer-payment-amazon-btn-pay');
+            var PayBtnElm = this.getElm().getElement('#quiqqer-payment-amazon-btn-pay');
 
+            if (!this.$PayBtn) {
                 this.$PayBtn = new QUIButton({
                     'class'  : 'btn-primary',
                     disabled : true,
@@ -315,7 +315,8 @@ define('package/quiqqer/payment-amazon/bin/controls/PaymentDisplay', [
             }
 
             // rendet wallet widget
-            new OffAmazonPayments.Widgets.Wallet(Options).bind('quiqqer-payment-amazon-wallet');
+            var WalletWidget = new OffAmazonPayments.Widgets.Wallet(Options).bind('quiqqer-payment-amazon-wallet');
+            WalletWidget.setPresentmentCurrency(PayBtnElm.get('data-currencycode'));
         },
 
         /**

src/QUI/ERP/Payments/Amazon/PaymentDisplay.html

@@ -11,6 +11,10 @@
 <div class="quiqqer-payment-amazon-content">
     <div id="quiqqer-payment-amazon-btn" class="quiqqer-payment-amazon-btn-elm" data-size="{$btn_size}" data-color="{$btn_color}"></div>
     <div id="quiqqer-payment-amazon-wallet" class="quiqqer-payment-amazon__hidden"></div>
-    <div id="quiqqer-payment-amazon-btn-pay" data-price="{$display_price}"></div>
+    <div id="quiqqer-payment-amazon-btn-pay"
+         data-price="{$display_price}"
+         data-currencycode="{$currency_code}"
+    >
+    </div>
 </div>
 {/if}
\ No newline at end of file

src/QUI/ERP/Payments/Amazon/PaymentDisplay.php

@@ -24,7 +24,7 @@ class PaymentDisplay extends QUI\Control
     {
         parent::__construct($attributes);
 
-        $this->addCSSFile(dirname(__FILE__) . '/PaymentDisplay.css');
+        $this->addCSSFile(dirname(__FILE__).'/PaymentDisplay.css');
 
         $this->setJavaScriptControl('package/quiqqer/payment-amazon/bin/controls/PaymentDisplay');
         $this->setJavaScriptControlOption('sandbox', boolval(Provider::getApiSetting('sandbox')));
@@ -51,7 +51,8 @@ class PaymentDisplay extends QUI\Control
             'btn_size'      => Provider::getWidgetsSetting('btn_size'),
             'btn_color'     => Provider::getWidgetsSetting('btn_color'),
             'display_price' => $PriceCalculation->getSum()->formatted(),
-            'apiSetUp'      => Provider::isApiSetUp()
+            'apiSetUp'      => Provider::isApiSetUp(),
+            'currency_code' => $Order->getCurrency()->getCode()
         ]);
 
         $this->setJavaScriptControlOption('orderhash', $Order->getHash());
@@ -59,6 +60,6 @@ class PaymentDisplay extends QUI\Control
         // Check if an Amazon Pay authorization already exists (i.e. Order is successful / can be processed)
         $this->setJavaScriptControlOption('successful', $Order->isSuccessful());
 
-        return $Engine->fetch(dirname(__FILE__) . '/PaymentDisplay.html');
+        return $Engine->fetch(dirname(__FILE__).'/PaymentDisplay.html');
     }
 }