saucy 0.2.4.1 → 0.2.5

data/README.md

@@ -34,6 +34,8 @@ Saucy::Configuration.mailer_sender = "billingemail@example.com"
 
 In addition, there are a number of string such as application name, support url, etc. that are provided and customized with i18n translations.  You can customize these in your app, and you can see what they are by looking at config/locales/en.yml in saucy.
 
+There is a `saucy:update_subscriptions` rake task which should be run on a regular basis to send receipts and payment processing problem emails.
+
 Development environment
 -----------------------
 

data/app/views/billings/show.html.erb

@@ -2,4 +2,22 @@
   <div class="current_credit_card">
     We're currently charging the credit card ending in <%= current_account.credit_card.last_4 %>. <%= link_to "Change", edit_account_billing_path(current_account) %>
   </div>
+  <div class="billing_history">
+    <h3>Your Invoices</h3>
+    <% if current_account.subscription.transactions.any? -%>
+      <table>
+        <tr>
+          <th>Date</th>
+          <th>Amount</th>
+        </tr>
+        <% current_account.subscription.transactions.each do |transaction| -%>
+          <tr>
+            <td><%= transaction.created_at.to_s(:short_date) %></td> <td><%= number_to_currency transaction.amount %></td>
+          </tr>
+        <% end -%>
+      </table>
+    <% else -%>
+      There have been no invoices yet.
+    <% end -%>
+  </div>
 <% end -%>

data/lib/generators/saucy/features/templates/features/manage_billing.feature

@@ -12,6 +12,7 @@ Feature: Manage Billing
     And "joe@example.com" is an admin of the "Test" account
     When I go to the billing page for the "Test" account
     Then I should see "card ending in 5555"
+    And I should see "There have been no invoices yet."
     And I follow "Change" within ".current_credit_card"
 
     Then the "Cardholder name" field should contain "Joe Smith"
@@ -62,3 +63,19 @@ Feature: Manage Billing
     When I go to the accounts page
     Then I should see "There was an issue processing the credit card on file for this account. Please have an administrator on the account update the credit card information."
     Then I should be on the billing page for the "Test" account
+
+  Scenario: View past credit card charges
+    Given a paid plan exists with a name of "Paid"
+    And the following account exists:
+      | name | keyword | plan       | cardholder_name | billing_email      | card_number      | verification_code | expiration_month | expiration_year |
+      | Test | test    | name: Paid | Joe Smith       | jsmith@example.com | 4111111111115555 | 122               | 01               | 2015            |
+    And the following transaction exist for the "Test" account:
+      | status  | amount | created_at        |
+      | Settled | 20.00  | July 1, 2010      |
+      | Settled | 5.00   | August 1, 2010    |
+    And I have signed in with "joe@example.com/test"
+    And "joe@example.com" is an admin of the "Test" account
+    When I go to the billing page for the "Test" account
+    Then I should see "Your Invoices"
+    And I should see "07/01/10 $20"
+    And I should see "08/01/10 $5"

data/lib/generators/saucy/features/templates/step_definitions/braintree_steps.rb

@@ -10,3 +10,16 @@ Given /^the "([^"]*)" account is past due$/ do |account_name|
   account = Account.find_by_name!(account_name)
   account.update_attribute(:subscription_status, Braintree::Subscription::Status::PastDue)
 end
+
+Given /^the following transaction exist for the "([^"]*)" account:$/ do |account_name, table|
+  account = Account.find_by_name!(account_name)
+  subscription = FakeBraintree.subscriptions[account.subscription_token]
+  subscription["transactions"] = []
+  table.hashes.each do |transaction|
+    FakeBraintree.transaction = { :status => transaction["status"],
+                                  :amount => transaction["amount"],
+                                  :created_at => Time.parse(transaction["created_at"]),
+                                  :subscription_id => account.subscription_token }
+    subscription["transactions"] << FakeBraintree.generated_transaction
+  end
+end

data/lib/saucy/account.rb

@@ -40,6 +40,7 @@ module Saucy
       before_create :create_subscription, :if => :billed?
 
       memoize :customer
+      memoize :subscription
     end
 
     module InstanceMethods
@@ -96,6 +97,7 @@ module Saucy
           else
             create_subscription
           end
+          flush_cache :subscription
         end
         successful && save
       end

data/lib/saucy/engine.rb

@@ -5,6 +5,10 @@ module Saucy
   class Engine < Rails::Engine
     config.saucy = Configuration.new
 
+    {:short_date => "%x"}.each do |k, v|
+      Time::DATE_FORMATS[k] = v
+    end
+
     rake_tasks do
       load "saucy/railties/tasks.rake"
     end 

data/lib/saucy/fake_braintree.rb

@@ -33,7 +33,7 @@ class FakeBraintree
   end
 
   def self.generated_transaction
