Merge branch 'medusajs:develop' into develop

Author: v0eak

.changeset/beige-llamas-drive.md

@@ -0,0 +1,7 @@
+---
+"@medusajs/core-flows": patch
+"@medusajs/types": patch
+"@medusajs/medusa": patch
+---
+
+feat(core-flows,medusa,types): add no_notification to markOrderFulfillmentAsDeliveredWorkflow

.changeset/forty-states-invent.md

@@ -0,0 +1,5 @@
+---
+"@medusajs/notification-sendgrid": patch
+---
+
+feat(notification-sendgrid): add support for personalizations via provider_data

.github/workflows/review-prs.yml

@@ -2,13 +2,13 @@ name: PR Review
 
 on:
   pull_request_target:
-    types: [opened, reopened, synchronize, edited]
+    types: [opened, reopened, synchronize, edited, ready_for_review]
   issue_comment:
     types: [created]
   workflow_dispatch:
     inputs:
       skip_reviewed:
-        description: 'Skip PRs that already have initial-approval or requires-more labels'
+        description: "Skip PRs that already have initial-approval or requires-more labels"
         required: false
         default: true
         type: boolean
@@ -49,8 +49,8 @@ jobs:
       fail-fast: false
     uses: ./.github/workflows/review-pr-action.yml
     with:
-      pr_number: '${{ matrix.pr.number }}'
-      trigger_reason: 'manual workflow dispatch'
+      pr_number: "${{ matrix.pr.number }}"
+      trigger_reason: "manual workflow dispatch"
     secrets:
       MEDUSA_APP_ID: ${{ secrets.MEDUSA_APP_ID }}
       MEDUSA_APP_PRIVATE_KEY: ${{ secrets.MEDUSA_APP_PRIVATE_KEY }}
@@ -109,6 +109,7 @@ jobs:
               reopened)  echo "trigger_reason=PR reopened" >> $GITHUB_OUTPUT ;;
               synchronize) echo "trigger_reason=new commit pushed" >> $GITHUB_OUTPUT ;;
               edited)    echo "trigger_reason=PR description updated" >> $GITHUB_OUTPUT ;;
+              ready_for_review) echo "trigger_reason=PR marked as ready for review" >> $GITHUB_OUTPUT ;;
               *)         echo "trigger_reason=${{ github.event.action }}" >> $GITHUB_OUTPUT ;;
             esac
 

packages/admin/dashboard/src/hooks/api/orders.tsx

