Merge pull request ggrammar#15 from wrighterase/master

Misc. changes and updated for Python3

Author: aluttik

.gitignore

@@ -182,3 +182,6 @@ $RECYCLE.BIN/
 
 # .nfs files are created when an open file is removed but is still being accessed
 .nfs*
+
+# ignoring a temp workspace
+workspace.py

README.md

@@ -8,18 +8,18 @@ It's a port of [the pizzapi node.js module](https://github.com/RIAEvangelist/nod
 
 First construct a `Customer` object and set the customer's address.
 ```python
->>> customer = Customer('Barack', 'Obama', '[email protected]', '2024561111')
->>> customer.set_address('700 Pennsylvania Avenue NW', 'Washington', 'DC', '20408')
+>>> customer = Customer('Barack', 'Obama', '[email protected]', '2024561111', '700 Pennsylvania Avenue NW, Washington, DC, 20408')
+>>> address = Address(*customer.address.split(','))
 ```
 
 Then, find a store that will deliver to the address.
 ```python
->>> store = find_closest_store(customer.address)
+>>> store = address.closest_store()
 ```
 
 Create an `Order` object.
 ```python
->>> order = Order(store, customer)
+>>> order = Order(store, customer, address)
 ```
 
 In order to add items to your order, you'll need the items' product codes.  
