- مالیات (۱۰٪)
+ ارزش افزوده
diff --git a/src/app/domains/pos/modules/landing/components/payloads/gold/form.component.ts b/src/app/domains/pos/modules/landing/components/payloads/gold/form.component.ts index 344fa42..8f36792 100644 --- a/src/app/domains/pos/modules/landing/components/payloads/gold/form.component.ts +++ b/src/app/domains/pos/modules/landing/components/payloads/gold/form.component.ts @@ -132,9 +132,14 @@ export class PosGoldPayloadFormComponent extends AbstractForm< const totalAmountBeforeProfit = unitWithQuantity + wageAmount + commissionAmount; const baseTotalAmount = totalAmountBeforeProfit + profitAmount; const baseAmountForDiscountCalculation = - this.discountType() === 1 ? profitAmount : baseTotalAmount; + this.discountType() === 1 ? profitAmount : unitWithQuantity; - const taxAmount = (profitAmount + commissionAmount + wageAmount - discountAmount) * 0.1; + const taxAmount = + (profitAmount + + commissionAmount + + wageAmount - + (this.discountType() === 1 ? discountAmount : 0)) * + 0.1; const totalAmount = baseTotalAmount - discountAmount + taxAmount; this.unitWithQuantity.set(unitWithQuantity); diff --git a/src/app/domains/pos/modules/saleInvoices/components/filter-drawer.component.html b/src/app/domains/pos/modules/saleInvoices/components/filter-drawer.component.html index b6bf435..f18a17a 100644 --- a/src/app/domains/pos/modules/saleInvoices/components/filter-drawer.component.html +++ b/src/app/domains/pos/modules/saleInvoices/components/filter-drawer.component.html @@ -23,7 +23,7 @@ />
+
diff --git a/src/app/domains/superAdmin/modules/guilds/components/form.component.ts b/src/app/domains/superAdmin/modules/guilds/components/form.component.ts
index 109b391..632d8cc 100644
--- a/src/app/domains/superAdmin/modules/guilds/components/form.component.ts
+++ b/src/app/domains/superAdmin/modules/guilds/components/form.component.ts
@@ -1,11 +1,12 @@
import { AbstractFormDialog } from '@/shared/abstractClasses';
-import { InputComponent } from '@/shared/components';
+import { CodeComponent, FieldInvoiceTemplatesComponent, NameComponent } from '@/shared/components';
+import { SharedDialogComponent } from '@/shared/components/dialog/dialog.component';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
+import { fieldControl } from '@/shared/constants';
import { Component, inject, Input } from '@angular/core';
-import { ReactiveFormsModule, Validators } from '@angular/forms';
+import { ReactiveFormsModule } from '@angular/forms';
import { IGuildRequest, IGuildResponse } from '../models';
import { GuildsService } from '../services/main.service';
-import { SharedDialogComponent } from '@/shared/components/dialog/dialog.component';
interface T {
name: string;
@@ -15,21 +16,23 @@ interface T {
@Component({
selector: 'admin-guild-form',
templateUrl: './form.component.html',
- imports: [ReactiveFormsModule, SharedDialogComponent, InputComponent, FormFooterActionsComponent],
+ imports: [
+ ReactiveFormsModule,
+ SharedDialogComponent,
+ FormFooterActionsComponent,
+ NameComponent,
+ CodeComponent,
+ FieldInvoiceTemplatesComponent,
+ ],
})
export class GuildFormComponent extends AbstractFormDialog {
@Input() guildId?: string;
private service = inject(GuildsService);
form = this.fb.group({
- name: [
- { value: this.initialValues?.name, disabled: this.submitLoading() },
- Validators.required,
- ],
- code: [
- { value: this.initialValues?.code, disabled: this.submitLoading() },
- Validators.required,
- ],
+ name: fieldControl.name(this.initialValues?.name, true),
+ code: fieldControl.code(this.initialValues?.code, true),
+ invoice_template: fieldControl.invoice_template(this.initialValues?.invoice_template.id, true),
});
override ngOnChanges() {
diff --git a/src/app/domains/superAdmin/modules/guilds/components/goods/list.component.html b/src/app/domains/superAdmin/modules/guilds/components/goods/list.component.html
index 4c2b653..04fdedb 100644
--- a/src/app/domains/superAdmin/modules/guilds/components/goods/list.component.html
+++ b/src/app/domains/superAdmin/modules/guilds/components/goods/list.component.html
@@ -1,6 +1,6 @@
diff --git a/src/app/domains/superAdmin/modules/partners/components/form.component.html b/src/app/domains/superAdmin/modules/partners/components/form.component.html
index 4855179..5cd6204 100644
--- a/src/app/domains/superAdmin/modules/partners/components/form.component.html
+++ b/src/app/domains/superAdmin/modules/partners/components/form.component.html
@@ -8,12 +8,11 @@
>
![مدیریت صورتحسابهای مالیاتی]()
- به پنل مدیریت صورتحسابهای مالیاتی خوش آمدید.
+ به پنل مدیریت صورتحسابهای مالیاتی پاژن خوش آمدید.
diff --git a/src/app/modules/auth/pages/auth.component.ts b/src/app/modules/auth/pages/auth.component.ts
index 36f13d3..0284402 100644
--- a/src/app/modules/auth/pages/auth.component.ts
+++ b/src/app/modules/auth/pages/auth.component.ts
@@ -1,15 +1,7 @@
import { IAuthResponse, TRoles } from '@/core';
import { ToastService } from '@/core/services/toast.service';
-import {
- Component,
- EventEmitter,
- Input,
- Output,
- signal,
- inject,
-} from '@angular/core';
+import { Component, EventEmitter, inject, Input, Output, signal } from '@angular/core';
import { Router } from '@angular/router';
-import { ButtonDirective } from 'primeng/button';
import images from 'src/assets/images';
import { LoginComponent } from './login/login.component';
@@ -18,7 +10,7 @@ type TSteps = 'login' | 'otp' | 'modifyLoginInfo' | 'signup';
@Component({
selector: 'app-auth',
templateUrl: './auth.component.html',
- imports: [LoginComponent, ButtonDirective],
+ imports: [LoginComponent],
})
export class AuthComponent {
@Input() redirectUrl!: string;
@@ -91,5 +83,4 @@ export class AuthComponent {
}
this.router.navigateByUrl(redirectUrl);
}
-
}
diff --git a/src/app/modules/pos/components/order/price-info-card.component.html b/src/app/modules/pos/components/order/price-info-card.component.html
index 7c60e0a..ffad995 100644
--- a/src/app/modules/pos/components/order/price-info-card.component.html
+++ b/src/app/modules/pos/components/order/price-info-card.component.html
@@ -12,7 +12,7 @@
}
-
diff --git a/src/app/layout/default/app.sidebar.component.ts b/src/app/layout/default/app.sidebar.component.ts
index 56fca6f..6078e17 100644
--- a/src/app/layout/default/app.sidebar.component.ts
+++ b/src/app/layout/default/app.sidebar.component.ts
@@ -1,12 +1,16 @@
import { Component, ElementRef } from '@angular/core';
+import { Divider } from 'primeng/divider';
+import images from 'src/assets/images';
import { AppMenu } from './app.menu.component';
@Component({
selector: 'app-sidebar',
standalone: true,
- imports: [AppMenu],
+ imports: [AppMenu, Divider],
templateUrl: './app.sidebar.component.html',
})
export class AppSidebar {
constructor(public el: ElementRef) {}
+
+ logo = images.logo;
}
diff --git a/src/app/modules/auth/pages/auth.component.html b/src/app/modules/auth/pages/auth.component.html
index 060c8e6..17fd577 100644
--- a/src/app/modules/auth/pages/auth.component.html
+++ b/src/app/modules/auth/pages/auth.component.html
@@ -8,7 +8,7 @@
>
- ارایه شده توسط (برند نرمافزار)
+
+
+ ![Logo]()
+
+ مدیریت صورتحسابهای مالیاتی پاژن
- مالیات (۱۰٪)
+ ارزش افزوده
diff --git a/src/app/shared/apiEnum/constants/apiRoutes.ts b/src/app/shared/apiEnum/constants/apiRoutes.ts index 02676e3..eb8c4d7 100644 --- a/src/app/shared/apiEnum/constants/apiRoutes.ts +++ b/src/app/shared/apiEnum/constants/apiRoutes.ts @@ -20,4 +20,5 @@ export const ENUMS_API_ROUTES = { goodPricingModel: `${baseUrl}/good_pricing_model`, consumerRole: `${baseUrl}/consumer_role`, fiscalResponseStatus: `${baseUrl}/tsp_provider_response_status`, + invoice_template_type: `${baseUrl}/invoice_templates`, }; diff --git a/src/app/shared/components/fields/abstractField.component.ts b/src/app/shared/components/fields/abstractField.component.ts new file mode 100644 index 0000000..e4c8484 --- /dev/null +++ b/src/app/shared/components/fields/abstractField.component.ts @@ -0,0 +1,13 @@ +import { Component, Input } from '@angular/core'; +import { FormControl, ReactiveFormsModule } from '@angular/forms'; + +@Component({ + selector: 'abstract-field', + template: '', + imports: [ReactiveFormsModule], +}) +export abstract class AbstractFieldComponent