radiant-shop-extension 0.11.6 → 0.90.0

data/app/views/admin/shop/categories/edit/meta/_status.html.haml

@@ -0,0 +1,3 @@
+- if @shop_category.new_record?
+  - f.fields_for :page do |pf|
+    = pf.hidden_field :status_id,:value => Status[Radiant::Config['defaults.page.status']].id

data/app/views/admin/shop/products/edit/_foot.html.haml

@@ -9,11 +9,4 @@
     = updated_stamp @shop_product
 
 - unless @shop_product.new_record?
-  :javascript
-    if(typeof(ROUTES) === 'undefined') ROUTES = new Array();
-  
-    ROUTES['admin_shop_product_images_path']        = "#{admin_shop_product_images_path(@shop_product)}";
-    ROUTES['sort_admin_shop_product_images_path']   = "#{sort_admin_shop_product_images_path(@shop_product)}";
-  
-    ROUTES['admin_shop_product_image_path']         = "#{admin_shop_product_image_path(@shop_product, ':id')}";
-    ROUTES['admin_shop_product_variant_path']       = "#{admin_shop_product_variant_path(@shop_product, ':id')}";
+  = routes_to_js(@routes)

data/app/views/admin/shop/products/edit/meta/_layout.html.haml

@@ -0,0 +1,6 @@
+- f.fields_for :page do |pf|
+  %tr
+    %th.label
+      = pf.label :layout_id, t('layout')
+    %td.field
+      = pf.collection_select :layout_id, Layout.all, :id, :name

data/app/views/admin/shop/products/edit/meta/_status.html.haml

@@ -0,0 +1,3 @@
+- if @shop_product.new_record?
+  - f.fields_for :page do |pf|
+    = pf.hidden_field :status_id,:value => Status[Radiant::Config['defaults.page.status']].id

data/app/views/admin/shop/products/index/_product.html.haml

@@ -6,7 +6,7 @@
       - body.icon do
         - link_to [:edit_admin, product], :class => 'icon' do
           - unless product.attachments.empty?
-            = image_tag product.attachments.first.image.url(:preview)
+            = image_tag product.attachments.first.image.url(:icon)
       - body.name do
         %span.name.attribute
           - link_to [:edit_admin, product] do

data/config/locales/en.yml

@@ -49,13 +49,14 @@ en:
   caption: "Caption"
   price: "Price"
   sku: "sku"
-  variant_templates: "Variant Templates"
-  product_groups: "Product Groups"
-  variant: "Variant"
-  new_variant: "New Variant"
-  price_variation: "Price Variation"
-  templates: "Templates"
-  apply_template: "Apply Template"
+  all: "all"
+  new: "new"
+  shipped: "shipped"
+  paid: "paid"
+  order: "Order"
+  orders: "Orders"
+  export: Export
+  new_customer: "New Customer"
   text:
     remove_customer:
       warning: "Deleting a customer is irreversible and will also delete their orders and addresses, make sure you're sure."

data/config/routes.rb

@@ -1,32 +1,20 @@
 ActionController::Routing::Routes.draw do |map|
   
   map.namespace :admin do |admin|
-    admin.namespace :shop, :member => { :remove => :get } do |shop|      
+    admin.namespace :shop, :member => { :remove => :get } do |shop|   
+         
       shop.resources :categories, :collection => { :sort => :put }, :member => { :products => :get } do |category|
         category.resources :products, :only => :new
       end
       
       shop.resources :products, :except => :new, :collection => { :sort => :put } do |product|
-        product.resources :images,            :controller => 'products/images',             :only => [:index, :create, :destroy],   :collection => { :sort => :put }
-        product.resources :variants,          :controller => 'products/variants',           :only => [ :create, :destroy]
-        product.resources :variant_templates, :controller => 'products/variant_templates',  :only => [ :update ]
-        product.resources :discounts,         :controller => 'products/discounts',          :only => [ :create, :destroy]
-        product.resources :discount_templates,:controller => 'products/discount_templates', :only => [ :update ]
+        product.resources :images,  :controller => 'products/images', :only => [:index, :create, :destroy], :collection => { :sort => :put }
       end
       
-      shop.resources :packages, :member => { :remove => :get } do |packages|
-        packages.resources :packings,         :controller => 'packages/packings',           :only => [:create, :update, :destroy],  :collection => { :sort => :put }
-      end
-      
-      shop.resources :discounts, :member => { :remove => :get } do |discounts|
-        discounts.resources :discountables,   :controller => 'discounts/discountables',     :only => [:create,:destroy]
-      end
-      
-      shop.resources :variants
-      
       shop.resources :customers
       
       shop.resources :orders, :except => [ :destroy ], :collection => { :export => :get }
+      
     end
 
     admin.resources :shops, :as => 'shop', :only => [ :index ]

data/db/migrate/20101011063133_setup_shop.rb

