diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue index ba67fcf9..4df5ffda 100644 --- a/ayanova/src/components/work-order-item-labors.vue +++ b/ayanova/src/components/work-order-item-labors.vue @@ -691,7 +691,7 @@ export default { headers.push({ text: this.$ay.t("WorkOrderItemLaborTaxRateSaleID"), align: "left", - value: "TaxCodeSaleViz" + value: "taxCodeSaleViz" }); } @@ -722,31 +722,46 @@ export default { return headers; }, itemList: function() { - HERE NEXT, then actual form fields return this.value.items[this.activeWoItemIndex].labors.map((x, i) => { return { index: i, id: x.id, - name: x.name, - totalCost: window.$gz.locale.currencyLocalized( - x.totalCost, + serviceStartDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized( + x.serviceStartDate, + this.pvm.timeZoneName, + this.pvm.languageName, + this.pvm.hour12 + ), + serviceStopDate: window.$gz.locale.utcDateToShortDateAndTimeLocalized( + x.serviceStopDate, + this.pvm.timeZoneName, + this.pvm.languageName, + this.pvm.hour12 + ), + + serviceRateQuantity: window.$gz.locale.decimalLocalized( + x.serviceRateQuantity, + this.pvm.languageName + ), + serviceRateViz: x.serviceRateViz, + userViz: x.userViz, + noChargeQuantity: window.$gz.locale.decimalLocalized( + x.noChargeQuantity, + this.pvm.languageName + ), + taxCodeSaleViz: taxCodeSaleViz, + manualDiscountPct: manualDiscountPct + "TODO PCT", + + basePrice: window.$gz.locale.currencyLocalized( + x.basePrice, this.pvm.languageName, this.pvm.currencyName ), - chargeAmount: window.$gz.locale.currencyLocalized( - x.chargeAmount, + price: window.$gz.locale.currencyLocalized( + x.price, this.pvm.languageName, this.pvm.currencyName - ), - chargeToCustomer: x.chargeToCustomer, - taxPaid: window.$gz.locale.currencyLocalized( - x.taxPaid, - this.pvm.languageName, - this.pvm.currencyName - ), - chargeTaxCodeViz: x.chargeTaxCodeViz, - reimburseUser: x.reimburseUser, - userViz: x.userViz + ) }; }); },