devartis · johnksterling · Aug 23, 2016 · May 5, 2017 · May 5, 2017 · May 5, 2017
diff --git a/.cache/v/cache/lastfailed b/.cache/v/cache/lastfailed
@@ -0,0 +1 @@
+{}
diff --git a/passbook/models.py b/passbook/models.py
@@ -98,7 +98,12 @@ def __init__(self, key, value, label='', currencyCode=''):
         self.currencyCode = currencyCode  # ISO 4217 currency code
 
     def json_dict(self):
-        return self.__dict__
+        json_dictionary = self.__dict__
+        # if the consumer provides both a style and currency, only encode the currency code
+        # apple will reject the pass otherwise
+        if json_dictionary.get('currencyCode') and json_dictionary.get('numberStyle'):
+            json_dictionary.pop('numberStyle', None)
+        return json_dictionary
 
 
 class Barcode(object):

diff --git a/passbook/test/test_passbook.py b/passbook/test/test_passbook.py
@@ -13,7 +13,7 @@
 from M2Crypto import m2
 from path import Path
 
-from passbook.models import Barcode, BarcodeFormat, Pass, StoreCard
+from passbook.models import Barcode, BarcodeFormat, CurrencyField, Pass, StoreCard
 
 cwd = Path(__file__).parent
 
@@ -98,6 +98,40 @@ def test_auxiliary_fields():
     assert pass_json['storeCard']['auxiliaryFields'][0]['label'] == 'Famous Inc.'
 
 
+def test_with_currency_field():
+    passfile = create_shell_pass()
+    balance_field = CurrencyField(
+        'balance',
+        float(22.00),
+        'test label',
+        'USD',
+    )
+    balance_field.changeMessage = 'Balance changed to %@.'
+    passfile.passInformation.headerFields.append(balance_field)
+    passfile.passInformation.addAuxiliaryField('aux1', 'VIP Store Card', 'Famous Inc.')
+    pass_json = passfile.json_dict()
+    assert 'numberStyle' not in pass_json['storeCard']['headerFields'][0]
+    assert 'currencyCode' in pass_json['storeCard']['headerFields'][0]
+
+
+def test_missing_currency_field():
+    passfile = create_shell_pass()
+    balance_field = CurrencyField(
+        'balance',
+        float(22.00),
+        'test label',
+        None
+        )
+    del balance_field.currencyCode
+    balance_field.changeMessage = 'Balance changed to %@.'
+    passfile.passInformation.headerFields.append(balance_field)
+    passfile.passInformation.addAuxiliaryField('aux1', 'VIP Store Card', 'Famous Inc.')
+    pass_json = passfile.json_dict()
+    print(pass_json)
+    assert 'numberStyle' in pass_json['storeCard']['headerFields'][0]
+    assert 'currencyCode' not in pass_json['storeCard']['headerFields'][0]
+
+
 def test_code128_pass():
     """
     This test is to create a pass with a new code128 format,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{}
Copy link Collaborator mbaechtold Dec 16, 2016 • edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Could you please add a line to the `.gitignore` file, so this file does is added to the git repo: `# Unit test / coverage reports .coverage .tox .cache # <--- Add this line.` Copy link Author johnksterling May 5, 2017 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Done Copy link Collaborator mbaechtold May 5, 2017 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Thanks, but unfortunately I forgot to mention that you must delete this file too.