Browse Source

fix(admin-ui): Improve display of OrderLine custom fields in form

Michael Bromley 11 months ago
parent
commit
4e92d85f46

+ 5 - 8
packages/admin-ui/src/lib/order/src/components/draft-order-variant-selector/draft-order-variant-selector.component.html

@@ -39,14 +39,11 @@
             </button>
         </div>
         <ng-container *ngIf="orderLineCustomFields.length">
-            <div class="custom-field" *ngFor="let field of orderLineCustomFields">
-                <vdr-custom-field-control
-                    [compact]="true"
-                    [readonly]="false"
-                    [customField]="field"
-                    [customFieldsFormGroup]="customFieldsFormGroup"
-                ></vdr-custom-field-control>
-            </div>
+            <vdr-tabbed-custom-fields
+                entityName="Order"
+                [customFields]="orderLineCustomFields"
+                [customFieldsFormGroup]="customFieldsFormGroup"
+            ></vdr-tabbed-custom-fields>
         </ng-container>
     </div>
 </div>

+ 6 - 10
packages/admin-ui/src/lib/order/src/components/order-editor/order-editor.component.html

@@ -231,16 +231,12 @@
                             </div>
                         </div>
                     </div>
-                    <div class="form-grid" *ngIf="addItemSelectedVariant">
-                        <ng-container *ngFor="let customField of orderLineCustomFields">
-                            <vdr-custom-field-control
-                                [readonly]="!addItemSelectedVariant"
-                                [customField]="customField"
-                                [customFieldsFormGroup]="addItemCustomFieldsForm"
-                                entityName="OrderLine"
-                                [compact]="true"
-                            ></vdr-custom-field-control>
-                        </ng-container>
+                    <div *ngIf="addItemSelectedVariant">
+                        <vdr-tabbed-custom-fields
+                            entityName="Order"
+                            [customFields]="orderLineCustomFields"
+                            [customFieldsFormGroup]="addItemCustomFieldsForm"
+                        ></vdr-tabbed-custom-fields>
                     </div>
                 </div>
                 <div class="flex-spacer"></div>