-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ getModifiedFields(shippingAddressForm) }}
+
+
+ {{ getModifiedFields(billingAddressForm) }}
+
+
+
-
-
- {{ 'order.add-item-to-order' | translate }}
-
-
-
-
-
-
-
-
-
- {{ 'order.set-coupon-codes' | translate }}
-
-
-
+
- {{ 'order.add-surcharge' | translate }}
-
-
-
-
-
- {{
- 'order.edit-shipping-address' | translate
- }}
-
-
-
-
- {{
- 'order.edit-billing-address' | translate
- }}
-
-
-
-
+
| - | {{ 'order.product-name' | translate }} | -{{ 'order.product-sku' | translate }} | -{{ 'order.unit-price' | translate }} | -{{ 'order.quantity' | translate }} | -- {{ 'common.custom-fields' | translate }} - | -{{ 'order.total' | translate }} | -
|---|---|---|---|---|---|---|
|
- |
- {{ line.productVariant.name }} | -{{ line.productVariant.sku }} | -
- {{ line.unitPriceWithTax | localeCurrency : order.currencyCode }}
-
- {{ line.unitPrice | localeCurrency : order.currencyCode }}
-
- |
-
-
- |
-
- |
-
- {{ line.linePriceWithTax | localeCurrency : order.currencyCode }}
-
- {{ line.linePrice | localeCurrency : order.currencyCode }}
-
- |
-
|
- |
- {{ addedLine.productVariantName }} | -{{ addedLine.sku }} | -
- {{ addedLine.priceWithTax | localeCurrency : order.currencyCode }}
-
- {{ addedLine.price | localeCurrency : order.currencyCode }}
-
- |
- - - - | -
- |
-
- {{
- (addedLine.priceWithTax * addedLine.quantity) / 100
- | currency : order.currencyCode
- }}
-
- {{
- (addedLine.price * addedLine.quantity) / 100
- | currency : order.currencyCode
- }}
-
- |
-
| {{ surcharge.description }} | -{{ surcharge.sku }} | -- | - | - |
- {{ surcharge.priceWithTax | localeCurrency : order.currencyCode }}
-
- {{ surcharge.price | localeCurrency : order.currencyCode }}
-
- |
- |
| - {{ surcharge.description }} - - | -{{ surcharge.sku }} | -- | - | - |
-
- {{ surchargePrice.price | localeCurrency : order.currencyCode }}
-
- |
- |
| {{ 'order.shipping' | translate }} | -- {{ order.shippingLines[0]?.shippingMethod?.name }} - | -- | - |
- {{ order.shippingWithTax | localeCurrency : order.currencyCode }}
-
- {{ order.shipping | localeCurrency : order.currencyCode }}
-
- |
- ||
+ {{ line }}
+
+
+ {{ item.productVariant.name }} x {{ item.quantity }}
+
+
+ {{ surcharge.description }}: {{ surcharge.price | localeCurrency : order.currencyCode }}
+
+ {{ change }}
+ {{ 'order.modifications' | translate }}
-
- ![]()
-
-
- {{
- addItemSelectedVariant.productVariantName
- }}
- {{ addItemSelectedVariant.sku }}
-
-
- {{
- getSelectedItemPrice(addItemSelectedVariant)
- | localeCurrency : order.currencyCode
- }}
-
-
+ {{ 'order.no-modifications-made' | translate }}
+
-
+
+
+
+
+
-
-
+
+
+
+
+
+
diff --git a/packages/admin-ui/src/lib/order/src/components/order-editor/order-editor.component.scss b/packages/admin-ui/src/lib/order/src/components/order-editor/order-editor.component.scss
index 0e54426dfc..c37cddd55d 100644
--- a/packages/admin-ui/src/lib/order/src/components/order-editor/order-editor.component.scss
+++ b/packages/admin-ui/src/lib/order/src/components/order-editor/order-editor.component.scss
@@ -14,3 +14,13 @@
.add-item-thumb {
max-width: 50px;
}
+
+.no-modifications {
+ color: var(--color-grey-400);
+}
+
+.summary-controls {
+ border-top: 1px solid var(--color-weight-200);
+ margin-top: calc(var(--space-unit) * 2);
+ padding-top: calc(var(--space-unit) * 1);
+}
\ No newline at end of file
diff --git a/packages/admin-ui/src/lib/order/src/components/order-editor/order-editor.component.ts b/packages/admin-ui/src/lib/order/src/components/order-editor/order-editor.component.ts
index b2578c2fa7..64c4417876 100644
--- a/packages/admin-ui/src/lib/order/src/components/order-editor/order-editor.component.ts
+++ b/packages/admin-ui/src/lib/order/src/components/order-editor/order-editor.component.ts
@@ -1,5 +1,12 @@
import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
-import { UntypedFormArray, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
+import {
+ FormControl,
+ FormGroup,
+ UntypedFormArray,
+ UntypedFormControl,
+ UntypedFormGroup,
+ Validators,
+} from '@angular/forms';
import {
AddItemInput,
CustomFieldConfig,
@@ -35,12 +42,15 @@ import {
type ProductSelectorItem = ProductSelectorSearchQuery['search']['items'][number];
interface AddedLine {
- productVariantId: string;
- productAsset?: ProductSelectorItem['productAsset'] | null;
- productVariantName: string;
- sku: string;
- priceWithTax: number;
- price: number;
+ id: string;
+ featuredAsset?: ProductSelectorItem['productAsset'] | null;
+ productVariant: {
+ id: string;
+ name: string;
+ sku: string;
+ };
+ unitPrice: number;
+ unitPriceWithTax: number;
quantity: number;
}
@@ -62,7 +72,7 @@ export class OrderEditorComponent
availableCountries$: Observable;
addressCustomFields: CustomFieldConfig[];
detailForm = new UntypedFormGroup({});
- couponCodesControl = new UntypedFormControl();
+ couponCodesControl = new FormControl([]);
orderLineCustomFieldsFormArray: UntypedFormArray;
addItemCustomFieldsFormArray: UntypedFormArray;
addItemCustomFieldsForm: UntypedFormGroup;
@@ -78,12 +88,41 @@ export class OrderEditorComponent
updateShippingAddress: {},
updateBillingAddress: {},
};
- surchargeForm: UntypedFormGroup;
- shippingAddressForm: UntypedFormGroup;
- billingAddressForm: UntypedFormGroup;
+ surchargeForm = new FormGroup({
+ description: new FormControl('', Validators.minLength(1)),
+ sku: new FormControl(''),
+ price: new FormControl(0),
+ priceIncludesTax: new FormControl(true),
+ taxRate: new FormControl(0),
+ taxDescription: new FormControl(''),
+ });
+ shippingAddressForm = new FormGroup({
+ fullName: new FormControl(''),
+ company: new FormControl(''),
+ streetLine1: new FormControl(''),
+ streetLine2: new FormControl(''),
+ city: new FormControl(''),
+ province: new FormControl(''),
+ postalCode: new FormControl(''),
+ countryCode: new FormControl(''),
+ phoneNumber: new FormControl(''),
+ });
+ billingAddressForm = new FormGroup({
+ fullName: new FormControl(''),
+ company: new FormControl(''),
+ streetLine1: new FormControl(''),
+ streetLine2: new FormControl(''),
+ city: new FormControl(''),
+ province: new FormControl(''),
+ postalCode: new FormControl(''),
+ countryCode: new FormControl(''),
+ phoneNumber: new FormControl(''),
+ });
note = '';
recalculateShipping = true;
previousState: string;
+ editingShippingAddress = false;
+ editingBillingAddress = false;
private addedVariants = new Map();
constructor(
@@ -95,24 +134,6 @@ export class OrderEditorComponent
super();
}
- get addedLines(): AddedLine[] {
- const getSinglePriceValue = (price: ProductSelectorItem['price']) =>
- price.__typename === 'SinglePrice' ? price.value : 0;
- return (this.modifyOrderInput.addItems || [])
- .map(row => {
- const variantInfo = this.addedVariants.get(row.productVariantId);
- if (variantInfo) {
- return {
- ...variantInfo,
- price: getSinglePriceValue(variantInfo.price),
- priceWithTax: getSinglePriceValue(variantInfo.priceWithTax),
- quantity: row.quantity,
- };
- }
- })
- .filter(notNullOrUndefined);
- }
-
ngOnInit(): void {
this.init();
this.addressCustomFields = this.getCustomFieldConfig('Address');
@@ -122,42 +143,15 @@ export class OrderEditorComponent
if (order.couponCodes.length) {
this.couponCodesControl.setValue(order.couponCodes);
}
- this.surchargeForm = new UntypedFormGroup({
- description: new UntypedFormControl('', Validators.required),
- sku: new UntypedFormControl(''),
- price: new UntypedFormControl(0, Validators.required),
- priceIncludesTax: new UntypedFormControl(true),
- taxRate: new UntypedFormControl(0),
- taxDescription: new UntypedFormControl(''),
- });
- if (!this.shippingAddressForm) {
- this.shippingAddressForm = new UntypedFormGroup({
- fullName: new UntypedFormControl(order.shippingAddress?.fullName),
- company: new UntypedFormControl(order.shippingAddress?.company),
- streetLine1: new UntypedFormControl(order.shippingAddress?.streetLine1),
- streetLine2: new UntypedFormControl(order.shippingAddress?.streetLine2),
- city: new UntypedFormControl(order.shippingAddress?.city),
- province: new UntypedFormControl(order.shippingAddress?.province),
- postalCode: new UntypedFormControl(order.shippingAddress?.postalCode),
- countryCode: new UntypedFormControl(order.shippingAddress?.countryCode),
- phoneNumber: new UntypedFormControl(order.shippingAddress?.phoneNumber),
- });
- this.addAddressCustomFieldsFormGroup(this.shippingAddressForm, order.shippingAddress);
+ this.surchargeForm.reset();
+ for (const [name, control] of Object.entries(this.shippingAddressForm.controls)) {
+ control.setValue(order.shippingAddress?.[name]);
}
- if (!this.billingAddressForm) {
- this.billingAddressForm = new UntypedFormGroup({
- fullName: new UntypedFormControl(order.billingAddress?.fullName),
- company: new UntypedFormControl(order.billingAddress?.company),
- streetLine1: new UntypedFormControl(order.billingAddress?.streetLine1),
- streetLine2: new UntypedFormControl(order.billingAddress?.streetLine2),
- city: new UntypedFormControl(order.billingAddress?.city),
- province: new UntypedFormControl(order.billingAddress?.province),
- postalCode: new UntypedFormControl(order.billingAddress?.postalCode),
- countryCode: new UntypedFormControl(order.billingAddress?.countryCode),
- phoneNumber: new UntypedFormControl(order.billingAddress?.phoneNumber),
- });
- this.addAddressCustomFieldsFormGroup(this.billingAddressForm, order.billingAddress);
+ this.addAddressCustomFieldsFormGroup(this.shippingAddressForm, order.shippingAddress);
+ for (const [name, control] of Object.entries(this.billingAddressForm.controls)) {
+ control.setValue(order.billingAddress?.[name]);
}
+ this.addAddressCustomFieldsFormGroup(this.billingAddressForm, order.billingAddress);
this.orderLineCustomFieldsFormArray = new UntypedFormArray([]);
for (const line of order.lines) {
const formGroup = new UntypedFormGroup({});
@@ -209,6 +203,71 @@ export class OrderEditorComponent
this.destroy();
}
+ get addedLines(): AddedLine[] {
+ const getSinglePriceValue = (price: ProductSelectorItem['price']) =>
+ price.__typename === 'SinglePrice' ? price.value : 0;
+ return (this.modifyOrderInput.addItems || [])
+ .map(row => {
+ const variantInfo = this.addedVariants.get(row.productVariantId);
+ if (variantInfo) {
+ return {
+ id: this.getIdForAddedItem(row),
+ featuredAsset: variantInfo.productAsset,
+ productVariant: {
+ id: variantInfo.productVariantId,
+ name: variantInfo.productVariantName,
+ sku: variantInfo.sku,
+ },
+ unitPrice: getSinglePriceValue(variantInfo.price),
+ unitPriceWithTax: getSinglePriceValue(variantInfo.priceWithTax),
+ quantity: row.quantity,
+ };
+ }
+ })
+ .filter(notNullOrUndefined);
+ }
+
+ get adjustedLines(): string[] {
+ return (this.modifyOrderInput.adjustOrderLines || [])
+ .map(l => {
+ const line = this.entity?.lines.find(line => line.id === l.orderLineId);
+ if (line) {
+ const delta = l.quantity - line.quantity;
+ const sign = delta === 0 ? '' : delta > 0 ? '+' : '-';
+ return delta
+ ? `${sign}${Math.abs(delta)} ${line.productVariant.name}`
+ : line.productVariant.name;
+ }
+ })
+ .filter(notNullOrUndefined);
+ }
+
+ get couponCodeChanges(): string[] {
+ const originalCodes = this.entity?.couponCodes || [];
+ const newCodes = this.couponCodesControl.value || [];
+ const addedCodes = newCodes.filter(c => !originalCodes.includes(c)).map(c => `+ ${c}`);
+ const removedCodes = originalCodes.filter(c => !newCodes.includes(c)).map(c => `- ${c}`);
+ return [...addedCodes, ...removedCodes];
+ }
+
+ getModifiedFields(formGroup: FormGroup): string {
+ if (!formGroup.dirty) {
+ return '';
+ }
+ return Object.entries(formGroup.controls)
+ .map(([key, control]) => {
+ if (control.dirty) {
+ return key;
+ }
+ })
+ .filter(notNullOrUndefined)
+ .join(', ');
+ }
+
+ private getIdForAddedItem(row: ModifyOrderData['addItems'][number]) {
+ return `added-${row.productVariantId}-${JSON.stringify(row.customFields || {})}`;
+ }
+
transitionToPriorState(order: OrderDetailFragment) {
this.orderTransitionService
.transitionToPreModifyingState(order.id, order.nextStates)
@@ -217,7 +276,7 @@ export class OrderEditorComponent
});
}
- canPreviewChanges(): boolean {
+ hasModifications(): boolean {
const { addItems, adjustOrderLines, surcharges } = this.modifyOrderInput;
return (
!!addItems?.length ||
@@ -235,30 +294,43 @@ export class OrderEditorComponent
);
}
- updateLineQuantity(line: OrderDetailFragment['lines'][number], quantity: string) {
+ updateLineQuantity(line: OrderDetailFragment['lines'][number] | AddedLine, quantity: string) {
const { adjustOrderLines } = this.modifyOrderInput;
- let row = adjustOrderLines?.find(l => l.orderLineId === line.id);
- if (row && +quantity === line.quantity) {
- // Remove the modification if the quantity is the same as
- // the original order
- adjustOrderLines?.splice(adjustOrderLines?.indexOf(row), 1);
- }
- if (!row) {
- row = { orderLineId: line.id, quantity: +quantity };
- adjustOrderLines?.push(row);
+ if (this.isAddedLine(line)) {
+ const row = this.modifyOrderInput.addItems?.find(
+ l => l.productVariantId === line.productVariant.id,
+ );
+ if (row) {
+ row.quantity = +quantity;
+ }
+ } else {
+ let row = adjustOrderLines?.find(l => l.orderLineId === line.id);
+ if (row && +quantity === line.quantity) {
+ // Remove the modification if the quantity is the same as
+ // the original order
+ adjustOrderLines?.splice(adjustOrderLines?.indexOf(row), 1);
+ }
+ if (!row) {
+ row = { orderLineId: line.id, quantity: +quantity };
+ adjustOrderLines?.push(row);
+ }
+ row.quantity = +quantity;
}
- row.quantity = +quantity;
+ }
+
+ isAddedLine(line: OrderDetailFragment['lines'][number] | AddedLine): line is AddedLine {
+ return (line as AddedLine).id.startsWith('added-');
}
updateAddedItemQuantity(item: AddedLine, quantity: string) {
- const row = this.modifyOrderInput.addItems?.find(l => l.productVariantId === item.productVariantId);
+ const row = this.modifyOrderInput.addItems?.find(l => l.productVariantId === item.productVariant.id);
if (row) {
row.quantity = +quantity;
}
}
trackByProductVariantId(index: number, item: AddedLine) {
- return item.productVariantId;
+ return item.productVariant.id;
}
getSelectedItemPrice(result: ProductSelectorItem | undefined): number {
@@ -317,11 +389,11 @@ export class OrderEditorComponent
);
}
- removeAddedItem(index: number) {
- this.modifyOrderInput.addItems.splice(index, 1);
- if (-1 < index) {
- this.addItemCustomFieldsFormArray.removeAt(index);
- }
+ removeAddedItem(id: string) {
+ this.modifyOrderInput.addItems = this.modifyOrderInput.addItems?.filter(l => {
+ const itemId = this.getIdForAddedItem(l);
+ return itemId !== id;
+ });
}
getSurchargePrices(surcharge: SurchargeInput) {
diff --git a/packages/admin-ui/src/lib/order/src/order.module.ts b/packages/admin-ui/src/lib/order/src/order.module.ts
index 834e421073..af659328e3 100644
--- a/packages/admin-ui/src/lib/order/src/order.module.ts
+++ b/packages/admin-ui/src/lib/order/src/order.module.ts
@@ -180,7 +180,7 @@ export class OrderModule {
link: ['/orders/', entity?.id],
},
{
- label: _('order.modify-order'),
+ label: _('breadcrumb.modifying-order'),
link: [entity?.id],
},
],
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/ar.json b/packages/admin-ui/src/lib/static/i18n-messages/ar.json
index 2bbf48ab2e..574dc16a94 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/ar.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/ar.json
@@ -37,7 +37,7 @@
"global-settings": "الاعدادات العامة",
"job-queue": "ذيل الوظيفة",
"manage-variants": "إدارة المتغيرات",
- "modifying": "تعديل",
+ "modifying-order": "تعديل الطلب",
"orders": "طلبيات",
"payment-methods": "طرق الدفع",
"product-options": "خيارات المنتج",
@@ -601,11 +601,11 @@
"modification-summary": "ملخص التعديلات",
"modification-updating-billing-address": "تحديث عنوان الفواتير",
"modification-updating-shipping-address": "تحديث عنوان الشحن",
- "modifications": "التعديلات",
"modify-order": "تعديل الترتيب",
"modify-order-price-difference": "فرق السعر",
"net-price": "السعر الصافي",
"new-customer": "عميل جديد",
+ "no-modifications-made": "لم يتم إجراء أي تعديلات",
"note": "ملحوظة",
"note-is-private": "ملاحظة خاصة",
"note-only-visible-to-administrators": "مرئي للمسؤولين فقط",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/cs.json b/packages/admin-ui/src/lib/static/i18n-messages/cs.json
index a2d2be054f..d595a5e9df 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/cs.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/cs.json
@@ -37,7 +37,7 @@
"global-settings": "Všeobecné nastavení",
"job-queue": "Fronta úloh",
"manage-variants": "Správa variant",
- "modifying": "Úpravy",
+ "modifying-order": "Modifikace objednávky",
"orders": "Objednávky",
"payment-methods": "Platební metody",
"product-options": "",
@@ -601,11 +601,11 @@
"modification-summary": "Souhrn úprav",
"modification-updating-billing-address": "Upravování fakturační adresy",
"modification-updating-shipping-address": "Upravování dodací adresy",
- "modifications": "Úpravy",
"modify-order": "Upravit objednávku",
"modify-order-price-difference": "Cenový rozdíl",
"net-price": "Čistá cena",
"new-customer": "Nový zákazník",
+ "no-modifications-made": "Nebyly provedeny žádné úpravy",
"note": "Poznámka",
"note-is-private": "Interní poznámka",
"note-only-visible-to-administrators": "Pouze pro adminy",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/de.json b/packages/admin-ui/src/lib/static/i18n-messages/de.json
index d3267e098a..fe859b8e7d 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/de.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/de.json
@@ -37,7 +37,7 @@
"global-settings": "Globale Einstellungen",
"job-queue": "Job-Warteschlange",
"manage-variants": "Varianten verwalten",
- "modifying": "Bearbeiten",
+ "modifying-order": "Bestellung bearbeiten",
"orders": "Bestellungen",
"payment-methods": "Zahlungsarten",
"product-options": "Produktoptionen",
@@ -601,11 +601,11 @@
"modification-summary": "Zusammenfassung der Änderungen",
"modification-updating-billing-address": "Rechnungsadresse aktualisieren",
"modification-updating-shipping-address": "Versandadresse aktualisieren",
- "modifications": "Änderungen",
"modify-order": "Bestellung ändern",
"modify-order-price-difference": "Preisunterschied",
"net-price": "Nettopreis",
"new-customer": "Neuer Kunde",
+ "no-modifications-made": "Es wurden keine Änderungen vorgenommen",
"note": "Notiz",
"note-is-private": "Notiz ist privat",
"note-only-visible-to-administrators": "Nur für Administratoren sichtbar",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/en.json b/packages/admin-ui/src/lib/static/i18n-messages/en.json
index d738859fd4..31fa6c406e 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/en.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/en.json
@@ -37,7 +37,7 @@
"global-settings": "Global settings",
"job-queue": "Job queue",
"manage-variants": "Manage variants",
- "modifying": "Modifying",
+ "modifying-order": "Modifying order",
"orders": "Orders",
"payment-methods": "Payment methods",
"product-options": "Product options",
@@ -601,11 +601,11 @@
"modification-summary": "Summary of modifications",
"modification-updating-billing-address": "Updating billing address",
"modification-updating-shipping-address": "Updating shipping address",
- "modifications": "Modifications",
"modify-order": "Modify order",
"modify-order-price-difference": "Price difference",
"net-price": "Net price",
"new-customer": "New customer",
+ "no-modifications-made": "No modifications have been made",
"note": "Note",
"note-is-private": "Note is private",
"note-only-visible-to-administrators": "Visible to admins only",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/es.json b/packages/admin-ui/src/lib/static/i18n-messages/es.json
index 4ef789eb41..1ce36c37fe 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/es.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/es.json
@@ -37,7 +37,7 @@
"global-settings": "Ajustes globales",
"job-queue": "Cola de tareas",
"manage-variants": "Gestionar variantes",
- "modifying": "Modificando",
+ "modifying-order": "Modificando orden",
"orders": "Pedidos",
"payment-methods": "Métodos de pago",
"product-options": "Opciones de producto",
@@ -601,11 +601,11 @@
"modification-summary": "Resumen de modificaciones",
"modification-updating-billing-address": "Actualizando dirección de facturación",
"modification-updating-shipping-address": "Actualizando dirección de envío",
- "modifications": "Modificaciones",
"modify-order": "Modificar pedido",
"modify-order-price-difference": "Diferencia de precio",
"net-price": "Precio neto",
"new-customer": "Nuevo cliente",
+ "no-modifications-made": "No se han realizado modificaciones",
"note": "Nota",
"note-is-private": "La nota es privada",
"note-only-visible-to-administrators": "Visible sólo para administradores",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/fa.json b/packages/admin-ui/src/lib/static/i18n-messages/fa.json
index 497f72d37c..ffadce89d4 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/fa.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/fa.json
@@ -37,7 +37,7 @@
"global-settings": "تنظیمات جهانی",
"job-queue": "صف کارها",
"manage-variants": "مدیریت انواع",
- "modifying": "درحال تغییر",
+ "modifying-order": "تغییر سفارش",
"orders": "سفارشات",
"payment-methods": "روش های پرداخت",
"product-options": "گزینه های محصول",
@@ -601,11 +601,11 @@
"modification-summary": "خلاصه تغییرات",
"modification-updating-billing-address": "بروزرسانی آدرس صورتحساب",
"modification-updating-shipping-address": "بروزرسانی آدرس حمل و نقل",
- "modifications": "تغییرات",
"modify-order": "تغییر سفارش",
"modify-order-price-difference": "تفاوت قیمتی",
"net-price": "قیمت کل",
"new-customer": "مشتری جدید",
+ "no-modifications-made": "هیچ تغییری انجام نشده است",
"note": "یادداشت",
"note-is-private": "یادداشت شخصی است",
"note-only-visible-to-administrators": "فقط برای مدیران قابل مشاهده است",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/fr.json b/packages/admin-ui/src/lib/static/i18n-messages/fr.json
index e6c4cb9d30..fed6465db0 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/fr.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/fr.json
@@ -37,7 +37,7 @@
"global-settings": "Paramètres globaux",
"job-queue": "File d'attente de tâches",
"manage-variants": "Gestion des variations",
- "modifying": "Modification",
+ "modifying-order": "Modification de la commande",
"orders": "Commandes",
"payment-methods": "Modes de paiement",
"product-options": "Options de produit",
@@ -601,11 +601,11 @@
"modification-summary": "Résumé des modifications",
"modification-updating-billing-address": "Mise à jour de l'adresse de facturation",
"modification-updating-shipping-address": "Mise à jour de l'adresse de livraison",
- "modifications": "Modifications",
"modify-order": "Modifier la commande",
"modify-order-price-difference": "Différence de prix",
"net-price": "Prix net",
"new-customer": "Nouveau client",
+ "no-modifications-made": "Aucune modification n'a été apportée",
"note": "Note",
"note-is-private": "La note est privée",
"note-only-visible-to-administrators": "Visible par les admins uniquement",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/he.json b/packages/admin-ui/src/lib/static/i18n-messages/he.json
index ae04e66962..aa73fb02dd 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/he.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/he.json
@@ -37,7 +37,7 @@
"global-settings": "הגדרות גלובליות",
"job-queue": "תור משימות",
"manage-variants": "נהל וריאנטים",
- "modifying": "משנה",
+ "modifying-order": "שינוי הזמנה",
"orders": "הזמנות",
"payment-methods": "שיטות תשלום",
"product-options": "אפשרויות מוצר",
@@ -601,11 +601,11 @@
"modification-summary": "סיכום השינויים",
"modification-updating-billing-address": "מעדכן כתובת לחיוב",
"modification-updating-shipping-address": "מעדכן כתובת למשלוח",
- "modifications": "שינויים",
"modify-order": "שנה הזמנה",
"modify-order-price-difference": "הפרש מחיר",
"net-price": "מחיר נטו",
"new-customer": "לקוח חדש",
+ "no-modifications-made": "לא בוצעו שינויים",
"note": "הערה",
"note-is-private": "הערה פרטית",
"note-only-visible-to-administrators": "נראה רק למנהלים",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/hr.json b/packages/admin-ui/src/lib/static/i18n-messages/hr.json
index c06a23b52e..a430c4f981 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/hr.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/hr.json
@@ -37,7 +37,7 @@
"global-settings": "Globalne postavke",
"job-queue": "Red poslova",
"manage-variants": "Upravljaj varijantama",
- "modifying": "Uređivanje",
+ "modifying-order": "Izmjena narudžbe",
"orders": "Narudžbe",
"payment-methods": "Načini plaćanja",
"product-options": "Opcije proizvoda",
@@ -601,11 +601,11 @@
"modification-summary": "Sažetak izmjena",
"modification-updating-billing-address": "Ažuriranje adrese za naplatu",
"modification-updating-shipping-address": "Ažuriranje adrese za dostavu",
- "modifications": "Izmjene",
"modify-order": "Izmijeni narudžbu",
"modify-order-price-difference": "Razlika u cijeni",
"net-price": "Neto cijena",
"new-customer": "Novi kupac",
+ "no-modifications-made": "Nisu napravljene nikakve izmjene",
"note": "Napomena",
"note-is-private": "Napomena je privatna",
"note-only-visible-to-administrators": "Vidljivo samo administratorima",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/it.json b/packages/admin-ui/src/lib/static/i18n-messages/it.json
index 5e1670dc7e..777fe589e2 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/it.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/it.json
@@ -37,7 +37,7 @@
"global-settings": "Impostazioni Globali",
"job-queue": "Coda operazioni",
"manage-variants": "Gestione varianti",
- "modifying": "Modifica",
+ "modifying-order": "Modifica ordine",
"orders": "Ordini",
"payment-methods": "Metodi di pagamento",
"product-options": "Opzioni prodotto",
@@ -601,11 +601,11 @@
"modification-summary": "Riepilogo delle modifiche",
"modification-updating-billing-address": "Aggiornando l'indirizzo di fatturazione",
"modification-updating-shipping-address": "Aggiornando l'indirizzo di spedizione",
- "modifications": "Modifiche",
"modify-order": "Modifica ordine",
"modify-order-price-difference": "Differenza di prezzo",
"net-price": "Prezzo netto",
"new-customer": "Nuovo cliente",
+ "no-modifications-made": "Non sono state apportate modifiche",
"note": "Nota",
"note-is-private": "Le note sono private",
"note-only-visible-to-administrators": "Visibile solo agli amministratori",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/nb.json b/packages/admin-ui/src/lib/static/i18n-messages/nb.json
index 77b0c5222d..d25b03a21c 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/nb.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/nb.json
@@ -37,7 +37,7 @@
"global-settings": "Global innstillinger",
"job-queue": "Jobbkø",
"manage-variants": "Administrer varianter",
- "modifying": "Modifisering",
+ "modifying-order": "Endrer ordre",
"orders": "Ordre",
"payment-methods": "Betalingsmetoder",
"product-options": "Produktalternativer",
@@ -601,11 +601,11 @@
"modification-summary": "Sammendrag av endringer",
"modification-updating-billing-address": "Oppdaterer faktureringsadresse",
"modification-updating-shipping-address": "Oppdaterer leveringsadresse",
- "modifications": "Endringer",
"modify-order": "Endre ordre",
"modify-order-price-difference": "Prisforskjell",
"net-price": "Nettopris",
"new-customer": "Ny kunde",
+ "no-modifications-made": "Ingen endringer er gjort",
"note": "Merknad",
"note-is-private": "Merknad er privat",
"note-only-visible-to-administrators": "Synlig kun for administratorer",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/ne.json b/packages/admin-ui/src/lib/static/i18n-messages/ne.json
index 9a8d294efe..c779c39501 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/ne.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/ne.json
@@ -37,7 +37,7 @@
"global-settings": "वैश्विक सेटिङहरू",
"job-queue": "काम कत्ति",
"manage-variants": "विविध विकल्पहरू प्रबन्ध गर्नुहोस्",
- "modifying": "परिमार्जन",
+ "modifying-order": "आदान-प्रदान परिवर्तन",
"orders": "ओर्दरहरु",
"payment-methods": "भुक्तानी विधिहरू",
"product-options": "समान विकल्पहरू",
@@ -601,11 +601,11 @@
"modification-summary": "संशोधनको संक्षेप",
"modification-updating-billing-address": "बिलिङ ठेगाना अपडेट गरिएको छ",
"modification-updating-shipping-address": "पारिश्रमिक ठेगाना अपडेट गरिएको छ",
- "modifications": "संशोधनहरू",
"modify-order": "ओर्दर संशोधन गर्नुहोस्",
"modify-order-price-difference": "मूल्य अन्तर",
"net-price": "नेट मूल्य",
"new-customer": "नयाँ ग्राहक",
+ "no-modifications-made": "कुनै परिवर्तन गरिएको छैन",
"note": "टिप्पणी",
"note-is-private": "टिप्पणी प्राइभेट छ",
"note-only-visible-to-administrators": "मात्र प्रशासकहरूले मात्र हेर्न सक्छन्",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/pl.json b/packages/admin-ui/src/lib/static/i18n-messages/pl.json
index 18075dd473..0b88ac1aef 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/pl.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/pl.json
@@ -37,7 +37,7 @@
"global-settings": "Ustawienia globalne",
"job-queue": "Kolejka zadań",
"manage-variants": "Zarządzaj wariantami",
- "modifying": "",
+ "modifying-order": "Modyfikowanie zamówienia",
"orders": "Zamówienia",
"payment-methods": "Metody płatności",
"product-options": "",
@@ -601,11 +601,11 @@
"modification-summary": "",
"modification-updating-billing-address": "",
"modification-updating-shipping-address": "",
- "modifications": "",
"modify-order": "",
"modify-order-price-difference": "",
"net-price": "Cena netto",
"new-customer": "Nowy klient",
+ "no-modifications-made": "Nie dokonano żadnych modyfikacji",
"note": "",
"note-is-private": "Notatka jest prywatna",
"note-only-visible-to-administrators": "Widoczne tylko dla administratora",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json b/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json
index 24c6f4e340..c6120ce2fc 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json
@@ -37,7 +37,7 @@
"global-settings": "Configurações globais",
"job-queue": "Fila de tabalho",
"manage-variants": "Gerenciamento de variações",
- "modifying": "Modificando",
+ "modifying-order": "Modificando pedido",
"orders": "Pedidos",
"payment-methods": "Métodos de pagamentos",
"product-options": "Opções do produto",
@@ -601,11 +601,11 @@
"modification-summary": "Resumo de modificações",
"modification-updating-billing-address": "Atualizando endereço de fatura",
"modification-updating-shipping-address": "Atualizando endereço de envio",
- "modifications": "Modificações",
"modify-order": "Modificar pedido",
"modify-order-price-difference": "Preço diference",
"net-price": "Preço líquido",
"new-customer": "Novo cliente",
+ "no-modifications-made": "Nenhuma modificação foi feita",
"note": "Nota",
"note-is-private": "Nota é privada",
"note-only-visible-to-administrators": "Visível somente para administradores",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/pt_PT.json b/packages/admin-ui/src/lib/static/i18n-messages/pt_PT.json
index acb329cd66..1097afd5c5 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/pt_PT.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/pt_PT.json
@@ -37,7 +37,7 @@
"global-settings": "Configurações globais",
"job-queue": "Fila de tabalho",
"manage-variants": "Gerir variações",
- "modifying": "A modificar",
+ "modifying-order": "Modificando pedido",
"orders": "Encomendas",
"payment-methods": "Métodos de pagamentos",
"product-options": "Opções",
@@ -601,11 +601,11 @@
"modification-summary": "Resumo de modificações",
"modification-updating-billing-address": "A actualizar morada de faturação",
"modification-updating-shipping-address": "A actualizar morada de entrega",
- "modifications": "Modificações",
"modify-order": "Modificar pedido",
"modify-order-price-difference": "Diferença de preço",
"net-price": "Preço líquido",
"new-customer": "Novo cliente",
+ "no-modifications-made": "Nenhuma modificação foi feita",
"note": "Nota",
"note-is-private": "Marcar como privada",
"note-only-visible-to-administrators": "Visível somente para administradores",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/ru.json b/packages/admin-ui/src/lib/static/i18n-messages/ru.json
index 733b13dc01..02b0d464f5 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/ru.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/ru.json
@@ -37,7 +37,7 @@
"global-settings": "Глобальные настройки",
"job-queue": "Очередь заданий",
"manage-variants": "Управление вариантами",
- "modifying": "Изменение",
+ "modifying-order": "Изменение заказа",
"orders": "Заказы",
"payment-methods": "Способы оплаты",
"product-options": "Опции товара",
@@ -601,11 +601,11 @@
"modification-summary": "Сводка модификаций",
"modification-updating-billing-address": "Обновление платежного адреса",
"modification-updating-shipping-address": "Обновление адреса доставки",
- "modifications": "Модификации",
"modify-order": "Изменить порядок",
"modify-order-price-difference": "Разница в цене",
"net-price": "Цена нетто",
"new-customer": "Новый клиент",
+ "no-modifications-made": "Изменений не внесено",
"note": "Примечание",
"note-is-private": "Заметка является приватной",
"note-only-visible-to-administrators": "Доступно только администраторам",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/uk.json b/packages/admin-ui/src/lib/static/i18n-messages/uk.json
index ed9a1459e1..889e255d08 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/uk.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/uk.json
@@ -37,7 +37,7 @@
"global-settings": "Глобальні налаштування",
"job-queue": "Черга завдань",
"manage-variants": "Управління варіантами",
- "modifying": "Зміна",
+ "modifying-order": "Модифікація замовлення",
"orders": "Замовлення",
"payment-methods": "Способи оплати",
"product-options": "",
@@ -601,11 +601,11 @@
"modification-summary": "Зведення модифікацій",
"modification-updating-billing-address": "Оновлення платіжної адреси",
"modification-updating-shipping-address": "Оновлення адреси доставки",
- "modifications": "Модифікації",
"modify-order": "Змінити порядок",
"modify-order-price-difference": "Різниця в ціні",
"net-price": "Ціна нетто",
"new-customer": "Новий клієнт",
+ "no-modifications-made": "Жодних модифікацій не зроблено",
"note": "Примітка",
"note-is-private": "Примітка є службовою",
"note-only-visible-to-administrators": "Доступно тільки адміністраторам",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json
index eb26a88d5a..7e931a8fe6 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json
@@ -37,7 +37,7 @@
"global-settings": "语言设置",
"job-queue": "任务队列",
"manage-variants": "商品规格管理",
- "modifying": "正在修改",
+ "modifying-order": "修改订单",
"orders": "订单管理",
"payment-methods": "支付管理",
"product-options": "",
@@ -601,11 +601,11 @@
"modification-summary": "",
"modification-updating-billing-address": "",
"modification-updating-shipping-address": "",
- "modifications": "",
"modify-order": "",
"modify-order-price-difference": "",
"net-price": "净价",
"new-customer": "新客户",
+ "no-modifications-made": "没有进行任何修改",
"note": "",
"note-is-private": "隐藏备注",
"note-only-visible-to-administrators": "仅管理员可见",
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json
index 2f7fa2cb8c..5a265748e3 100644
--- a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json
+++ b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json
@@ -37,7 +37,7 @@
"global-settings": "語言",
"job-queue": "",
"manage-variants": "商品規格管理",
- "modifying": "",
+ "modifying-order": "修改訂單",
"orders": "訂單管理",
"payment-methods": "支付方式",
"product-options": "",
@@ -601,11 +601,11 @@
"modification-summary": "",
"modification-updating-billing-address": "",
"modification-updating-shipping-address": "",
- "modifications": "",
"modify-order": "",
"modify-order-price-difference": "",
"net-price": "淨價",
"new-customer": "新客戶",
+ "no-modifications-made": "沒有進行任何修改",
"note": "",
"note-is-private": "隱藏備注",
"note-only-visible-to-administrators": "僅管理員可瀏覽",
-
-
- {{ 'order.modification-summary' | translate }}
-
-
-
- -
-
- - {{ - 'order.modification-adding-items' - | translate : { count: modifyOrderInput.addItems?.length } - }} - -
- - {{ - 'order.modification-adjusting-lines' - | translate : { count: modifyOrderInput.adjustOrderLines?.length } - }} - -
- - {{ - 'order.modification-adding-surcharges' - | translate : { count: modifyOrderInput.surcharges?.length } - }} - -
- - {{ 'order.modification-updating-shipping-address' | translate }} - -
- - {{ 'order.modification-updating-billing-address' | translate }} - -
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ line.id }}
+
+
+
+
+ {{ line.createdAt | localeDate : 'short' }}
+
+
+
+
+ {{ line.updatedAt | localeDate : 'short' }}
+
+
+
+
+
+
+
+
+ {{ line.productVariant.name }}
+
+
+
+
+ {{ line.productVariant.sku }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ ![]()
+
+
+
+
+
+
+
+ {{ line.unitPriceWithTax | localeCurrency : order.currencyCode }}
+
+ {{ line.unitPrice | localeCurrency : order.currencyCode }}
+
+
+
-
+
+
+
+
+
+ ![]()
+
+
+ {{ addItemSelectedVariant.productVariantName }}
+ {{ addItemSelectedVariant.sku }}
+
+ {{
+ getSelectedItemPrice(addItemSelectedVariant)
+ | localeCurrency : order.currencyCode
+ }}
+
+
+