-    {"status_history"=>[{"timestamp"=>Time.now, "amount"=>"50.00", "transaction_source"=>"CP", "user"=>"copycopter", "status"=>"authorized"}, {"timestamp"=>Time.now, "amount"=>"50.00", "transaction_source"=>"CP", "user"=>"copycopter", "status"=>FakeBraintree.transaction[:status]}], "created_at"=>Time.now, "currency_iso_code"=>"USD", "settlement_batch_id"=>nil, "processor_authorization_code"=>"ZKB4VJ", "avs_postal_code_response_code"=>"I", "order_id"=>nil, "updated_at"=>Time.now, "refunded_transaction_id"=>nil, "amount"=>"50.00", "credit_card"=>{"last_4"=>"1111", "card_type"=>"Visa", "token"=>"8yq7", "customer_location"=>"US", "expiration_year"=>"2013", "expiration_month"=>"02", "bin"=>"411111", "cardholder_name"=>"Chad Lee Pytel"}, "refund_id"=>nil, "add_ons"=>[], "shipping"=>{"region"=>nil, "company"=>nil, "country_name"=>nil, "extended_address"=>nil, "postal_code"=>nil, "id"=>nil, "street_address"=>nil, "country_code_numeric"=>nil, "last_name"=>nil, "locality"=>nil, "country_code_alpha2"=>nil, "country_code_alpha3"=>nil, "first_name"=>nil}, "id"=>"49sbx6", "merchant_account_id"=>"Thoughtbot", "type"=>"sale", "cvv_response_code"=>"I", "subscription_id"=>FakeBraintree.transaction[:subscription_id], "custom_fields"=>"\n    ", "discounts"=>[], "billing"=>{"region"=>nil, "company"=>nil, "country_name"=>nil, "extended_address"=>nil, "postal_code"=>nil, "id"=>nil, "street_address"=>nil, "country_code_numeric"=>nil, "last_name"=>nil, "locality"=>nil, "country_code_alpha2"=>nil, "country_code_alpha3"=>nil, "first_name"=>nil}, "processor_response_code"=>"1000", "refund_ids"=>[], "customer"=>{"company"=>nil, "id"=>"108427", "last_name"=>nil, "fax"=>nil, "phone"=>nil, "website"=>nil, "first_name"=>nil, "email"=>"cpytel@thoughtbot.com"}, "avs_error_response_code"=>nil, "processor_response_text"=>"Approved", "avs_street_address_response_code"=>"I", "status"=>FakeBraintree.transaction[:status], "gateway_rejection_reason"=>nil}
+    {"status_history"=>[{"timestamp"=>Time.now, "amount"=>FakeBraintree.transaction[:amount], "transaction_source"=>"CP", "user"=>"copycopter", "status"=>"authorized"}, {"timestamp"=>Time.now, "amount"=>FakeBraintree.transaction[:amount], "transaction_source"=>"CP", "user"=>"copycopter", "status"=>FakeBraintree.transaction[:status]}], "created_at"=>(FakeBraintree.transaction[:created_at] || Time.now), "currency_iso_code"=>"USD", "settlement_batch_id"=>nil, "processor_authorization_code"=>"ZKB4VJ", "avs_postal_code_response_code"=>"I", "order_id"=>nil, "updated_at"=>Time.now, "refunded_transaction_id"=>nil, "amount"=>FakeBraintree.transaction[:amount], "credit_card"=>{"last_4"=>"1111", "card_type"=>"Visa", "token"=>"8yq7", "customer_location"=>"US", "expiration_year"=>"2013", "expiration_month"=>"02", "bin"=>"411111", "cardholder_name"=>"Chad Lee Pytel"}, "refund_id"=>nil, "add_ons"=>[], "shipping"=>{"region"=>nil, "company"=>nil, "country_name"=>nil, "extended_address"=>nil, "postal_code"=>nil, "id"=>nil, "street_address"=>nil, "country_code_numeric"=>nil, "last_name"=>nil, "locality"=>nil, "country_code_alpha2"=>nil, "country_code_alpha3"=>nil, "first_name"=>nil}, "id"=>"49sbx6", "merchant_account_id"=>"Thoughtbot", "type"=>"sale", "cvv_response_code"=>"I", "subscription_id"=>FakeBraintree.transaction[:subscription_id], "custom_fields"=>"\n    ", "discounts"=>[], "billing"=>{"region"=>nil, "company"=>nil, "country_name"=>nil, "extended_address"=>nil, "postal_code"=>nil, "id"=>nil, "street_address"=>nil, "country_code_numeric"=>nil, "last_name"=>nil, "locality"=>nil, "country_code_alpha2"=>nil, "country_code_alpha3"=>nil, "first_name"=>nil}, "processor_response_code"=>"1000", "refund_ids"=>[], "customer"=>{"company"=>nil, "id"=>"108427", "last_name"=>nil, "fax"=>nil, "phone"=>nil, "website"=>nil, "first_name"=>nil, "email"=>"cpytel@thoughtbot.com"}, "avs_error_response_code"=>nil, "processor_response_text"=>"Approved", "avs_street_address_response_code"=>"I", "status"=>FakeBraintree.transaction[:status], "gateway_rejection_reason"=>nil}
   end
 end
 

data/spec/models/account_spec.rb

@@ -289,6 +289,9 @@ describe Account, "with a paid subscription" do
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
     subscription["status"] = Braintree::Subscription::Status::Active
     subscription["next_billing_date"] = 2.months.from_now
+    FakeBraintree.transaction = { :status => Braintree::Transaction::Status::Settled,
+                                  :subscription_id => subject.subscription_token }
+    subscription["transactions"] = [FakeBraintree.generated_transaction]
 
     Timecop.travel(subject.next_billing_date + 1.day) do
       Account.update_subscriptions!

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  - 1
-  version: 0.2.4.1
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - thoughtbot, inc.