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