radiant-shop-extension 0.9.3 → 0.10.0

data/db/migrate/20100927041624_change_payments_add_gateway.rb

@@ -0,0 +1,11 @@
+class ChangePaymentsAddGateway < ActiveRecord::Migration
+  def self.up
+    add_column  :shop_payments, :gateway, :string
+    add_index   :shop_payments, :gateway
+  end
+
+  def self.down
+    remove_index  :shop_payments, :gateway
+    remove_column :shop_payments, :gateway
+  end
+end

data/db/migrate/20100927140446_change_payment_add_card_type_card_number.rb

@@ -0,0 +1,11 @@
+class ChangePaymentAddCardTypeCardNumber < ActiveRecord::Migration
+  def self.up
+    add_column :shop_payments, :card_type, :string
+    add_column :shop_payments, :card_number, :string
+  end
+
+  def self.down
+    remove_column :shop_payments, :card_type
+    remove_column :shop_payments, :card_number
+  end
+end

data/db/seed.rb

@@ -0,0 +1 @@
+Dir[File.dirname(__FILE__) + "/seeds/*.rb"].each {|file| require file }

data/db/seeds/forms.rb

@@ -0,0 +1,179 @@
+puts "Seed Shop Forms";
+
+# Add Cart Item
+
+Form.create({
+  :title  => 'AddCartItem',
+  :action => '/shop/cart/items',
+  :body   => <<-BODY
+<r:shop:product>
+  <input type="hidden" name="line_item[item_id]" value="<r:id />" />
+  <!-- Your Customisation Below -->
+  
+  <r:form:text name='line_item[quantity]' value="1" /> <!-- Amount of items to add -->
+  <input type="submit" name="add_to_cart" id="add_to_cart_<r:id />" value="Add To Cart" />
+  
+  <!-- Your Customisation Above -->
+</r:shop:product>
+BODY
+})
+
+# Update Cart Item
+
+Form.create({
+  :title  => 'UpdateCartItem',
+  :action => '/shop/cart/items/x',
+  :body   => <<-BODY
+<r:shop:cart:item>
+  <input type="hidden" name="_method" value="put" />
+  <input type="hidden" name="line_item[id]" value="<r:id />" />
+  <!-- Your Customisation Below -->
+  
+  <input type="text" name="line_item[quantity]" value="<r:quantity />" />
+  <input type="submit" name="add_to_cart" id="update_<r:id />" value="Update" />
+  
+  <!-- Your Customisation Above -->
+</r:shop:cart:item>
+BODY
+})
+
+# Checkout Addresses
+
+addresses_body = <<-BODY
+<r:shop:cart>
+  <div class="addresses">
+    <div id="billing" class="address">
+      <h4>Billing</h4>
+      <ol class="address">
+        <r:address type='billing'>
+          <r:if_address><input type="hidden" name="billing[id]" value="<r:id />" /></r:if_address>
+          <li>
+            <r:label for='billing[name]'>Full Name</r:label>
+            <input type="text" name="billing[name]" value="<r:name/>" />
+          </li>
+          <li>
+            <r:label for='billing[email]'>Email</r:label>
+            <input type="text" name="billing[email]" value="<r:email/>" />
+          </li>
+          <li>
+            <r:label for='billing[street]'>Street</r:label>
+            <input type="text" name="billing[street]" value="<r:street/>" />
+          </li>
+          <li>
+            <r:label for='billing[city]'>Suburb and Postcode</r:label>
+            <input type="text" name="billing[city]" value="<r:city/>" />
+            <input type="text" name="billing[postcode]" value="<r:postcode/>" />
+          </li>
+          <li>
+            <r:label for='billing[state]'>State and Country</r:label>
+            <input type="text" name="billing[state]" value="<r:state/>" />
+            <input type="text" name="billing[country]" value="<r:country/>" />
+          </li>
+        </r:address>
+      </ol>
+    </div>
+    
+    <div id="shipping" class="address">
+      <h4>Shipping</h4>
+      <ol class="address">
+        <r:address type='shipping'>
+          <r:if_address><input type="hidden" name="shipping[id]" value="<r:id />" /></r:if_address>
+          <li>
+            <r:label for='shipping[name]'>Full Name</r:label>
+            <input type="text" name="shipping[name]" value="<r:name/>" />
+          </li>
+          <li>
+            <r:label for='shipping[email]'>Email</r:label>
+            <input type="text" name="shipping[email]" value="<r:email/>" />
+          </li>
+          <li>
+            <r:label for='shipping[street]'>Street</r:label>
+            <input type="text" name="shipping[street]" value="<r:street/>" />
+          </li>
+          <li>
+            <r:label for='shipping[city]'>Suburb and Postcode</r:label>
+            <input type="text" name="shipping[city]" value="<r:city/>" />
+            <input type="text" name="shipping[postcode]" value="<r:postcode/>" />
+          </li>
+          <li>
+            <r:label for='shipping[state]'>State and Country</r:label>
+            <input type="text" name="shipping[state]" value="<r:state/>" />
+            <input type="text" name="shipping[country]" value="<r:country/>" />
+          </li>
+        </r:address>
+      </ol>
+    </div>
+  </div>
+</r:shop:cart>
+
+<r:submit value="Save Addresses" />
+BODY
+
+addresses_config = <<-CONFIG
+checkout:
+  address:
+    billing: true
+    shipping: true
+CONFIG
+
+Forms.create({
+  :title        => 'CheckoutAddresses',
+  :redirect_to  => '/shop',
+  :body         => addresses_body,
+  :config       => addresses_config
+})
+
+eway_body = <<-BODY
+<r:shop:cart>
+  <ol class="card">
+    <li>
+      <r:label for='card[type]'>Type of Card</r:label>
+      <r:select name='card[type]'>
+        <r:option value='visa'>Visa</r:option>
+        <r:option value='mastercard'>Master Card</r:option>
+        <r:option value='diners'>Diners Club</r:option>
+        <r:option vlaue='amex'>AMEX</r:option>
+      </r:select>
+    </li>
+    <li>
+      <r:label for='card[name]'>Name on Card</r:label>
+      <r:text name='card[name]' />
+    </li>
+    <li>
+      <r:label for='card[number]'>Card Number</r:label>
+      <r:text name='card[number]' />
+    </li>
+    <li>
+      <r:label for='card[verification]'>Verification Code</r:label>
+      <r:text name='card[verification]' length='4' />
+    </li>
+    <li>
+      <r:label for='card[month]'>Date on Card</r:label>
+      <r:select:card:month />
+      <r:select:card:year />
+    </li>
+  </ol>
+</r:shop:cart>
+
+<h3>Special Instructions</h3>
+
+<p><textarea name="order[message]"></textarea></p>
+
+<r:shop:cart:address type='billing'>
+  <input type="hidden" name="options[address][address1]" value="<r:street />" />
+  <input type="hidden" name="options[address][city]" value="<r:city />" />
+  <input type="hidden" name="options[address][state]" value="<r:state />" />
+  <input type="hidden" name="options[address][country]" value="<r:country />" />
+  <input type="hidden" name="options[address][zip]" value="<r:postcode />" />
+  <input type="hidden" name="options[email]" value="<r:email />" />
+  <input type="hidden" name="options[description]" value="<r:config:setting key='site.url' /> order #<r:shop:cart:id />" />
+</r:shop:cart:address>
+
+<r:submit value="Place Order" />
+
+<r:snippet name='PaymentResponse' />
+BODY
+
+eway_config = <<-CONFIG
+
+CONFIG

