Merge branch 'test' into dev
gitea/salix/dev This commit looks good Details

This commit is contained in:
Gerard 2019-02-21 10:17:54 +01:00
commit 506c857b70
5 changed files with 6 additions and 6 deletions

View File

@ -1,7 +1,7 @@
{ {
"module": "agency", "module": "agency",
"name": "Agencies", "name": "Agencies",
"icon" : "local_shipping", "icon" : "icon-delivery",
"validations" : true, "validations" : true,
"menu": [ "menu": [
{"state": "zone.card.basicData", "icon": "settings"}, {"state": "zone.card.basicData", "icon": "settings"},

View File

@ -25,7 +25,7 @@ class Controller {
tooltip: 'Client ticket list' tooltip: 'Client ticket list'
}, },
btnTwo: { btnTwo: {
icon: 'shopping_cart', icon: 'icon-basket',
state: `order.create({clientFk: ${value.id}})`, state: `order.create({clientFk: ${value.id}})`,
tooltip: 'New order' tooltip: 'New order'
} }

View File

@ -7,7 +7,7 @@
{"state": "client.card.basicData", "icon": "settings"}, {"state": "client.card.basicData", "icon": "settings"},
{"state": "client.card.fiscalData", "icon": "account_balance"}, {"state": "client.card.fiscalData", "icon": "account_balance"},
{"state": "client.card.billingData", "icon": "icon-payment"}, {"state": "client.card.billingData", "icon": "icon-payment"},
{"state": "client.card.address.index", "icon": "local_shipping"}, {"state": "client.card.address.index", "icon": "icon-delivery"},
{"state": "client.card.note.index", "icon": "insert_drive_file"}, {"state": "client.card.note.index", "icon": "insert_drive_file"},
{"state": "client.card.credit.index", "icon": "credit_card"}, {"state": "client.card.credit.index", "icon": "credit_card"},
{"state": "client.card.greuge.index", "icon": "work"}, {"state": "client.card.greuge.index", "icon": "work"},

View File

@ -1,7 +1,7 @@
{ {
"module": "item", "module": "item",
"name": "Items", "name": "Items",
"icon": "inbox", "icon": "icon-item",
"validations" : true, "validations" : true,
"dependencies": ["worker", "client", "ticket"], "dependencies": ["worker", "client", "ticket"],
"menu": [ "menu": [

View File

@ -1,12 +1,12 @@
{ {
"module": "order", "module": "order",
"name": "Orders", "name": "Orders",
"icon": "shopping_cart", "icon": "icon-basket",
"validations": true, "validations": true,
"dependencies": ["worker", "item", "ticket"], "dependencies": ["worker", "item", "ticket"],
"menu": [ "menu": [
{"state": "order.card.basicData", "icon": "settings"}, {"state": "order.card.basicData", "icon": "settings"},
{"state": "order.card.catalog", "icon": "shopping_cart"}, {"state": "order.card.catalog", "icon": "icon-basket"},
{"state": "order.card.volume", "icon": "icon-volume"}, {"state": "order.card.volume", "icon": "icon-volume"},
{"state": "order.card.line", "icon": "icon-lines"} {"state": "order.card.line", "icon": "icon-lines"}
], ],