@easypayment/medusa-paypal 0.3.0 → 0.3.1

package/.medusa/server/src/admin/index.js

@@ -75,9 +75,7 @@ const DEFAULT_FORM$1 = {
   brandName: "PayPal",
   landingPage: "no_preference",
   requireInstantPayment: false,
-  useShippingAsBilling: true,
   sendItemDetails: true,
-  skipOrderReviewPage: true,
   invoicePrefix: "WC-",
   creditCardStatementName: "PayPal",
   logPath: "/uploads/wc-logs/"
@@ -175,18 +173,10 @@ function AdditionalSettingsTab() {
             /* @__PURE__ */ jsxRuntime.jsx("input", { type: "checkbox", checked: form.requireInstantPayment, onChange: (e) => setForm((p) => ({ ...p, requireInstantPayment: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
             /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm text-ui-fg-base", children: "Require Instant Payment" })
           ] }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(FieldRow$2, { label: "Billing Address", hint: "If the billing address is empty and PayPal provides a shipping address, the order will use the shipping address as the billing address.", children: /* @__PURE__ */ jsxRuntime.jsxs("label", { className: "inline-flex items-center gap-2", children: [
-            /* @__PURE__ */ jsxRuntime.jsx("input", { type: "checkbox", checked: form.useShippingAsBilling, onChange: (e) => setForm((p) => ({ ...p, useShippingAsBilling: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
-            /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm text-ui-fg-base", children: "Use PayPal Shipping Address as Billing" })
-          ] }) }),
           /* @__PURE__ */ jsxRuntime.jsx(FieldRow$2, { label: "Send Item Details", hint: "Include all line item details in the payment request to PayPal so that they can be seen from the PayPal transaction details page.", children: /* @__PURE__ */ jsxRuntime.jsxs("label", { className: "inline-flex items-center gap-2", children: [
             /* @__PURE__ */ jsxRuntime.jsx("input", { type: "checkbox", checked: form.sendItemDetails, onChange: (e) => setForm((p) => ({ ...p, sendItemDetails: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
             /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm text-ui-fg-base", children: "Send line item details to PayPal" })
           ] }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(FieldRow$2, { label: "Order Review Page", hint: "Payments from the Product or Cart page skip the review step and go straight to the Thank You page.", children: /* @__PURE__ */ jsxRuntime.jsxs("label", { className: "inline-flex items-center gap-2", children: [
-            /* @__PURE__ */ jsxRuntime.jsx("input", { type: "checkbox", checked: form.skipOrderReviewPage, onChange: (e) => setForm((p) => ({ ...p, skipOrderReviewPage: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
-            /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm text-ui-fg-base", children: "Skip Order Review Page" })
-          ] }) }),
           /* @__PURE__ */ jsxRuntime.jsx(FieldRow$2, { label: "Invoice prefix", children: /* @__PURE__ */ jsxRuntime.jsx("input", { value: form.invoicePrefix, onChange: (e) => setForm((p) => ({ ...p, invoicePrefix: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", placeholder: "WC-" }) }),
           /* @__PURE__ */ jsxRuntime.jsx(FieldRow$2, { label: "Credit Card Statement Name", children: /* @__PURE__ */ jsxRuntime.jsx("input", { value: form.creditCardStatementName, onChange: (e) => setForm((p) => ({ ...p, creditCardStatementName: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", placeholder: "PayPal" }) })
         ] })
@@ -194,9 +184,6 @@ function AdditionalSettingsTab() {
     )
   ] }) });
 }
-function PayPalGooglePayPage() {
-  return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
-}
 async function adminFetch$1(path, opts = {}) {
   var _a;
   const { method = "GET", body, query } = opts;
@@ -230,7 +217,7 @@ async function adminFetch$1(path, opts = {}) {
     return {};
   }
 }
-const DEFAULT_FORM = { enabled: true, title: "Credit or Debit Card", disabledCards: [], threeDS: "when_required", cardSaveEnabled: false };
+const DEFAULT_FORM = { enabled: true, title: "Credit or Debit Card", disabledCards: [], threeDS: "when_required" };
 function mergeWithDefaults(saved) {
   if (!saved) return { ...DEFAULT_FORM };
   const entries = Object.entries(saved).filter(([, value]) => value !== void 0);
@@ -358,16 +345,15 @@ function AdvancedCardPaymentsTab() {
           /* @__PURE__ */ jsxRuntime.jsx(FieldRow$1, { label: "Contingency for 3D Secure", hint: "Choose when 3D Secure should be triggered during card payments.", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-2", children: [
             /* @__PURE__ */ jsxRuntime.jsx("select", { value: form.threeDS, onChange: (e) => setForm((p) => ({ ...p, threeDS: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", children: THREE_DS_OPTIONS.map((o) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: o.value, children: o.label }, o.value)) }),
             ((_a = THREE_DS_OPTIONS.find((o) => o.value === form.threeDS)) == null ? void 0 : _a.hint) ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs text-ui-fg-subtle", children: (_b = THREE_DS_OPTIONS.find((o) => o.value === form.threeDS)) == null ? void 0 : _b.hint }) : null
-          ] }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(FieldRow$1, { label: "Card Save Enabled", hint: "Allow customers to save a card at checkout for future use.", children: /* @__PURE__ */ jsxRuntime.jsxs("label", { className: "inline-flex items-center gap-2", children: [
-            /* @__PURE__ */ jsxRuntime.jsx("input", { type: "checkbox", checked: form.cardSaveEnabled, onChange: (e) => setForm((p) => ({ ...p, cardSaveEnabled: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
-            /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm text-ui-fg-base", children: "Enable card saving at checkout" })
           ] }) })
         ] })
       }
     )
   ] }) });
 }
+function PayPalApplePayPage() {
+  return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
+}
 const config = adminSdk.defineRouteConfig({
   label: "PayPal Connection",
   hide: true
@@ -952,7 +938,7 @@ function PayPalConnectionPage() {
       ` })
   ] });
 }
-function PayPalApplePayPage() {
+function PayPalGooglePayPage() {
   return /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Navigate, { to: "/settings/paypal/connection", replace: true });
 }
 function PayPalPayLaterMessagingPage() {
@@ -991,13 +977,6 @@ async function adminFetch(path, opts = {}) {
     return {};
   }
 }
-const DISPLAY_LOCATION_OPTIONS = [
-  { value: "product", label: "Product Page" },
-  { value: "cart", label: "Cart Page" },
-  { value: "express", label: "Express Checkout" },
-  { value: "checkout", label: "Checkout Page", disabled: true, hint: "Locked by PayPal eligibility / checkout config" },
-  { value: "mini_cart", label: "Mini Cart (Side Cart)" }
-];
 const DISABLE_BUTTON_OPTIONS = [
   { value: "paypal", label: "PayPal" },
   { value: "paylater", label: "Pay Later" },
@@ -1103,7 +1082,6 @@ function PayPalSettingsTab() {
     enabled: true,
     title: "PayPal",
     description: "Pay via PayPal; you can pay with your credit card if you don't have a PayPal account",
-    displayOn: ["product", "cart", "express", "mini_cart"],
     disableButtons: [],
     buttonColor: "gold",
     buttonShape: "rect",
@@ -1174,7 +1152,6 @@ function PayPalSettingsTab() {
       setSaving(false);
     }
   }
-  react.useMemo(() => new Map(DISPLAY_LOCATION_OPTIONS.map((o) => [o.value, o])), []);
   function toggleMulti(key, value) {
     setForm((prev) => {
       const list = prev[key] || [];
@@ -1208,7 +1185,7 @@ function PayPalSettingsTab() {
       SectionCard,
       {
         title: "PayPal Settings",
-        description: "Enable PayPal, set title/description, and choose where Smart Buttons appear.",
+        description: "Enable PayPal and configure checkout title/description.",
         right: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-3", children: [
           /* @__PURE__ */ jsxRuntime.jsx(
             "button",
@@ -1252,60 +1229,7 @@ function PayPalSettingsTab() {
               className: "min-h-[84px] w-full resize-y rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive",
               placeholder: "Pay via PayPal..."
             }
-          ) }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            FieldRow,
-            {
-              label: "Display PayPal Buttons On",
-              hint: "Choose where PayPal Smart Buttons should render.",
-              children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-2", children: [
-                /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-wrap gap-2", children: [
-                  DISPLAY_LOCATION_OPTIONS.filter((o) => form.displayOn.includes(o.value)).map((o) => /* @__PURE__ */ jsxRuntime.jsxs(
-                    Pill,
-                    {
-                      disabled: o.disabled,
-                      onRemove: o.disabled ? void 0 : () => removeMulti("displayOn", o.value),
-                      children: [
-                        o.label,
-                        o.disabled ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "ml-1 rounded bg-ui-bg-subtle px-1 py-[1px] text-[10px] text-ui-fg-subtle", children: "Locked" }) : null
-                      ]
-                    },
-                    o.value
-                  )),
-                  form.displayOn.length === 0 ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm text-ui-fg-subtle", children: "No locations selected." }) : null
-                ] }),
-                /* @__PURE__ */ jsxRuntime.jsx("div", { className: "rounded-md border border-ui-border-base p-3", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "grid gap-2 md:grid-cols-2", children: DISPLAY_LOCATION_OPTIONS.map((o) => {
-                  const checked = form.displayOn.includes(o.value);
-                  return /* @__PURE__ */ jsxRuntime.jsxs(
-                    "label",
-                    {
-                      className: cx(
-                        "flex items-start gap-2 rounded-md p-2",
-                        o.disabled ? "opacity-60" : "hover:bg-ui-bg-subtle"
-                      ),
-                      children: [
-                        /* @__PURE__ */ jsxRuntime.jsx(
-                          "input",
-                          {
-                            type: "checkbox",
-                            disabled: o.disabled,
-                            checked,
-                            onChange: () => toggleMulti("displayOn", o.value),
-                            className: "mt-0.5 h-4 w-4 rounded border-ui-border-base"
-                          }
-                        ),
-                        /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "flex flex-col", children: [
-                          /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm text-ui-fg-base", children: o.label }),
-                          o.hint ? /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs text-ui-fg-subtle", children: o.hint }) : null
-                        ] })
-                      ]
-                    },
-                    o.value
-                  );
-                }) }) })
-              ] })
-            }
-          )
+          ) })
         ] })
       }
     ),
@@ -1432,21 +1356,21 @@ const routeModule = {
       Component: AdditionalSettingsTab,
       path: "/settings/paypal/additional-settings"
     },
-    {
-      Component: PayPalGooglePayPage,
-      path: "/settings/paypal/google-pay"
-    },
     {
       Component: AdvancedCardPaymentsTab,
       path: "/settings/paypal/advanced-card-payments"
     },
+    {
+      Component: PayPalApplePayPage,
+      path: "/settings/paypal/apple-pay"
+    },
     {
       Component: PayPalConnectionPage,
       path: "/settings/paypal/connection"
     },
     {
-      Component: PayPalApplePayPage,
-      path: "/settings/paypal/apple-pay"
+      Component: PayPalGooglePayPage,
+      path: "/settings/paypal/google-pay"
     },
     {
       Component: PayPalPayLaterMessagingPage,

package/.medusa/server/src/admin/index.mjs

@@ -74,9 +74,7 @@ const DEFAULT_FORM$1 = {
   brandName: "PayPal",
   landingPage: "no_preference",
   requireInstantPayment: false,
-  useShippingAsBilling: true,
   sendItemDetails: true,
-  skipOrderReviewPage: true,
   invoicePrefix: "WC-",
   creditCardStatementName: "PayPal",
   logPath: "/uploads/wc-logs/"
@@ -174,18 +172,10 @@ function AdditionalSettingsTab() {
             /* @__PURE__ */ jsx("input", { type: "checkbox", checked: form.requireInstantPayment, onChange: (e) => setForm((p) => ({ ...p, requireInstantPayment: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
             /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-base", children: "Require Instant Payment" })
           ] }) }),
-          /* @__PURE__ */ jsx(FieldRow$2, { label: "Billing Address", hint: "If the billing address is empty and PayPal provides a shipping address, the order will use the shipping address as the billing address.", children: /* @__PURE__ */ jsxs("label", { className: "inline-flex items-center gap-2", children: [
-            /* @__PURE__ */ jsx("input", { type: "checkbox", checked: form.useShippingAsBilling, onChange: (e) => setForm((p) => ({ ...p, useShippingAsBilling: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
-            /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-base", children: "Use PayPal Shipping Address as Billing" })
-          ] }) }),
           /* @__PURE__ */ jsx(FieldRow$2, { label: "Send Item Details", hint: "Include all line item details in the payment request to PayPal so that they can be seen from the PayPal transaction details page.", children: /* @__PURE__ */ jsxs("label", { className: "inline-flex items-center gap-2", children: [
             /* @__PURE__ */ jsx("input", { type: "checkbox", checked: form.sendItemDetails, onChange: (e) => setForm((p) => ({ ...p, sendItemDetails: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
             /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-base", children: "Send line item details to PayPal" })
           ] }) }),
-          /* @__PURE__ */ jsx(FieldRow$2, { label: "Order Review Page", hint: "Payments from the Product or Cart page skip the review step and go straight to the Thank You page.", children: /* @__PURE__ */ jsxs("label", { className: "inline-flex items-center gap-2", children: [
-            /* @__PURE__ */ jsx("input", { type: "checkbox", checked: form.skipOrderReviewPage, onChange: (e) => setForm((p) => ({ ...p, skipOrderReviewPage: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
-            /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-base", children: "Skip Order Review Page" })
-          ] }) }),
           /* @__PURE__ */ jsx(FieldRow$2, { label: "Invoice prefix", children: /* @__PURE__ */ jsx("input", { value: form.invoicePrefix, onChange: (e) => setForm((p) => ({ ...p, invoicePrefix: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", placeholder: "WC-" }) }),
           /* @__PURE__ */ jsx(FieldRow$2, { label: "Credit Card Statement Name", children: /* @__PURE__ */ jsx("input", { value: form.creditCardStatementName, onChange: (e) => setForm((p) => ({ ...p, creditCardStatementName: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", placeholder: "PayPal" }) })
         ] })
@@ -193,9 +183,6 @@ function AdditionalSettingsTab() {
     )
   ] }) });
 }
-function PayPalGooglePayPage() {
-  return /* @__PURE__ */ jsx(Navigate, { to: "/settings/paypal/connection", replace: true });
-}
 async function adminFetch$1(path, opts = {}) {
   var _a;
   const { method = "GET", body, query } = opts;
@@ -229,7 +216,7 @@ async function adminFetch$1(path, opts = {}) {
     return {};
   }
 }
-const DEFAULT_FORM = { enabled: true, title: "Credit or Debit Card", disabledCards: [], threeDS: "when_required", cardSaveEnabled: false };
+const DEFAULT_FORM = { enabled: true, title: "Credit or Debit Card", disabledCards: [], threeDS: "when_required" };
 function mergeWithDefaults(saved) {
   if (!saved) return { ...DEFAULT_FORM };
   const entries = Object.entries(saved).filter(([, value]) => value !== void 0);
@@ -357,16 +344,15 @@ function AdvancedCardPaymentsTab() {
           /* @__PURE__ */ jsx(FieldRow$1, { label: "Contingency for 3D Secure", hint: "Choose when 3D Secure should be triggered during card payments.", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-2", children: [
             /* @__PURE__ */ jsx("select", { value: form.threeDS, onChange: (e) => setForm((p) => ({ ...p, threeDS: e.target.value })), className: "w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive", children: THREE_DS_OPTIONS.map((o) => /* @__PURE__ */ jsx("option", { value: o.value, children: o.label }, o.value)) }),
             ((_a = THREE_DS_OPTIONS.find((o) => o.value === form.threeDS)) == null ? void 0 : _a.hint) ? /* @__PURE__ */ jsx("div", { className: "text-xs text-ui-fg-subtle", children: (_b = THREE_DS_OPTIONS.find((o) => o.value === form.threeDS)) == null ? void 0 : _b.hint }) : null
-          ] }) }),
-          /* @__PURE__ */ jsx(FieldRow$1, { label: "Card Save Enabled", hint: "Allow customers to save a card at checkout for future use.", children: /* @__PURE__ */ jsxs("label", { className: "inline-flex items-center gap-2", children: [
-            /* @__PURE__ */ jsx("input", { type: "checkbox", checked: form.cardSaveEnabled, onChange: (e) => setForm((p) => ({ ...p, cardSaveEnabled: e.target.checked })), className: "h-4 w-4 rounded border-ui-border-base" }),
-            /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-base", children: "Enable card saving at checkout" })
           ] }) })
         ] })
       }
     )
   ] }) });
 }
+function PayPalApplePayPage() {
+  return /* @__PURE__ */ jsx(Navigate, { to: "/settings/paypal/connection", replace: true });
+}
 const config = defineRouteConfig({
   label: "PayPal Connection",
   hide: true
@@ -951,7 +937,7 @@ function PayPalConnectionPage() {
       ` })
   ] });
 }
-function PayPalApplePayPage() {
+function PayPalGooglePayPage() {
   return /* @__PURE__ */ jsx(Navigate, { to: "/settings/paypal/connection", replace: true });
 }
 function PayPalPayLaterMessagingPage() {
@@ -990,13 +976,6 @@ async function adminFetch(path, opts = {}) {
     return {};
   }
 }
-const DISPLAY_LOCATION_OPTIONS = [
-  { value: "product", label: "Product Page" },
-  { value: "cart", label: "Cart Page" },
-  { value: "express", label: "Express Checkout" },
-  { value: "checkout", label: "Checkout Page", disabled: true, hint: "Locked by PayPal eligibility / checkout config" },
-  { value: "mini_cart", label: "Mini Cart (Side Cart)" }
-];
 const DISABLE_BUTTON_OPTIONS = [
   { value: "paypal", label: "PayPal" },
   { value: "paylater", label: "Pay Later" },
@@ -1102,7 +1081,6 @@ function PayPalSettingsTab() {
     enabled: true,
     title: "PayPal",
     description: "Pay via PayPal; you can pay with your credit card if you don't have a PayPal account",
-    displayOn: ["product", "cart", "express", "mini_cart"],
     disableButtons: [],
     buttonColor: "gold",
     buttonShape: "rect",
@@ -1173,7 +1151,6 @@ function PayPalSettingsTab() {
       setSaving(false);
     }
   }
-  useMemo(() => new Map(DISPLAY_LOCATION_OPTIONS.map((o) => [o.value, o])), []);
   function toggleMulti(key, value) {
     setForm((prev) => {
       const list = prev[key] || [];
@@ -1207,7 +1184,7 @@ function PayPalSettingsTab() {
       SectionCard,
       {
         title: "PayPal Settings",
-        description: "Enable PayPal, set title/description, and choose where Smart Buttons appear.",
+        description: "Enable PayPal and configure checkout title/description.",
         right: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-3", children: [
           /* @__PURE__ */ jsx(
             "button",
@@ -1251,60 +1228,7 @@ function PayPalSettingsTab() {
               className: "min-h-[84px] w-full resize-y rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive",
               placeholder: "Pay via PayPal..."
             }
-          ) }),
-          /* @__PURE__ */ jsx(
-            FieldRow,
-            {
-              label: "Display PayPal Buttons On",
-              hint: "Choose where PayPal Smart Buttons should render.",
-              children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-2", children: [
-                /* @__PURE__ */ jsxs("div", { className: "flex flex-wrap gap-2", children: [
-                  DISPLAY_LOCATION_OPTIONS.filter((o) => form.displayOn.includes(o.value)).map((o) => /* @__PURE__ */ jsxs(
-                    Pill,
-                    {
-                      disabled: o.disabled,
-                      onRemove: o.disabled ? void 0 : () => removeMulti("displayOn", o.value),
-                      children: [
-                        o.label,
-                        o.disabled ? /* @__PURE__ */ jsx("span", { className: "ml-1 rounded bg-ui-bg-subtle px-1 py-[1px] text-[10px] text-ui-fg-subtle", children: "Locked" }) : null
-                      ]
-                    },
-                    o.value
-                  )),
-                  form.displayOn.length === 0 ? /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-subtle", children: "No locations selected." }) : null
-                ] }),
-                /* @__PURE__ */ jsx("div", { className: "rounded-md border border-ui-border-base p-3", children: /* @__PURE__ */ jsx("div", { className: "grid gap-2 md:grid-cols-2", children: DISPLAY_LOCATION_OPTIONS.map((o) => {
-                  const checked = form.displayOn.includes(o.value);
-                  return /* @__PURE__ */ jsxs(
-                    "label",
-                    {
-                      className: cx(
-                        "flex items-start gap-2 rounded-md p-2",
-                        o.disabled ? "opacity-60" : "hover:bg-ui-bg-subtle"
-                      ),
-                      children: [
-                        /* @__PURE__ */ jsx(
-                          "input",
-                          {
-                            type: "checkbox",
-                            disabled: o.disabled,
-                            checked,
-                            onChange: () => toggleMulti("displayOn", o.value),
-                            className: "mt-0.5 h-4 w-4 rounded border-ui-border-base"
-                          }
-                        ),
-                        /* @__PURE__ */ jsxs("span", { className: "flex flex-col", children: [
-                          /* @__PURE__ */ jsx("span", { className: "text-sm text-ui-fg-base", children: o.label }),
-                          o.hint ? /* @__PURE__ */ jsx("span", { className: "text-xs text-ui-fg-subtle", children: o.hint }) : null
-                        ] })
-                      ]
-                    },
-                    o.value
-                  );
-                }) }) })
-              ] })
-            }
-          )
+          ) })
         ] })
       }
     ),
@@ -1431,21 +1355,21 @@ const routeModule = {
       Component: AdditionalSettingsTab,
       path: "/settings/paypal/additional-settings"
     },
-    {
-      Component: PayPalGooglePayPage,
-      path: "/settings/paypal/google-pay"
-    },
     {
       Component: AdvancedCardPaymentsTab,
       path: "/settings/paypal/advanced-card-payments"
     },
+    {
+      Component: PayPalApplePayPage,
+      path: "/settings/paypal/apple-pay"
+    },
     {
       Component: PayPalConnectionPage,
       path: "/settings/paypal/connection"
     },
     {
-      Component: PayPalApplePayPage,
-      path: "/settings/paypal/apple-pay"
+      Component: PayPalGooglePayPage,
+      path: "/settings/paypal/google-pay"
     },
     {
       Component: PayPalPayLaterMessagingPage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easypayment/medusa-paypal",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Industry-standard PayPal integration for Medusa v2",
   "license": "MIT",
   "main": "./.medusa/server/src/index.js",

package/src/admin/routes/settings/paypal/additional-settings/page.tsx

@@ -42,9 +42,7 @@ type AdditionalSettingsForm = {
   brandName: string
   landingPage: LandingPage
   requireInstantPayment: boolean
-  useShippingAsBilling: boolean
   sendItemDetails: boolean
-  skipOrderReviewPage: boolean
   invoicePrefix: string
   creditCardStatementName: string
   logPath?: string
@@ -55,9 +53,7 @@ const DEFAULT_FORM: AdditionalSettingsForm = {
   brandName: "PayPal",
   landingPage: "no_preference",
   requireInstantPayment: false,
-  useShippingAsBilling: true,
   sendItemDetails: true,
-  skipOrderReviewPage: true,
   invoicePrefix: "WC-",
   creditCardStatementName: "PayPal",
   logPath: "/uploads/wc-logs/",
@@ -186,24 +182,12 @@ export default function AdditionalSettingsTab() {
                 <span className="text-sm text-ui-fg-base">Require Instant Payment</span>
               </label>
             </FieldRow>
-            <FieldRow label="Billing Address" hint="If the billing address is empty and PayPal provides a shipping address, the order will use the shipping address as the billing address.">
-              <label className="inline-flex items-center gap-2">
-                <input type="checkbox" checked={form.useShippingAsBilling} onChange={(e) => setForm((p) => ({ ...p, useShippingAsBilling: e.target.checked }))} className="h-4 w-4 rounded border-ui-border-base" />
-                <span className="text-sm text-ui-fg-base">Use PayPal Shipping Address as Billing</span>
-              </label>
-            </FieldRow>
             <FieldRow label="Send Item Details" hint="Include all line item details in the payment request to PayPal so that they can be seen from the PayPal transaction details page.">
               <label className="inline-flex items-center gap-2">
                 <input type="checkbox" checked={form.sendItemDetails} onChange={(e) => setForm((p) => ({ ...p, sendItemDetails: e.target.checked }))} className="h-4 w-4 rounded border-ui-border-base" />
                 <span className="text-sm text-ui-fg-base">Send line item details to PayPal</span>
               </label>
             </FieldRow>
-            <FieldRow label="Order Review Page" hint="Payments from the Product or Cart page skip the review step and go straight to the Thank You page.">
-              <label className="inline-flex items-center gap-2">
-                <input type="checkbox" checked={form.skipOrderReviewPage} onChange={(e) => setForm((p) => ({ ...p, skipOrderReviewPage: e.target.checked }))} className="h-4 w-4 rounded border-ui-border-base" />
-                <span className="text-sm text-ui-fg-base">Skip Order Review Page</span>
-              </label>
-            </FieldRow>
             <FieldRow label="Invoice prefix">
               <input value={form.invoicePrefix} onChange={(e) => setForm((p) => ({ ...p, invoicePrefix: e.target.value }))} className="w-full rounded-md border border-ui-border-base bg-ui-bg-base px-3 py-2 text-sm text-ui-fg-base outline-none focus:ring-2 focus:ring-ui-border-interactive" placeholder="WC-" />
             </FieldRow>