@@ -0,0 +1,94 @@
+class SetupShop < ActiveRecord::Migration
+  def self.up
+    create_table "shop_products", :force => true do |t|
+      t.decimal  "price"
+      t.decimal  "weight"
+      t.decimal  "height"
+      t.decimal  "width"
+      t.decimal  "depth"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.integer  "created_by_id"
+      t.integer  "updated_by_id"
+      t.integer  "page_id"
+    end
+    
+    create_table "shop_categories", :force => true do |t|
+      t.integer  "product_layout_id"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.integer  "created_by_id"
+      t.integer  "updated_by_id"
+      t.integer  "page_id"
+    end
+    
+    create_table "shop_product_attachments", :force => true do |t|
+      t.integer "position",      :default => 1
+      t.integer "image_id"
+      t.integer "product_id"
+      t.integer "created_by_id"
+      t.integer "updated_by_id"
+    end
+    add_index "shop_product_attachments", ["image_id"],   :name => "index_shop_product_attachments_on_image_id"
+    add_index "shop_product_attachments", ["position"],   :name => "index_shop_product_attachments_on_position"
+    add_index "shop_product_attachments", ["product_id"], :name => "index_shop_product_attachments_on_product_id"
+
+    create_table "shop_orders", :force => true do |t|
+      t.text     "notes"
+      t.string   "status",      :default => "new"
+      t.integer  "billing_id"
+      t.integer  "shipping_id"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.integer  "customer_id"
+      t.integer  "created_by_id"
+      t.integer  "updated_by_id"
+    end
+    add_index "shop_orders", ["customer_id"], :name => "index_shop_orders_on_customer_id"
+    add_index "shop_orders", ["status"], :name => "index_shop_orders_on_status"
+    
+    create_table "shop_line_items", :force => true do |t|
+      t.integer  "quantity",      :default => 1
+      t.integer  "item_id"
+      t.string   "item_type"
+      t.decimal  "item_price"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.integer  "order_id"
+      t.integer  "created_by_id"
+      t.integer  "updated_by_id"
+    end
+    add_index "shop_line_items", ["item_id"], :name => "index_shop_line_items_on_item_id"
+    add_index "shop_line_items", ["order_id"], :name => "index_shop_line_items_on_order_id"
+    
+    create_table "shop_addresses", :force => true do |t|
+      t.string   "email"
+      t.string   "name"
+      t.string   "unit"
+      t.string   "street"
+      t.string   "city"
+      t.string   "state"
+      t.string   "postcode"
+      t.string   "country"
+      t.integer  "created_by_id"
+      t.integer  "updated_by_id"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    create_table "shop_payments", :force => true do |t|
+      t.float    "amount"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.string   "gateway"
+      t.string   "card_type"
+      t.string   "card_number"
+      t.integer  "order_id"
+      t.integer  "created_by_id"
+      t.integer  "updated_by_id"
+    end
+
+    add_index "shop_payments", ["gateway"],  :name => "index_shop_payments_on_gateway"
+    add_index "shop_payments", ["order_id"], :name => "index_shop_payments_on_order_id"
+  end
+end

data/db/seeds/forms.rb

@@ -1,11 +1,9 @@
-puts "Seed Shop Forms";
-
+#---------------------------------------------------#
 # Add Cart Item