data/db/{migrate/20100520033059_create_layouts.rb → seeds/layouts.rb}

@@ -1,9 +1,6 @@
-class CreateLayouts < ActiveRecord::Migration
-  def self.up
-    # Will only create a layout if it doesn't exist
-    Layout.create({
-      :name       => 'Application',
-      :content    => <<-CONTENT
+Layout.create({
+  :name       => 'Application',
+  :content    => <<-CONTENT
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
   <head>
@@ -15,11 +12,11 @@ class CreateLayouts < ActiveRecord::Migration
   </body>
 </html>
 CONTENT
-    })
-    
-    Layout.create({
-      :name       => Radiant::Config['shop.product_layout'],
-      :content    => <<-CONTENT
+})
+
+Layout.create({
+  :name       => Radiant::Config['shop.product_layout'],
+  :content    => <<-CONTENT
 <r:inside_layout name='Application'>
   <r:shop:product>
     <div id="shop_product_<r:sku />" class="shop_product">
@@ -49,10 +46,11 @@ CONTENT
   </r:shop:product>
 </r:inside_layout>
 CONTENT
-    })
-    Layout.create({
-      :name => Radiant::Config['shop.category_layout'],
-      :content => <<-CONTENT
+})
+
+Layout.create({
+  :name => Radiant::Config['shop.category_layout'],
+  :content => <<-CONTENT
 <r:inside_layout name='Application'>
   <r:shop:category>
     <div id="shop_category_<r:handle />" class="shop_category">
@@ -81,11 +79,11 @@ CONTENT
   </r:shop:category>
 </r:inside_layout>
 CONTENT
-    })
-    
-    Layout.create({
-      :name => Radiant::Config['shop.order_layout'],
-      :content => <<-CONTENT
+})
+
+Layout.create({
+  :name => Radiant::Config['shop.order_layout'],
+  :content => <<-CONTENT
 <r:inside_layout name='Application'>
   <r:shop:cart>
     <r:if_items>
@@ -110,10 +108,4 @@ CONTENT
   </r:shop:cart>
 </r:inside_layout>
 CONTENT
-    })
-  end
-
-  def self.down
-    # Won't delete content, that would be cruel
-  end
-end
+})

