diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index e5680eb8..123a8d6e 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -346,8 +346,7 @@ CURRENTLY DOING: workorderitem part, front end ORDER: parts, part requests, loans, units, outside service -todo: prior woitem* override column header using wrong key, repeats priceviz not override - labor, travel etc +todo: test all Override column header visibility, still funky after fix earlier I bet todo: "DispatchFull" and "DispatchLimited" roles MUST be renamed to "ServiceFull" and "ServiceLimited" to match other roles and intent dispatch is a subset of a service manager job diff --git a/ayanova/src/components/work-order-item-labors.vue b/ayanova/src/components/work-order-item-labors.vue index e7bd6321..50a7dda4 100644 --- a/ayanova/src/components/work-order-item-labors.vue +++ b/ayanova/src/components/work-order-item-labors.vue @@ -488,15 +488,8 @@ export default { noChargeQuantity: 0, serviceBankId: null, taxCodeSaleId: null, - taxName: null, price: 0, priceOverride: null, - //costViz: 0, - // listPriceViz: 0, - //taxAViz: 0, - //taxBViz: 0, - //lineTotalViz: 0, - //unitOfMeasureViz:null, isDirty: true, workOrderItemId: this.value.items[this.activeWoItemIndex].id, uid: Date.now() //used for error tracking / display diff --git a/ayanova/src/components/work-order-item-parts.vue b/ayanova/src/components/work-order-item-parts.vue index 00e7cb28..94f3b431 100644 --- a/ayanova/src/components/work-order-item-parts.vue +++ b/ayanova/src/components/work-order-item-parts.vue @@ -524,24 +524,16 @@ export default { id: 0, concurrency: 0, userId: null, - //userViz: null, - serviceStartDate: window.$gz.locale.nowUTC8601String(), - serviceStopDate: window.$gz.locale.nowUTC8601String(), //TODO:sb now plus one hour to match v7 - serviceRateId: null, - serviceDetails: null, - serviceRateQuantity: 1, - noChargeQuantity: 0, - serviceBankId: null, - taxCodeSaleId: null, - taxName: null, + description: null, + serials: null, + partId: null, + partWarehouseId: null, + quantity: 1, + taxPartSaleId: null, price: 0, priceOverride: null, - //costViz: 0, - // listPriceViz: 0, - //taxAViz: 0, - //taxBViz: 0, - //lineTotalViz: 0, - //unitOfMeasureViz:null, + cost: 0, + listPrice: 0, isDirty: true, workOrderItemId: this.value.items[this.activeWoItemIndex].id, uid: Date.now() //used for error tracking / display @@ -683,8 +675,6 @@ export default { }); } - - if (this.form().showMe(this, "PartUnitOfMeasureViz")) { headers.push({ text: this.$ay.t("UnitOfMeasure"), @@ -693,7 +683,7 @@ export default { }); } - if (this.form().showMe(this, "PartCostViz")) { + if (this.form().showMe(this, "PartCost")) { headers.push({ text: this.$ay.t("Cost"), align: "right", @@ -701,7 +691,7 @@ export default { }); } - if (this.form().showMe(this, "PartListPriceViz")) { + if (this.form().showMe(this, "PartListPrice")) { headers.push({ text: this.$ay.t("ListPrice"), align: "right", @@ -709,7 +699,7 @@ export default { }); } - if (this.form().showMe(this, "PartPriceViz")) { + if (this.form().showMe(this, "PartPriceOverride")) { headers.push({ text: this.$ay.t("PriceOverride"), align: "right", @@ -725,11 +715,11 @@ export default { }); } - if (this.form().showMe(this, "WorkOrderItemPartTaxRateSaleID")) { + if (this.form().showMe(this, "WorkOrderItemPartTaxPartSaleID")) { headers.push({ text: this.$ay.t("Tax"), align: "left", - value: "taxCodeSaleViz" + value: "taxPartSaleViz" }); } @@ -771,37 +761,23 @@ export default { return { index: i, id: x.id, - 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, + partViz: x.partViz, + partWarehouseViz: x.partWarehouseViz, + quantity: window.$gz.locale.decimalLocalized( + x.quantity, this.pvm.languageName ), + upcViz: x.upcViz, + description: x.description, + serials: window.$gz.util.truncateString(x.serials, 50), unitOfMeasureViz: x.unitOfMeasureViz, - costViz: window.$gz.locale.currencyLocalized( - x.costViz, + cost: window.$gz.locale.currencyLocalized( + x.cost, this.pvm.languageName, this.pvm.currencyName ), - listPriceViz: window.$gz.locale.currencyLocalized( - x.listPriceViz, + listPrice: window.$gz.locale.currencyLocalized( + x.listPrice, this.pvm.languageName, this.pvm.currencyName ), @@ -810,7 +786,7 @@ export default { this.pvm.languageName, this.pvm.currencyName ), - taxCodeSaleViz: x.taxCodeSaleViz, + taxPartSaleViz: x.taxPartSaleViz, priceOverride: window.$gz.locale.currencyLocalized( x.priceOverride, this.pvm.languageName, @@ -835,8 +811,7 @@ export default { x.lineTotalViz, this.pvm.languageName, this.pvm.currencyName - ), - serviceDetails: window.$gz.util.truncateString(x.serviceDetails, 50) + ) }; }); }, diff --git a/ayanova/src/components/work-order-item-travels.vue b/ayanova/src/components/work-order-item-travels.vue index 645853c4..d647c63d 100644 --- a/ayanova/src/components/work-order-item-travels.vue +++ b/ayanova/src/components/work-order-item-travels.vue @@ -481,7 +481,6 @@ export default { id: 0, concurrency: 0, userId: null, - //userViz: null, travelStartDate: window.$gz.locale.nowUTC8601String(), travelStopDate: window.$gz.locale.nowUTC8601String(), //TODO:sb now plus one hour to match v7 travelRateId: null, @@ -490,15 +489,8 @@ export default { noChargeQuantity: 0, serviceBankId: null, taxCodeSaleId: null, - taxName: null, price: 0, priceOverride: null, - //costViz: 0, - // listPriceViz: 0, - //taxAViz: 0, - //taxBViz: 0, - //lineTotalViz: 0, - //unitOfMeasureViz:null, isDirty: true, workOrderItemId: this.value.items[this.activeWoItemIndex].id, uid: Date.now() //used for error tracking / display diff --git a/ayanova/src/views/svc-workorder.vue b/ayanova/src/views/svc-workorder.vue index 82c3fcd0..7adf1734 100644 --- a/ayanova/src/views/svc-workorder.vue +++ b/ayanova/src/views/svc-workorder.vue @@ -1574,390 +1574,5 @@ async function populateSelectionLists(vm) { ); //--------- - /* - - { - "data": { - "id": 10, - "concurrency": 7981529, - "serial": 10, - "notes": "Consequatur reprehenderit eveniet molestiae molestiae molestiae autem.", - "wiki": null, - "customFields": null, - "tags": [ - "brown", - "red", - "zone8", - "zone9" - ], - "customerId": 43, - "projectId": null, - "projectViz": null, - "internalReferenceNumber": "irf-6149", - "customerReferenceNumber": "crf-0272", - "customerContactName": "contact name here", - "fromQuoteId": null, - "fromPMId": null, - "fromCSRId": null, - "serviceDate": "2021-02-01T17:00:00Z", - "completeByDate": "2021-02-06T17:00:00Z", - "durationToCompleted": "00:00:00", - "invoiceNumber": null, - "customerSignature": null, - "customerSignatureName": null, - "customerSignatureCaptured": null, - "techSignature": null, - "techSignatureName": null, - "techSignatureCaptured": null, - "onsite": false, - "contractId": null, - "contractViz": "-", - "postAddress": "6304 Eduardo Lights", - "postCity": "Schoenfort", - "postRegion": "South Dakota", - "postCountry": "Liberia", - "postCode": "03315", - "address": "750 Darrell Cliff", - "city": "Armstrongview", - "region": "Illinois", - "country": "Israel", - "latitude": 9.8268, - "longitude": 34.3788, - "items": [ - { - "id": 20, - "concurrency": 7981529, - "notes": "itemnotes - 0 ", - "wiki": null, - "customFields": null, - "tags": [], - "workOrderId": 10, - "techNotes": "technotes - 0", - "workorderItemStatusId": 1, - "workorderItemPriorityId": 5, - "requestDate": "2021-02-01T17:00:00Z", - "warrantyService": false, - "sequence": 1, - "isDirty": false, - "expenses": [ - { - "id": 39, - "concurrency": 7981529, - "description": null, - "name": "Small Soft Pants", - "totalCost": 5.459658245770105, - "chargeAmount": 6.551589894924126, - "taxPaid": 0, - "chargeTaxCodeId": 2, - "chargeTaxCodeViz": "Goods only", - "reimburseUser": true, - "userId": 43, - "userViz": "Carolyne Watsica", - "chargeToCustomer": true, - "isDirty": false, - "workOrderItemId": 20 - }, - { - "id": 40, - "concurrency": 7981529, - "description": null, - "name": "Tasty Wooden Salad", - "totalCost": 10.91931649154021, - "chargeAmount": 12.011248140694232, - "taxPaid": 0, - "chargeTaxCodeId": 2, - "chargeTaxCodeViz": "Goods only", - "reimburseUser": true, - "userId": 25, - "userViz": "Dereck Romaguera", - "chargeToCustomer": true, - "isDirty": false, - "workOrderItemId": 20 - } - ], - "labors": [ - { - "id": 39, - "concurrency": 7981529, - "userId": 25, - "userViz": "Dereck Romaguera", - "serviceStartDate": "2021-02-01T17:00:00Z", - "serviceStopDate": "2021-02-01T18:00:00Z", - "serviceRateId": 6, - "serviceRateViz": "Purple TV", - "serviceDetails": "Error autem quaerat voluptatem.", - "serviceRateQuantity": 1, - "noChargeQuantity": 0, - "serviceBankId": null, - "taxCodeSaleId": null, - "taxCodeSaleViz": null, - "cost": 0, - "listPrice": 0, - "price": 0, - "taxName": null, - "taxAPct": 0, - "taxBPct": 0, - "taxOnTax": false, - "taxAViz": 0, - "taxBViz": 0, - "lineTotalViz": 0, - "isDirty": false, - "workOrderItemId": 20 - }, - { - "id": 40, - "concurrency": 7981529, - "userId": 22, - "userViz": "Georgette Dooley - CustomerLimited", - "serviceStartDate": "2021-02-01T17:00:00Z", - "serviceStopDate": "2021-02-01T18:00:00Z", - "serviceRateId": 2, - "serviceRateViz": "Silver service rate", - "serviceDetails": "Ipsam id officiis non.", - "serviceRateQuantity": 2, - "noChargeQuantity": 0, - "serviceBankId": null, - "taxCodeSaleId": null, - "taxCodeSaleViz": null, - "cost": 0, - "listPrice": 0, - "price": 0, - "taxName": null, - "taxAPct": 0, - "taxBPct": 0, - "taxOnTax": false, - "taxAViz": 0, - "taxBViz": 0, - "lineTotalViz": 0, - "isDirty": false, - "workOrderItemId": 20 - } - ], - "loans": [], - "parts": [], - "partRequests": [], - "scheduledUsers": [ - { - "id": 39, - "concurrency": 7981529, - "userId": 40, - "userViz": "Raul Berge", - "estimatedQuantity": 1, - "startDate": "2021-02-01T17:00:00Z", - "stopDate": "2021-02-01T18:00:00Z", - "serviceRateId": null, - "serviceRateViz": null, - "isDirty": false, - "workOrderItemId": 20 - }, - { - "id": 40, - "concurrency": 7981529, - "userId": 37, - "userViz": "Caleb Kovacek", - "estimatedQuantity": 2, - "startDate": "2021-02-01T17:00:00Z", - "stopDate": "2021-02-01T18:00:00Z", - "serviceRateId": null, - "serviceRateViz": null, - "isDirty": false, - "workOrderItemId": 20 - } - ], - "tasks": [], - "travels": [], - "units": [], - "outsideServices": [] - }, - { - "id": 21, - "concurrency": 7981529, - "notes": "itemnotes - 1 ", - "wiki": null, - "customFields": null, - "tags": [], - "workOrderId": 10, - "techNotes": "technotes - 1", - "workorderItemStatusId": 1, - "workorderItemPriorityId": 1, - "requestDate": "2021-02-01T17:01:00Z", - "warrantyService": false, - "sequence": 2, - "isDirty": false, - "expenses": [ - { - "id": 41, - "concurrency": 7981529, - "description": null, - "name": "Licensed Concrete Sausages", - "totalCost": 4.596012142764409, - "chargeAmount": 5.515214571317291, - "taxPaid": 0, - "chargeTaxCodeId": 2, - "chargeTaxCodeViz": "Goods only", - "reimburseUser": true, - "userId": 37, - "userViz": "Caleb Kovacek", - "chargeToCustomer": true, - "isDirty": false, - "workOrderItemId": 21 - }, - { - "id": 42, - "concurrency": 7981529, - "description": null, - "name": "Fantastic Concrete Fish", - "totalCost": 9.192024285528818, - "chargeAmount": 10.111226714081699, - "taxPaid": 0, - "chargeTaxCodeId": 2, - "chargeTaxCodeViz": "Goods only", - "reimburseUser": true, - "userId": 20, - "userViz": "Reta Braun - HeadOffice", - "chargeToCustomer": true, - "isDirty": false, - "workOrderItemId": 21 - } - ], - "labors": [ - { - "id": 41, - "concurrency": 7981529, - "userId": 34, - "userViz": "Matilda Mraz", - "serviceStartDate": "2021-02-01T17:00:00Z", - "serviceStopDate": "2021-02-01T18:00:00Z", - "serviceRateId": 4, - "serviceRateViz": "Salmon PA", - "serviceDetails": "Voluptatibus eos facilis impedit iusto atque nulla.", - "serviceRateQuantity": 1, - "noChargeQuantity": 0, - "serviceBankId": null, - "taxCodeSaleId": null, - "taxCodeSaleViz": null, - "cost": 0, - "listPrice": 0, - "price": 0, - "taxName": null, - "taxAPct": 0, - "taxBPct": 0, - "taxOnTax": false, - "taxAViz": 0, - "taxBViz": 0, - "lineTotalViz": 0, - "isDirty": false, - "workOrderItemId": 21 - }, - { - "id": 42, - "concurrency": 7981529, - "userId": 36, - "userViz": "Chasity VonRueden", - "serviceStartDate": "2021-02-01T17:00:00Z", - "serviceStopDate": "2021-02-01T18:00:00Z", - "serviceRateId": 2, - "serviceRateViz": "Silver service rate", - "serviceDetails": "Quibusdam autem ut aut.", - "serviceRateQuantity": 2, - "noChargeQuantity": 0, - "serviceBankId": null, - "taxCodeSaleId": null, - "taxCodeSaleViz": null, - "cost": 0, - "listPrice": 0, - "price": 0, - "taxName": null, - "taxAPct": 0, - "taxBPct": 0, - "taxOnTax": false, - "taxAViz": 0, - "taxBViz": 0, - "lineTotalViz": 0, - "isDirty": false, - "workOrderItemId": 21 - } - ], - "loans": [], - "parts": [], - "partRequests": [], - "scheduledUsers": [ - { - "id": 41, - "concurrency": 7981529, - "userId": 27, - "userViz": "Oran Kreiger", - "estimatedQuantity": 1, - "startDate": "2021-02-01T17:00:00Z", - "stopDate": "2021-02-01T18:00:00Z", - "serviceRateId": null, - "serviceRateViz": null, - "isDirty": false, - "workOrderItemId": 21 - }, - { - "id": 42, - "concurrency": 7981529, - "userId": 29, - "userViz": "Luisa Mayer", - "estimatedQuantity": 2, - "startDate": "2021-02-01T17:00:00Z", - "stopDate": "2021-02-01T18:00:00Z", - "serviceRateId": null, - "serviceRateViz": null, - "isDirty": false, - "workOrderItemId": 21 - } - ], - "tasks": [], - "travels": [], - "units": [], - "outsideServices": [] - } - ], - "states": [ - { - "id": 37, - "concurrency": 7981529, - "workOrderId": 10, - "workOrderStatusId": 2, - "created": "2021-02-01T17:05:00Z", - "userId": 34, - "userViz": "Matilda Mraz" - }, - { - "id": 38, - "concurrency": 7981529, - "workOrderId": 10, - "workOrderStatusId": 3, - "created": "2021-02-01T18:00:00Z", - "userId": 37, - "userViz": "Caleb Kovacek" - }, - { - "id": 39, - "concurrency": 7981529, - "workOrderId": 10, - "workOrderStatusId": 1, - "created": "2021-02-01T18:05:00Z", - "userId": 21, - "userViz": "Johnnie Mueller - CustomerFull" - }, - { - "id": 40, - "concurrency": 7981529, - "workOrderId": 10, - "workOrderStatusId": 3, - "created": "2021-02-01T19:00:00Z", - "userId": 41, - "userViz": "Palma Huel" - } - ], - "isDirty": false, - "isLockedAtServer": false, - "alertViz": null - } -} - */ }