convert products as dataobjects

HelloBetterLTD · Oct 21, 2024 · 7e75df9 · 7e75df9
1 parent b543822
commit 7e75df9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/src/Cart/ShoppingCart.php b/src/Cart/ShoppingCart.php
@@ -16,6 +16,7 @@
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Omnipay\Model\Payment;
+use SilverStripe\ORM\DataObject;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\Security;
 
@@ -495,7 +496,7 @@ public function get(Buyable $buyable, $customFilter = [])
      */
     public function getCorrectBuyable(Buyable $buyable)
     {
-        if ($buyable instanceof Product
+        if ($buyable instanceof DataObject
             && $buyable->hasExtension(ProductVariationsExtension::class)
             && $buyable->Variations()->count() > 0
         ) {

diff --git a/src/Model/Product/OrderItem.php b/src/Model/Product/OrderItem.php
@@ -3,6 +3,7 @@
 namespace SilverShop\Model\Product;
 
 use SilverShop\Page\Product;
+use SilverStripe\ORM\DataObject;
 use SilverStripe\Versioned\Versioned;
 
 /**
@@ -19,7 +20,7 @@ class OrderItem extends \SilverShop\Model\OrderItem
     ];
 
     private static $has_one = [
-        'Product' => Product::class,
+        'Product' => DataObject::class,
     ];
 
     private static $table_name = 'SilverShop_Product_OrderItem';

diff --git a/src/Model/Variation/AttributeType.php b/src/Model/Variation/AttributeType.php
@@ -37,7 +37,7 @@ class AttributeType extends DataObject
     ];
 
     private static $belongs_many_many = [
-        'Product' => Product::class,
+        'Product' => DataObject::class,
     ];
 
     private static $summary_fields = [

diff --git a/src/Model/Variation/Variation.php b/src/Model/Variation/Variation.php
@@ -54,7 +54,7 @@ class Variation extends DataObject implements Buyable
     ];
 
     private static $has_one = [
-        'Product' => Product::class,
+        'Product' => DataObject::class,
         'Image' => Image::class
     ];
 

diff --git a/src/Page/Product.php b/src/Page/Product.php
@@ -321,7 +321,7 @@ public function getCategories()
      * @return boolean
      */
     public function canPurchase($member = null, $quantity = 1)
-    {
+    {die('aaaaaa');
         $global = self::config()->global_allow_purchase;
 
         if (!$global || !$this->AllowPurchase) {

diff --git a/src/Page/ProductCategory.php b/src/Page/ProductCategory.php
@@ -6,6 +6,7 @@
 use SilverShop\Extension\ProductVariationsExtension;
 use SilverStripe\i18n\i18nEntityProvider;
 use SilverStripe\ORM\DataList;
+use SilverStripe\ORM\DataObject;
 
 /**
  * Product Category provides a way to hierartically categorise products.
@@ -17,7 +18,7 @@
 class ProductCategory extends Page implements i18nEntityProvider
 {
     private static $belongs_many_many = [
-        'Products' => Product::class,
+        'Products' => DataObject::class,
     ];
 
     private static $singular_name = 'Category';