Commits

Chris Moffitt committed b2a4621 Merge

Merging.

Comments (0)

Files changed (3)

satchmo/apps/payment/models.py

     
     def getCCV(self):
         try:
-            ccv = keyedcache.cache_get(self.encrypted_cc, skiplog=True)
+            ccv = keyedcache.cache_get(self.encrypted_cc)
         except keyedcache.NotCachedError:
             ccv = ""
 
         if not config_value('PAYMENT', 'STORE_CREDIT_NUMBERS'):
             try:
                 key = _encrypt_code(ccnum + '-card')
-                encrypted_ccnum = keyedcache.cache_get(key, skiplog=True)
+                encrypted_ccnum = keyedcache.cache_get(key)
                 ccnum = _decrypt_code(encrypted_ccnum)
             except keyedcache.NotCachedError:
                 ccnum = ""

satchmo/apps/product/modules/custom/tests.py

             'credit_type': 'Visa',
             'credit_number': '4485079141095836',
             'month_expires': '1',
-            'year_expires': '2012',
+            'year_expires': '2015',
             'ccv': '552',
             'shipping': 'FlatRate'}
         response = self.client.post(url('DUMMY_satchmo_checkout-step2'), data)

satchmo/apps/satchmo_store/shop/tests.py

             'credit_type': 'Visa',
             'credit_number': '4485079141095836',
             'month_expires': '1',
-            'year_expires': '2014',
+            'year_expires': '2015',
             'ccv': '552',
             'shipping': 'FlatRate'}
         response = self.client.post(url('DUMMY_satchmo_checkout-step2'), data)
             'credit_type': 'Visa',
             'credit_number': '4485079141095836',
             'month_expires': '1',
-            'year_expires': '2014',
+            'year_expires': '2015',
             'ccv': '552',
             'shipping': 'FlatRate'}
         response = self.client.post(url('DUMMY_satchmo_checkout-step2'), data)
             'credit_type': 'Visa',
             'credit_number': '4485079141095836',
             'month_expires': '1',
-            'year_expires': '2014',
+            'year_expires': '2015',
             'ccv': '552',
             'shipping': 'FlatRate'}
         response = self.client.post(url('DUMMY_satchmo_checkout-step2'), data)