Added Estimate Modal and solved some merge conflicts.
This commit is contained in:
parent
942e9beeab
commit
88171caee6
6 changed files with 389 additions and 47 deletions
|
|
@ -233,8 +233,9 @@ class Api {
|
|||
customer: timesheet.customer,
|
||||
totalHours: timesheet.total_hours,
|
||||
status: timesheet.status,
|
||||
totalPayFormatted: timesheet.total_costing_amount,
|
||||
};
|
||||
totalPay: timesheet.total_costing_amount
|
||||
}
|
||||
console.log("Timesheet Row: ", tableRow);
|
||||
data.push(tableRow);
|
||||
}
|
||||
console.log("DEBUG: API - getTimesheetData result: ", data);
|
||||
|
|
@ -311,7 +312,7 @@ class Api {
|
|||
* @param {Object} filters
|
||||
* @returns {Promise<Object[]>}
|
||||
*/
|
||||
static async getDocsList(doctype, fields = [], filters = {}, page = 0, pageLength = 0) {
|
||||
static async getDocsList(doctype, fields = [], filters = {}, page = 0, start=0, pageLength = 0) {
|
||||
const docs = await frappe.db.get_list(doctype, {
|
||||
fields,
|
||||
filters,
|
||||
|
|
@ -361,6 +362,12 @@ class Api {
|
|||
return customerNames;
|
||||
}
|
||||
|
||||
static async getCompanyNames() {
|
||||
const companies = await this.getDocsList("Company", ["name"]);
|
||||
console.log("DEBUG: API - Fetched Company Names: ", companyNames);
|
||||
return companyNames;
|
||||
}
|
||||
|
||||
// Create methods
|
||||
|
||||
static async createClient(clientData) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue