This commit is contained in:
@@ -29,7 +29,14 @@ todo: actual customer reports so can figure out datalist for bringing other name
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
CURRENTLY DOING: update front and back end stuff
|
CURRENTLY DOING: Rate
|
||||||
|
Split into laborrate and travelrate
|
||||||
|
Needs multiple locale keys?
|
||||||
|
actually just for the list and the object name, the rest is the same really
|
||||||
|
import
|
||||||
|
split out labor/service rates
|
||||||
|
unitchargedescription now just text field so import accordingly
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -71,12 +78,10 @@ EACH OBJECT DEV CYCLE:
|
|||||||
## OBJECT ORDER
|
## OBJECT ORDER
|
||||||
Preliminary order to get the ball rolling, these are the easiest starting point:
|
Preliminary order to get the ball rolling, these are the easiest starting point:
|
||||||
|
|
||||||
|
TaxCode (really don't see any changes, but surely there would be?? Think this one over)
|
||||||
|
|
||||||
|
|
||||||
Rate
|
|
||||||
ServiceBank
|
ServiceBank
|
||||||
(note, see cases, has changed, affects client, ho, unit)
|
(note, see cases, has changed, affects client, ho, unit)
|
||||||
TaxCode (really don't see any changes, but surely there would be?? Think this one over)
|
|
||||||
Unit
|
Unit
|
||||||
see cases 3536,
|
see cases 3536,
|
||||||
UnitModel
|
UnitModel
|
||||||
@@ -92,6 +97,7 @@ Preliminary order to get the ball rolling, these are the easiest starting point:
|
|||||||
When do this need to go back and do a bunch of //MIGRATE_OUTSTANDING
|
When do this need to go back and do a bunch of //MIGRATE_OUTSTANDING
|
||||||
i.e. show all
|
i.e. show all
|
||||||
todo: Consider adding latitude / longitude to wo, quote, pm objects
|
todo: Consider adding latitude / longitude to wo, quote, pm objects
|
||||||
|
rate split
|
||||||
can copy over from the unit or customer or set themselves
|
can copy over from the unit or customer or set themselves
|
||||||
and can always hide
|
and can always hide
|
||||||
means wo could be scheduled for ad-hoc locations and serviced that way, i.e. a truck parked on the side of the highway etc
|
means wo could be scheduled for ad-hoc locations and serviced that way, i.e. a truck parked on the side of the highway etc
|
||||||
|
|||||||
@@ -455,8 +455,6 @@ function initNavPanel() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//****************** ACCOUNTING
|
//****************** ACCOUNTING
|
||||||
//TODO: NO specific objects yet to check rights for so keeping this as originally written until we get there
|
|
||||||
//Not sure what this is exactly, probably to do with integration
|
|
||||||
if (
|
if (
|
||||||
window.$gz.role.hasRole([
|
window.$gz.role.hasRole([
|
||||||
role.BizAdminFull,
|
role.BizAdminFull,
|
||||||
@@ -466,23 +464,23 @@ function initNavPanel() {
|
|||||||
) {
|
) {
|
||||||
sub = [];
|
sub = [];
|
||||||
|
|
||||||
//FAKE subitem as is still TBD
|
//RATES
|
||||||
sub.push({
|
sub.push({
|
||||||
title: "Accounting",
|
title: "RateList",
|
||||||
icon: "$ayiCalculator",
|
icon: "$ayiCalculator",
|
||||||
route: "/acc-accounting",
|
route: "/acc-accounting",
|
||||||
key: key++
|
key: key++
|
||||||
});
|
});
|
||||||
|
|
||||||
|
sub.push({
|
||||||
|
title: "TaxCodeList",
|
||||||
|
icon: "$ayiPercent",
|
||||||
|
route: "/acc-accounting",
|
||||||
|
key: key++
|
||||||
|
});
|
||||||
|
|
||||||
// ** ACCOUNTING (TOP)
|
// ** ACCOUNTING (TOP)
|
||||||
addNavItem(
|
addNavItem("Accounting", "$ayiCoins", undefined, sub, key++, "accounting");
|
||||||
"Accounting",
|
|
||||||
"$ayiCalculator",
|
|
||||||
undefined,
|
|
||||||
sub,
|
|
||||||
key++,
|
|
||||||
"accounting"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//############# ADMINISTRATION
|
//############# ADMINISTRATION
|
||||||
|
|||||||
@@ -167,6 +167,8 @@ export default {
|
|||||||
"ReminderList",
|
"ReminderList",
|
||||||
"Inventory",
|
"Inventory",
|
||||||
"Accounting",
|
"Accounting",
|
||||||
|
"TaxCodeList",
|
||||||
|
"RateList",
|
||||||
"Administration",
|
"Administration",
|
||||||
"Operations",
|
"Operations",
|
||||||
"Attachments",
|
"Attachments",
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ import {
|
|||||||
faClone,
|
faClone,
|
||||||
faCode,
|
faCode,
|
||||||
faCogs,
|
faCogs,
|
||||||
|
faCoins,
|
||||||
faColumns,
|
faColumns,
|
||||||
faCommentAlt,
|
faCommentAlt,
|
||||||
faConciergeBell,
|
faConciergeBell,
|
||||||
@@ -124,6 +125,7 @@ import {
|
|||||||
faPencilAlt,
|
faPencilAlt,
|
||||||
faPencilRuler,
|
faPencilRuler,
|
||||||
faPeopleCarry,
|
faPeopleCarry,
|
||||||
|
faPercent,
|
||||||
faPhoneAlt,
|
faPhoneAlt,
|
||||||
faPlug,
|
faPlug,
|
||||||
faPlus,
|
faPlus,
|
||||||
@@ -217,6 +219,7 @@ library.add(
|
|||||||
faClone,
|
faClone,
|
||||||
faCode,
|
faCode,
|
||||||
faCogs,
|
faCogs,
|
||||||
|
faCoins,
|
||||||
faColumns,
|
faColumns,
|
||||||
faCommentAlt,
|
faCommentAlt,
|
||||||
faConciergeBell,
|
faConciergeBell,
|
||||||
@@ -291,6 +294,7 @@ library.add(
|
|||||||
faPencilAlt,
|
faPencilAlt,
|
||||||
faPencilRuler,
|
faPencilRuler,
|
||||||
faPeopleCarry,
|
faPeopleCarry,
|
||||||
|
faPercent,
|
||||||
faPhoneAlt,
|
faPhoneAlt,
|
||||||
faPlug,
|
faPlug,
|
||||||
faPlus,
|
faPlus,
|
||||||
@@ -503,6 +507,12 @@ const CUSTOM_ICONS = {
|
|||||||
icon: ["fas", "cogs"]
|
icon: ["fas", "cogs"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
ayiCoins: {
|
||||||
|
component: FontAwesomeIcon,
|
||||||
|
props: {
|
||||||
|
icon: ["fas", "coins"]
|
||||||
|
}
|
||||||
|
},
|
||||||
ayiColumns: {
|
ayiColumns: {
|
||||||
component: FontAwesomeIcon,
|
component: FontAwesomeIcon,
|
||||||
props: {
|
props: {
|
||||||
@@ -935,6 +945,12 @@ const CUSTOM_ICONS = {
|
|||||||
icon: ["fas", "people-carry"]
|
icon: ["fas", "people-carry"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
ayiPercent: {
|
||||||
|
component: FontAwesomeIcon,
|
||||||
|
props: {
|
||||||
|
icon: ["fas", "percent"]
|
||||||
|
}
|
||||||
|
},
|
||||||
ayiPhoneAlt: {
|
ayiPhoneAlt: {
|
||||||
component: FontAwesomeIcon,
|
component: FontAwesomeIcon,
|
||||||
props: {
|
props: {
|
||||||
|
|||||||
Reference in New Issue
Block a user