Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Only offer to delete a supplier that can be deleted

Łukasz Adamczyk5e392ed97d24
diff --git a/packages/admin-sdk/src/types/generated/Supplier.ts b/packages/admin-sdk/src/types/generated/Supplier.ts
index 043c911f94..ea97931417 100644
--- a/packages/admin-sdk/src/types/generated/Supplier.ts
+++ b/packages/admin-sdk/src/types/generated/Supplier.ts
@@ -1,4 +1,4 @@
-// Typelizer digest 512af3d1c9db676d1e9b7c18eec00ef4
+// Typelizer digest 8aa26f6f5cdb74c9c833570ee65f18c9
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
@@ -21,6 +21,7 @@ interface Supplier {
created_at: string;
updated_at: string;
deleted_at: string | null;
+ can_be_deleted: boolean;
}
export default Supplier;
diff --git a/packages/dashboard/src/locales/ar.json b/packages/dashboard/src/locales/ar.json
index 885e0653ec..1d08e5772e 100644
--- a/packages/dashboard/src/locales/ar.json
+++ b/packages/dashboard/src/locales/ar.json
@@ -5613,7 +5613,7 @@
},
"delete_confirm": {
"title": "حذف هذا المورد؟",
- "message": "لن يكون {{name}} متاحًا لأوامر شراء جديدة. لا يمكن حذف مورد ما زال أي أمر شراء يشير إليه."
+ "message": "سيتم إزالة {{name}} من قائمة الموردين."
}
}
}
diff --git a/packages/dashboard/src/locales/de.json b/packages/dashboard/src/locales/de.json
index 8c45f68804..dd95651711 100644
--- a/packages/dashboard/src/locales/de.json
+++ b/packages/dashboard/src/locales/de.json
@@ -5584,7 +5584,7 @@
},
"delete_confirm": {
"title": "Diesen Lieferanten löschen?",
- "message": "{{name}} steht für neue Bestellungen nicht mehr zur Verfügung. Ein Lieferant, den noch eine Bestellung nennt, kann nicht gelöscht werden."
+ "message": "{{name}} wird aus Ihrer Lieferantenliste entfernt."
}
}
}
diff --git a/packages/dashboard/src/locales/en.json b/packages/dashboard/src/locales/en.json
index 8a4d115e61..14b7f3997c 100644
--- a/packages/dashboard/src/locales/en.json
+++ b/packages/dashboard/src/locales/en.json
@@ -5584,7 +5584,7 @@
},
"delete_confirm": {
"title": "Delete this supplier?",
- "message": "{{name}} will no longer be available for new purchase orders. A supplier that any purchase order still names cannot be deleted."
+ "message": "{{name}} will be removed from your supplier list."
}
}
}
diff --git a/packages/dashboard/src/locales/fr.json b/packages/dashboard/src/locales/fr.json
index 50f7fb12d3..2522608f6c 100644
--- a/packages/dashboard/src/locales/fr.json
+++ b/packages/dashboard/src/locales/fr.json
@@ -5584,7 +5584,7 @@
},
"delete_confirm": {
"title": "Supprimer ce fournisseur ?",
- "message": "{{name}} ne sera plus disponible pour de nouveaux bons de commande. Un fournisseur encore nommé par un bon de commande ne peut pas être supprimé."
+ "message": "{{name}} sera retiré de votre liste de fournisseurs."
}
}
}
diff --git a/packages/dashboard/src/locales/pl.json b/packages/dashboard/src/locales/pl.json
index 00bb6aa568..f7d94bb36e 100644
--- a/packages/dashboard/src/locales/pl.json
+++ b/packages/dashboard/src/locales/pl.json
@@ -5646,7 +5646,7 @@
},
"delete_confirm": {
"title": "Usunąć tego dostawcę?",
- "message": "{{name}} nie będzie już dostępny w nowych zamówieniach zakupu. Dostawcy, którego wskazuje jakiekolwiek zamówienie zakupu, nie można usunąć."
+ "message": "{{name}} zostanie usunięty z listy dostawców."
}
}
}
diff --git a/packages/dashboard/src/locales/zh-CN.json b/packages/dashboard/src/locales/zh-CN.json
index 0f5f325ff7..d18d4705b4 100644
--- a/packages/dashboard/src/locales/zh-CN.json
+++ b/packages/dashboard/src/locales/zh-CN.json
@@ -5573,7 +5573,7 @@
},
"delete_confirm": {
"title": "删除此供应商?",
- "message": "{{name}} 将无法用于新的采购订单。仍被任何采购订单引用的供应商无法删除。"
+ "message": "{{name}} 将从您的供应商列表中移除。"
}
}
}
diff --git a/packages/dashboard/src/routes/_authenticated/$storeId/settings/suppliers.tsx b/packages/dashboard/src/routes/_authenticated/$storeId/settings/suppliers.tsx
index fd43fe24b2..423800ee1d 100644
--- a/packages/dashboard/src/routes/_authenticated/$storeId/settings/suppliers.tsx
+++ b/packages/dashboard/src/routes/_authenticated/$storeId/settings/suppliers.tsx
@@ -108,7 +108,11 @@ function SuppliersPage() {
{
key: 'delete',
destructive: true,
- visible: permissions.can('destroy', Subject.Supplier),
+ // A supplier with a purchasing history is kept: the orders
+ // naming it have to keep meaning something, which is what the
+ // model's `restrict_with_error` enforces. The Orders column
+ // shows why the option is absent.
+ visible: permissions.can('destroy', Subject.Supplier) && supplier.can_be_deleted,
disabled: deleteMutation.isPending,
onSelect: () => handleDelete(supplier),
},
diff --git a/spree/api/app/serializers/spree/api/v3/admin/supplier_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/supplier_serializer.rb
index 4126d610ad..9237971c62 100644
--- a/spree/api/app/serializers/spree/api/v3/admin/supplier_serializer.rb
+++ b/spree/api/app/serializers/spree/api/v3/admin/supplier_serializer.rb
@@ -18,6 +18,7 @@ module Spree
country_code: 'string | null',
postal_code: 'string | null',
purchase_orders_count: :number,
+ can_be_deleted: :boolean,
deleted_at: 'string | null',
metadata: 'Record<string, unknown>'
@@ -25,6 +26,12 @@ module Spree
:address1, :address2, :city, :state_name, :state_code,
:country_code, :postal_code, :purchase_orders_count, :metadata,
created_at: :iso8601, updated_at: :iso8601, deleted_at: :iso8601
+
+ # Lets the dashboard hide the delete control rather than offer one
+ # the model will refuse.
+ attribute :can_be_deleted do |supplier|
+ supplier.can_be_deleted?
+ end
end
end
end
diff --git a/spree/core/app/models/spree/supplier.rb b/spree/core/app/models/spree/supplier.rb
index 1d2c0aa312..3d52e51ff4 100644
--- a/spree/core/app/models/spree/supplier.rb
+++ b/spree/core/app/models/spree/supplier.rb
@@ -59,6 +59,16 @@ module Spree
address1.present? && city.present? && country_code.present?
end
+ # Mirrors what `dependent: :restrict_with_error` enforces, so the dashboard
+ # can hide the delete control rather than offer one the model will refuse.
+ # A supplier with a purchasing history is kept, not removed — the orders
+ # naming it have to keep meaning something.
+ #
+ # @return [Boolean]
+ def can_be_deleted?
+ !purchase_orders.exists?
+ end
+
def event_serializer_class
'Spree::Api::V3::SupplierEventSerializer'.safe_constantize
end
diff --git a/spree/core/spec/models/spree/supplier_spec.rb b/spree/core/spec/models/spree/supplier_spec.rb
index 6bdedc616f..8dbcc8ac63 100644
--- a/spree/core/spec/models/spree/supplier_spec.rb
+++ b/spree/core/spec/models/spree/supplier_spec.rb
@@ -67,6 +67,16 @@ module Spree
expect(supplier.destroy).to be false
expect(supplier.errors[:base]).to be_present
end
+
+ # What the dashboard reads to word its confirmation, so it has to agree
+ # with what `destroy` actually does above.
+ it 'reports whether it can be deleted' do
+ supplier = create(:supplier, store: store)
+ expect(supplier).to be_can_be_deleted
+
+ create(:purchase_order, store: store, supplier: supplier)
+ expect(supplier).not_to be_can_be_deleted
+ end
end
end
end