Merge branch 'feat/data-table-medusa-ui' of https://github.com/medusa…

…js/medusa into feat/data-table-medusa-ui

.changeset/gentle-dancers-count.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/medusa": patch
+---
+
+fix: do not update the .env.template file with the database name

.changeset/honest-chefs-attend.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/core-flows": patch
+---
+
+Order edit quantity diff

.changeset/thirty-lamps-collect.md

@@ -0,0 +1,6 @@
+---
+"@medusajs/core-flows": patch
+"@medusajs/medusa": patch
+---
+
+Create Order before payment capture

integration-tests/http/__tests__/order-edits/order-edits.spec.ts

@@ -1,10 +1,10 @@
+import { medusaIntegrationTestRunner } from "@medusajs/test-utils"
 import {
   ContainerRegistrationKeys,
   Modules,
   OrderChangeStatus,
   RuleOperator,
 } from "@medusajs/utils"
-import { medusaIntegrationTestRunner } from "@medusajs/test-utils"
 import {
   adminHeaders,
   createAdminUser,
@@ -418,6 +418,31 @@ medusaIntegrationTestRunner({
         expect(result.summary.current_order_total).toEqual(124)
         expect(result.summary.original_order_total).toEqual(60)
 
+        const updatedItem = result.items.find((i) => i.id === item.id)
+        expect(updatedItem.actions).toEqual([
+          expect.objectContaining({
+            details: expect.objectContaining({
+              quantity: 2,
+              unit_price: 25,
+              quantity_diff: 0,
+            }),
+          }),
+          expect.objectContaining({
+            details: expect.objectContaining({
+              quantity: 3,
+              unit_price: 25,
+              quantity_diff: 1,
+            }),
+          }),
+          expect.objectContaining({
+            details: expect.objectContaining({
+              quantity: 3,
+              unit_price: 30,
+              quantity_diff: 1,
+            }),
+          }),
+        ])
+
         // Remove the item by setting the quantity to 0
         result = (
           await api.post(

packages/admin/dashboard/src/i18n/languages.ts

@@ -1,4 +1,4 @@
-import { enUS, pl } from "date-fns/locale"
+import { de, enUS, pl } from "date-fns/locale"
 import { Language } from "./types"
 
 export const languages: Language[] = [
@@ -8,9 +8,15 @@ export const languages: Language[] = [
     ltr: true,
     date_locale: enUS,
   },
+  {
+    code: "de",
+    display_name: "Deutsch",
+    ltr: true,
+    date_locale: de,
+  },
   {
     code: "pl",
-    display_name: "Polish",
+    display_name: "Polski",
     ltr: true,
     date_locale: pl,
   },