Merge branch 'develop' of http://github.com/kwinkunks/modelr_app into…

… develop

CHANGES.txt

@@ -0,0 +1,5 @@
+modelr 0.2.1 Jun 14
+changed path to cloud bucket
+
+modelr 0.2 Jun 13
+Added image based modelling

app.yaml

@@ -1,4 +1,4 @@
-application: agile-modelr
+application: agilemodelr
 version: 1
 runtime: python27
 api_version: 1

main.py

@@ -1328,13 +1328,14 @@ def post(self):
 
         # Create the customer account
         try:
-            customer = \
-              stripe.Customer.create(card=token,
-                                     email=email,
-                                    description="New Modelr customer")
-
+            customer = stripe.Customer.create(card=token,
+                                              email=email,
+                                              description="New Modelr customer")
         except:
-            self.response.out.write("Payment failed, credit card type not excepted")
+            # The card has been declined
+            # Let the user know and DON'T UPGRADE USER
+            self.response.out.write("Payment failed. Credit card not accepted at this time")
+            return
 
         # Check the country to see if we need to charge tax
         country = self.request.get('stripeBillingAddressCountry')
@@ -1490,7 +1491,7 @@ def post(self):
             #event["data"]["object"]["total"] = price
 
             stripe_id = event["data"]["object"]["customer"]
-            amount = price #event["data"]["object"]["total"]
+            amount = PRICE 
             event_id = event["data"]["object"]["id"]
             user = User.all().ancestor(ModelrRoot)
             user = user.filter("stripe_id =", stripe_id).fetch(1)
@@ -1742,7 +1743,7 @@ def post(self):
             output = StringIO.StringIO()
             im.save(output, format='PNG')
 
-            bucket = '/modelr_bucket/'
+            bucket = '/modelr_live_bucket/'
             output_filename = (bucket + str(user.user_id) +'/2' +
                                str(time.time()))
 
@@ -1791,7 +1792,7 @@ def post(self):
         self.response.headers['Content-Type'] = 'text/plain'
         self.response.out.write('All OK!!')
 
-        bucket = '/modelr_bucket/'
+        bucket = '/modelr_live_bucket/'
         filename = bucket + str(user.user_id) +'/' + str(time.time())
 
         encoded_image = self.request.get('image').split(',')[1]

templates/help.html

@@ -88,7 +88,7 @@ <h4 class="panel-title">
 
         <div class="media">
           <a class="pull-left" href="#">
-            <p><img src="http://placehold.it/150x150"></p>
+            <p><img src="/static/img/help/help_edit_rocks.png"></p>
           </a>
             <div class="media-body">
                 <h4 class="media-heading">Define your own rocks</h4>
@@ -100,7 +100,7 @@ <h4 class="media-heading">Define your own rocks</h4>
 
          <div class="media">
           <a class="pull-left" href="#">
-            <p><img src="http://placehold.it/150x150"></p>
+            <p><img src="/static/img/help/help_default_rocks.png"></p>
           </a>
             <div class="media-body">
                 <h4 class="media-heading">Use default rocks</h4>

templates/scenario.html

@@ -405,21 +405,21 @@ <h3 class="panel-title">Result</h3>
   <!--[if IE 9]><select disabled style="display:none"><![endif]-->
 
   {% for rock in rocks %}
-  <option data-value="{{rock.vp}},{{rock.rho}},{{rock.vs}},
+  <option data-value="{{rock.vp}},{{rock.vs}},{{rock.rho}},
 	  {{rock.vp_std}}, {{rock.vs_std}}, {{rock.rho_std}}"
 	  data-name="{{rock.name}}">{{rock.name}}</option>
   {% endfor %}
   {% for group in group_rocks %}
   {% for rock in group.rocks %}
-  <option data-value="{{rock.vp}},{{rock.rho}},{{rock.vs}},
+  <option data-value="{{rock.vp}},{{rock.vs}},{{rock.rho}},
 	  {{rock.vp_std}}, {{rock.vs_std}}, {{rock.rho_std}}"
 	  data-name="{{rock.name}}">
     {{rock.name}}
   </option>
   {% endfor %}
   {% endfor %}
   {% for rock in default_rocks %}
-  <option data-value="{{rock.vp}},{{rock.rho}},{{rock.vs}},
+  <option data-value="{{rock.vp}},{{rock.vs}},{{rock.rho}},
 	  {{rock.vp_std}}, {{rock.vs_std}}, {{rock.rho_std}}"
 	  data-name="{{rock.name}}">{{rock.name}}
   </option>