Merge pull request #73 from jpajuelo/user-story/issue-#45

Add price alterations into price plans
FIWARE-TMForum · Jan 24, 2018 · 6354396 · 6354396
2 parents 8599b07 + ac1d589
commit 6354396
Show file tree

Hide file tree

Showing 14 changed files with 420 additions and 44 deletions.
diff --git a/public/resources/core/css/default-theme.css b/public/resources/core/css/default-theme.css
@@ -1617,13 +1617,13 @@ a.list-group-item > .badge-status {
 
 .item-toggle {
     padding: 0 0;
-    margin-bottom: 15px;
+    margin-bottom: 10px;
 }
 .item-toggle .toggle {
     position: relative;
     display: block;
     cursor: pointer;
-    padding: 10px 0;
+    padding: 0 0;
     padding-right: 35px;
     margin-bottom: 0;
     font-weight: bold;
@@ -1799,11 +1799,15 @@ a.thumbnail:focus {
     border-width: 0;
     border-radius: 2px;
     box-shadow: 0 2px 5px rgba(0, 0, 0, 0.16);
+    display: flex;
+    flex-direction: column;
 }
 
 .panel-heading {
     position: relative;
     border-radius: 0;
+    flex-grow: 0;
+    flex-shrink: 0;
 }
 
 .panel-heading.panel-product {
@@ -1824,6 +1828,13 @@ a.thumbnail:focus {
 .panel-body {
     padding-bottom: 0;
     border-radius: 0;
+    flex-grow: 1;
+    flex-shrink: 1;
+}
+
+.panel-footer {
+    flex-grow: 0;
+    flex-shrink: 0;
 }
 
 .panel-subtitle {

diff --git a/public/resources/core/js/controllers/product-offering.controller.js b/public/resources/core/js/controllers/product-offering.controller.js
@@ -191,8 +191,9 @@
         vm.CURRENCY_CODES = Offering.TYPES.CURRENCY_CODE;
         vm.PRICES = Offering.TYPES.PRICE;
         vm.STATUS = PROMISE_STATUS;
-
-        vm.STATUS = PROMISE_STATUS;
+        vm.PRICE_ALTERATIONS = Offering.TYPES.PRICE_ALTERATION;
+        vm.PRICE_ALTERATIONS_SUPPORTED = Offering.TYPES.PRICE_ALTERATION_SUPPORTED;
+        vm.PRICE_CONDITIONS = Offering.TYPES.PRICE_CONDITION;
 
         vm.data = angular.copy(Offering.TEMPLATES.RESOURCE);
         vm.stepList = stepList;
@@ -217,6 +218,7 @@
 
         vm.pricePlan = new Offering.PricePlan();
         vm.pricePlanEnabled = false;
+        vm.priceAlterationType = vm.PRICE_ALTERATIONS_SUPPORTED.NOTHING;
 
         vm.createPricePlan = createPricePlan;
         vm.updatePricePlan = updatePricePlan;
@@ -361,6 +363,7 @@
             vm.data.productOfferingPrice.push(vm.pricePlan);
             vm.pricePlan = new Offering.PricePlan();
             vm.pricePlanEnabled = false;
+            vm.priceAlterationType = vm.PRICE_ALTERATIONS_SUPPORTED.NOTHING;
         }
 
         function updatePricePlan(index) {
@@ -521,13 +524,17 @@
         vm.CURRENCY_CODES = Offering.TYPES.CURRENCY_CODE;
         vm.PRICES = Offering.TYPES.PRICE;
         vm.$state = $state;
+        vm.PRICE_ALTERATIONS = Offering.TYPES.PRICE_ALTERATION;
+        vm.PRICE_ALTERATIONS_SUPPORTED = Offering.TYPES.PRICE_ALTERATION_SUPPORTED;
+        vm.PRICE_CONDITIONS = Offering.TYPES.PRICE_CONDITION;
 
         vm.update = update;
         vm.updateStatus = updateStatus;
         vm.hasCategory = hasCategory;
 
         vm.pricePlan = new Offering.PricePlan();
         vm.pricePlanEnabled = false;
+        vm.priceAlterationType = vm.PRICE_ALTERATIONS_SUPPORTED.NOTHING;
 
         vm.createPricePlan = createPricePlan;
         vm.updatePricePlan = updatePricePlan;
@@ -566,6 +573,7 @@
             createPricePlanPromise.then(function (productOffering) {
                 vm.pricePlan = new Offering.PricePlan();
                 vm.pricePlanEnabled = false;
+                vm.priceAlterationType = vm.PRICE_ALTERATIONS_SUPPORTED.NOTHING;
                 $rootScope.$broadcast(EVENTS.MESSAGE_ADDED, 'success', {message: 'The offering price plan was created.'});
             }, function (response) {
                 $rootScope.$broadcast(EVENTS.MESSAGE_ADDED, 'error', {

diff --git a/public/resources/core/js/controllers/product-offering.price.controller.js b/public/resources/core/js/controllers/product-offering.price.controller.js
@@ -40,13 +40,25 @@
         vm.CHARGE_PERIODS = Offering.TYPES.CHARGE_PERIOD;
         vm.CURRENCY_CODES = Offering.TYPES.CURRENCY_CODE;
         vm.PRICES = Offering.TYPES.PRICE;
+        vm.PRICE_ALTERATIONS = Offering.TYPES.PRICE_ALTERATION;
+        vm.PRICE_ALTERATIONS_SUPPORTED = Offering.TYPES.PRICE_ALTERATION_SUPPORTED;
+        vm.PRICE_CONDITIONS = Offering.TYPES.PRICE_CONDITION;
+
+        vm.priceAlterationType = vm.PRICE_ALTERATIONS_SUPPORTED.NOTHING;
 
         vm.update = update;
 
         $scope.$on(Offering.EVENTS.PRICEPLAN_UPDATE, function (event, index, pricePlan) {
             _index = index;
             _pricePlan = pricePlan;
             vm.data = angular.copy(pricePlan);
+
+            if (angular.isObject(pricePlan.productOfferPriceAlteration)) {
+                vm.priceAlterationType = pricePlan.productOfferPriceAlteration.priceAlterationType;
+            } else {
+                vm.priceAlterationType = vm.PRICE_ALTERATIONS_SUPPORTED.NOTHING;
+            }
+
             $element.modal('show');
         });
 

diff --git a/public/resources/core/js/controllers/product-order.controller.js b/public/resources/core/js/controllers/product-order.controller.js
@@ -210,6 +210,7 @@
             ShoppingCart.getItems().then(function(orderItems) {
 
                 vm.loadingStatus = LOADED;
+                vm.orderItems = orderItems;
 
                 if (orderItems.length) {
 
@@ -274,6 +275,10 @@
                                 amount: orderItems[i].options.pricing.price.taxIncludedAmount,
                                 currency: orderItems[i].options.pricing.price.currencyCode
                             };
+                            if (angular.isObject(orderItems[i].pricePlan.priceAlteration())) {
+                                price.description = price.description + '\n' + orderItems[i].pricePlan.priceAlteration().format();
+                            }
+                            delete price.productOfferPriceAlteration;
                             item.product.productPrice = [price];
                         }
 

diff --git a/public/resources/core/js/controllers/purchase-options.controller.js b/public/resources/core/js/controllers/purchase-options.controller.js
@@ -232,7 +232,7 @@
 
             if (angular.isArray(productOfferingPrice) && productOfferingPrice.length) {
                 if (productOfferingPrice.length === 1) {
-                    priceplan = productOfferingPrice[0];
+                    setPriceplan(productOfferingPrice[0]);
                 }
                 vm.priceplans = productOfferingPrice;
             }