anything new

dioscouri · Jul 9, 2014 · 8e21e52 · 8e21e52
1 parent 171c03e
commit 8e21e52
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/src/Striper/Models/PaymentRequests.php b/src/Striper/Models/PaymentRequests.php
@@ -68,7 +68,7 @@ public function validate()
 
     protected function beforeSave()
     {
-        $this->amount = (float) $this->amount;
+        //$this->amount = (float) $this->amount;
 
         foreach ($this->items as $key=>$item) 
         {
@@ -84,18 +84,18 @@ protected function beforeSave()
 
     public function sendChargeEmailClient($charge){
 
-      $html = \Dsc\System::instance()->get( 'theme' )->renderView( 'Striper/Site/Views::paymentrequests/emails/client_success_html.php' );
-      $text = \Dsc\System::instance()->get( 'theme' )->renderView( 'Striper/Site/Views::paymentrequests/emails/client_success_text.php' );
+     // $html = \Dsc\System::instance()->get( 'theme' )->renderView( 'Striper/Site/Views::paymentrequests/emails/client_success_html.php' );
+     // $text = \Dsc\System::instance()->get( 'theme' )->renderView( 'Striper/Site/Views::paymentrequests/emails/client_success_text.php' );
 
-     \Dsc\System::instance()->get('mailer')->send($charge->{'client.email'}, 'Successfully Subscribed', array($html, $text) );
+     //\Dsc\System::instance()->get('mailer')->send($charge->{'client.email'}, 'Successfully Subscribed', array($html, $text) );
 
     }
 
     public function sendChargeEmailAdmin($charge){
-    	$html = \Dsc\System::instance()->get( 'theme' )->renderView( 'Striper/Site/Views::paymentrequests/emails/admin_success_html.php' );
-    	$text = \Dsc\System::instance()->get( 'theme' )->renderView( 'Striper/Site/Views::paymentrequests/emails/admin_success_text.php' );
+    //	$html = \Dsc\System::instance()->get( 'theme' )->renderView( 'Striper/Site/Views::paymentrequests/emails/admin_success_html.php' );
+    //	$text = \Dsc\System::instance()->get( 'theme' )->renderView( 'Striper/Site/Views::paymentrequests/emails/admin_success_text.php' );
 
-    	\Dsc\System::instance()->get('mailer')->send($charge->{'client.email'}, 'Successfully Subscribed', array($html, $text) );
+    //	\Dsc\System::instance()->get('mailer')->send($charge->{'client.email'}, 'Successfully Subscribed', array($html, $text) );
 
     }
 

diff --git a/src/Striper/Site/Views/paymentrequest/read.php b/src/Striper/Site/Views/paymentrequest/read.php
@@ -43,11 +43,12 @@
             <?php } ?>
 
 
-            <?php if (!empty($paymentrequest->amount())) { ?>
+            <?php if (!empty($paymentrequest->amount)) { ?>
                 <?php // TODO Format this so it looks like currency ?>
                     <h3>
                         Total: <?php setlocale(LC_MONETARY, 'en_US.UTF-8');
-echo money_format('$%i', number_format(($paymentrequest->amount()/100),2));?>
+                        echo '$'. number_format(($paymentrequest->amount/100),2);?>
+
 
                     </h3>
             <?php } ?>
@@ -61,7 +62,7 @@
             <script src="https://checkout.stripe.com/checkout.js" class="stripe-button" 
             data-key="<?php echo $settings->{$settings->mode.'.publishable_key'} ?>"
                data-image="/theme/img/logo.png"
-              data-name="<?php echo $paymentrequest->title; ?>" data-description="" data-email="<?php echo $paymentrequest->{'client.email'}; ?>" data-allow-remember-me="false" data-amount="<?php echo $paymentrequest->amountForStripe(); ?>"></script>
+              data-name="<?php echo $paymentrequest->title; ?>" data-description="" data-email="<?php echo $paymentrequest->{'client.email'}; ?>" data-allow-remember-me="false" data-amount="<?php echo $paymentrequest->amount; ?>"></script>
         </p>
     </form>
 

diff --git a/src/Striper/Site/Views/paymentrequest/success.php b/src/Striper/Site/Views/paymentrequest/success.php
@@ -1 +1,10 @@
-<h1> Your Payment was Succesful</h1>
+<div class="container">
+ 	<div class="panel panel-default">
+        
+        
+        <div class="panel-body"><h1>Success!</h1>
+
+			Everything is well, you will receive an email with your reciept.
+		</div>
+	</div>
+</div>