Simplify the API

2 files changed, 16 insertions, 30 deletions

diff --git a/payments/dotpay/__init__.py b/payments/dotpay/__init__.py
index b03287a..0b12586 100644
--- a/payments/dotpay/__init__.py
+++ b/payments/dotpay/__init__.py
@@ -23,8 +23,6 @@ class DotpayProvider(BasicProvider):
     lock:
         whether to disable channels other than the default selected above
     '''
-    LINE_TEMPLATE = '%(quantity)dx %(name)s (%(sku)s), %(price)f %(currency)s'
-
     _method = 'post'
     _action = 'https://ssl.dotpay.pl/'
 
@@ -36,16 +34,14 @@ class DotpayProvider(BasicProvider):
         self._lock = kwargs.pop('lock', False)
         super(DotpayProvider, self).__init__(*args, **kwargs)
 
-    def get_hidden_fields(self,):
+    def get_hidden_fields(self, ordered_items=None):
         self.payment.save()
-        description = '; '.join([self.LINE_TEMPLATE % order_line._asdict()
-                                 for order_line in self.order_items])
         data = {
             'id': self._seller_id,
             'amount': str(self.payment.total),
             'control': str(self.payment.id),
             'currency': self.payment.currency,
-            'description': description,
+            'description': self.payment.description,
             'lang': self._lang,
             'channel': str(self._channel),
             'ch_lock': '1' if self._lock else '0',
diff --git a/payments/dotpay/tests.py b/payments/dotpay/tests.py
index 319a5db..c55e4d6 100644
--- a/payments/dotpay/tests.py
+++ b/payments/dotpay/tests.py
@@ -60,39 +60,29 @@ class TestDotpayProvider(TestCase):
 
     def setUp(self):
         self.payment = Payment()
-        self.order_items = MagicMock()
-        self.order_items.__iter__.return_value = [PaymentItem('foo', 10, 100,
-                                                              'USD', 'd431')]
+        self.ordered_items = MagicMock()
+        self.ordered_items.__iter__.return_value = [PaymentItem('foo', 10, 100,
+                                                                'USD', 'd431')]
 
     def test_get_hidden_fields(self):
-        '''
-        Tests if the get_hidden_fields returns a dictionary.
-        '''
-        provider = DotpayProvider(self.payment, VARIANT, self.order_items,
-                                  seller_id='123', pin=PIN)
-        self.assertEqual(type(provider.get_hidden_fields()), dict,
-                         'Should return a dictionary.')
+        """DotpayProvider.get_hidden_fields() returns a dictionary"""
+        provider = DotpayProvider(self.payment, seller_id='123', pin=PIN)
+        self.assertEqual(
+            type(provider.get_hidden_fields(ordered_items=self.ordered_items)),
+            dict)
 
     def test_process_data(self):
-        '''
-        Tests if the process_dat returns a correct http response.
-        '''
+        """DotpayProvider.process_data() returns a correct HTTP response"""
         request = MagicMock()
         request.POST = get_post_with_md5(PROCESS_POST)
-        provider = DotpayProvider(self.payment, VARIANT, self.order_items,
-                                  seller_id='123', pin=PIN)
+        provider = DotpayProvider(self.payment, seller_id='123', pin=PIN)
         response = provider.process_data(request)
-        self.assertEqual(type(response), HttpResponse,
-                         'Should return a HttpResponse object.')
+        self.assertEqual(type(response), HttpResponse)
 
     def test_uncorrect_process_data(self):
-        '''
-        Tests if the process_dat returns a correct http response.
-        '''
+        """DotpayProvider.process_data() checks POST signature"""
         request = MagicMock()
         request.POST = PROCESS_POST
-        provider = DotpayProvider(self.payment, VARIANT, self.order_items,
-                                  seller_id='123', pin=PIN)
+        provider = DotpayProvider(self.payment, seller_id='123', pin=PIN)
         response = provider.process_data(request)
-        self.assertEqual(type(response), HttpResponseForbidden,
-                         'Should return a HttpResponseForbidden object.')
+        self.assertEqual(type(response), HttpResponseForbidden)