data/db/seeds/snippets.rb

@@ -0,0 +1,23 @@
+Snippet.create({
+  :name     => 'CartOverview',
+  :content  => <<-BEGIN
+<r:shop:cart>
+  <r:if_items>
+    <span class="quantity"><r:quantity /></span>
+    <span class="price"><r:price /></span>
+    <r:link>checkout</r:link>
+  </r:if_items>
+  <r:unless_items>
+    <p>Your cart is empty</p>
+  </r:unless_items>
+</r:shop:cart>
+BEGIN
+})
+
+PaymentResponse
+
+<r:response:checkout:payment:unless_success>
+  <p>We couldn't process your payment: <strong><r:response:get name="results[checkout][payment][message]" /></strong></p>
+</r:response:checkout:payment:unless_success>
+
+<r:response:clear />

data/lib/shop/interface/customers.rb

@@ -0,0 +1,34 @@
+module Shop
+  module Interface
+    module Customers
+      
+      def self.included(base)
+        base.send :include, InstanceMethods
+      end
+      
+      module InstanceMethods
+        attr_accessor :customers
+        
+        protected
+          def load_default_shop_customers_regions
+            returning OpenStruct.new do |customers|
+              customers.edit = Radiant::AdminUI::RegionSet.new do |edit|
+                edit.main.concat %w{header form popups}
+                edit.form.concat %w{name email meta parts}
+                edit.bottom.concat %w{buttons timestamp}
+              end
+              customers.new = customers.edit
+              customers.index = Radiant::AdminUI::RegionSet.new do |index|
+                index.top
+                index.bottom.concat %w{ add }
+                index.thead.concat %w{ name modify }
+                index.customer.concat %w{ name modify }
+              end
+              customers.remove = customers.index
+            end
+          end
+      end
+      
+    end
+  end
+end

data/lib/shop/tags/address.rb

@@ -13,6 +13,7 @@ module Shop
         Forms::Tags::Helpers.require!(tag,'shop:cart:address','type')
         
         tag.locals.address = Shop::Tags::Helpers.current_address(tag)
+        tag.locals.address_type = tag.attr['type']
         
         tag.expand
       end

data/lib/shop/tags/card.rb