@@ -62,3 +62,11 @@ Or if you're just testing and don't want to actually order something, use `.pay_
 ```python
 >>> order.pay_with(card)
 ```
+```
+Notes:
+```
+The first steps seem unnecessary.  It seems more efficient to initalize Customer info and Address info seperately.  
+customer.address(...) has issues with the address coming across as a single string.  
+If you .split(',') you can pass it to Address as 
+```address = Address(*customer.address.split(','))``` to parse it properly.  
+From there you can do```store = Address.closes_store(address)``` to get the nearest location.

pizzapi/__init__.py

@@ -1,9 +1,9 @@
-from store import Store
-from utils import request_json
-from urls import FIND_URL
+from .store import Store
+from .utils import request_json
+from .urls import FIND_URL
 
 class Address(object):
-    def __init__(self, street, city, region='', zip=''):
+    def __init__(self, street, city, region='', zip='', *args):
         self.street = street.strip()
         self.city = city.strip()
         self.region = region.strip()

pizzapi/address.py

@@ -1,5 +1,6 @@
-from urls import MENU_URL
-from utils import request_json
+from __future__ import print_function
+from .urls import MENU_URL
+from .utils import request_json
 
 
 # TODO: Get rid of this class
@@ -35,7 +36,7 @@ def __init__(self, data={}):
             self.products = self.parse_items(data['Products'])
             self.coupons = self.parse_items(data['Coupons'])
             self.preconfigured = self.parse_items(data['PreconfiguredProducts'])
-            for key, value in data['Categorization'].iteritems():
+            for key, value in data['Categorization'].items():
                 self.root_categories[key] = self.build_categories(value)
 
     @classmethod
@@ -60,7 +61,7 @@ def build_categories(self, category_data, parent=None):
 
     def parse_items(self, parent_data):
         items = []
-        for code in parent_data.iterkeys():
+        for code in parent_data.keys():
             obj = MenuItem(parent_data[code])
             self.menu_by_code[obj.code] = obj
             items.append(obj)
@@ -71,30 +72,30 @@ def display(self):
         def print_category(category, depth=1):
             indent = "  " * (depth + 1)
             if len(category.products) + len(category.subcategories) > 0:
-                print indent + category.name
+                print(indent + category.name)
                 for subcategory in category.subcategories:
                     print_category(subcategory, depth + 1)
                 for product in category.products:
-                    print indent + "  [%s]" % product.code, product.name
-        print "************ Coupon Menu ************"
+                    print(indent + "  [%s]" % product.code, product.name)
+        print("************ Coupon Menu ************")
         print_category(self.root_categories['Coupons'])
-        print "\n************ Preconfigured Menu ************"
+        print("\n************ Preconfigured Menu ************")
         print_category(self.root_categories['PreconfiguredProducts'])
-        print "\n************ Regular Menu ************"
+        print("\n************ Regular Menu ************")
         print_category(self.root_categories['Food'])
 
     # TODO: Find more pythonic way to format the menu
     # TODO: Format the menu after the variants have been filtered
     # TODO: Return the search results and print in different method
     # TODO: Import fuzzy search module or allow lists as search conditions
     def search(self, **conditions):
-        max_len = lambda x: 2 + max(len(v[x]) for v in self.variants.values())
-        for v in self.variants.itervalues():
+        max_len = lambda x: 2 + max(len(v[x]) for v in list(self.variants.values()))
+        for v in self.variants.values():
             v['Toppings'] = dict(x.split('=', 1) for x in v['Tags']['DefaultToppings'].split(',') if x)
-            if all(y in e.get(x, '') for x, y in conditions.iteritems()):
-                print v['Code'],
-                print v['Name'],
-                print '$' + v['Price'],
-                print v['SizeCode'],
-                print v['ProductCode'],
-                print v['Toppings']
+            if all(y in v.get(x, '') for x, y in conditions.items()):
+                print(v['Code'], end=' ')
+                print(v['Name'], end=' ')
+                print('$' + v['Price'], end=' ')
+                print(v['SizeCode'], end=' ')
+                print(v['ProductCode'], end=' ')
+                print(v['Toppings'])

pizzapi/coupon.py

@@ -1,16 +1,22 @@
 import requests
 
-from menu import Menu
-from urls import PRICE_URL, PLACE_URL, VALIDATE_URL
+from .menu import Menu
+from .urls import PRICE_URL, PLACE_URL, VALIDATE_URL
 
 
 # TODO: Add add_coupon and remove_coupon methods
 class Order(object):
-    def __init__(self, store, customer):
+    def __init__(self, store, customer, address):
         self.store = store
         self.menu = Menu.from_store(store_id=store.id)
         self.customer = customer
+        self.address = address
         self.data = {
+            'Address': {'Street': self.address.street,
+                        'City': self.address.city,
+                        'Region': self.address.region,
+                        'PostalCode': self.address.zip,
+                        'Type': 'House'},
             'Coupons': [], 'CustomerID': '', 'Extension': '',
             'OrderChannel': 'OLO', 'OrderID': '', 'NoCombine': True,
             'OrderMethod': 'Web', 'OrderTaker': None, 'Payments': [],
@@ -20,7 +26,7 @@ def __init__(self, store, customer):
             'Partners': {}, 'NewUser': True, 'metaData': {}, 'Amounts': {},
             'BusinessDate': '', 'EstimatedWaitMinutes': '',
             'PriceOrderTime': '', 'AmountsBreakdown': {}
-        }
+            }
 
     # TODO: Implement item options
     # TODO: Add exception handling for KeyErrors
@@ -35,14 +41,25 @@ def remove_item(self, code):
         codes = [x['Code'] for x in self.data['Products']]
         return self.data['Products'].pop(codes.index(code))
 
+    def add_coupon(self, code, qty=1):
+        item = self.menu.variants[code]
+        item.update(ID=1, isNew=True, Qty=qty, AutoRemove=False)
+        self.data['Coupons'].append(item)
+        return item
+
+    def remove_coupon(self, code):
+        codes = [x['Code'] for x in self.data['Coupons']]
+        return self.data['Coupons'].pop(codes.index(code))
+
     def _send(self, url, merge):
         self.data.update(
             StoreID=self.store.id,
             Email=self.customer.email,
             FirstName=self.customer.first_name,
             LastName=self.customer.last_name,
             Phone=self.customer.phone,
-            Address=self.customer.address.data
+            #Address=self.address.street
+
         )
 
         for key in ('Products', 'StoreID', 'Address'):
@@ -53,14 +70,15 @@ def _send(self, url, merge):
             'Referer': 'https://order.dominos.com/en/pages/order/',
             'Content-Type': 'application/json'
         }
+
         r = requests.post(url=url, headers=headers, json={'Order': self.data})
         r.raise_for_status()
         json_data = r.json()
+
         if merge:
-            for key, value in json_data['Order'].iteritems():
+            for key, value in json_data['Order'].items():
                 if value or not isinstance(value, list):
                     self.data[key] = value
-
         return json_data
 
     # TODO: Figure out if this validates anything that PRICE_URL does not
@@ -79,18 +97,18 @@ def pay_with(self, card):
         """Use this instead of self.place when testing"""
         # get the price to check that everything worked okay
         response = self._send(PRICE_URL, True)
+        
         if response['Status'] == -1:
             raise Exception('get price failed: %r' % response)
-
         self.credit_card = card
         self.data['Payments'] = [
             {
                 'Type': 'CreditCard',
-                'Experiation': self.card.expiration,
+                'Expiration': self.credit_card.expiration,
                 'Amount': self.data['Amounts'].get('Customer', 0),
-                'CardType': self.card.card_type,
-                'Number': self.card.number,
-                'SecurityCode': self.card.cvv,
-                'PostalCode': self.card.zip
+                'CardType': self.credit_card.card_type,
+                'Number': int(self.credit_card.number),
+                'SecurityCode': int(self.credit_card.cvv),
+                'PostalCode': int(self.credit_card.zip)
             }
         ]

pizzapi/customer.py

@@ -24,5 +24,5 @@ def find_type(self):
                     'DISCOVER': r'^6(?:011|5[0-9]{2})[0-9]{12}$',
                     'JCB': r'^(?:2131|1800|35\d{3})\d{11}$',
                     'ENROUTE': r'^(?:2014|2149)\d{11}$'}
-        return next((card_type for card_type, pattern in patterns.items()
+        return next((card_type for card_type, pattern in list(patterns.items())
                      if re.match(pattern, self.number)), '')

pizzapi/menu.py

@@ -1,11 +1,11 @@
-from menu import Menu
-from urls import INFO_URL, MENU_URL
-from utils import request_json
+from .menu import Menu
+from .urls import INFO_URL, MENU_URL
+from .utils import request_json
 
 
 class Store(object):
     def __init__(self, data={}):
-        self.id = int(data.get('StoreID', -1))
+        self.id = str(data.get('StoreID', -1))
         self.data = data
 
     def get_details(self):

pizzapi/order.py

@@ -1,5 +1,5 @@
-from urls import TRACK_BY_PHONE, TRACK_BY_ORDER
-from utils import request_xml, request_json
+from .urls import TRACK_BY_PHONE, TRACK_BY_ORDER
+from .utils import request_xml, request_json
 
 
 def track_by_phone(phone):

pizzapi/payment.py

@@ -6,3 +6,4 @@
 TRACK_BY_ORDER = 'https://trkweb.dominos.com/orderstorage/GetTrackerData?StoreID={store_id}&OrderKey={order_key}'
 TRACK_BY_PHONE = 'https://trkweb.dominos.com/orderstorage/GetTrackerData?Phone={phone}'
 VALIDATE_URL = 'https://order.dominos.com/power/validate-order'
+COUPON_URL = 'https://order.dominos.com/power/store/{store_id}/coupon/{couponid}?lang={lang}'

pizzapi/store.py

@@ -1,7 +1,6 @@
 import requests
 import xmltodict
 
-
 # TODO: Find out why this occasionally hangs
 def request_json(url, **kwargs):
     r = requests.get(url.format(**kwargs))