Merge branch 'bugfix/MAR10001-941-po-recalculation-advised-products' …

…into maintenance/3.0
marellocommerce · Jun 29, 2020 · fec2210 · fec2210
2 parents 413ab5a + a2d4afd
commit fec2210
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/...rello/Bundle/PurchaseOrderBundle/Resources/public/js/app/views/purchaseorder-item-view.js b/...rello/Bundle/PurchaseOrderBundle/Resources/public/js/app/views/purchaseorder-item-view.js
@@ -35,7 +35,7 @@ define(function(require) {
             var currencyLabel = this.priceEl.closest('.control-group').find('label').text();
             var start_pos = currencyLabel.indexOf('(') + 1;
             var end_pos = currencyLabel.indexOf(')',start_pos);
-            this.currencySymbol = currencyLabel.substring(start_pos,end_pos)
+            this.currencySymbol = currencyLabel.substring(start_pos,end_pos);
             this.priceEl.change(_.bind(this.updateRowTotal, this));
             PurchaseOrderItemView.__super__.initialize.apply(this, arguments);
         },

diff --git a/...ello/Bundle/PurchaseOrderBundle/Resources/public/js/app/views/purchaseorder-items-view.js b/...ello/Bundle/PurchaseOrderBundle/Resources/public/js/app/views/purchaseorder-items-view.js
@@ -42,8 +42,7 @@ define(function(require) {
                 }
             });
             mediator.trigger('po:items:total:changed', {'value': total.toFixed(2), 'currency': data.currency, 'type': 'additional', 'label': 'Additional items Total'});
-        },
-
+        }
     });
 
     return PurchaseOrderItemsView;

diff --git a/src/Marello/Bundle/PurchaseOrderBundle/Resources/public/js/multiple-entity.js b/src/Marello/Bundle/PurchaseOrderBundle/Resources/public/js/multiple-entity.js
@@ -71,6 +71,7 @@ define(function(require) {
             this.addedCollectionItems = [];
             this.removedCollectionItems = [];
 
+            mediator.on('po:row:total:changed', this.triggerTotalsUpdateEvent, this);
             this.render();
         },
 

diff --git a/src/Marello/Bundle/PurchaseOrderBundle/Resources/public/js/multiple-entity/view.js b/src/Marello/Bundle/PurchaseOrderBundle/Resources/public/js/multiple-entity/view.js
@@ -4,6 +4,7 @@ define(function(require) {
     const _ = require('underscore');
     const Backbone = require('backbone');
     const DialogWidget = require('oro/dialog-widget');
+    const mediator = require('oroui/js/mediator');
 
     /**
      * @export  oroform/js/multiple-entity/view
@@ -102,12 +103,14 @@ define(function(require) {
             this.model.set('purchasePrice', price);
 
             let rowTotal = parseFloat(amount) * parseFloat(price);
+            let currencySymbol = this.model.get('currency');
             if (!isNaN(rowTotal)) {
-                let currencySymbol = this.model.get('currency');
                 this.$el.find('td.purchase-order-line-item-row-total').html(currencySymbol + rowTotal.toFixed(2));
             } else {
                 this.$el.find('td.purchase-order-line-item-row-total').html('');
             }
+
+            mediator.trigger('po:row:total:changed', {'currency': currencySymbol});
         }
     });