Skip to content

Commit a176df1

Browse files
committed
Patch subscriptions for sync
1 parent 0b144a5 commit a176df1

6 files changed

Lines changed: 16 additions & 23 deletions

File tree

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
include LICENSE
22
include README.md
3-
include VERSION
43
include setup.py
54
recursive-include membersuite_api_client *

VERSION

Lines changed: 0 additions & 1 deletion
This file was deleted.

membersuite_api_client/VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.3.1

membersuite_api_client/orders/models.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,16 @@ def __str__(self):
6565
session_id=self.session_id))
6666

6767
@property
68-
def first_line_item(self):
69-
"""Returns the first OrderLineItem object for line items in this order.
68+
def line_items(self):
69+
"""Returns the OrderLineItem objects for line items
70+
in this order.
7071
"""
7172
membersuite_object_data = (
72-
self.fields["LineItems"]["MemberSuiteObject"][0])
73-
line_item = OrderLineItem(
74-
membersuite_object_data=membersuite_object_data)
75-
return line_item
73+
self.fields["LineItems"]["MemberSuiteObject"])
74+
line_items = []
75+
for datum in membersuite_object_data:
76+
line_items.append(OrderLineItem(membersuite_object_data=datum))
77+
return line_items
7678

7779
def get_products(self, client=None):
7880
"""A list of Product objects in this Order.

membersuite_api_client/subscriptions/models.py

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,14 @@ class Subscription(MemberSuiteObject):
1515
def __init__(self, membersuite_object_data):
1616
super(Subscription, self).__init__(
1717
membersuite_object_data=membersuite_object_data)
18-
self.owner_id = self.fields['Owner']
19-
self.start_date = self.fields['StartDate']
20-
self.expiration_date = self.fields['ExpirationDate']
21-
self.name = self.fields['Name']
22-
self.order_id = self.fields['OriginalOrder']
18+
self.owner_id = self.fields["Owner"]
19+
self.start_date = self.fields["StartDate"]
20+
self.expiration_date = self.fields["ExpirationDate"]
21+
self.name = self.fields["Name"]
22+
self.created_date = self.fields["CreatedDate"]
23+
self.order_id = self.fields["OriginalOrder"]
2324

2425
def get_order(self, client=None):
2526
order = orders_services.get_order(membersuite_id=self.order_id,
2627
client=client)
2728
return order
28-
29-
def get_product(self, client=None):
30-
order = self.get_order(client=client)
31-
if order:
32-
first_line_item = order.first_line_item
33-
product = first_line_item.get_product(client=client)
34-
return product
35-
else:
36-
return None

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def read(fname):
99

1010

1111
setup(name='membersuite_api_client',
12-
version=read("VERSION"),
12+
version=read("membersuite_api_client/VERSION"),
1313
description='MemberSuite API Client',
1414
author='AASHE',
1515
author_email='webdev@aashe.org',

0 commit comments

Comments
 (0)