Merge pull request #11 from 2Checkout/CC-210

Update python2 library for new test orders approach

Author: craigchristenson

setup.py

@@ -3,7 +3,7 @@
 from distutils.core import setup
 setup(
     name="twocheckout",
-    version='0.3.0',
+    version='0.4.0',
     description="2Checkout Python Library",
     author="Craig Christenson",
     author_email="christensoncraig@gmail.com",

test/test_twocheckout.py

@@ -12,36 +12,25 @@
 NOW = datetime.datetime.now()
 
 EXAMPLE_PRODUCT = {
-    'name': 'Example Product',
-    'price': 1.00
-}
-
-EXAMPLE_OPTION = {
-    'option_name': 'Example Option',
-    'option_value_name': 'Test',
-    'option_value_surcharge': 1.00
-}
-
-EXAMPLE_COUPON = {
-    'date_expire': '2020-12-12',
-    'type': 'shipping'
+    'name': 'Python Example Product',
+    'price': 2.00
 }
 
 EXAMPLE_SALE = {
-    'sale_id': 9093717691800
+    'sale_id': 250353589267
 }
 
 EXAMPLE_COMMENT = {
-    'sale_comment': "test"
+    'sale_comment': "python2 test"
 }
 
 EXAMPLE_REFUND = {
-    'comment': "test",
+    'comment': "Python Refund Sale",
     'category': 1
 }
 
 EXAMPLE_SHIP = {
-    'tracking_number': 123
+    'tracking_number': "test"
 }
 
 EXAMPLE_PASSBACK = {
@@ -61,19 +50,22 @@
 }
 
 EXAMPLE_AUTH = {
-    'merchantOrderId': '123',
-    'token': 'NTQyZTQyOTMtNjA0Ni00NzM4LTkyNDItNjVlMmUzZTU2NTNj',
-    'currency': 'USD',
-    'total': '1.00',
-    'billingAddr': {
-        'name': 'Testing Tester',
-        'addrLine1': '123 Test St',
-        'city': 'Columbus',
-        'state': 'OH',
-        'zipCode': '43123',
-        'country': 'USA',
-        'email': 'cchristenson@2co.com',
-        'phoneNumber': '555-555-5555'
+    "sellerId": "CREDENTIALS_HERE",
+    "privateKey": "CREDENTIALS_HERE",
+    "merchantOrderId": "123",
+    "token": "CUSTOMER-CLIENT-SIDE-TOKEN",
+    "currency": "USD",
+    "total": "2.00",
+    "demo": True,
+     "billingAddr": {
+        "name": "John Doe",
+        "addrLine1": "123 Test St",
+        "city": "Columbus",
+        "state": "Ohio",
+        "zipCode": "43123",
+        "country": "USA",
+        "email": "example@2co.com",
+        "phoneNumber": "5555555555"
     }
 }
 
@@ -82,25 +74,40 @@ def setUp(self):
         super(TwocheckoutTestCase, self).setUp()
 
         twocheckout.Api.credentials({
-            'username': 'testlibraryapi901248204',
-            'password': 'testlibraryapi901248204PASS',
-            'mode': 'sandbox'
+            'username': 'CREDENTIALS_HERE',
+            'password': 'CREDENTIALS_HERE'
         })
 
         twocheckout.Api.auth_credentials({
-            'private_key': 'BE632CB0-BB29-11E3-AFB6-D99C28100996',
-            'seller_id': '901248204',
-            'mode': 'sandbox'
+            'private_key': 'CREDENTIALS_HERE',
+            'seller_id': 'CREDENTIALS_HERE'
         })
 
+
+class AuthorizationTest(TwocheckoutTestCase):
+    def setUp(self):
+        super(AuthorizationTest, self).setUp()
+
+## Place order test
+    def test_1_auth(self):
+        params = EXAMPLE_AUTH
+        try:
+            result = twocheckout.Charge.authorize(params)
+
+            ## use OrderNumber for sale_id for next tests
+            print("OrderNumber: ", result.orderNumber)
+            self.assertEqual(result.responseCode, "APPROVED")
+        except TwocheckoutError as error:
+            self.assertEqual(error.msg, "Unauthorized")
+
 class SaleTest(TwocheckoutTestCase):
     def setUp(self):
         super(SaleTest, self).setUp()
 
     def test_1_find_sale(self):
         try:
             sale = twocheckout.Sale.find(EXAMPLE_SALE)
-            self.assertEqual(int(sale.sale_id), 9093717691800)
+            self.assertEqual(int(sale.sale_id), 250353589267)
         except TwocheckoutError as error:
             self.assertEqual(error.message, "Unable to find record.")
 
@@ -115,26 +122,27 @@ def test_3_refund_sale(self):
             result = sale.refund(EXAMPLE_REFUND)
             self.assertEqual(result.message, "refund added to invoice")
         except TwocheckoutError as error:
-            self.assertEqual(error.message, "Invoice was already refunded.")
+            self.assertEqual(error.message, "Amount greater than remaining balance on invoice.")
 
+## If you have already run test_3 then test_4 will fail for the same sale_id.
     def test_4_refund_invoice(self):
         try:
             sale = twocheckout.Sale.find(EXAMPLE_SALE)
             invoice = sale.invoices[0]
             result = invoice.refund(EXAMPLE_REFUND)
-            self.assertEqual(result.message, "refund added to invoice")
+            self.assertEqual(result.response_message, "refund added to invoice")
         except TwocheckoutError as error:
-            self.assertEqual(error.message, "Invoice was already refunded.")
+            self.assertEqual(error.message, "Amount greater than remaining balance on invoice.")
 
     def test_5_refund_lineitem(self):
         try:
             sale = twocheckout.Sale.find(EXAMPLE_SALE)
             invoice = sale.invoices[0]
             lineitem = invoice.lineitems[0]
             result = lineitem.refund(EXAMPLE_REFUND)
-            self.assertEqual(result.message, "lineitem refunded")
+            self.assertEqual(result.response_message, "lineitem refunded")
         except TwocheckoutError as error:
-            self.assertEqual(error.message, "Lineitem was already refunded.")
+            self.assertEqual(error.message, "Lineitem amount greater than remaining balance on invoice.")
 
     def test_6_stop_sale(self):
         sale = twocheckout.Sale.find(EXAMPLE_SALE)
@@ -147,7 +155,8 @@ def test_7_stop_invoice(self):
         result = invoice.stop()
         self.assertEqual(result.response_message, "No active recurring lineitems")
 
-    def test_6_stop_sale(self):
+## If you have already run "test_7_stop_invoice" then "test_8_stop_sale_lineitem" will fail for the same sale_id.
+    def test_8_stop_sale_lineitem(self):
         sale = twocheckout.Sale.find(EXAMPLE_SALE)
         invoice = sale.invoices[0]
         try:
@@ -156,37 +165,30 @@ def test_6_stop_sale(self):
         except TwocheckoutError as error:
             self.assertEqual(error.message, "Lineitem is not scheduled to recur.")
 
-    def test_7_comment(self):
+    def test_9_comment(self):
         sale = twocheckout.Sale.find(EXAMPLE_SALE)
         result = sale.comment(EXAMPLE_COMMENT)
         self.assertEqual(result.response_message, "Created comment successfully.")
 
-    def test_8_ship(self):
+    def test_10_ship(self):
         try:
             sale = twocheckout.Sale.find(EXAMPLE_SALE)
             result = sale.ship(EXAMPLE_SHIP)
         except TwocheckoutError as error:
             self.assertEqual(error.message, "Sale already marked shipped.")
 
-    def test_9_reauth(self):
-        try:
-            sale = twocheckout.Sale.find(EXAMPLE_SALE)
-            sale.reauth()
-        except TwocheckoutError as error:
-            self.assertEqual(error.message, "Payment is already pending or deposited and cannot be reauthorized.")
-
 class ProductTest(TwocheckoutTestCase):
     def setUp(self):
         super(ProductTest, self).setUp()
 
     def test_1_create(self):
         result = twocheckout.Product.create(EXAMPLE_PRODUCT)
-        self.assertEqual(result.response_message, "Product successfully created")
+        self.assertEqual(result.response_message, "Product successfully created.")
         EXAMPLE_PRODUCT['product_id'] = result.product_id
 
     def test_2_find(self):
         product = twocheckout.Product.find(EXAMPLE_PRODUCT)
-        self.assertEqual(product.name, "Example Product")
+        self.assertEqual(product.name, "Python Example Product")
 
     def test_3_update(self):
         product = twocheckout.Product.find(EXAMPLE_PRODUCT)
@@ -204,75 +206,21 @@ def test_5_list(self):
         list = twocheckout.Product.list(params)
         self.assertEqual(len(list), 2)
 
-class OptionTest(TwocheckoutTestCase):
-    def setUp(self):
-        super(OptionTest, self).setUp()
-
-    def test_1_create(self):
-        result = twocheckout.Option.create(EXAMPLE_OPTION)
-        self.assertEqual(result.response_message, "Option created successfully")
-        EXAMPLE_OPTION['option_id'] = result.option_id
-
-    def test_2_find(self):
-        option = twocheckout.Option.find(EXAMPLE_OPTION)
-        self.assertEqual(option.option_name, "Example Option")
-
-    def test_3_update(self):
-        option = twocheckout.Option.find(EXAMPLE_OPTION)
-        params = dict()
-        params['option_name'] = "Updated Name"
-        option = option.update(params)
-        self.assertEqual(option.option_name, "Updated Name")
-
-    def test_4_delete(self):
-        option = twocheckout.Option.find(EXAMPLE_OPTION)
-        result = option.delete(EXAMPLE_OPTION)
-        self.assertEqual(result.response_message, "Option deleted successfully")
-
-    def test_5_list(self):
-        params = {'pagesize': 3}
-        list = twocheckout.Option.list(params)
-        self.assertEqual(len(list), 3)
-
-class CouponTest(TwocheckoutTestCase):
-    def setUp(self):
-        super(CouponTest, self).setUp()
-
-    def test_1_create(self):
-        result = twocheckout.Coupon.create(EXAMPLE_COUPON)
-        EXAMPLE_COUPON['coupon_code'] = result.coupon_code
-        self.assertEqual(result.response_message, "Coupon successfully created")
-
-    def test_2_find(self):
-        coupon = twocheckout.Coupon.find(EXAMPLE_COUPON)
-        self.assertEqual(coupon.coupon_code, EXAMPLE_COUPON['coupon_code'])
-
-    def test_3_update(self):
-        coupon = twocheckout.Coupon.find(EXAMPLE_COUPON)
-        EXAMPLE_COUPON['date_expire'] = "2020-01-02"
-        coupon = coupon.update(EXAMPLE_COUPON)
-        self.assertEqual(coupon.date_expire, "2020-01-02")
-
-    def test_4_delete(self):
-        coupon = twocheckout.Coupon.find(EXAMPLE_COUPON)
-        result = coupon.delete(EXAMPLE_COUPON)
-        self.assertEqual(result.response_message, "Coupon successfully deleted.")
-
 class CompanyTest(TwocheckoutTestCase):
     def setUp(self):
         super(CompanyTest, self).setUp()
 
     def test_1_retrieve(self):
         company = twocheckout.Company.retrieve()
-        self.assertEqual(company.vendor_id, "901248204")
+        self.assertEqual(company.vendor_id, "250111206876")
 
 class ContactTest(TwocheckoutTestCase):
     def setUp(self):
         super(ContactTest, self).setUp()
 
     def test_1_create(self):
         contact = twocheckout.Contact.retrieve()
-        self.assertEqual(contact.vendor_id, "901248204")
+        self.assertEqual(contact.vendor_id, "250111206876")
 
 class PaymentTest(TwocheckoutTestCase):
     def setUp(self):
@@ -304,17 +252,5 @@ def test_1_check(self):
         result = twocheckout.Notification.check(params)
         self.assertEqual(result.response_code, "SUCCESS")
 
-class AuthorizationTest(TwocheckoutTestCase):
-    def setUp(self):
-        super(AuthorizationTest, self).setUp()
-
-    def test_1_auth(self):
-        params = EXAMPLE_AUTH
-        try:
-            result = twocheckout.Charge.authorize(params)
-            self.assertEqual(result.responseCode, "APPROVED")
-        except TwocheckoutError as error:
-            self.assertEqual(error.msg, "Unauthorized")
-
 if __name__ == '__main__':
     unittest.main()

twocheckout/__init__.py

@@ -4,8 +4,6 @@
 from passback import Passback
 from ins import Notification
 from product import Product
-from option import Option
-from coupon import Coupon
 from contact import Contact
 from company import Company
 from charge import Charge

twocheckout/api_request.py

@@ -10,22 +10,17 @@ class Api:
     password = None
     private_key = None
     seller_id = None
-    mode = None
     version = '1'
 
     @classmethod
     def credentials(cls, credentials):
         Api.username = credentials['username']
         Api.password = credentials['password']
-        if 'mode' in credentials:
-            Api.mode = credentials['mode']
 
     @classmethod
     def auth_credentials(cls, credentials):
         Api.private_key = credentials['private_key']
         Api.seller_id = credentials['seller_id']
-        if 'mode' in credentials:
-            Api.mode = credentials['mode']
 
     @classmethod
     def call(cls, method, params=None):
@@ -60,10 +55,7 @@ def set_opts(cls, method, params=None):
         else:
             username = cls.username
             password = cls.password
-            if cls.mode == 'sandbox':
-                passwd_url = 'https://sandbox.2checkout.com'
-            else:
-                passwd_url = 'https://www.2checkout.com'
+            passwd_url = 'https://www.2checkout.com'
             data = urllib.urlencode(params)
             password_manager = urllib2.HTTPPasswordMgrWithDefaultRealm()
             password_manager.add_password(
@@ -91,10 +83,7 @@ def build_headers(cls, method):
 
     @classmethod
     def build_url(cls, method):
-        if cls.mode == 'sandbox':
-            url = 'https://sandbox.2checkout.com'
-        else:
-            url = 'https://www.2checkout.com'
+        url = 'https://www.2checkout.com'
         if method == 'authService':
             url += '/checkout/api/' + cls.version + '/' + cls.seller_id + '/rs/' + method
         else: