Merge branch 'next-23395/creating-new-order-tabs-changes' into 'trunk'

NEXT-23395 - Creating new order tabs changes See merge request shopware/6/product/platform!9115
En0Ma1259 · Dec 1, 2022 · d6b8df5 · d6b8df5
2 parents 5ffd3cc + 37e1e87
commit d6b8df5
Show file tree

Hide file tree

Showing 60 changed files with 2,621 additions and 2,755 deletions.
diff --git a/changelog/_unreleased/2021-11-26-implement-modal-to-create-new-order.md b/changelog/_unreleased/2021-11-26-implement-modal-to-create-new-order.md
@@ -10,18 +10,13 @@ flag: FEATURE_NEXT_7530
 * Added function `addMultipleLineItems` in `src/core/service/api/cart-store-api.api.service.js` to save multiple line items to cart.
 * Added component `sw-order-create-initial-modal` in `src/module/sw-order/component/sw-order-create-initial-modal/index.js`
 * Added component `sw-order-create-options` in `src/module/sw-order/component/sw-order-create-options/index.js`
-* Added component `sw-order-credit-item` in `src/module/sw-order/component/sw-order-credit-item/index.js`
-* Added component `sw-order-custom-item` in `src/module/sw-order/component/sw-order-custom-item/index.js`
-* Added component `sw-order-custom-grid` in `src/module/sw-order/component/sw-order-customer-grid/index.js`
-* Added component `sw-order-product-grid` in `src/module/sw-order/component/sw-order-product-grid/index.js`
+* Added component `sw-order-customer-grid` in `src/module/sw-order/component/sw-order-customer-grid/index.js`
 * Changed computed property `getLineItemColumns` in `src/module/sw-order/component/sw-order-line-items-grid-sales-channel/index.js` to change column order.
 * Added mixin `src/module/sw-order/mixin/cart-notification.mixin.js`
 * Added mixin `src/module/sw-order/mixin/order-cart.mixin.js`
 * Changed in `src/module/sw-order/state/order.store.js`
     * Added mutation `setDisabledAutoPromotion`
-    * Added mutation `setTestOrder` 
     * Added state `disabledAutoPromotion`
-    * Added state `testOrder`
 * Changed in `src/module/sw-order/page/sw-order-create/index.js`
     * Added computed property `showInitialModal`
 * Changed in `src/module/sw-order/page/sw-order-create/sw-order-create.html.twig`

diff --git a/changelog/_unreleased/2022-08-01-add-items-to-an-order.md b/changelog/_unreleased/2022-08-01-add-items-to-an-order.md
diff --git a/changelog/_unreleased/2022-08-24-change-line-item-default-value-to-one.md b/changelog/_unreleased/2022-08-24-change-line-item-default-value-to-one.md
diff --git a/changelog/_unreleased/2022-11-15-creating-new-order-tabs-changes.md b/changelog/_unreleased/2022-11-15-creating-new-order-tabs-changes.md
@@ -0,0 +1,28 @@
+---
+title: Creating new order tabs changes
+issue: NEXT-23395
+flag: FEATURE_NEXT_7530
+---
+# Administration
+* Changed in `src/module/sw-order/component/sw-order-line-items-grid-sales-channel/index.js`
+  * Changed method `onInlineEditCancel` to revert quantity of existing product when cancel inline editing
+  * Changed method `onDeleteSelectedItems` to reset line item grid selection after deleting items
+  * Added method `changeItemQuantity` to handle changing item quantity
+
+* Changed in `src/module/sw-order/component/sw-order-line-items-grid-sales-channel/sw-order-line-items-grid-sales-channel.html.twig`
+  * Changed block `sw_order_line_items_grid_sales_channel_grid_columns_quantity_inline_edit` to handle editing item quantity
+  * Changed block `sw_order_line_items_grid_sales_channel_grid_columns_label_link` to remove link for empty product label. 
+
+* Changed in `src/module/sw-order/component/sw-order-line-items-grid/index.js`
+  * Changed method `onDeleteSelectedItems` to delete blank line items
+  * Change method `onDeleteItem` to delete single blank line items
+
+* Changed in `src/module/sw-order/component/sw-order-line-items-grid/sw-order-line-items-grid.html.twig`
+  * Changed block `sw_order_line_items_grid_create_actions_dropdown_menu_item` to handle ACL for add product button
+  * Changed block `sw_order_line_items_grid_grid_actions` to handle ACL for remove from order button and delete blank item.
+
+* Changed method `onCreateDocument` in `src/Administration/Resources/app/administration/src/module/sw-order/component/sw-order-document-card/index.js` to get document data correctly
+* Changed in `src/module/sw-order/state/order.store.ts` to add action `saveMultipleLineItems` to save multiple line items.
+* Changed in `src/module/sw-order/acl/index.js` to edit data access for order viewer permission.
+* Changed block `sw_order_document_settings_modal_media_modal` in `src/module/sw-order/component/sw-order-document-settings-modal/sw-order-document-settings-modal.html.twig` to fileAccept prop of `sw-media-modal-v2`.
+* Changed method `checkFileType` in `src/app/component/media/sw-media-upload-v2/index.js` to remove blank characters in fileTypes
diff --git a/...stration/Resources/app/administration/src/app/component/media/sw-media-upload-v2/index.js b/...stration/Resources/app/administration/src/app/component/media/sw-media-upload-v2/index.js
@@ -451,7 +451,7 @@ Component.register('sw-media-upload-v2', {
                 return true;
             }
 
-            const fileTypes = this.fileAccept.split(',');
+            const fileTypes = this.fileAccept.replaceAll(' ', '').split(',');
 
             fileTypes.forEach(fileType => {
                 const fileAcceptType = fileType.split('/');

diff --git a/src/Administration/Resources/app/administration/src/module/sw-order/acl/index.js b/src/Administration/Resources/app/administration/src/module/sw-order/acl/index.js
@@ -47,6 +47,8 @@ Shopware.Service('privileges')
                     'user_config:read',
                     'user_config:create',
                     'user_config:update',
+                    'customer:read',
+                    'customer_address:read',
                 ],
                 dependencies: [],
             },
@@ -71,8 +73,6 @@ Shopware.Service('privileges')
                     'product_visibility:read',
                     'order_line_item:update',
                     'order_line_item:create',
-                    'customer:read',
-                    'customer_address:read',
                     'salutation:read',
                     'order_address:create',
                     'order:delete',

diff --git a/...ources/app/administration/src/module/sw-order/component/sw-order-add-items-modal/index.ts b/...ources/app/administration/src/module/sw-order/component/sw-order-add-items-modal/index.ts