Merge branch 'FearlessKiwis-MAGETWO-32057-downloadable-price' into develop

Author: Robert He

app/code/Magento/Downloadable/Block/Catalog/Product/Links.php

@@ -103,6 +103,7 @@ public function getJsonConfig()
             $amount = $finalPrice->getCustomAmount($link->getPrice());
             $linksConfig[$link->getId()] = [
                 'finalPrice' => $amount->getValue(),
+                'basePrice' => $amount->getBaseAmount()
             ];
         }
 

app/code/Magento/Downloadable/Test/Unit/Block/Catalog/Product/LinksTest.php

@@ -105,12 +105,14 @@ public function testGetLinkPrice()
     public function testGetJsonConfig()
     {
         $linkPrice = 3.;
+        $basePrice = 3.;
         $linkId = 42;
 
         $config = [
             'links' => [
                 $linkId => [
                     'finalPrice' => $linkPrice,
+                    'basePrice' => $basePrice
                 ],
             ],
         ];
@@ -119,6 +121,9 @@ public function testGetJsonConfig()
         $linkAmountMock->expects($this->once())
             ->method('getValue')
             ->will($this->returnValue($linkPrice));
+        $linkAmountMock->expects($this->once())
+            ->method('getBaseAmount')
+            ->will($this->returnValue($linkPrice));
 
         $typeInstanceMock = $this->getMock('Magento\Catalog\Model\Product\Type\Simple', ['getLinks'], [], '', false);
         $typeInstanceMock->expects($this->once())

app/code/Magento/Downloadable/view/frontend/web/downloadable.js

@@ -43,12 +43,17 @@ define([
          */
         _reloadPrice: function() {
             var finalPrice = 0;
+            var basePrice = 0;
             this.element.find(this.options.linkElement + ':checked').each($.proxy(function(index, element) {
                 finalPrice += this.options.config.links[$(element).val()].finalPrice;
+                basePrice += this.options.config.links[$(element).val()].basePrice;
             }, this));
 
             $(this.options.priceHolderSelector).trigger('updatePrice', {
-                'prices': { 'finalPrice': { 'amount': finalPrice }}
+                'prices': {
+                    'finalPrice': { 'amount': finalPrice },
+                    'basePrice': { 'amount': basePrice }
+                }
             });
         }
     });