sdarbinyan/market-backOfficce
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

integration

Browse Source
This commit is contained in:
sdarbinyan
2026-02-20 10:43:47 +04:00
parent 6850a911f3
commit f7919f6ca7
9 changed files with 79 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/i18n/translations.ts
View File

@@ -53,6 +53,7 @@ export const TRANSLATIONS: Record<string, Record<string, string>> = {
// --- Item basic fields ---
ITEM_NAME: 'Item Name',
PRICE: 'Price',
DISCOUNT: 'Discount (%)',
QUANTITY: 'Quantity',
CURRENCY: 'Currency',
SIMPLE_DESCRIPTION: 'Simple Description',
@@ -169,6 +170,7 @@ export const TRANSLATIONS: Record<string, Record<string, string>> = {
// --- Item basic fields ---
ITEM_NAME: 'Название товара',
PRICE: 'Цена',
DISCOUNT: 'Скидка (%)',
QUANTITY: 'Количество',
CURRENCY: 'Валюта',
SIMPLE_DESCRIPTION: 'Краткое описание',

1
src/app/models/item.model.ts
View File

@@ -14,6 +14,7 @@ export interface Item {
priority: number;
quantity: number;
price: number;
discount: number;
currency: string;
imgs: string[];
tags: string[];

19
src/app/pages/item-editor/item-editor.component.html
View File

@@ -107,6 +107,25 @@
</mat-form-field>
</div>
<div class="form-row">
<mat-form-field appearance="outline" class="half-width">
<mat-label>{{ 'DISCOUNT' | translate }}</mat-label>
<input
matInput
type="number"
step="1"
[(ngModel)]="item()!.discount"
(blur)="onFieldChange('discount', item()!.discount)"
min="0"
max="100"
placeholder="0">
<span matSuffix>%</span>
@if (item()!.discount < 0 || item()!.discount > 100) {
<mat-error>Discount must be 0–100%</mat-error>
}
</mat-form-field>
</div>
<mat-form-field appearance="outline" class="full-width">
<mat-label>{{ 'SIMPLE_DESCRIPTION' | translate }}</mat-label>
<textarea

8
src/app/pages/item-preview/item-preview.component.html
View File

@@ -72,7 +72,13 @@
<h1 class="item-name">{{ item.name }}</h1>
<div class="price-row">
<span class="price">{{ item.price | number:'1.2-2' }} {{ item.currency }}</span>
@if (item.discount > 0) {
<span class="price-old">{{ item.price | number:'1.2-2' }} {{ item.currency }}</span>
<span class="price">{{ item.price * (1 - item.discount / 100) | number:'1.2-2' }} {{ item.currency }}</span>
<span class="discount-tag">-{{ item.discount }}%</span>
} @else {
<span class="price">{{ item.price | number:'1.2-2' }} {{ item.currency }}</span>
}
@if (item.quantity > 0) {
<span class="in-stock">
<mat-icon>check_circle</mat-icon>

16
src/app/pages/item-preview/item-preview.component.scss
View File

@@ -195,6 +195,22 @@
color: #1976d2;
}
.price-old {
font-size: 1.1rem;
color: #999;
text-decoration: line-through;
}
.discount-tag {
display: inline-block;
padding: 2px 8px;
border-radius: 4px;
background: #e53935;
color: #fff;
font-size: 0.85rem;
font-weight: 600;
}
.in-stock, .out-of-stock {
display: flex;
align-items: center;

3
src/app/pages/items-list/items-list.component.html
View File

@@ -98,6 +98,9 @@
<div class="item-details">
<span class="price">{{ item.price }} {{ item.currency }}</span>
@if (item.discount > 0) {
<span class="discount-chip">-{{ item.discount }}%</span>
}
<span class="quantity">{{ 'QTY' | translate }}: {{ item.quantity }}</span>
</div>

10
src/app/pages/items-list/items-list.component.scss
View File

@@ -226,6 +226,16 @@
color: #1976d2;
}
.discount-chip {
display: inline-block;
padding: 1px 6px;
border-radius: 4px;
background: #e53935;
color: #fff;
font-size: 0.75rem;
font-weight: 600;
}
.quantity {
color: #666;
}

7
src/app/services/mock-data.service.ts
View File

@@ -90,6 +90,7 @@ export class MockDataService {
priority: 1,
quantity: 50,
price: 1299,
discount: 0,
currency: 'USD',
imgs: [
'https://via.placeholder.com/600x400?text=iPhone+Front',
@@ -121,6 +122,7 @@ export class MockDataService {
priority: 2,
quantity: 35,
price: 1199,
discount: 10,
currency: 'USD',
imgs: ['https://via.placeholder.com/600x400?text=Samsung+S24'],
tags: ['new', 'android'],
@@ -140,6 +142,7 @@ export class MockDataService {
priority: 3,
quantity: 20,
price: 999,
discount: 15,
currency: 'USD',
imgs: ['https://via.placeholder.com/600x400?text=Pixel+8'],
tags: ['sale', 'android', 'ai'],
@@ -158,6 +161,7 @@ export class MockDataService {
priority: 1,
quantity: 15,
price: 2499,
discount: 0,
currency: 'USD',
imgs: ['https://via.placeholder.com/600x400?text=MacBook'],
tags: ['featured', 'professional'],
@@ -177,6 +181,7 @@ export class MockDataService {
priority: 2,
quantity: 0,
price: 1799,
discount: 5,
currency: 'USD',
imgs: ['https://via.placeholder.com/600x400?text=Dell+XPS'],
tags: ['out-of-stock'],
@@ -200,6 +205,7 @@ export class MockDataService {
priority: i,
quantity: Math.floor(Math.random() * 100),
price: Math.floor(Math.random() * 1000) + 100,
discount: Math.random() > 0.7 ? Math.floor(Math.random() * 30) + 5 : 0,
currency: 'USD',
imgs: [`https://via.placeholder.com/600x400?text=Product+${i}`],
tags: ['test'],
@@ -404,6 +410,7 @@ export class MockDataService {
priority: data.priority || 99,
quantity: data.quantity || 0,
price: data.price || 0,
discount: data.discount || 0,
currency: data.currency || 'USD',
imgs: data.imgs || [],
tags: data.tags || [],

14
src/app/services/validation.service.ts
View File

@@ -54,6 +54,15 @@ export class ValidationService {
return null;
}
validateDiscount(value: any): string | null {
if (value === undefined || value === null || value === '') return null;
const num = Number(value);
if (isNaN(num)) return 'Discount must be a number';
if (num < 0) return 'Discount cannot be negative';
if (num > 100) return 'Discount cannot exceed 100%';
return null;
}
validateUrl(value: string): string | null {
if (!value || value.trim().length === 0) {
return null; // Optional field
@@ -130,6 +139,11 @@ export class ValidationService {
const quantityError = this.validateQuantity(item['quantity']);
if (quantityError) errors['quantity'] = quantityError;
}
if (item['discount'] !== undefined) {
const discountError = this.validateDiscount(item['discount']);
if (discountError) errors['discount'] = discountError;
}
if (item['currency'] !== undefined) {
const currencyError = this.validateCurrency(item['currency']);