iptdevs-design-system 3.2.148 → 3.2.150

package/lib/core/models/commercial/commercial.model.d.ts

@@ -493,7 +493,6 @@ export interface IPaySelectedCommissionsRq {
     user_code: number;
     commissions_to_pay: ICommissionsToPayRq[];
     observation: string;
-    wallet: number;
 }
 export interface ICommissionsToPayRq {
     cod_code: number;
@@ -529,6 +528,8 @@ export interface ICommissionListRs {
     cod_status_name: string;
     cod_date: Date;
     course_type_name: string;
+    course_type_label: string;
+    course_code: number | null;
     agreement_code: number;
     agreement_name: string | null;
     commission_area_name: string | null;
@@ -543,7 +544,7 @@ export interface ICommissionListRs {
     cod_price: number;
     payments_ok: boolean;
     existing_commission: boolean;
-    student_id_card: string | null;
+    student_id_card?: string | null;
     payment_validation: PaymentValidation;
     validation: Validation[];
 }
@@ -612,8 +613,8 @@ export interface ITransactionRs {
     deleted_at: Date | null;
     updated_at: Date;
     created_at: Date;
-    managed_commissions: IExistingCommissionDataRs[];
-    payment_bill: number | null;
+    managed_commissions?: IExistingCommissionDataRs[];
+    payment_bill?: number | null;
 }
 export interface IUserTransactionRs {
     code: number;
@@ -624,7 +625,15 @@ export interface IGetCommissionsByTransactionCodeRq {
     transaction_code: number;
     end_date?: string;
 }
-export interface ISelectTransactionCommissionRq {
+export interface IApproveTransactionCommissionRq {
+    token: string;
+    transaction_code: number;
+    observation: string;
+    wallet: number;
+    bank: number;
+    payment_reference: number;
+}
+export interface IrejectTransactionCommissionRq {
     token: string;
     transaction_code: number;
     observation: string;
@@ -637,3 +646,56 @@ export interface IEditConditionRuleRq {
     operator: string;
     value: string;
 }
+export interface IApproveTransactionRs {
+    transaction: ITransactionRs;
+    bill: IBillCreatedRs;
+    bill_observation?: IBillObservationListRs;
+    commissions: ICommissionListRs[];
+}
+export interface IBillCreatedRs {
+    payment_method: number;
+    payment_services: number;
+    payment_wallet: number;
+    bank: string;
+    payment_reference: string;
+    generated_for: number;
+    generated_by: number;
+    type_movements: number;
+    common_expenses: number;
+    total_amount: number;
+    payment_amount: number;
+    outstanding_amount: number;
+    positive_amount: number;
+    discount: number;
+    payer_name: null;
+    payer_document: null;
+    payment_date: Date;
+    observation: string;
+    transfer_code: null;
+    code: number;
+}
+export interface IBillObservationListRs {
+    details: IDetailBillRs[];
+    total_commissions: number;
+    total_amount: number;
+    period: IPeriodBillRs;
+}
+export interface IDetailBillRs {
+    area: string;
+    quantity: number;
+    amount: number;
+    statuses: any;
+}
+export interface IPeriodBillRs {
+    from: string;
+    to: string;
+}
+export interface IShowTransactionBillRq {
+    token: string;
+    code: number;
+}
+export interface ICancellTransactionBillRq {
+    token: string;
+    code: number;
+    observation: string;
+}

package/lib/core/services/commercial-service/comercial.service.d.ts

@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
 import { GetDiscountCouponsRq } from '../../models/payment/payment-rq.model';
 import { CreateCODRq, FullDataCODRq, GetCodByCourseRq, IUpdateCODRq, IobtaincodCurrrentAndLevelFullDataRenovationsRq, ICodPaymentRq } from '../../models/cod/cod-rq.model';
 import { IPTGeneralService } from '../service-enviroments';
-import { AdicInfoByCodeRq, CodPricesRq, IGoalInterfaceRq, ParentByCodeRq, IObtainRefersByUserRq, IAssignPosibleStudentForValueRq, IGetContactsadviserRq, IObtainCodPricesRq, IAssigningAdvisorGoalsRq, IReportCodForAdviserRq, ICreateTicketReferralRq, IGetPosibleStudentByDateRq, IGetUserAdviserCommercialByTypeAssingContactsRq, AssingCustomersByTypeAssingContactForAdviserRq, ICreateTypePaymentRq, ICreateCommissionAreaRq, IAssignCourseTypesToAreaRq, ICreatePaymentAreaCommissionRq, ICreateTypeUserCommissionRq, IAssignCommissionModelToUserRq, ITokenRq, IGetSummaryByCommercialAdvisorRq, IGetCodStudentDetailsByAdviserRq, IUpdatePaymentAreaCommissionRq, IAddConditionToRuleRq, IEditConditionRuleRq, IUpdateTypePaymentRq, IAssignSubordinateRq, IRemoveSubordinateRq, IUpdateTypeUserCommissionRq, IPayAdvisorBonusesRq, IPaySelectedCommissionsRq, IAssignSubordinatesMassiveRq, IDeleteTypeUserCommissionRq, IGetCommissionsByTransactionCodeRq, ISelectTransactionCommissionRq } from '../../models/commercial/commercial.model';
+import { AdicInfoByCodeRq, CodPricesRq, IGoalInterfaceRq, ParentByCodeRq, IObtainRefersByUserRq, IAssignPosibleStudentForValueRq, IGetContactsadviserRq, IObtainCodPricesRq, IAssigningAdvisorGoalsRq, IReportCodForAdviserRq, ICreateTicketReferralRq, IGetPosibleStudentByDateRq, IGetUserAdviserCommercialByTypeAssingContactsRq, AssingCustomersByTypeAssingContactForAdviserRq, ICreateTypePaymentRq, ICreateCommissionAreaRq, IAssignCourseTypesToAreaRq, ICreatePaymentAreaCommissionRq, ICreateTypeUserCommissionRq, IAssignCommissionModelToUserRq, ITokenRq, IGetSummaryByCommercialAdvisorRq, IGetCodStudentDetailsByAdviserRq, IUpdatePaymentAreaCommissionRq, IAddConditionToRuleRq, IEditConditionRuleRq, IUpdateTypePaymentRq, IAssignSubordinateRq, IRemoveSubordinateRq, IUpdateTypeUserCommissionRq, IPayAdvisorBonusesRq, IPaySelectedCommissionsRq, IAssignSubordinatesMassiveRq, IDeleteTypeUserCommissionRq, IGetCommissionsByTransactionCodeRq, IrejectTransactionCommissionRq, IApproveTransactionCommissionRq, IShowTransactionBillRq, ICancellTransactionBillRq } from '../../models/commercial/commercial.model';
 import { UserTokenRq } from '../../models/user/user-rq.model';
 import { ISocialNetworksRq } from '../../models/marketing/marketing.model';
 import { IObtainAllCoursewallet } from '../../models/budget/budget.model';
@@ -72,7 +72,6 @@ export declare class CommercialService extends IPTGeneralService {
     obtainAllInformationCodByCode(code: number): Observable<any>;
     getSummaryByCommercialAdvisor(params: IGetSummaryByCommercialAdvisorRq): Observable<any>;
     getCodStudentDetailsByAdviser(request: IGetCodStudentDetailsByAdviserRq, adviserCode: number): Observable<any>;
-    getTransactionCommissionsByCode(request: IGetCommissionsByTransactionCodeRq): Observable<any>;
     createTypePayment(params: ICreateTypePaymentRq): Observable<any>;
     getAllTypePayments(request: ITokenRq): Observable<any>;
     createCommissionArea(params: ICreateCommissionAreaRq): Observable<any>;
@@ -85,8 +84,11 @@ export declare class CommercialService extends IPTGeneralService {
     assignCommissionModelToUser(params: IAssignCommissionModelToUserRq): Observable<any>;
     getActiveCommissionModelForUser(request: ITokenRq, userCode: number): Observable<any>;
     payCommissions(params: IPaySelectedCommissionsRq): Observable<any>;
-    rejectTransactionByCode(params: ISelectTransactionCommissionRq): Observable<any>;
-    approveTransactionByCode(params: ISelectTransactionCommissionRq): Observable<any>;
+    rejectTransactionByCode(params: IrejectTransactionCommissionRq): Observable<any>;
+    approveTransactionByCode(params: IApproveTransactionCommissionRq): Observable<any>;
+    getTransactionCommissionsByCode(request: IGetCommissionsByTransactionCodeRq): Observable<any>;
+    seeTransactionBill(request: IShowTransactionBillRq): Observable<any>;
+    cancellTransactionBill(params: ICancellTransactionBillRq): Observable<any>;
     payAdvisorBonuses(params: IPayAdvisorBonusesRq): Observable<any>;
     updatePaymentAreaCommission(request: IUpdatePaymentAreaCommissionRq, ruleCode: number): Observable<any>;
     getAllAreasWithCommissionRules(request: ITokenRq): Observable<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iptdevs-design-system",
-  "version": "3.2.148",
+  "version": "3.2.150",
   "description": "Library common elements into IPT Plattform.",
   "keywords": [
     "IPT",