From 4bab83e97d681e053163d9abdb9000f60bb4f691 Mon Sep 17 00:00:00 2001
From: The Nguyen <6950941+treoden@users.noreply.github.com>
Date: Thu, 9 May 2024 10:26:52 +0700
Subject: [PATCH 1/2] Fix sql query from the subscriber

---
 .../catalog/subscribers/product_deleted/deleteUrlRewrite.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/evershop/src/modules/catalog/subscribers/product_deleted/deleteUrlRewrite.js b/packages/evershop/src/modules/catalog/subscribers/product_deleted/deleteUrlRewrite.js
index 5739bd9fd..8047df96b 100644
--- a/packages/evershop/src/modules/catalog/subscribers/product_deleted/deleteUrlRewrite.js
+++ b/packages/evershop/src/modules/catalog/subscribers/product_deleted/deleteUrlRewrite.js
@@ -7,6 +7,6 @@ module.exports = async function buildUrlReWrite(data) {
   // Delete the url rewrite for the product
   await execute(
     pool,
-    `DELETE FROM url_rewrite WHERE entity_uuid = ${productUuid} AND entity_type = 'product'`
+    `DELETE FROM url_rewrite WHERE entity_uuid = '${productUuid}' AND entity_type = 'product'`
   );
 };

From 2e387f6d906bfbb7f853daa215dd9f1225e011b0 Mon Sep 17 00:00:00 2001
From: The Nguyen <6950941+treoden@users.noreply.github.com>
Date: Thu, 9 May 2024 10:27:47 +0700
Subject: [PATCH 2/2] Fix returning value after delete record

---
 .../checkout/api/deleteShippingZone/deleteShippingZone.js  | 7 ++-----
 .../deleteShippingZoneMethod/deleteShippingZoneMethod.js   | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/evershop/src/modules/checkout/api/deleteShippingZone/deleteShippingZone.js b/packages/evershop/src/modules/checkout/api/deleteShippingZone/deleteShippingZone.js
index f72478e5b..07ec90a56 100644
--- a/packages/evershop/src/modules/checkout/api/deleteShippingZone/deleteShippingZone.js
+++ b/packages/evershop/src/modules/checkout/api/deleteShippingZone/deleteShippingZone.js
@@ -38,14 +38,11 @@ module.exports = async (request, response, deledate, next) => {
       });
       return;
     }
-    const zone = await del('shipping_zone')
-      .where('uuid', '=', id)
-      .execute(connection);
-
+    await del('shipping_zone').where('uuid', '=', id).execute(connection);
     await commit(connection);
     response.status(OK);
     response.json({
-      data: zone
+      data: shippingZone
     });
   } catch (e) {
     error(e);
diff --git a/packages/evershop/src/modules/checkout/api/deleteShippingZoneMethod/deleteShippingZoneMethod.js b/packages/evershop/src/modules/checkout/api/deleteShippingZoneMethod/deleteShippingZoneMethod.js
index 908d3ad6d..02b766336 100644
--- a/packages/evershop/src/modules/checkout/api/deleteShippingZoneMethod/deleteShippingZoneMethod.js
+++ b/packages/evershop/src/modules/checkout/api/deleteShippingZoneMethod/deleteShippingZoneMethod.js
@@ -63,14 +63,14 @@ module.exports = async (request, response, deledate, next) => {
     }
 
     // Delete the shipping zone method
-    const method = await del('shipping_zone_method')
+    await del('shipping_zone_method')
       .where('method_id', '=', zoneMethod.shipping_method_id)
       .and('zone_id', '=', shippingZone.shipping_zone_id)
       .execute(connection);
     await commit(connection);
     response.status(OK);
     response.json({
-      data: method
+      data: zoneMethod
     });
   } catch (e) {
     await rollback(connection);