diff --git a/resources/assets/vue/components/bookings/sections/BookingMergeSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingMergeSectionComponent.vue index 65abfab2..ad0ab389 100644 --- a/resources/assets/vue/components/bookings/sections/BookingMergeSectionComponent.vue +++ b/resources/assets/vue/components/bookings/sections/BookingMergeSectionComponent.vue @@ -123,11 +123,11 @@
-
Purchase Order Total Amount:
+
Order Total Amount:
- {{totalPurchaseAmount}} + {{totalOrderAmount}}
@@ -185,13 +185,13 @@ totalAmount(){ return (Math.round((this.booking.amount + Number.EPSILON) * 100) / 100).toFixed(2); }, - totalPurchaseAmount(){ + totalOrderAmount(){ - let totalPurchase = (this.booking.purchase_order) ? this.booking.purchase_order.amount : 0; + let totalOrderAmount = this.booking.amount; this.bookings.forEach(function(booking) { - totalPurchase += (booking.purchase_order ? booking.purchase_order.amount : 0); + totalOrderAmount += booking.amount; }); - return (Math.round((totalPurchase + Number.EPSILON) * 100) / 100).toFixed(2); + return (Math.round((totalOrderAmount + Number.EPSILON) * 100) / 100).toFixed(2); }, validForSubmit(){ return (this.bookings.length>0);// && this.totalAmount == this.totalPurchaseAmount);