nazar-salary 2.3.2 → 2.5.0

package/index.d.ts

@@ -602,6 +602,172 @@ declare module 'nazar-salary' {
     reassigned_at: number;
   }
 
+  export interface UpdateStudentProgressData {
+    new_completed_lessons: number;
+    comment?: string;
+  }
+
+  export interface UpdateStudentProgressResponse {
+    status: string;
+    student: {
+      id: number;
+      completed_lessons: number;
+      total_lessons: number;
+      progress_percent: number;
+    };
+    students_in_group?: Array<{
+      id: number;
+      name: string;
+      completed_lessons: number;
+    }>;
+    teacher_payment_created?: {
+      id: number;
+      month_number: number;
+      amount: number;
+      status: string;
+    };
+  }
+
+  export type StopReason = 'student_quit' | 'moved_away' | 'health_issues' | 'financial' | 'other';
+
+  export interface StopStudentData {
+    reason: StopReason;
+    comment?: string;
+  }
+
+  export interface StopStudentResponse {
+    status: string;
+    student: {
+      id: number;
+      is_active: boolean;
+      finished_at: string;
+      stop_reason: StopReason;
+      completed_lessons: number;
+    };
+    teacher_payment_created?: {
+      id: number;
+      lessons_count: number;
+      amount: number;
+      status: string;
+    };
+  }
+
+  // Salary interfaces
+  export interface ManagerPayment {
+    payment_id: number;
+    student_id: number;
+    student_name: string;
+    operation_number: string;
+    purchase_amount: number;
+    prepayment: boolean;
+    kaspi_amount: number;
+    kaspi_commission: number;
+    net_amount: number;
+    manager_commission: number;
+    verified_at: string;
+  }
+
+  export interface ManagerSalaryItem {
+    manager_id: number;
+    first_name: string;
+    last_name: string;
+    phone: string;
+    hire_date: string;
+    work_days: number;
+    students_count: number;
+    payments_count: number;
+    total_commission: number;
+    payments: ManagerPayment[];
+  }
+
+  export interface ManagerSalaryResponse {
+    period: {
+      month: string;
+      display: string;
+      date_from: string;
+      date_to: string;
+    };
+    summary: {
+      total_managers: number;
+      total_students: number;
+      total_payments: number;
+      total_commission: number;
+    };
+    manager_list: ManagerSalaryItem[];
+  }
+
+  export type TeacherPaymentStatus = 'not_paid' | 'pending' | 'paid';
+
+  export interface TeacherPayment {
+    id: number;
+    type: 'individual' | 'group';
+    month_number: number | null;
+    lessons_count: number;
+    rate_per_lesson: number;
+    amount: number;
+    status: TeacherPaymentStatus;
+    created_at: string;
+    paid_at?: string;
+    student_id?: number;
+    student_name?: string;
+    lesson_group_id?: number;
+    lesson_group_name?: string;
+    students?: Array<{ id: number; name: string }>;
+    note?: string;
+  }
+
+  export interface TeacherSalaryItem {
+    teacher_id: number;
+    first_name: string;
+    last_name: string;
+    phone: string;
+    payments_count: number;
+    total_amount: number;
+    payments: TeacherPayment[];
+  }
+
+  export interface TeachersSalaryParams {
+    period_type: 'month' | 'custom';
+    month?: string;
+    date_from?: string;
+    date_to?: string;
+    status?: TeacherPaymentStatus;
+    teacher_id?: number;
+  }
+
+  export interface TeachersSalaryResponse {
+    period: {
+      type: 'month' | 'custom';
+      month?: string;
+      date_from?: string;
+      date_to?: string;
+      display: string;
+    };
+    summary: {
+      total_teachers: number;
+      total_payments: number;
+      total_amount: number;
+      by_status: {
+        not_paid: number;
+        pending: number;
+        paid: number;
+      };
+    };
+    teachers: TeacherSalaryItem[];
+  }
+
+  export interface MarkTeacherPaymentsPaidData {
+    payment_ids?: number[];
+    teacher_id?: number;
+    mark_all?: boolean;
+  }
+
+  export interface MarkTeacherPaymentsPaidResponse {
+    status: string;
+    updated_count: number;
+    total_amount: number;
+  }
+
   export interface StudentBasicInfo {
     id: number;
     first_name: string;
@@ -811,6 +977,11 @@ declare module 'nazar-salary' {
     getOrphanPayments(params?: { page?: number; limit?: number }): Promise<OrphanPaymentsResponse>;
     getBanksConfig(): Promise<BanksConfigResponse>;
     getManagerStudentsAdmin(managerId: number, params?: StudentsListParams): Promise<StudentsListResponse>;
+    
+    // Salary endpoints
+    getManagerSalary(month: string, managerId?: number): Promise<ManagerSalaryResponse>;
+    getTeachersSalary(params: TeachersSalaryParams): Promise<TeachersSalaryResponse>;
+    markTeacherPaymentsPaid(data: MarkTeacherPaymentsPaidData): Promise<MarkTeacherPaymentsPaidResponse>;
 
     // Teacher endpoints
     getTeacherLanguages(): Promise<TeacherLanguagesResponse>;
@@ -834,6 +1005,8 @@ declare module 'nazar-salary' {
     updateStudent(studentId: number, data: UpdateStudentData): Promise<UpdateStudentResponse>;
     transferStudent(studentId: number, data: TransferStudentData): Promise<TransferResponse>;
     changeStudentManager(studentId: number, data: ChangeStudentManagerData): Promise<ChangeStudentManagerResponse>;
+    updateStudentProgress(studentId: number, data: UpdateStudentProgressData): Promise<UpdateStudentProgressResponse>;
+    stopStudent(studentId: number, data: StopStudentData): Promise<StopStudentResponse>;
     getStudent(studentId: number): Promise<StudentDetail>;
     searchStudents(params: SearchStudentsParams): Promise<SearchStudentsResponse>;
     getStudentsList(params?: StudentsListParams): Promise<StudentsListResponse>;

package/index.js

@@ -274,7 +274,54 @@ class SalaryAPI {
    * @returns {Promise<{manager: object, total_students: number, current_page: number, total_pages: number, students: array}>}
    */
   async getManagerStudentsAdmin(managerId, params = {}) {
-    return await this.client.get(`/api/v1/admin/manager/${managerId}/students`, { params });
+    return await this.client.get(
+      `/api/v1/admin/manager/${managerId}/students`,
+      { params },
+    );
+  }
+
+  /**
+   * Get manager salary for specific month (Admin only)
+   * @param {string} month - Month in YYYY-MM format
+   * @param {number} [managerId] - Optional manager ID filter
+   * @returns {Promise<{period: object, summary: object, manager_list: array}>}
+   */
+  async getManagerSalary(month, managerId = null) {
+    const params = { month };
+    if (managerId) {
+      params.manager_id = managerId;
+    }
+    return await this.client.get("/api/v1/admin/salary/manager", { params });
+  }
+
+  /**
+   * Get teachers salary for specific period (Admin only)
+   * @param {object} params - Query parameters
+   * @param {string} params.period_type - 'month' or 'custom'
+   * @param {string} [params.month] - Month in YYYY-MM format (required if period_type=month)
+   * @param {string} [params.date_from] - Start date YYYY-MM-DD (required if period_type=custom)
+   * @param {string} [params.date_to] - End date YYYY-MM-DD (required if period_type=custom)
+   * @param {string} [params.status] - Filter by status: 'not_paid', 'pending', 'paid'
+   * @param {number} [params.teacher_id] - Filter by teacher ID
+   * @returns {Promise<{period: object, summary: object, teachers: array}>}
+   */
+  async getTeachersSalary(params) {
+    return await this.client.get("/api/v1/admin/salary/teachers", { params });
+  }
+
+  /**
+   * Mark teacher payments as paid (Admin only)
+   * @param {object} data - Payment data
+   * @param {number[]} [data.payment_ids] - Array of payment IDs to mark as paid
+   * @param {number} [data.teacher_id] - Teacher ID (used with mark_all)
+   * @param {boolean} [data.mark_all] - Mark all pending payments for teacher
+   * @returns {Promise<{status: string, updated_count: number, total_amount: number}>}
+   */
+  async markTeacherPaymentsPaid(data) {
+    return await this.client.post(
+      "/api/v1/admin/salary/teachers/mark-paid",
+      data,
+    );
   }
 
   // ===== TEACHER ENDPOINTS =====
@@ -502,6 +549,36 @@ class SalaryAPI {
     );
   }
 
+  /**
+   * Update student progress (Admin only)
+   * @param {number} studentId - Student ID
+   * @param {object} data - Progress data
+   * @param {number} data.new_completed_lessons - New completed lessons count
+   * @param {string} [data.comment] - Optional comment for logging
+   * @returns {Promise<{status: string, student: object, students_in_group?: array, teacher_payment_created?: object}>}
+   */
+  async updateStudentProgress(studentId, data) {
+    return await this.client.put(
+      `/api/v1/admin/progress/${studentId}/progress`,
+      data,
+    );
+  }
+
+  /**
+   * Stop student enrollment (Admin only)
+   * @param {number} studentId - Student ID
+   * @param {object} data - Stop data
+   * @param {string} data.reason - Reason for stopping (student_quit, moved_away, health_issues, financial, other)
+   * @param {string} [data.comment] - Optional comment
+   * @returns {Promise<{status: string, student: object, teacher_payment_created?: object}>}
+   */
+  async stopStudent(studentId, data) {
+    return await this.client.post(
+      `/api/v1/admin/progress/${studentId}/stop`,
+      data,
+    );
+  }
+
   /**
    * Get student by ID (requireAuth)
    * @param {number} studentId - Student ID

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nazar-salary",
-  "version": "2.3.2",
+  "version": "2.5.0",
   "description": "Frontend library for Nazar Salary API",
   "main": "index.js",
   "types": "index.d.ts",