Browse Source

Adjust default lead time to be None

It's potentially confusing to have it default to a value as you might
miss this in your project.
master
David Winterbottom 13 years ago
parent
commit
2ffc10e0ce
2 changed files with 21 additions and 1 deletions
  1. 9
    1
      oscar/apps/partner/wrappers.py
  2. 12
    0
      tests/unit/partner/wrapper_tests.py

+ 9
- 1
oscar/apps/partner/wrappers.py View File

@@ -76,10 +76,18 @@ class DefaultWrapper(object):
76 76
         return _("Not available")
77 77
 
78 78
     def dispatch_date(self, stockrecord):
79
+        """
80
+        We don't provide a default value as it could be confusing.  Subclass
81
+        and override this method to provide estimated dispatch dates
82
+        """
79 83
         return None
80 84
 
81 85
     def lead_time(self, stockrecord):
82
-        return 1
86
+        """
87
+        We don't provide a default value as it could be confusing.  Subclass
88
+        and override this method to provide estimated dispatch dates
89
+        """
90
+        return None
83 91
 
84 92
     def calculate_tax(self, stockrecord):
85 93
         return D('0.00')

+ 12
- 0
tests/unit/partner/wrapper_tests.py View File

@@ -40,6 +40,9 @@ class TestStockRecordWithNullStockLevel(TestCase):
40 40
     def test_returns_no_estimated_dispatch_date(self):
41 41
         self.assertIsNone(self.wrapper.dispatch_date(self.record))
42 42
 
43
+    def test_returns_no_estimated_lead_time(self):
44
+        self.assertIsNone(self.wrapper.lead_time(self.record))
45
+
43 46
     def test_returns_zero_tax(self):
44 47
         self.assertEqual(D('0.00'), self.wrapper.calculate_tax(self.record))
45 48
 
@@ -74,6 +77,9 @@ class TestStockRecordOfDigitalProduct(TestCase):
74 77
     def test_returns_no_estimated_dispatch_date(self):
75 78
         self.assertIsNone(self.wrapper.dispatch_date(self.record))
76 79
 
80
+    def test_returns_no_estimated_lead_time(self):
81
+        self.assertIsNone(self.wrapper.lead_time(self.record))
82
+
77 83
     def test_returns_zero_tax(self):
78 84
         self.assertEqual(D('0.00'), self.wrapper.calculate_tax(self.record))
79 85
 
@@ -108,6 +114,9 @@ class TestStockRecordOfZeroStockProduct(TestCase):
108 114
     def test_returns_no_estimated_dispatch_date(self):
109 115
         self.assertIsNone(self.wrapper.dispatch_date(self.record))
110 116
 
117
+    def test_returns_no_estimated_lead_time(self):
118
+        self.assertIsNone(self.wrapper.lead_time(self.record))
119
+
111 120
     def test_returns_zero_tax(self):
112 121
         self.assertEqual(D('0.00'), self.wrapper.calculate_tax(self.record))
113 122
 
@@ -149,5 +158,8 @@ class TestStockRecordWithPositiveStock(TestCase):
149 158
     def test_returns_no_estimated_dispatch_date(self):
150 159
         self.assertIsNone(self.wrapper.dispatch_date(self.record))
151 160
 
161
+    def test_returns_no_estimated_lead_time(self):
162
+        self.assertIsNone(self.wrapper.lead_time(self.record))
163
+
152 164
     def test_returns_zero_tax(self):
153 165
         self.assertEqual(D('0.00'), self.wrapper.calculate_tax(self.record))

Loading…
Cancel
Save