radiant-shop-extension 0.9.3 → 0.10.0

data/lib/shop/tags/item.rb

@@ -59,7 +59,7 @@ module Shop
       end
       
       # Output the related elements attributes
-      [:name, :price, :weight].each do |symbol|
+      [:name, :sku, :price, :weight].each do |symbol|
         desc %{ outputs the #{symbol} of the current cart item }
         tag "shop:cart:item:#{symbol}" do |tag|
           tag.locals.shop_line_item.item.send(symbol)

data/lib/shop/tags/product.rb

@@ -15,15 +15,16 @@ module Shop
       end
       
       tag 'shop:products' do |tag|
+        tag.locals.shop_products = Helpers.current_products(tag)
+        
         tag.expand
       end
       
       desc %{ iterates through each product within the scope }
       tag 'shop:products:each' do |tag|
-        content   = ''
-        products  = Helpers.current_products(tag)
+        content = ''
         
-        products.each do |product|
+        tag.locals.shop_products.each do |product|
           tag.locals.shop_product = product
           content << tag.expand
         end
@@ -33,7 +34,8 @@ module Shop
       
       tag 'shop:product' do |tag|
         tag.locals.shop_product = Helpers.current_product(tag)
-        tag.expand unless tag.locals.shop_product.nil?
+        
+        tag.expand if tag.locals.shop_product.present?
       end
       
       [:id, :name, :sku, :slug].each do |symbol|
@@ -50,53 +52,52 @@ module Shop
       
       desc %{ generates a link to the products generated page }
       tag 'shop:product:link' do |tag|
-        product = tag.locals.shop_product
         options = tag.attr.dup
         attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
-        attributes = " #{attributes}" unless attributes.empty?
+        attributes = " #{attributes}" if attributes.present?
         
-        text = tag.double? ? tag.expand : product.name
+        text = tag.double? ? tag.expand : tag.locals.shop_product.name
         
-        %{<a href="#{product.slug}"#{attributes}>#{text}</a>}
+        %{<a href="#{tag.locals.shop_product.slug}"#{attributes}>#{text}</a>}
       end
       
       desc %{ outputs the slug to the products generated page }
       tag 'shop:product:slug' do |tag|
-        product = tag.locals.shop_product
-        product.slug unless product.nil?
+        tag.locals.shop_product.slug
       end
       
       desc %{ output price of product }
       tag 'shop:product:price' do |tag|
         attr = tag.attr.symbolize_keys
-        product = tag.locals.shop_product
-                
-        number_to_currency(product.price, 
+        
+        number_to_currency(tag.locals.shop_product.price, 
           :precision  =>(attr[:precision] || Radiant::Config['shop.price_precision']).to_i,
           :unit       => attr[:unit]      || Radiant::Config['shop.price_unit'],
           :separator  => attr[:separator] || Radiant::Config['shop.price_seperator'],
           :delimiter  => attr[:delimiter] || Radiant::Config['shop.price_delimiter'])
       end
       
-      desc %{ expands if the product has a valid image }
-      tag 'shop:product:if_images' do |tag|
-        tag.expand unless tag.locals.shop_product.images.empty?
+      tag 'shop:product:images' do |tag|
+        tag.locals.images = tag.locals.shop_product.attachments
+        
+        tag.expand
       end
       
-      desc %{ expands if the product does not have a valid image }
-      tag 'shop:product:unless_images' do |tag|
-        tag.expand if tag.locals.shop_product.images.empty?
+      desc %{ expands if the product has a valid image }
+      tag 'shop:product:images:if_images' do |tag|
+        tag.expand if tag.locals.images.present?
       end
       
-      tag 'shop:product:images' do |tag|
-        tag.expand
+      desc %{ expands if the product does not have a valid image }
+      tag 'shop:product:images:unless_images' do |tag|
+        tag.expand unless tag.locals.images.present?
       end
       
       desc %{ iterates through each of the products images }
       tag 'shop:product:images:each' do |tag|
         content = ''
         
-        tag.locals.shop_product.images.each do |image|
+        tag.locals.images.each do |image|
           tag.locals.image = image
           content << tag.expand
         end

data/lib/shop/tags/responses.rb

@@ -14,19 +14,19 @@ module Shop
       # Expand if there is a checkout payment response
       desc %{ Expand if there is a checkout payment response }
       tag 'response:checkout:payment' do |tag|
-        tag.expand if tag.locals.response_checkout[:payment].present?
+        tag.expand
       end
       
       # Expand if the payment was successful
       desc %{ Expand if the payment was successful }
       tag 'response:checkout:payment:if_success' do |tag|
-        tag.expand if tag.locals.response_checkout[:payment][:success]
+        tag.expand if tag.locals.response_checkout[:payment] === true
       end
       
       # Expand if the payment was not successful
       desc %{ Expand if the payment was not successful }
       tag 'response:checkout:payment:unless_success' do |tag|
-        tag.expand unless tag.locals.response_checkout[:payment][:success]
+        tag.expand if tag.locals.response_checkout[:payment] === false
       end
       
     end

data/lib/tasks/shop_extension_tasks.rake

@@ -13,6 +13,12 @@ namespace :radiant do
         Rake::Task['db:schema:dump'].invoke
       end
       
+      desc "Runs the migration of the Shop extension"
+      task :seed => :environment do
+        load "#{ShopExtension.root}/db/seed.rb"
+      end
+      
+      
       desc "Copies public assets of the Shop to the instance public/ directory."
       task :update => :environment do
         is_svn_or_dir = proc {|path| path =~ /\.svn/ || File.directory?(path) }

data/public/stylesheets/sass/admin/extensions/shop/index.sass

@@ -0,0 +1,64 @@
+.map
+  border:
+    top: 21px #9e9e9e solid
+
+  .object
+    position: relative
+    height: 45px
+    line:
+      height: 45px
+    margin:
+      bottom: 2px
+      
+    .attributes
+      padding:
+        left: 5px
+      border:
+        bottom: 1px solid #cecece
+        
+      &:hover
+        background:
+          color: #e0f0ff
+            
+      .name, .name a
+        color: black
+        font:
+          weight: bold
+          size: 16px
+        text:
+          decoration: none
+          
+        &:hover
+          color: #0066ce
+          text:
+            decoration: underline
+          
+      .modify
+        float: right
+        width: 200px
+        text:
+          align: right
+        font:
+          size: 10px
+            
+        span
+          padding:
+            left: 15px
+            right: 15px
+            
+          a
+            color: black
+            text:
+              decoration: none
+              
+        .add_child
+          background:
+            image: url(/images/admin/plus.png)
+            repeat: no-repeat
+            position: 0 50%
+            
+        .remove
+          background:
+            image: url(/images/admin/minus.png)
+            repeat: no-repeat
+            position: 0 50%

data/radiant-shop-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-shop-extension}
-  s.version = "0.9.3"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly", "John Barker"]
-  s.date = %q{2010-09-24}
+  s.date = %q{2010-09-28}
   s.description = %q{Radiant Shop is an attempt at a simple but complete store. It includes Products, Categories, Orders and Credit Card Payments}
   s.email = %q{dk@dirkkelly.com}
   s.extra_rdoc_files = [
@@ -44,7 +44,6 @@ Gem::Specification.new do |s|
      "app/models/shop_line_item.rb",
      "app/models/shop_order.rb",
      "app/models/shop_payment.rb",
-     "app/models/shop_payment_method.rb",
      "app/models/shop_product.rb",
      "app/models/shop_product_attachment.rb",
      "app/models/shop_product_page.rb",
@@ -64,7 +63,23 @@ Gem::Specification.new do |s|
      "app/views/admin/shop/categories/index/_category.html.haml",
      "app/views/admin/shop/categories/new.html.haml",
      "app/views/admin/shop/categories/remove.html.haml",
+     "app/views/admin/shop/customers/edit.html.haml",
+     "app/views/admin/shop/customers/edit/_fields.html.haml",
+     "app/views/admin/shop/customers/edit/_head.html.haml",
+     "app/views/admin/shop/customers/edit/_meta.html.haml",
+     "app/views/admin/shop/customers/edit/_parts.html.haml",
+     "app/views/admin/shop/customers/edit/_popups.html.haml",
+     "app/views/admin/shop/customers/edit/meta/_login.html.haml",
+     "app/views/admin/shop/customers/edit/meta/_password.html.haml",
+     "app/views/admin/shop/customers/edit/meta/_password_confirmation.html.haml",
+     "app/views/admin/shop/customers/edit/parts/_address.html.haml",
+     "app/views/admin/shop/customers/edit/parts/_addresses.html.haml",
+     "app/views/admin/shop/customers/edit/parts/_orders.html.haml",
      "app/views/admin/shop/customers/index.html.haml",
+     "app/views/admin/shop/customers/index/_bottom.html.haml",
+     "app/views/admin/shop/customers/index/_customer.html.haml",
+     "app/views/admin/shop/customers/new.html.haml",
+     "app/views/admin/shop/customers/remove.html.haml",
      "app/views/admin/shop/orders/index.html.haml",
      "app/views/admin/shop/products/edit.html.haml",
      "app/views/admin/shop/products/edit/_fields.html.haml",
@@ -95,17 +110,23 @@ Gem::Specification.new do |s|
      "config/shop_cart.yml",
      "cucumber.yml",
      "db/migrate/20100311053701_initial.rb",
-     "db/migrate/20100520033059_create_layouts.rb",
-     "db/migrate/20100903122123_create_forms.rb",
-     "db/migrate/20100908063639_create_snippets.rb",
+     "db/migrate/20100927041219_remove_payment_methods.rb",
+     "db/migrate/20100927041624_change_payments_add_gateway.rb",
+     "db/migrate/20100927140446_change_payment_add_card_type_card_number.rb",
+     "db/seed.rb",
+     "db/seeds/forms.rb",
+     "db/seeds/layouts.rb",
+     "db/seeds/snippets.rb",
      "features/support/env.rb",
      "features/support/paths.rb",
      "lib/shop/controllers/application_controller.rb",
      "lib/shop/controllers/site_controller.rb",
+     "lib/shop/interface/customers.rb",
      "lib/shop/interface/products.rb",
      "lib/shop/models/image.rb",
      "lib/shop/models/page.rb",
      "lib/shop/tags/address.rb",
+     "lib/shop/tags/card.rb",
      "lib/shop/tags/cart.rb",
      "lib/shop/tags/category.rb",
      "lib/shop/tags/core.rb",
@@ -120,6 +141,7 @@ Gem::Specification.new do |s|
      "public/javascripts/admin/extensions/shop/products/edit.js",
      "public/javascripts/admin/extensions/shop/products/index.js",
      "public/stylesheets/sass/admin/extensions/shop/edit.sass",
+     "public/stylesheets/sass/admin/extensions/shop/index.sass",
      "public/stylesheets/sass/admin/extensions/shop/products/edit.sass",
      "public/stylesheets/sass/admin/extensions/shop/products/index.sass",
      "radiant-shop-extension.gemspec",
@@ -136,6 +158,7 @@ Gem::Specification.new do |s|
      "spec/datasets/images.rb",
      "spec/datasets/shop_addresses.rb",
      "spec/datasets/shop_categories.rb",
+     "spec/datasets/shop_customers.rb",
      "spec/datasets/shop_line_items.rb",
      "spec/datasets/shop_orders.rb",
      "spec/datasets/shop_products.rb",
@@ -143,12 +166,14 @@ Gem::Specification.new do |s|
      "spec/lib/shop/models/image_spec.rb",
      "spec/lib/shop/models/page_spec.rb",
      "spec/lib/shop/tags/address_spec.rb",
+     "spec/lib/shop/tags/card_spec.rb",
      "spec/lib/shop/tags/cart_spec.rb",
      "spec/lib/shop/tags/category_spec.rb",
      "spec/lib/shop/tags/core_spec.rb",
      "spec/lib/shop/tags/helpers_spec.rb",
      "spec/lib/shop/tags/item_spec.rb",
      "spec/lib/shop/tags/product_spec.rb",
+     "spec/lib/shop/tags/responses_spec.rb",
      "spec/matchers/comparison.rb",
      "spec/matchers/render_matcher.rb",
      "spec/models/form_checkout_spec.rb",
@@ -194,6 +219,7 @@ Gem::Specification.new do |s|
      "spec/datasets/images.rb",
      "spec/datasets/shop_addresses.rb",
      "spec/datasets/shop_categories.rb",
+     "spec/datasets/shop_customers.rb",
      "spec/datasets/shop_line_items.rb",
      "spec/datasets/shop_orders.rb",
      "spec/datasets/shop_products.rb",
@@ -201,12 +227,14 @@ Gem::Specification.new do |s|
      "spec/lib/shop/models/image_spec.rb",
      "spec/lib/shop/models/page_spec.rb",
      "spec/lib/shop/tags/address_spec.rb",
+     "spec/lib/shop/tags/card_spec.rb",
      "spec/lib/shop/tags/cart_spec.rb",
      "spec/lib/shop/tags/category_spec.rb",
      "spec/lib/shop/tags/core_spec.rb",
      "spec/lib/shop/tags/helpers_spec.rb",
      "spec/lib/shop/tags/item_spec.rb",
      "spec/lib/shop/tags/product_spec.rb",
+     "spec/lib/shop/tags/responses_spec.rb",
      "spec/matchers/comparison.rb",
      "spec/matchers/render_matcher.rb",
      "spec/models/form_checkout_spec.rb",
@@ -225,17 +253,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<radiant>, [">= 0.9.1"])
       s.add_runtime_dependency(%q<radiant-forms-extension>, [">= 3.1.0"])
       s.add_runtime_dependency(%q<radiant-images-extension>, [">= 0.2.0"])
       s.add_runtime_dependency(%q<radiant-layouts-extension>, [">= 0.9.1"])
       s.add_runtime_dependency(%q<radiant-settings-extension>, [">= 1.1.1"])
     else
+      s.add_dependency(%q<radiant>, [">= 0.9.1"])
       s.add_dependency(%q<radiant-forms-extension>, [">= 3.1.0"])
       s.add_dependency(%q<radiant-images-extension>, [">= 0.2.0"])
       s.add_dependency(%q<radiant-layouts-extension>, [">= 0.9.1"])
       s.add_dependency(%q<radiant-settings-extension>, [">= 1.1.1"])
     end
   else
+    s.add_dependency(%q<radiant>, [">= 0.9.1"])
     s.add_dependency(%q<radiant-forms-extension>, [">= 3.1.0"])
     s.add_dependency(%q<radiant-images-extension>, [">= 0.2.0"])
     s.add_dependency(%q<radiant-layouts-extension>, [">= 0.9.1"])

data/shop_extension.rb

@@ -17,10 +17,11 @@ class ShopExtension < Radiant::Extension
     
     # View Hooks
     unless defined? admin.products
-      Radiant::AdminUI.send :include, Shop::Interface::Products
+      Radiant::AdminUI.send :include, Shop::Interface::Products, Shop::Interface::Customers
       
       admin.products    = Radiant::AdminUI.load_default_shop_products_regions
       admin.categories  = Radiant::AdminUI.load_default_shop_categories_regions
+      admin.customers   = Radiant::AdminUI.load_default_shop_customers_regions
     end
     
     if admin.respond_to? :page
@@ -29,7 +30,7 @@ class ShopExtension < Radiant::Extension
     end
     
     # Tags
-    Page.send :include, Shop::Tags::Core, Shop::Tags::Cart, Shop::Tags::Category, Shop::Tags::Item, Shop::Tags::Product, Shop::Tags::Address, Shop::Tags::Responses
+    Page.send :include, Shop::Tags::Core, Shop::Tags::Cart, Shop::Tags::Category, Shop::Tags::Item, Shop::Tags::Product, Shop::Tags::Address, Shop::Tags::Responses, Shop::Tags::Card
     
     # Model Includes
     Page.send :include, Shop::Models::Page
@@ -42,6 +43,7 @@ class ShopExtension < Radiant::Extension
     # Tabs3
     tab "Shop" do
       add_item "Products", "/admin/shop"
+      add_item "Customers", "/admin/shop/customers"
     end
     
     # Ensure there is always a shop prefix, otherwise we'll lose admin and pages
@@ -57,6 +59,9 @@ class ShopExtension < Radiant::Extension
     Radiant::Config['shop.price_precision'] ||= 2
     Radiant::Config['shop.price_seperator'] ||= '.'
     Radiant::Config['shop.price_delimiter'] ||= ','
+    
+    # Scoped Customer Welcome Page
+    Radiant::Config['scoped.customer.redirect'] = '/cart'
   end
   
 end

data/spec/datasets/forms.rb

@@ -1,4 +1,7 @@
 class FormsDataset < Dataset::Base
+  
+  uses :pages, :shop_orders
+  
   def load
     create_record :form, :checkout, 
       :title    => 'Checkout',
@@ -10,122 +13,38 @@ class FormsDataset < Dataset::Base
   def body
 <<-BODY
 <r:shop:cart>
-<ul class="items">
-  <r:items:each:item>
-    <li class="item"><r:quantity /> x <r:name /></li>
-  </r:items:each:item>
-</ul>
-<div class="addresses">
-  <ol class="billing">
-    <li>
-      <r:label for='billing[name]'>Name</r:label>
-      <r:text name='billing[name]' />
-    </li>
-    <li>
-      <r:label for='billing[unit]'>Unit</r:label>
-      <r:text name='billing[unit]' />
-    </li>
-    <li>
-      <r:label for='billing[street]'>Street</r:label>
-      <r:text name='billing[street]' />
-    </li>
+  <div class="addresses">
+    <ol class="billing">
+      <li>
+        <r:label for='billing[name]'>Name</r:label>
+        <r:text name='billing[name]' />
+      </li>
+      <li>
+        <r:label for='billing[unit]'>Address</r:label>
+        <r:text name='billing[unit]' /> <r:text name='billing[street]' /> <r:text name='billing[suburb]' />
+      </li>
+      <li>
+        <r:label for='billing[state]'>State and Country</r:label>
+        <r:text name='billing[state]' /> <r:text name='billing[country]' />
+      </li>
+      <li>
+        <r:label for='billing[postcode]'>Postcode</r:label>
+        <r:text name='billing[postcode]' />
+      </li>
+    </ol>
+  </div>
+  <ol class="card">
     <li>
-      <r:label for='billing[suburb]'>Suburb</r:label>
-      <r:text name='billing[suburb]' />
+      <r:label for='card[name]'>Name on Card</r:label>
+      <r:text name='card[name]' />
     </li>
     <li>
-      <r:label for='billing[state]'>State</r:label>
-      <r:text name='billing[state]' />
-    </li>
-    <li>
-      <r:label for='billing[postcode]'>Postcode</r:label>
-      <r:text name='billing[postcode]' />
-    </li>
-    <li>
-      <r:label for='billing[country]'>Country</r:label>
-      <r:text name='billing[country]' />
+      <r:label for='card[number]'>Card</r:label>
+      <r:card:type /> <r:text name='card[number]' /> <r:text name='card[verification]' length='4' />
+      <r:card:month /> <r:card:year />
     </li>
   </ol>
-  <ol class="shipping">
-    <li>
-      <r:label for='shipping[name]'>Name</r:label>
-      <r:text name='shipping[name]' />
-    </li>
-    <li>
-      <r:label for='shipping[unit]'>Unit</r:label>
-      <r:text name='shipping[unit]' />
-    </li>
-    <li>
-      <r:label for='shipping[street]'>Street</r:label>
-      <r:text name='shipping[street]' />
-    </li>
-    <li>
-      <r:label for='shipping[suburb]'>Suburb</r:label>
-      <r:text name='shipping[suburb]' />
-    </li>
-    <li>
-      <r:label for='shipping[state]'>State</r:label>
-      <r:text name='shipping[state]' />
-    </li>
-    <li>
-      <r:label for='shipping[postcode]'>Postcode</r:label>
-      <r:text name='shipping[postcode]' />
-    </li>
-    <li>
-      <r:label for='shipping[country]'>Country</r:label>
-      <r:text name='shipping[country]' />
-    </li>
-  </ol>
-</div>
-<ol class="card">
-  <li>
-    <r:label for='card[type]'>Type 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>
-    # Todo turns these into tags
-    <r:select name='card[month]'>
-      <r:option value='01'>01 - January</r:option>
-      <r:option value='02'>02 - February</r:option>
-      <r:option value='03'>03 - March</r:option>
-      <r:option value='04'>04 - April</r:option>
-      <r:option value='05'>05 - May</r:option>
-      <r:option value='06'>06 - June</r:option>
-      <r:option value='07'>07 - July</r:option>
-      <r:option value='08'>08 - August</r:option>
-      <r:option value='09'>09 - September</r:option>
-      <r:option value='10'>10 - October</r:option>
-      <r:option value='11'>11 - November</r:option>
-      <r:option value='12'>12 - December</r:option>
-    </r:select>
-    <r:select name='card[year]'>
-      <r:option value='2010'>2010</r:option>
-      <r:option value='2011'>2011</r:option>
-      <r:option value='2012'>2012</r:option>
-      <r:option value='2013'>2013</r:option>
-      <r:option value='2014'>2014</r:option>
-    </r:select>
-  </li>
-</ol>
-<r:form:submit />
+  <r:form:submit />
 </r:shop:cart>
 BODY
   end
@@ -139,15 +58,90 @@ CONTENT
   def config
 <<-CONFIG
 checkout:
-  shipping:
-    enabled: true
+  test: true
   gateway:
-    name: PayWay
-    username: 123456
-    password: abcdef
-    merchant: test
-    pem: /var/www/certificate.pem
+    name: Bogus
+    credentials:
+      login: 123456
 CONFIG
   end
   
+  helpers do
+    def mock_page_with_request_and_data
+      @page     = pages(:home)
+      
+      @request  = OpenStruct.new({
+        :session => {}
+      })
+      @data     = {}
+      
+      stub(@page).data    { @data }
+      stub(@page).request { @request }
+    end
+    
+    def mock_response
+      @response = OpenStruct.new({
+        :result => {
+          :results => {}
+        }
+      })
+      mock(Forms::Tags::Responses).current(anything,anything) { @response }
+    end
+    
+    def mock_valid_form_checkout_request
+      @form   = forms(:checkout)
+      @form[:extensions] = {
+        :checkout   => {
+          :test     => true,
+          :gateway  => {
+            :name   => 'Bogus'
+          },
+          :mail     => {
+            :subject=> 'new order',
+            :bcc    => 'orders@example.com'
+          },
+        }
+      }
+      
+      @data = {
+        :card => { 
+          :number       => '1',
+          :name         => 'Mr. Joe Bloggs',
+          :verification => '123',
+          :month        => 1,
+          :year         => 2012,
+          :type         => 'visa'
+        },
+        :billing => {
+          :id           => shop_addresses(:billing).id,
+          :name         => shop_addresses(:billing).name,
+          :email        => shop_addresses(:billing).email,
+          :street       => shop_addresses(:billing).street,
+          :city         => shop_addresses(:billing).city,
+          :state        => shop_addresses(:billing).state,
+          :country      => shop_addresses(:billing).country,
+          :postcode     => shop_addresses(:billing).postcode
+        },
+        :shipping => {
+          :id           => shop_addresses(:shipping).id,
+          :name         => shop_addresses(:shipping).name,
+          :email        => shop_addresses(:shipping).email,
+          :street       => shop_addresses(:shipping).street,
+          :city         => shop_addresses(:shipping).city,
+          :state        => shop_addresses(:shipping).state,
+          :country      => shop_addresses(:shipping).country,
+          :postcode     => shop_addresses(:shipping).postcode
+        },
+        :options => {
+          :address => {
+            :address1   => 'address',
+            :zip        => 'zip'
+          }
+        }
+      }
+      
+      @request.session = { :shop_order => @order.id }
+    end
+  end
+  
 end