-
-Form.create({
-  :title  => 'CartAddProduct',
-  :action => '/shop/cart', # Redirects to the cart listing
-  :body   => <<-BODY
+#---------------------------------------------------#
+add = Form.new
+add.title = 'CartAddProduct'
+add.body  = <<-BODY
 <r:shop:product>
   <input type="hidden" name="line_item[item_id]" value="<r:id />" />
   <input type="hidden" name="line_item[item_type]" value="ShopProduct" />
@@ -14,177 +12,138 @@ Form.create({
   <input type="submit" name="add_to_cart" id="add_to_cart_<r:id />" value="Buy Now" />
 </r:shop:product>
 BODY
-})
+add.config = <<-CONFIG
+add_product:
+  extension: line_item
+  process:   add
+CONFIG
 
-Form.create({
-  :title  => 'CartAddProductVariant',
-  :action => '/shop/cart', # Redirects to the cart listing
-  :body   => <<-BODY
-<r:shop:product>
-  <input type="hidden" name="line_item[item_id]" value="<r:id />" />
-  <input type="hidden" name="line_item[item_type]" value="ShopProduct" />
-  
-  <input type="hidden" name="line_item[quantity]" value="1" />
-  <input type="submit" name="add_to_cart" id="add_to_cart_<r:id />" value="Buy Now" />
-</r:shop:product>
-BODY
-})
+add.save
 
+#---------------------------------------------------#
 # Update Cart Item
-
-Form.create({
-  :title  => 'CartUpdateItem',
-  :action => '',
-  :body   => <<-BODY
+#---------------------------------------------------#
+update = Form.new
+update.title = 'CartUpdateItem'
+update.body  = <<-BODY
 <r:shop:cart>
-  <r:item>
-    <input type="hidden" name="_method" value="put" />
-    <input type="hidden" name="line_item[id]" value="<r:item:id />" />
-    
-    <input type="text" name="line_item[quantity]" value="<r:quantity />" />
-    <input type="submit" name="add_to_cart" id="update_<r:id />" value="Update" />
-  </r:item>
+<r:item>
+  <input type="hidden" name="_method" value="put" />
+  <input type="hidden" name="line_item[id]" value="<r:item:id />" />
+  
+  <input type="text" name="line_item[quantity]" value="<r:quantity />" />
+  <input type="submit" name="add_to_cart" id="update_<r:id />" value="Update" />
+</r:item>
 </r:shop:cart>
 BODY
-})
-
-# Checkout Addresses
+update.config = <<-CONFIG
+add_product:
+  extension: line_item
+  process:   modify
+CONFIG
 
-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>
+update.save
+
+#---------------------------------------------------#
+# Cart Address
+#---------------------------------------------------#
+address = Form.new
+address.title = 'CartAddress'
+address.redirect_to = '/cart/payment'
+address.body  = <<-BODY
+<r:shop:cart:items:if_items>
+  <div id="billing" class="address">
+    <r:address type='billing'>
+      <h4>Address</h4>
+      
+      <r:if_address><input type="hidden" name="billing[id]" value="<r:id />" /></r:if_address>
+      
       <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>
+        <li id="billing_name_input" class="input required">
+          <r:label for='billing[name]'>Full Name</r:label>
+          <input type="text" name="billing[name]" value="<r:name/>" />
+        </li>
+        <li id="billing_email_input" class="input required">
+          <r:label for='billing[email]'>Email</r:label>
+          <input type="text" name="billing[email]" value="<r:email/>" />
+        </li>
+        <li id="billing_street_input" class="input required">
+          <r:label for='billing[street]'>Street</r:label>
+          <input type="text" name="billing[street]" value="<r:street/>" />
+        </li>
+        <li id="billing_city_input" class="input required">
+          <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 id="billing_state_input" class="input required">
+          <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>
       </ol>
-    </div>
+    </r:address>      
   </div>
-</r:shop:cart>
+</r:shop:cart:items:if_items>
 
-<r:submit value="Save Addresses" />
+<r:submit value="On To Payment" />
 BODY
-
-addresses_config = <<-CONFIG
-checkout:
-  address:
-    billing: true
-    shipping: true
+address.config = <<-CONFIG
+checkout_addresses:
+  extension: address
+  billing: true
 CONFIG
-
-Forms.create({
-  :title        => 'CheckoutAddresses',
-  :redirect_to  => '/shop',
-  :body         => addresses_body,
-  :config       => addresses_config
-})
-
-eway_body = <<-BODY
-<r:shop:cart>
+address.save
+
+
+#---------------------------------------------------#
+# Cart Payment
+#---------------------------------------------------#
+payment = Form.new
+payment.title = 'CartPayment'
+payment.redirect_to = '/cart/thanks'
+payment.body  = <<-BODY
+<r:response:if_results extension='bogus_checkout'>
+  <r:response:get name='results[bogus_checkout][message]' />
+</r:response:if_results>
+
+<r:shop:cart:items:if_items>
+  <input type="hidden" name="options[order_number]" value="<r:id />" />
   <ol class="card">
-    <li>
+    <li id="card_type_select" class="select required">
       <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>
+      <r:form:card:type />
+      <r:hidden name='card[type]' value='bogus' /> <!-- delete me -->
     </li>
-    <li>
+    <li id="card_name_input" class="input required">
       <r:label for='card[name]'>Name on Card</r:label>
       <r:text name='card[name]' />
     </li>
-    <li>
+    <li id="card_number_input" class="input required">
       <r:label for='card[number]'>Card Number</r:label>
       <r:text name='card[number]' />
+      <r:hidden name='card[number]' value='1' /> <!-- delete me -->
     </li>
-    <li>
-      <r:label for='card[verification]'>Verification Code</r:label>
+    <li id="card_verification_input" class="input required">
+      <r:label for='card[verification]'>Security 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 id="card_month_select" class="select required">
+      <r:label for='card[month]'>Expiry</r:label>
+      <r:form:card:month /><r:form:card:year />
+    </li>
+    <li id="card_submit" class="submit">
+      <r:submit value='Place Order' />
     </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' />
+  
+</r:shop:cart:items:if_items>
 BODY
-
-eway_config = <<-CONFIG
-
-CONFIG
+payment.config = <<-CONFIG
+bogus_checkout:
+  extension: checkout
+  test: true
+  gateway:
+    name: bogus
+CONFIG
+payment.save