CHECKPOINT COMMIT - POST SERVICE BANK REMOVAL
Service bank feature removed from front, back and e2e testing mostly commented out in case need to add back again but in some places such as db schema it had to be removed entirely so refer here if adding back in again
This commit is contained in:
@@ -89,7 +89,7 @@ export default {
|
|||||||
Reminder: 52,
|
Reminder: 52,
|
||||||
UnitMeterReading: 53,
|
UnitMeterReading: 53,
|
||||||
CustomerServiceRequest: 54,
|
CustomerServiceRequest: 54,
|
||||||
ServiceBank: 55,
|
//ServiceBank: 55,
|
||||||
OpsNotificationSettings: 56,
|
OpsNotificationSettings: 56,
|
||||||
Report: 57,
|
Report: 57,
|
||||||
DashboardView: 58,
|
DashboardView: 58,
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ export default {
|
|||||||
ServiceRate: { Change: 66, ReadFullRecord: 98701, Select: 131071 },
|
ServiceRate: { Change: 66, ReadFullRecord: 98701, Select: 131071 },
|
||||||
TravelRate: { Change: 66, ReadFullRecord: 98701, Select: 131071 },
|
TravelRate: { Change: 66, ReadFullRecord: 98701, Select: 131071 },
|
||||||
TaxCode: { Change: 66, ReadFullRecord: 98701, Select: 131071 },
|
TaxCode: { Change: 66, ReadFullRecord: 98701, Select: 131071 },
|
||||||
ServiceBank: { Change: 74, ReadFullRecord: 98693, Select: 131071 },
|
//ServiceBank: { Change: 74, ReadFullRecord: 98693, Select: 131071 },
|
||||||
Quote: { Change: 33098, ReadFullRecord: 65669, Select: 131071 },
|
Quote: { Change: 33098, ReadFullRecord: 65669, Select: 131071 },
|
||||||
QuoteItem: { Change: 33098, ReadFullRecord: 65669, Select: 131071 },
|
QuoteItem: { Change: 33098, ReadFullRecord: 65669, Select: 131071 },
|
||||||
QuoteTemplate: { Change: 33098, ReadFullRecord: 65669, Select: 131071 },
|
QuoteTemplate: { Change: 33098, ReadFullRecord: 65669, Select: 131071 },
|
||||||
|
|||||||
@@ -527,8 +527,8 @@ export default {
|
|||||||
return "$ayiWeight";
|
return "$ayiWeight";
|
||||||
case window.$gz.type.CustomerServiceRequest:
|
case window.$gz.type.CustomerServiceRequest:
|
||||||
return "$ayiConciergeBell";
|
return "$ayiConciergeBell";
|
||||||
case window.$gz.type.ServiceBank:
|
// case window.$gz.type.ServiceBank:
|
||||||
return "$ayiCarBattery";
|
// return "$ayiCarBattery";
|
||||||
case window.$gz.type.OpsNotificationSettings:
|
case window.$gz.type.OpsNotificationSettings:
|
||||||
return "$ayiBullhorn";
|
return "$ayiBullhorn";
|
||||||
case window.$gz.type.Report:
|
case window.$gz.type.Report:
|
||||||
|
|||||||
@@ -448,15 +448,15 @@ function initNavPanel() {
|
|||||||
key: key++
|
key: key++
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
//SERVICE BANK
|
// //SERVICE BANK
|
||||||
if (window.$gz.role.canOpen(window.$gz.type.ServiceBank)) {
|
// if (window.$gz.role.canOpen(window.$gz.type.ServiceBank)) {
|
||||||
sub.push({
|
// sub.push({
|
||||||
title: "ServiceBankList",
|
// title: "ServiceBankList",
|
||||||
icon: "$ayiCarBattery",
|
// icon: "$ayiCarBattery",
|
||||||
route: "/acc-service-banks",
|
// route: "/acc-service-banks",
|
||||||
key: key++
|
// key: key++
|
||||||
});
|
// });
|
||||||
}
|
// }
|
||||||
|
|
||||||
//SERVICE RATES
|
//SERVICE RATES
|
||||||
if (window.$gz.role.canOpen(window.$gz.type.ServiceRate)) {
|
if (window.$gz.role.canOpen(window.$gz.type.ServiceRate)) {
|
||||||
|
|||||||
@@ -274,12 +274,12 @@ export default {
|
|||||||
params: { recordid: tid.id }
|
params: { recordid: tid.id }
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
case ayatype.ServiceBank:
|
// case ayatype.ServiceBank:
|
||||||
vm.$router.push({
|
// vm.$router.push({
|
||||||
name: "service-bank-edit",
|
// name: "service-bank-edit",
|
||||||
params: { recordid: tid.id }
|
// params: { recordid: tid.id }
|
||||||
});
|
// });
|
||||||
break;
|
// break;
|
||||||
case ayatype.PurchaseOrder:
|
case ayatype.PurchaseOrder:
|
||||||
vm.$router.push({
|
vm.$router.push({
|
||||||
name: "inv-purchase-order",
|
name: "inv-purchase-order",
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ export default {
|
|||||||
"TaxCodeList",
|
"TaxCodeList",
|
||||||
"ServiceRateList",
|
"ServiceRateList",
|
||||||
"TravelRateList",
|
"TravelRateList",
|
||||||
"ServiceBankList",
|
//"ServiceBankList",
|
||||||
"Administration",
|
"Administration",
|
||||||
"Operations",
|
"Operations",
|
||||||
"Attachments",
|
"Attachments",
|
||||||
|
|||||||
@@ -484,7 +484,7 @@ export default {
|
|||||||
serviceDetails: null,
|
serviceDetails: null,
|
||||||
serviceRateQuantity: 0,
|
serviceRateQuantity: 0,
|
||||||
noChargeQuantity: 0,
|
noChargeQuantity: 0,
|
||||||
serviceBankId: null,
|
//serviceBankId: null,
|
||||||
taxCodeSaleId: null,
|
taxCodeSaleId: null,
|
||||||
price: 0,
|
price: 0,
|
||||||
priceOverride: null,
|
priceOverride: null,
|
||||||
|
|||||||
@@ -481,7 +481,7 @@ export default {
|
|||||||
travelDetails: null,
|
travelDetails: null,
|
||||||
travelRateQuantity: 0,
|
travelRateQuantity: 0,
|
||||||
noChargeQuantity: 0,
|
noChargeQuantity: 0,
|
||||||
serviceBankId: null,
|
// serviceBankId: null,
|
||||||
taxCodeSaleId: null,
|
taxCodeSaleId: null,
|
||||||
price: 0,
|
price: 0,
|
||||||
priceOverride: null,
|
priceOverride: null,
|
||||||
|
|||||||
@@ -609,18 +609,18 @@ export default new Router({
|
|||||||
component: () =>
|
component: () =>
|
||||||
import(/* webpackChunkName: "acc" */ "./views/acc-tax-code.vue")
|
import(/* webpackChunkName: "acc" */ "./views/acc-tax-code.vue")
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
path: "/acc-service-banks/:aType?/:objectId?",
|
// path: "/acc-service-banks/:aType?/:objectId?",
|
||||||
name: "service-banks",
|
// name: "service-banks",
|
||||||
component: () =>
|
// component: () =>
|
||||||
import(/* webpackChunkName: "acc" */ "./views/acc-service-banks.vue")
|
// import(/* webpackChunkName: "acc" */ "./views/acc-service-banks.vue")
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
path: "/acc-service-banks/:recordid/:aType?/:objectId?",
|
// path: "/acc-service-banks/:recordid/:aType?/:objectId?",
|
||||||
name: "service-bank-edit",
|
// name: "service-bank-edit",
|
||||||
component: () =>
|
// component: () =>
|
||||||
import(/* webpackChunkName: "acc" */ "./views/acc-service-bank.vue")
|
// import(/* webpackChunkName: "acc" */ "./views/acc-service-bank.vue")
|
||||||
},
|
// },
|
||||||
//######################### ADMINISTRATION GROUP #####################################
|
//######################### ADMINISTRATION GROUP #####################################
|
||||||
{
|
{
|
||||||
path: "/adm-global-settings",
|
path: "/adm-global-settings",
|
||||||
|
|||||||
@@ -276,7 +276,7 @@
|
|||||||
></gz-date-time-picker>
|
></gz-date-time-picker>
|
||||||
</v-col>
|
</v-col>
|
||||||
|
|
||||||
<v-col
|
<!-- <v-col
|
||||||
v-if="form().showMe(this, 'UsesBanking')"
|
v-if="form().showMe(this, 'UsesBanking')"
|
||||||
cols="12"
|
cols="12"
|
||||||
sm="6"
|
sm="6"
|
||||||
@@ -304,7 +304,7 @@
|
|||||||
>
|
>
|
||||||
</template>
|
</template>
|
||||||
</v-checkbox>
|
</v-checkbox>
|
||||||
</v-col>
|
</v-col> -->
|
||||||
<v-col cols="12" sm="6" lg="4" xl="3">
|
<v-col cols="12" sm="6" lg="4" xl="3">
|
||||||
<v-checkbox
|
<v-checkbox
|
||||||
v-model="obj.active"
|
v-model="obj.active"
|
||||||
@@ -836,7 +836,7 @@ export default {
|
|||||||
headOfficeId: null,
|
headOfficeId: null,
|
||||||
techNotes: null,
|
techNotes: null,
|
||||||
accountNumber: null,
|
accountNumber: null,
|
||||||
usesBanking: false,
|
//usesBanking: false,
|
||||||
contractId: null,
|
contractId: null,
|
||||||
contractExpires: null,
|
contractExpires: null,
|
||||||
defaultServiceTemplateId: null,
|
defaultServiceTemplateId: null,
|
||||||
@@ -916,22 +916,22 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
canOpenServiceBank: function() {
|
// canOpenServiceBank: function() {
|
||||||
return this.obj.usesBanking == true && this.$route.params.recordid != 0;
|
// return this.obj.usesBanking == true && this.$route.params.recordid != 0;
|
||||||
},
|
// },
|
||||||
openServiceBank: function() {
|
// openServiceBank: function() {
|
||||||
if (this.canOpenServiceBank()) {
|
// if (this.canOpenServiceBank()) {
|
||||||
this.$router.push({
|
// this.$router.push({
|
||||||
name: "service-banks",
|
// name: "service-banks",
|
||||||
params: {
|
// params: {
|
||||||
aType: window.$gz.type.Customer,
|
// aType: window.$gz.type.Customer,
|
||||||
objectId: this.$route.params.recordid,
|
// objectId: this.$route.params.recordid,
|
||||||
viz: this.obj.name,
|
// viz: this.obj.name,
|
||||||
icon: "$ayiAddressCard"
|
// icon: "$ayiAddressCard"
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
}
|
// }
|
||||||
},
|
// },
|
||||||
canSave: function() {
|
canSave: function() {
|
||||||
return this.formState.valid && this.formState.dirty;
|
return this.formState.valid && this.formState.dirty;
|
||||||
},
|
},
|
||||||
@@ -1577,7 +1577,7 @@ async function fetchTranslatedText(vm) {
|
|||||||
"HeadOffice",
|
"HeadOffice",
|
||||||
"CustomerTechNotes",
|
"CustomerTechNotes",
|
||||||
"CustomerAccountNumber",
|
"CustomerAccountNumber",
|
||||||
"UsesBanking",
|
//"UsesBanking",
|
||||||
"Contract",
|
"Contract",
|
||||||
"ContractExpires",
|
"ContractExpires",
|
||||||
"WorkOrderTemplate",
|
"WorkOrderTemplate",
|
||||||
|
|||||||
@@ -214,7 +214,7 @@
|
|||||||
></gz-date-time-picker>
|
></gz-date-time-picker>
|
||||||
</v-col>
|
</v-col>
|
||||||
|
|
||||||
<v-col
|
<!-- <v-col
|
||||||
v-if="form().showMe(this, 'UsesBanking')"
|
v-if="form().showMe(this, 'UsesBanking')"
|
||||||
cols="12"
|
cols="12"
|
||||||
sm="6"
|
sm="6"
|
||||||
@@ -242,7 +242,7 @@
|
|||||||
>
|
>
|
||||||
</template></v-checkbox
|
</template></v-checkbox
|
||||||
>
|
>
|
||||||
</v-col>
|
</v-col> -->
|
||||||
<v-col cols="12" sm="6" lg="4" xl="3">
|
<v-col cols="12" sm="6" lg="4" xl="3">
|
||||||
<v-checkbox
|
<v-checkbox
|
||||||
v-model="obj.active"
|
v-model="obj.active"
|
||||||
@@ -741,7 +741,7 @@ export default {
|
|||||||
tags: [],
|
tags: [],
|
||||||
webAddress: null,
|
webAddress: null,
|
||||||
accountNumber: null,
|
accountNumber: null,
|
||||||
usesBanking: false,
|
// usesBanking: false,
|
||||||
contractId: null,
|
contractId: null,
|
||||||
contractExpires: null,
|
contractExpires: null,
|
||||||
phone1: null,
|
phone1: null,
|
||||||
@@ -820,22 +820,22 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
canOpenServiceBank: function() {
|
// canOpenServiceBank: function() {
|
||||||
return this.obj.usesBanking == true && this.$route.params.recordid != 0;
|
// return this.obj.usesBanking == true && this.$route.params.recordid != 0;
|
||||||
},
|
// },
|
||||||
openServiceBank: function() {
|
// openServiceBank: function() {
|
||||||
if (this.canOpenServiceBank()) {
|
// if (this.canOpenServiceBank()) {
|
||||||
this.$router.push({
|
// this.$router.push({
|
||||||
name: "service-banks",
|
// name: "service-banks",
|
||||||
params: {
|
// params: {
|
||||||
aType: window.$gz.type.HeadOffice,
|
// aType: window.$gz.type.HeadOffice,
|
||||||
objectId: this.$route.params.recordid,
|
// objectId: this.$route.params.recordid,
|
||||||
viz: this.obj.name,
|
// viz: this.obj.name,
|
||||||
icon: "$ayiSitemap"
|
// icon: "$ayiSitemap"
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
}
|
// }
|
||||||
},
|
// },
|
||||||
canSave: function() {
|
canSave: function() {
|
||||||
return this.formState.valid && this.formState.dirty;
|
return this.formState.valid && this.formState.dirty;
|
||||||
},
|
},
|
||||||
@@ -1446,7 +1446,7 @@ async function fetchTranslatedText(vm) {
|
|||||||
"HeadOfficeNotes",
|
"HeadOfficeNotes",
|
||||||
"WebAddress",
|
"WebAddress",
|
||||||
"HeadOfficeAccountNumber",
|
"HeadOfficeAccountNumber",
|
||||||
"UsesBanking",
|
//"UsesBanking",
|
||||||
"Contract",
|
"Contract",
|
||||||
"ContractExpires",
|
"ContractExpires",
|
||||||
"HeadOfficePhone1",
|
"HeadOfficePhone1",
|
||||||
|
|||||||
@@ -354,8 +354,8 @@ async function fetchTranslatedText(vm) {
|
|||||||
await window.$gz.translation.cacheTranslations([
|
await window.$gz.translation.cacheTranslations([
|
||||||
"TooManyResults",
|
"TooManyResults",
|
||||||
"NoResults",
|
"NoResults",
|
||||||
"Object",
|
"Object"
|
||||||
"ServiceBank"
|
//, "ServiceBank"
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -369,10 +369,9 @@ async function populateSelectionLists(vm) {
|
|||||||
window.$gz.form.setErrorBoxErrors(vm);
|
window.$gz.form.setErrorBoxErrors(vm);
|
||||||
} else {
|
} else {
|
||||||
vm.selectLists.objectTypes = res.data;
|
vm.selectLists.objectTypes = res.data;
|
||||||
//ServiceBank will appear in search results but is not a Core biz object so won't be added to list by server
|
// // //ServiceBank will appear in search results but is not a Core biz object so won't be added to list by server
|
||||||
//and needs to be added manually here
|
// // //and needs to be added manually here
|
||||||
vm.selectLists.objectTypes.push({ name: vm.$ay.t("ServiceBank"), id: 55 });
|
// // vm.selectLists.objectTypes.push({ name: vm.$ay.t("ServiceBank"), id: 55 });
|
||||||
//servicebank?
|
|
||||||
window.$gz.form.addNoSelectionItem(vm.selectLists.objectTypes);
|
window.$gz.form.addNoSelectionItem(vm.selectLists.objectTypes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -167,7 +167,7 @@
|
|||||||
></gz-date-time-picker>
|
></gz-date-time-picker>
|
||||||
</v-col>
|
</v-col>
|
||||||
|
|
||||||
<v-col
|
<!-- <v-col
|
||||||
v-if="form().showMe(this, 'UsesBanking')"
|
v-if="form().showMe(this, 'UsesBanking')"
|
||||||
cols="12"
|
cols="12"
|
||||||
sm="6"
|
sm="6"
|
||||||
@@ -195,7 +195,7 @@
|
|||||||
>
|
>
|
||||||
</template>
|
</template>
|
||||||
</v-checkbox>
|
</v-checkbox>
|
||||||
</v-col>
|
</v-col> -->
|
||||||
|
|
||||||
<v-col
|
<v-col
|
||||||
v-if="form().showMe(this, 'UnitMetered')"
|
v-if="form().showMe(this, 'UnitMetered')"
|
||||||
@@ -854,7 +854,7 @@ export default {
|
|||||||
overrideModelWarranty: false,
|
overrideModelWarranty: false,
|
||||||
warrantyLength: null,
|
warrantyLength: null,
|
||||||
warrantyTerms: null,
|
warrantyTerms: null,
|
||||||
usesBanking: false,
|
//usesBanking: false,
|
||||||
contractId: null,
|
contractId: null,
|
||||||
contractExpires: null,
|
contractExpires: null,
|
||||||
metered: false,
|
metered: false,
|
||||||
@@ -920,22 +920,22 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
canOpenServiceBank: function() {
|
// canOpenServiceBank: function() {
|
||||||
return this.obj.usesBanking == true && this.$route.params.recordid != 0;
|
// return this.obj.usesBanking == true && this.$route.params.recordid != 0;
|
||||||
},
|
// },
|
||||||
openServiceBank: function() {
|
// openServiceBank: function() {
|
||||||
if (this.canOpenServiceBank()) {
|
// if (this.canOpenServiceBank()) {
|
||||||
this.$router.push({
|
// this.$router.push({
|
||||||
name: "service-banks",
|
// name: "service-banks",
|
||||||
params: {
|
// params: {
|
||||||
aType: window.$gz.type.Unit,
|
// aType: window.$gz.type.Unit,
|
||||||
objectId: this.$route.params.recordid,
|
// objectId: this.$route.params.recordid,
|
||||||
viz: this.obj.serial,
|
// viz: this.obj.serial,
|
||||||
icon: "$ayiFan"
|
// icon: "$ayiFan"
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
}
|
// }
|
||||||
},
|
// },
|
||||||
canOpenMeter: function() {
|
canOpenMeter: function() {
|
||||||
return this.obj.metered == true && this.$route.params.recordid != 0;
|
return this.obj.metered == true && this.$route.params.recordid != 0;
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -265,17 +265,17 @@ describe("SMOKE", () => {
|
|||||||
cy.get("[data-cy=name]");
|
cy.get("[data-cy=name]");
|
||||||
|
|
||||||
//################# ACCOUNTING
|
//################# ACCOUNTING
|
||||||
cy.visit("/acc-service-banks");
|
// cy.visit("/acc-service-banks");
|
||||||
cy.url({ timeout: 10000 }).should("include", "/acc-service-banks");
|
// cy.url({ timeout: 10000 }).should("include", "/acc-service-banks");
|
||||||
cy.get("[data-cy=serviceBanksTable]");
|
// cy.get("[data-cy=serviceBanksTable]");
|
||||||
|
|
||||||
cy.visit("/acc-service-banks/8/1");
|
// cy.visit("/acc-service-banks/8/1");
|
||||||
cy.url({ timeout: 10000 }).should("include", "/acc-service-banks/8/1");
|
// cy.url({ timeout: 10000 }).should("include", "/acc-service-banks/8/1");
|
||||||
cy.get("[data-cy=clickThru]");
|
// cy.get("[data-cy=clickThru]");
|
||||||
|
|
||||||
cy.visit("/acc-service-banks/0/8/1");
|
// cy.visit("/acc-service-banks/0/8/1");
|
||||||
cy.url({ timeout: 10000 }).should("include", "/acc-service-banks/0/8/1");
|
// cy.url({ timeout: 10000 }).should("include", "/acc-service-banks/0/8/1");
|
||||||
cy.get("[data-cy=name]");
|
// cy.get("[data-cy=name]");
|
||||||
|
|
||||||
cy.visit("/acc-service-rates");
|
cy.visit("/acc-service-rates");
|
||||||
cy.url({ timeout: 10000 }).should("include", "/acc-service-rates");
|
cy.url({ timeout: 10000 }).should("include", "/acc-service-rates");
|
||||||
|
|||||||
Reference in New Issue
Block a user