@@ -296,11 +296,12 @@ export const useMarkOrderFulfillmentAsDelivered = (
   options?: UseMutationOptions<
     { order: HttpTypes.AdminOrder },
     FetchError,
-    void
+    HttpTypes.AdminMarkOrderFulfillmentAsDelivered
   >
 ) => {
   return useMutation({
-    mutationFn: () => sdk.admin.order.markAsDelivered(orderId, fulfillmentId),
+    mutationFn: (payload: HttpTypes.AdminMarkOrderFulfillmentAsDelivered) =>
+      sdk.admin.order.markAsDelivered(orderId, fulfillmentId, payload),
     onSuccess: (data: any, variables: any, context: any) => {
       queryClient.invalidateQueries({
         queryKey: ordersQueryKeys.all,

packages/admin/dashboard/src/routes/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx

@@ -11,13 +11,17 @@ import {
   Container,
   Copy,
   Heading,
+  Label,
+  Prompt,
   StatusBadge,
+  Switch,
   Text,
   Tooltip,
   toast,
   usePrompt,
 } from "@medusajs/ui"
 import { format } from "date-fns"
+import { useState } from "react"
 import { useTranslation } from "react-i18next"
 import { Link, useNavigate } from "react-router-dom"
 import { ActionMenu } from "../../../../../components/common/action-menu"
@@ -264,17 +268,24 @@ const Fulfillment = ({
   const showDeliveryButton =
     !fulfillment.canceled_at && !fulfillment.delivered_at
 
-  const handleMarkAsDelivered = async () => {
-    const res = await prompt({
-      title: t("general.areYouSure"),
-      description: t("orders.fulfillment.markAsDeliveredWarning"),
-      confirmText: t("actions.continue"),
-      cancelText: t("actions.cancel"),
-      variant: "confirmation",
-    })
+  const [sendNotification, setSendNotification] = useState(
+    !order.no_notification
+  )
+  const [showDeliveredPrompt, setShowDeliveredPrompt] = useState(false)
 
-    if (res) {
-      await markAsDelivered(undefined, {
+  const handleMarkAsDelivered = () => {
+    setShowDeliveredPrompt(true)
+  }
+
+  const handleCancelDeliveredPrompt = () => {
+    setShowDeliveredPrompt(false)
+  }
+
+  const handleConfirmDelivered = async () => {
+    setShowDeliveredPrompt(false)
+    await markAsDelivered(
+      { no_notification: !sendNotification },
+      {
         onSuccess: () => {
           toast.success(
             t(
@@ -287,8 +298,8 @@ const Fulfillment = ({
         onError: (e) => {
           toast.error(e.message)
         },
-      })
-    }
+      }
+    )
   }
 
   const handleCancel = async () => {
@@ -484,6 +495,40 @@ const Fulfillment = ({
           )}
         </div>
       )}
+
+      <Prompt open={showDeliveredPrompt} variant="confirmation">
+        <Prompt.Content>
+          <Prompt.Header>
+            <Prompt.Title>{t("general.areYouSure")}</Prompt.Title>
+            <Prompt.Description>
+              {t("orders.fulfillment.markAsDeliveredWarning")}
+            </Prompt.Description>
+          </Prompt.Header>
+          <div className="border-ui-border-base mt-6 flex items-center justify-between border-y border-dotted p-6">
+            <Label
+              htmlFor={`send-notification-${fulfillment.id}`}
+              className="txt-compact-small text-ui-fg-subtle"
+            >
+              {t("orders.returns.sendNotification")}
+            </Label>
+            <Switch
+              id={`send-notification-${fulfillment.id}`}
+              dir="ltr"
+              className="rtl:rotate-180"
+              checked={sendNotification}
+              onCheckedChange={setSendNotification}
+            />
+          </div>
+          <Prompt.Footer>
+            <Prompt.Cancel onClick={handleCancelDeliveredPrompt}>
+              {t("actions.cancel")}
+            </Prompt.Cancel>
+            <Prompt.Action onClick={handleConfirmDelivered}>
+              {t("actions.continue")}
+            </Prompt.Action>
+          </Prompt.Footer>
+        </Prompt.Content>
+      </Prompt>
     </Container>
   )
 }

packages/core/core-flows/src/order/workflows/mark-order-fulfillment-as-delivered.ts

@@ -169,8 +169,7 @@ function prepareRegisterDeliveryData({
         const iitem = iitems.find(
           (i) => i.inventory.id === fitem.inventory_item_id
         )
-        if(iitem)
-          quantity = MathBN.div(quantity, iitem.required_quantity)
+        if (iitem) quantity = MathBN.div(quantity, iitem.required_quantity)
       }
 
       return {
@@ -193,6 +192,12 @@ export type MarkOrderFulfillmentAsDeliveredWorkflowInput = {
    * The ID of the fulfillment to mark as delivered.
    */
   fulfillmentId: string
+  /**
+   * Whether to notify the customer about the delivery.
+   *
+   * @since 2.13.7
+   */
+  no_notification?: boolean
 }
 
 export const markOrderFulfillmentAsDeliveredWorkflowId =
@@ -277,7 +282,10 @@ export const markOrderFulfillmentAsDeliveredWorkflow = createWorkflow(
 
     emitEventStep({
       eventName: FulfillmentWorkflowEvents.DELIVERY_CREATED,
-      data: { id: deliveredFulfillment.id },
+      data: {
+        id: deliveredFulfillment.id,
+        no_notification: input.no_notification,
+      },
     })
 
     return new WorkflowResponse(void 0)

packages/core/js-sdk/src/admin/order.ts

@@ -475,6 +475,7 @@ export class Order {
    *
    * @param id - The order's ID.
    * @param fulfillmentId - The fulfillment's ID.
+   * @param body - The delivery options.
    * @param query - Configure the fields to retrieve in the order.
    * @param headers - Headers to pass in the request
    * @returns The order's details.
@@ -491,6 +492,7 @@ export class Order {
   async markAsDelivered(
     id: string,
     fulfillmentId: string,
+    body?: HttpTypes.AdminMarkOrderFulfillmentAsDelivered,
     query?: SelectParams,
     headers?: ClientHeaders
   ) {
@@ -499,6 +501,7 @@ export class Order {
       {
         method: "POST",
         headers,
+        body,
         query,
       }
     )

packages/core/types/src/http/order/admin/payloads.ts

@@ -100,6 +100,18 @@ export interface AdminCreateOrderShipment {
   metadata?: Record<string, unknown> | null
 }
 
+/**
+ * The data needed to mark a fulfillment as delivered.
+ *
+ * @since 2.13.7
+ */
+export interface AdminMarkOrderFulfillmentAsDelivered {
+  /**
+   * Whether to notify the customer about the delivery.
+   */
+  no_notification?: boolean
+}
+
 export interface AdminCancelOrderFulfillment {
   /**
    * Whether to notify the customer about this change.

packages/medusa/src/api/admin/orders/[id]/fulfillments/[fulfillment_id]/mark-as-delivered/route.ts

@@ -7,13 +7,20 @@ import {
 } from "@medusajs/framework/http"
 
 export const POST = async (
-  req: AuthenticatedMedusaRequest<{}, HttpTypes.AdminGetOrderParams>,
+  req: AuthenticatedMedusaRequest<
+    HttpTypes.AdminMarkOrderFulfillmentAsDelivered,
+    HttpTypes.AdminGetOrderParams
+  >,
   res: MedusaResponse<HttpTypes.AdminOrderResponse>
 ) => {
   const { id: orderId, fulfillment_id: fulfillmentId } = req.params
 
   await markOrderFulfillmentAsDeliveredWorkflow(req.scope).run({
-    input: { orderId, fulfillmentId },
+    input: {
+      orderId,
+      fulfillmentId,
+      no_notification: req.validatedBody.no_notification,
+    },
   })
 
   const order = await refetchEntity({

packages/medusa/src/api/admin/orders/middlewares.ts

@@ -13,6 +13,7 @@ import {
   AdminGetOrdersOrderItemsParams,
   AdminGetOrdersOrderParams,
   AdminGetOrdersParams,
+  AdminMarkOrderFulfillmentAsDelivered,
   AdminOrderCancelFulfillment,
   AdminOrderChangesParams,
   AdminOrderCreateFulfillment,
@@ -256,6 +257,7 @@ export const adminOrderRoutesMiddlewares: MiddlewareRoute[] = [
         AdminGetOrdersOrderParams,
         QueryConfig.retrieveTransformQueryConfig
       ),
+      validateAndTransformBody(AdminMarkOrderFulfillmentAsDelivered),
     ],
     policies: [
       {