@@ -0,0 +1,51 @@
+module Shop
+  module Tags
+    module Card
+      
+      TYPES = {
+        'visa'        => 'Visa',
+        'mastercard'  => 'Master Card',
+        'diners'      => 'Diners Club',
+        'amex'        => 'American Express'
+      }
+      
+      include Radiant::Taggable
+      
+      tag 'form:card' do |tag|
+        tag.expand
+      end
+      
+      # Outputs a list of credit card types
+      desc %{ Outputs a list of credit card types }
+      tag 'form:card:type' do |tag|
+        content = %{<select name="card[type]" id="card_type">\n}
+        TYPES.sort.each do |k, v|
+          content << %{<option value="#{k}">#{v}</option>\n}
+        end
+        content << %{</select>}
+      end
+      
+      # Outputs a list of months for credit cards
+      desc %{ Outputs a list of months for credit cards }
+      tag 'form:card:month' do |tag|
+        content = %{<select name="card[month]" id="card_month">\n}
+          Date::MONTHNAMES[1,12].each_with_index do |name,index|
+            month = sprintf('%02d', index+1)
+            content << %{<option value="#{month}">#{month} - #{name}</option>\n}
+          end
+        content << %{</select>}
+      end
+      
+      # Ouputs a list of years for credit cards
+      desc %{ Ouputs a list of years for credit cards }
+      tag 'form:card:year' do |tag|
+        content = %{<select name="card[year]" id="card_year">\n}
+          (Time.new.year ... Time.new.year + 10).each do |year|
+            content << %{<option value="#{year}">#{year}</option>\n}
+          end
+        content << %{</select>}
+      end
+      
+    end
+  end
+end

data/lib/shop/tags/helpers.rb

@@ -6,15 +6,19 @@ module Shop
         def current_categories(tag)
           result = []
           
-          # Page params are protected, send is used to overcome this
           if tag.locals.shop_categories.present?
             result = tag.locals.shop_categories
+          
+            # Page params are protected, send is used to overcome this  
           elsif tag.locals.page.send(:params).has_key? 'query'
-            result = ShopCategory.search(tag.locals.page.params['query'])
+            result = ShopCategory.search(tag.locals.page.send(:params)['query'])
+            
           elsif tag.attr['key'] and tag.attr['value']
             result = ShopCategory.all(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value'] })
+            
           else
             result = ShopCategory.all
+            
           end
           
           result
@@ -25,16 +29,22 @@ module Shop
           
           if tag.locals.shop_category.present?
             result = tag.locals.shop_category
+            
+          elsif tag.locals.shop_product.present?
+            result = tag.locals.shop_product.category
+            
           elsif tag.attr['key'] and tag.attr['value']
             result = ShopCategory.first(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value'] })
+            
           elsif tag.locals.page.shop_category.present?
             result = tag.locals.page.shop_category
+            
           elsif tag.locals.page.shop_product.present?
             result = tag.locals.page.shop_product.category
-          elsif tag.locals.shop_product.present?
-            result = tag.locals.shop_product.category
+            
           else
             result = ShopCategory.find_by_handle(tag.locals.page.slug)
+            
           end
           
           result
@@ -45,33 +55,42 @@ module Shop
          
           if tag.locals.shop_products.present?
             result = tag.locals.shop_products
+            
+          elsif tag.locals.shop_category.present?
+            result = tag.locals.shop_category.products
+                        
           elsif tag.locals.page.send(:params).has_key? 'query'
             result = ShopProduct.search(tag.locals.page.params['query'])
+            
           elsif tag.attr['key'] and tag.attr['value']
             result = ShopProduct.all(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value'] })
+            
           elsif tag.locals.page.shop_category.present?
-            result = tag.locals.page.shop_category.products          
-          elsif tag.locals.shop_category.present?
-            result = tag.locals.shop_category.products  
+            result = tag.locals.page.shop_category.products
+            
           else
             result = ShopProduct.all
+            
           end
           
           result
         end
         
         def current_product(tag)
-          
           result = nil
-
+          
           if tag.locals.shop_product.present?
             result = tag.locals.shop_product
-          elsif tag.locals.page.shop_product.present?
-            result = tag.locals.page.shop_product
+            
           elsif tag.attr['key'] and tag.attr['value']
             result = ShopProduct.first(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value'] })
+            
+          elsif tag.locals.page.shop_product.present?
+            result = tag.locals.page.shop_product
+            
           else
             result = ShopProduct.find_by_sku(tag.locals.page.slug)
+            
           end
           
           result
@@ -80,17 +99,16 @@ module Shop
         def current_order(tag)
           result = nil
           
-          if !tag.locals.shop_order.nil?
+          if tag.locals.shop_order.present?
             result  = tag.locals.shop_order
-          elsif tag.attr['id']
-            result  = ShopOrder.find(tag.attr['id'])
-          elsif tag.locals.page.request.session[:shop_order]
-            begin
-              result  = ShopOrder.find(tag.locals.page.request.session[:shop_order])
-            rescue
-              result  = ShopOrder.create
-              tag.locals.page.request.session[:shop_order] = result.id
-            end
+            
+          elsif tag.attr['key'] and tag.attr['value']
+            result  = ShopOrder.first(:conditions => { tag.attr['key'].downcase.to_sym => tag.attr['value'] })
+            
+          elsif tag.locals.page.request.session[:shop_order].present?
+            session = tag.locals.page.request.session[:shop_order]
+            result  = ShopOrder.find(session)
+            
           end
           
           result
@@ -101,12 +119,10 @@ module Shop
           
           if tag.locals.shop_line_item.present?
             result  = tag.locals.shop_line_item
-          elsif tag.locals.shop_product.present?
-            order   = tag.locals.shop_order
-            product = tag.locals.shop_product
-            item    = order.line_items.find_by_item_id(product.id)
             
-            result  = item
+          elsif tag.locals.shop_order.present? and tag.locals.shop_product.present?
+            result  = tag.locals.shop_order.line_items.find_by_item_id(tag.locals.shop_product.id)
+            
           end
           
           result
@@ -117,23 +133,22 @@ module Shop
         def current_address(tag)
           result = nil
           
-          if tag.locals.address.present?
+          if tag.locals.address.present? and tag.locals.address_type == tag.attr['type']
             result = tag.locals.address
-          else
-            order = current_order(tag) # we need the current order
-            if order.present? # if it exists
-              begin
-                address = order.send(tag.attr['type']) # Get the address type (order.billing)
-                if address.present? # If that address exists
-                  result = address # The result is that address
-                end
-              rescue
-                result = nil # Will catch an incorrect address type being send
+            
+          elsif tag.locals.shop_order.present?
+            begin
+              address = tag.locals.shop_order.send(tag.attr['type']) # Get the address type (order.billing)
+              if address.present? # If that address exists
+                result = address # The result is that address
               end
+            rescue
+              result = nil # Will catch an incorrect address type being send
             end
+            
           end
           
-          result # Return result
+          result
         end
         
       end