Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 25 additions & 26 deletions codbex-payments/codbex-payments.edm

Large diffs are not rendered by default.

201 changes: 94 additions & 107 deletions codbex-payments/codbex-payments.gen

Large diffs are not rendered by default.

108 changes: 57 additions & 51 deletions codbex-payments/codbex-payments.model
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
"widgetType": "DROPDOWN",
"relationshipName": "CustomerPayment_Currency",
"relationshipEntityName": "Currency",
"relationshipEntityPerspectiveName": "Currencies",
"relationshipEntityPerspectiveName": "Settings",
"relationshipEntityPerspectiveLabel": "Entities"
},
{
Expand Down Expand Up @@ -241,7 +241,7 @@
"widgetType": "DROPDOWN",
"relationshipName": "CustomerPayment_PaymentMethod",
"relationshipEntityName": "PaymentMethod",
"relationshipEntityPerspectiveName": "Methods",
"relationshipEntityPerspectiveName": "Settings",
"relationshipEntityPerspectiveLabel": "methods"
}
],
Expand All @@ -261,11 +261,12 @@
"menuKey": "customerpayment",
"menuLabel": "CustomerPayment",
"name": "CustomerPayment",
"navigationPath": "/Home",
"perspectiveHeader": "",
"perspectiveIcon": "/services/web/resources/unicons/usd-square.svg",
"perspectiveLabel": "CustomerPayment",
"perspectiveName": "CustomerPayment",
"perspectiveOrder": "10",
"perspectiveNavId": "sales-navigation-group",
"perspectiveOrder": "300",
"perspectiveRole": "",
"roleRead": "codbex-payments.CustomerPayment.CustomerPaymentReadOnly",
"roleWrite": "codbex-payments.CustomerPayment.CustomerPaymentFullAccess",
Expand Down Expand Up @@ -405,7 +406,7 @@
"widgetType": "DROPDOWN",
"relationshipName": "SupplierPayment_Currency",
"relationshipEntityName": "Currency",
"relationshipEntityPerspectiveName": "Currencies",
"relationshipEntityPerspectiveName": "Settings",
"relationshipEntityPerspectiveLabel": "Entities"
},
{
Expand Down Expand Up @@ -514,11 +515,12 @@
"menuKey": "supplierpayment",
"menuLabel": "SupplierPayment",
"name": "SupplierPayment",
"navigationPath": "/Home",
"perspectiveHeader": "",
"perspectiveIcon": "/services/web/resources/unicons/box.svg",
"perspectiveLabel": "SupplierPayment",
"perspectiveName": "SupplierPayment",
"perspectiveOrder": "20",
"perspectiveNavId": "purchasing-navigation-group",
"perspectiveOrder": "300",
"perspectiveRole": "",
"roleRead": "codbex-payments.SupplierPayment.SupplierPaymentReadOnly",
"roleWrite": "codbex-payments.SupplierPayment.SupplierPaymentFullAccess",
Expand Down Expand Up @@ -640,7 +642,7 @@
"widgetType": "DROPDOWN",
"relationshipName": "EmployeePayment_Currency",
"relationshipEntityName": "Currency",
"relationshipEntityPerspectiveName": "Currencies",
"relationshipEntityPerspectiveName": "Settings",
"relationshipEntityPerspectiveLabel": "Entities"
},
{
Expand Down Expand Up @@ -749,11 +751,12 @@
"menuKey": "employeepayment",
"menuLabel": "EmployeePayment",
"name": "EmployeePayment",
"navigationPath": "/Home",
"perspectiveHeader": "",
"perspectiveIcon": "/services/web/resources/unicons/folder-check.svg",
"perspectiveLabel": "EmployeePayment",
"perspectiveName": "EmployeePayment",
"perspectiveOrder": "30",
"perspectiveNavId": "salaries-navigation-group",
"perspectiveOrder": "300",
"perspectiveRole": "",
"roleRead": "codbex-payments.EmployeePayment.EmployeePaymentReadOnly",
"roleWrite": "codbex-payments.EmployeePayment.EmployeePaymentFullAccess",
Expand Down Expand Up @@ -873,7 +876,7 @@
"widgetType": "DROPDOWN",
"relationshipName": "PaymentRecord_Currency",
"relationshipEntityName": "Currency",
"relationshipEntityPerspectiveName": "Currencies",
"relationshipEntityPerspectiveName": "Settings",
"relationshipEntityPerspectiveLabel": "Entities"
},
{
Expand Down Expand Up @@ -1031,10 +1034,11 @@
"menuKey": "paymentrecord",
"menuLabel": "PaymentRecord",
"name": "PaymentRecord",
"navigationPath": "/Home",
"perspectiveHeader": "",
"perspectiveIcon": "/services/web/resources/unicons/align-justify.svg",
"perspectiveLabel": "PaymentRecord",
"perspectiveName": "PaymentRecord",
"perspectiveNavId": "accounting-navigation-group",
"perspectiveOrder": "40",
"perspectiveRole": "",
"roleRead": "codbex-payments.PaymentRecord.PaymentRecordReadOnly",
Expand Down Expand Up @@ -1162,10 +1166,11 @@
"menuKey": "currency",
"menuLabel": "Currency",
"name": "Currency",
"navigationPath": "/Home",
"perspectiveHeader": "",
"perspectiveIcon": "/services/web/resources/unicons/dollar-alt.svg",
"perspectiveLabel": "Entities",
"perspectiveName": "Currencies",
"perspectiveName": "Settings",
"perspectiveNavId": "",
"perspectiveOrder": "990",
"perspectiveRole": "",
"projectionReferencedEntity": "Currency",
Expand Down Expand Up @@ -1368,10 +1373,11 @@
"menuKey": "company",
"menuLabel": "Company",
"name": "Company",
"navigationPath": "/Home",
"perspectiveHeader": "",
"perspectiveIcon": "/services/web/resources/unicons/university.svg",
"perspectiveLabel": "Entities",
"perspectiveName": "Companies",
"perspectiveNavId": "",
"perspectiveOrder": "100",
"perspectiveRole": "",
"projectionReferencedEntity": "Company",
Expand Down Expand Up @@ -1425,11 +1431,12 @@
"menuKey": "paymentrecorddirection",
"menuLabel": "PaymentRecordDirection",
"name": "PaymentRecordDirection",
"navigationPath": "/Home",
"perspectiveIcon": "/services/web/resources/unicons/wrench.svg",
"perspectiveLabel": "Settings",
"perspectiveHeader": "",
"perspectiveIcon": "/services/web/resources/unicons/copy.svg",
"perspectiveLabel": "Entities",
"perspectiveName": "Settings",
"perspectiveOrder": "999",
"perspectiveNavId": "",
"perspectiveOrder": "100",
"perspectiveRole": "",
"roleRead": "codbex-payments.Settings.PaymentRecordDirectionReadOnly",
"roleWrite": "codbex-payments.Settings.PaymentRecordDirectionFullAccess",
Expand Down Expand Up @@ -1482,11 +1489,12 @@
"menuKey": "paymentstatus",
"menuLabel": "PaymentStatus",
"name": "PaymentStatus",
"navigationPath": "/Home",
"perspectiveIcon": "/services/web/resources/unicons/wrench.svg",
"perspectiveLabel": "Settings",
"perspectiveHeader": "",
"perspectiveIcon": "/services/web/resources/unicons/copy.svg",
"perspectiveLabel": "Entities",
"perspectiveName": "Settings",
"perspectiveOrder": "999",
"perspectiveNavId": "",
"perspectiveOrder": "100",
"perspectiveRole": "",
"roleRead": "codbex-payments.Settings.PaymentStatusReadOnly",
"roleWrite": "codbex-payments.Settings.PaymentStatusFullAccess",
Expand Down Expand Up @@ -1539,11 +1547,12 @@
"menuKey": "paymenttype",
"menuLabel": "PaymentType",
"name": "PaymentType",
"navigationPath": "/Home",
"perspectiveIcon": "/services/web/resources/unicons/wrench.svg",
"perspectiveLabel": "Settings",
"perspectiveHeader": "",
"perspectiveIcon": "/services/web/resources/unicons/copy.svg",
"perspectiveLabel": "Entities",
"perspectiveName": "Settings",
"perspectiveOrder": "999",
"perspectiveNavId": "",
"perspectiveOrder": "100",
"perspectiveRole": "",
"roleRead": "codbex-payments.Settings.PaymentTypeReadOnly",
"roleWrite": "codbex-payments.Settings.PaymentTypeFullAccess",
Expand Down Expand Up @@ -1594,10 +1603,11 @@
"menuKey": "paymentmethod",
"menuLabel": "PaymentMethod",
"name": "PaymentMethod",
"navigationPath": "/Home",
"perspectiveHeader": "",
"perspectiveIcon": "/services/web/resources/unicons/archive.svg",
"perspectiveLabel": "methods",
"perspectiveName": "Methods",
"perspectiveName": "Settings",
"perspectiveNavId": "",
"perspectiveOrder": "100",
"perspectiveRole": "",
"projectionReferencedEntity": "PaymentMethod",
Expand Down Expand Up @@ -1779,10 +1789,11 @@
"menuKey": "customer",
"menuLabel": "Customer",
"name": "Customer",
"navigationPath": "/Home",
"perspectiveHeader": "",
"perspectiveIcon": "/services/web/resources/unicons/user-plus.svg",
"perspectiveLabel": "Customers",
"perspectiveName": "Customers",
"perspectiveNavId": "",
"perspectiveOrder": "100",
"perspectiveRole": "",
"projectionReferencedEntity": "Customer",
Expand Down Expand Up @@ -1865,7 +1876,7 @@
"widgetType": "DROPDOWN",
"relationshipName": "PaymentAdjustment_Currency",
"relationshipEntityName": "Currency",
"relationshipEntityPerspectiveName": "Currencies",
"relationshipEntityPerspectiveName": "Settings",
"relationshipEntityPerspectiveLabel": "Entities"
},
{
Expand Down Expand Up @@ -1931,11 +1942,12 @@
"menuKey": "paymentadjustment",
"menuLabel": "PaymentAdjustment",
"name": "PaymentAdjustment",
"navigationPath": "/Home",
"perspectiveHeader": "",
"perspectiveIcon": "/services/web/resources/unicons/paypal.svg",
"perspectiveLabel": "PaymentAdjustment",
"perspectiveName": "PaymentAdjustment",
"perspectiveOrder": "110",
"perspectiveNavId": "sales-navigation-group",
"perspectiveOrder": "700",
"perspectiveRole": "",
"roleRead": "codbex-payments.PaymentAdjustment.PaymentAdjustmentReadOnly",
"roleWrite": "codbex-payments.PaymentAdjustment.PaymentAdjustmentFullAccess",
Expand Down Expand Up @@ -2116,10 +2128,11 @@
"menuKey": "supplier",
"menuLabel": "Supplier",
"name": "Supplier",
"navigationPath": "/Home",
"perspectiveHeader": "",
"perspectiveIcon": "/services/web/resources/unicons/user-minus.svg",
"perspectiveLabel": "Suppliers",
"perspectiveName": "Suppliers",
"perspectiveNavId": "",
"perspectiveOrder": "200",
"perspectiveRole": "",
"projectionReferencedEntity": "Supplier",
Expand All @@ -2133,44 +2146,37 @@
{
"name": "CustomerPayment",
"label": "CustomerPayment",
"navId": "sales-navigation-group",
"icon": "/services/web/resources/unicons/usd-square.svg",
"order": "10",
"role": {}
"order": "300"
},
{
"name": "SupplierPayment",
"label": "SupplierPayment",
"navId": "purchasing-navigation-group",
"icon": "/services/web/resources/unicons/box.svg",
"order": "20",
"role": {}
"order": "300"
},
{
"name": "PaymentRecord",
"label": "PaymentRecord",
"navId": "accounting-navigation-group",
"icon": "/services/web/resources/unicons/align-justify.svg",
"order": "40",
"role": {}
},
{
"name": "Settings",
"label": "Settings",
"icon": "/services/web/resources/unicons/wrench.svg",
"order": "999",
"role": {}
"order": "40"
},
{
"name": "EmployeePayment",
"label": "EmployeePayment",
"navId": "salaries-navigation-group",
"icon": "/services/web/resources/unicons/folder-check.svg",
"order": "30",
"role": {}
"order": "300"
},
{
"name": "PaymentAdjustment",
"label": "PaymentAdjustment",
"navId": "sales-navigation-group",
"icon": "/services/web/resources/unicons/paypal.svg",
"order": "110",
"role": {}
"order": "700"
}
],
"navigations": []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class CustomerPaymentService {
public count() {
try {
this.checkPermissions("read");
return this.repository.count();
return { count: this.repository.count() };
} catch (error: any) {
this.handleError(error);
}
Expand All @@ -58,7 +58,7 @@ class CustomerPaymentService {
public countWithFilter(filter: any) {
try {
this.checkPermissions("read");
return this.repository.count(filter);
return { count: this.repository.count(filter) };
} catch (error: any) {
this.handleError(error);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class EmployeePaymentService {
public count() {
try {
this.checkPermissions("read");
return this.repository.count();
return { count: this.repository.count() };
} catch (error: any) {
this.handleError(error);
}
Expand All @@ -58,7 +58,7 @@ class EmployeePaymentService {
public countWithFilter(filter: any) {
try {
this.checkPermissions("read");
return this.repository.count(filter);
return { count: this.repository.count(filter) };
} catch (error: any) {
this.handleError(error);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class PaymentAdjustmentService {
public count() {
try {
this.checkPermissions("read");
return this.repository.count();
return { count: this.repository.count() };
} catch (error: any) {
this.handleError(error);
}
Expand All @@ -56,7 +56,7 @@ class PaymentAdjustmentService {
public countWithFilter(filter: any) {
try {
this.checkPermissions("read");
return this.repository.count(filter);
return { count: this.repository.count(filter) };
} catch (error: any) {
this.handleError(error);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class PaymentRecordService {
public count() {
try {
this.checkPermissions("read");
return this.repository.count();
return { count: this.repository.count() };
} catch (error: any) {
this.handleError(error);
}
Expand All @@ -56,7 +56,7 @@ class PaymentRecordService {
public countWithFilter(filter: any) {
try {
this.checkPermissions("read");
return this.repository.count(filter);
return { count: this.repository.count(filter) };
} catch (error: any) {
this.handleError(error);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class PaymentRecordDirectionService {
public count() {
try {
this.checkPermissions("read");
return this.repository.count();
return { count: this.repository.count() };
} catch (error: any) {
this.handleError(error);
}
Expand All @@ -56,7 +56,7 @@ class PaymentRecordDirectionService {
public countWithFilter(filter: any) {
try {
this.checkPermissions("read");
return this.repository.count(filter);
return { count: this.repository.count(filter) };
} catch (error: any) {
this.handleError(error);
}
Expand Down
Loading