radiant-shop-extension 0.92.8 → 0.92.9

data/VERSION

@@ -1 +1 @@
-0.92.8
+0.92.9

data/app/models/form_checkout.rb

@@ -56,6 +56,7 @@ class FormCheckout
     end
     
     if purchase
+      assign_notes
       create_payment    
       finalize_checkout
       @form.redirect_to = success_redirect
@@ -72,6 +73,10 @@ class FormCheckout
     @result[:gateway]
   end
   
+  def assign_notes
+    @order.update_attribute(:notes, notes) if notes.present?
+  end
+  
   # Creates a payment object attached to the order
   def create_payment
     payment = ShopPayment.new({
@@ -161,6 +166,11 @@ class FormCheckout
     @config[:test].present? ? :test : :production
   end
   
+  # Returns the notes on the order
+  def notes
+    @data[:notes]
+  end 
+  
   # Returns the submitted card attributes
   def card
     @data[:credit_card]

data/lib/shop/tags/cart.rb

@@ -53,7 +53,7 @@ module Shop
       end
       
       # Display the cart id / status
-      [:id, :status, :quantity, :weight].each do |symbol|
+      [:id, :status, :quantity, :weight, :notes].each do |symbol|
         desc %{ outputs the #{symbol} to the cart }
         tag "shop:cart:#{symbol}" do |tag|
           tag.locals.shop_order.send(symbol)

data/radiant-shop-extension.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.92.8"
+  s.version = "0.92.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly", "John Barker", "Darcy Laycock"]

data/spec/datasets/forms.rb

@@ -33,6 +33,7 @@ class FormsDataset < Dataset::Base
       </li>
     </ol>
   </div>
+  <r:text name='notes' value="some note"/>
   <ol class="credit_card">
     <li>
       <r:label for='credit_card[name]'>Name on Card</r:label>
@@ -117,8 +118,9 @@ CONFIG
           :year         => 2012,
           :type         => 'visa'
         },
+        :notes          => 'some note',
         :options => {
-          :address => {
+          :address      => {
             :address1   => 'address',
             :zip        => 'zip'
           }

data/spec/lib/shop/tags/cart_spec.rb

@@ -21,6 +21,7 @@ describe Shop::Tags::Cart do
       'shop:cart:status',
       'shop:cart:quantity',
       'shop:cart:weight',
+      'shop:cart:notes',
       'shop:cart:price'].sort
   end
   
@@ -211,6 +212,12 @@ describe Shop::Tags::Cart do
         tag = %{<r:shop:cart:weight />}
         expected = @order.weight.to_s
         
+        @page.should render(tag).as(expected)
+      end
+      it 'should render <r:notes />' do
+        tag = %{<r:shop:cart:notes />}
+        expected = @order.notes.to_s
+        
         @page.should render(tag).as(expected)
       end
     end

data/spec/models/form_checkout_spec.rb

@@ -41,9 +41,17 @@ describe FormCheckout do
           @checkout = FormCheckout.new(@form, @page, @form[:extensions][:bogus_checkout])
           result = @checkout.create
           
-          @order.payment.card_number.should === "XXXX-XXXX-XXXX-1"
-          @order.payment.card_type.should   === @data[:credit_card][:type]
-          @order.payment.amount.should      === @order.price
+          @order.payment.card_number.should   === "XXXX-XXXX-XXXX-1"
+          @order.payment.card_type.should     === @data[:credit_card][:type]
+          @order.payment.amount.should        === @order.price
+        end
+        
+        it 'should assign the note' do
+          mock.instance_of(ActiveMerchant::Billing::CreditCard).valid? { true }
+          @checkout = FormCheckout.new(@form, @page, @form[:extensions][:bogus_checkout])
+          result = @checkout.create
+          
+          shop_orders(:several_items).notes.should === 'some note'
         end
         
         it 'should assign session shop_order to nil' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-shop-extension
 version: !ruby/object:Gem::Version 
-  hash: 383
+  hash: 381
   prerelease: false
   segments: 
   - 0
   - 92
-  - 8
-  version: 0.92.8
+  - 9
+  version: 0.92.9
 platform: ruby
 authors: 
 - Dirk Kelly