Merge branch 'master' into develop

This commit is contained in:
olivermrbl
2023-01-10 19:23:34 +01:00
37 changed files with 5200 additions and 3609 deletions
+24 -5
View File
@@ -247,6 +247,11 @@ module.exports = {
id: "advanced/storefront/customer-profiles",
label: "Add Customer Profiles"
},
{
type: "doc",
id: "advanced/storefront/use-gift-cards",
label: "Use Gift Cards"
},
{
type: "doc",
id: "guides/carts-in-medusa",
@@ -323,6 +328,11 @@ module.exports = {
id: "advanced/admin/manage-discounts",
label: "Manage Discounts"
},
{
type: "doc",
id: "advanced/admin/manage-gift-cards",
label: "Manage Gift Cards"
},
{
type: "doc",
id: "advanced/admin/manage-regions",
@@ -409,12 +419,21 @@ module.exports = {
id: "advanced/ecommerce/handle-order-claim-event",
label: "Handle Order Claim Event"
},
{
type: "doc",
id: "advanced/ecommerce/send-gift-card-to-customer",
label: "Send Gift Card Code"
},
]
},
{
type: "category",
label: "Conceptual Guides",
items: [
{
type: "doc",
id: "advanced/backend/dependency-container/index"
},
{
type: "doc",
id: "advanced/backend/entities/overview",
@@ -478,6 +497,10 @@ module.exports = {
type: "doc",
id: "advanced/backend/customers/index"
},
{
type: "doc",
id: "advanced/backend/customer-groups/index"
},
{
type: "doc",
id: "advanced/backend/taxes/inclusive-pricing",
@@ -497,11 +520,7 @@ module.exports = {
},
{
type: "doc",
id: "advanced/backend/customer-groups/index"
},
{
type: "doc",
id: "advanced/backend/dependency-container/index"
id: "advanced/backend/gift-cards/index"
},
]
},
+14 -7
View File
@@ -29,27 +29,34 @@ export default function Feedback ({
const location = useLocation();
function handleFeedback (e) {
submitFeedback()
setPositiveFeedbac(e.target.classList.contains('positive'));
setShowForm(true);
}
function submitFeedback (e) {
function submitFeedback () {
if (isBrowser) {
if (window.analytics) {
setLoading(true);
if (showForm) {
setLoading(true);
}
window.analytics.track(event, {
url: location.pathname,
label: document.title,
feedback: positiveFeedback ? 'yes' : 'no',
message
}, function () {
setLoading(false);
setShowForm(false);
setSubmittedFeedback(true);
if (showForm) {
setLoading(false);
setShowForm(false);
setSubmittedFeedback(true);
}
})
} else {
setShowForm(false);
setSubmittedFeedback(true);
if (showForm) {
setShowForm(false);
setSubmittedFeedback(true);
}
}
}
}