radiant-shop-extension 0.9.3 → 0.10.0

data/app/models/shop_category.rb

@@ -36,9 +36,9 @@ class ShopCategory < ActiveRecord::Base
     def search(search)
       unless search.blank?
         queries = []
-        queries << 'LOWER(title) LIKE (:term)'
-        queries << 'LOWER(handle) LIKE (:term)'
-        queries << 'LOWER(description) LIKE (:term)'
+        queries << 'LOWER(shop_categories.name)         LIKE (:term)'
+        queries << 'LOWER(shop_categories.handle)       LIKE (:term)'
+        queries << 'LOWER(shop_categories.description)  LIKE (:term)'
       
         sql = queries.join(" OR ")
         conditions = [sql, {:term => "%#{search.downcase}%" }]

data/app/models/shop_customer.rb

@@ -1,16 +1,12 @@
 class ShopCustomer < User
-  
-  default_scope where(:all, :conditions => { :access => 'shop' })
+  include Scoped::Models::User::Scoped
   
   has_many  :orders,        :class_name => 'ShopOrder'
-  has_many  :addressables,  :class_name => 'ShopAddressable', :as => :addresser
-  has_many  :billings,      :through => :addressables, :source => :address, :source_type => 'ShopAddressBilling',   :uniq => true
-  has_many  :shippings,     :through => :addressables, :source => :address, :source_type => 'ShopAddressShipping',  :uniq => true
+  has_many  :billings,      :through => :orders
+  has_many  :shippings,     :through => :orders
   
   accepts_nested_attributes_for :orders, :allow_destroy => true
   
-  before_save :set_access
-  
   def first_name
     self.name.split(' ')[0]
   end
@@ -19,9 +15,4 @@ class ShopCustomer < User
     self.name.split(' ')[1]
   end
   
-  private
-    def set_access
-      self.access = 'shop'
-    end
-  
 end

data/app/models/shop_order.rb

@@ -1,6 +1,8 @@
 class ShopOrder < ActiveRecord::Base
   
-  has_many  :payments,    :class_name => 'ShopPayment',   :dependent => :destroy
+  default_scope :order => 'shop_orders.updated_at ASC'
+  
+  has_one   :payment,     :class_name => 'ShopPayment',   :dependent => :destroy
   has_many  :line_items,  :class_name => 'ShopLineItem',  :dependent => :destroy
   
   belongs_to :billing,    :class_name => 'ShopAddress'
@@ -10,7 +12,6 @@ class ShopOrder < ActiveRecord::Base
   belongs_to :customer,   :class_name => 'ShopCustomer', :foreign_key => :shop_customer_id
   
   accepts_nested_attributes_for :line_items,  :reject_if => :all_blank
-  accepts_nested_attributes_for :payments,    :reject_if => :all_blank
   accepts_nested_attributes_for :billing,     :reject_if => :all_blank
   accepts_nested_attributes_for :shipping,    :reject_if => :all_blank
   
@@ -74,7 +75,8 @@ class ShopOrder < ActiveRecord::Base
   end
   
   def paid?
-    self.status === 'paid'
+    return false unless self.payment.present?
+    self.payment.amount === self.price and self.status === 'paid'
   end
   
   def shipped?

data/app/models/shop_payment.rb

@@ -1,6 +1,5 @@
 class ShopPayment < ActiveRecord::Base
   
   belongs_to :order,  :class_name => 'ShopOrder', :foreign_key => :shop_order_id
-  belongs_to :method, :class_name => 'ShopPaymentMethod', :foreign_key => :shop_payment_method_id
   
 end

data/app/models/shop_product.rb

@@ -44,9 +44,9 @@ class ShopProduct < ActiveRecord::Base
     def search(search)
       unless search.blank?
         queries = []
-        queries << 'LOWER(title)        LIKE (:term)'
-        queries << 'LOWER(sku)          LIKE (:term)'
-        queries << 'LOWER(description)  LIKE (:term)'
+        queries << 'LOWER(shop_products.name)         LIKE (:term)'
+        queries << 'LOWER(shop_products.sku)          LIKE (:term)'
+        queries << 'LOWER(shop_products.description)  LIKE (:term)'
         
         sql = queries.join(" OR ")
         conditions = [sql, {:term => "%#{search.downcase}%" }]

data/app/views/admin/shop/customers/edit.html.haml

@@ -0,0 +1,13 @@
+- @page_title = @shop_customer.name + ' - ' + default_page_title
+
+- render_region :main do |main|
+  - main.header do
+    %h1
+      = @shop_customer.name
+      = render 'admin/shop/customers/edit/head'
+  - main.form do
+    - form_for :shop_customer, @shop_customer, :url => admin_shop_customer_path(@shop_customer), :html => {:method => :put, :multipart => true, :id => 'edit_shop_customer', 'data-onsubmit_status'=>"Saving Changes…"} do |f|
+      = render :partial => 'admin/shop/customers/edit/fields', :locals => { :f => f }
+  - main.popups do
+    #popups
+      = render 'admin/shop/customers/edit/popups'

data/app/views/admin/shop/customers/edit/_fields.html.haml

@@ -0,0 +1,33 @@
+- render_region :top
+
+- render_region :form do |form|
+  - form.name do
+    %p.title
+      %label{:for => 'shop_customer_name'}= t('name')
+      = f.text_field :name, :class => 'textbox', :maxlenth => 255
+    
+  - form.email do
+    %p.title
+      %label{:for => 'shop_customer_email'}= t('email')
+      = f.text_field :email, :class => 'textbox', :maxlenth => 255
+  
+  - form.meta do
+    = render :partial => '/admin/shop/customers/edit/meta', :locals => { :f => f }
+    
+  - form.parts do 
+    #tab_control
+      #tabs.tabs
+        #tab_toolbar
+      #pages.pages
+        = hidden_field_tag 'page_part_index_field' #important
+        = render :partial => '/admin/shop/customers/edit/parts', :locals => { :f => f }
+    
+- render_region :bottom do |bottom|
+  - bottom.buttons do
+    %p.buttons{:style=>"clear: left"}
+      = save_model_button(@shop_customer)
+      = save_model_and_continue_editing_button(@shop_customer)
+      = t('or')
+      = link_to t('cancel'), admin_shop_customers_path
+  - bottom.timestamp do
+    = updated_stamp @shop_customer

data/app/views/admin/shop/customers/edit/_head.html.haml

@@ -0,0 +1,2 @@
+- @buttons.each do |button|
+  = render :partial => "admin/shop/customers/edit/buttons/#{button}"

data/app/views/admin/shop/customers/edit/_meta.html.haml

@@ -0,0 +1,7 @@
+.drawer
+  .drawer_contents#attributes
+    %table.fieldset
+      - @meta.each do |meta|
+        = render :partial => 'admin/shop/customers/edit/meta/' + meta, :locals => { :f => f }
+  .drawer_handle
+    %a.toggle{:href=>'#attributes', :rel=>"toggle[attributes]", :class=>"#{(meta_errors? ? 'less' : 'more')}"}= meta_label

data/app/views/admin/shop/customers/edit/_parts.html.haml

@@ -0,0 +1,4 @@
+- @parts.each do |part|
+  .page{:id => "customer_page_#{part}", 'data-caption'=>h(part)}
+    .part{:id => "customer_part_#{part}"}
+      = render :partial => "admin/shop/customers/edit/parts/#{part}", :locals => { :f => f }

data/app/views/admin/shop/customers/edit/_popups.html.haml

@@ -0,0 +1,3 @@
+= @popups.each do |popup|
+  .popup{ :id => "#{popup}_popup"}
+    = render :partial => "admin/shop/customers/edit/popups/#{popup}"

data/app/views/admin/shop/customers/edit/meta/_login.html.haml

@@ -0,0 +1,5 @@
+%tr
+  %th.label
+    = f.label :login, t('login')
+  %td.field
+    = f.text_field :login

data/app/views/admin/shop/customers/edit/meta/_password.html.haml

@@ -0,0 +1,5 @@
+%tr
+  %th.label
+    = f.label :password, t('password')
+  %td.field
+    = f.password_field :password, :value => ''

data/app/views/admin/shop/customers/edit/meta/_password_confirmation.html.haml

@@ -0,0 +1,5 @@
+%tr
+  %th.label
+    = f.label :password_confirmation, t('password')
+  %td.field
+    = f.password_field :password_confirmation, :value => ''

data/app/views/admin/shop/customers/edit/parts/_address.html.haml

@@ -0,0 +1,7 @@
+%span.name= address.name
+%span.unit= address.unit
+%span.street= address.street
+%span.city= address.city
+%span.state= address.state
+%span.country= address.country
+%span.postcode= address.postcode

data/app/views/admin/shop/customers/edit/parts/_addresses.html.haml

@@ -0,0 +1,13 @@
+%h3 Billing
+
+%ul#billings
+  - @shop_customer.billings.each do |billing|
+    %li.billing
+      = render :partial => '/admin/shop/customers/edit/parts/address', :locals => { :address => billing }
+      
+%h3 Shipping
+
+%ul#shippings
+  - @shop_customer.billings.each do |shipping|
+    %li.shipping
+      = render :partial => '/admin/shop/customers/edit/parts/address', :locals => { :address => shipping }

data/app/views/admin/shop/customers/edit/parts/_orders.html.haml

@@ -0,0 +1,29 @@
+%ul#orders
+  - @shop_customer.orders.each do |order|
+    %li.order
+      %h3
+        = number_to_currency(order.price)
+        = distance_of_time_in_words Time.now, order.updated_at
+        ago
+      %h4
+        = order.line_items.count
+        = order.line_items.count == 1 ? 'item' : 'items'
+        = "(#{order.status})"
+      
+      %br
+      
+      %h4 Billing
+      %span.billing= render :partial => '/admin/shop/customers/edit/parts/address', :locals => { :address => order.billing }
+      
+      %h4 Shipping
+      %span.shipping= render :partial => '/admin/shop/customers/edit/parts/address', :locals => { :address => order.shipping }
+      
+      %h4 Payment
+      %span.payment
+        - if order.paid?
+          = order.payment.card_number
+          = order.payment.card_type
+        - else
+          This order hasn't been paid for yet
+      
+      %hr

data/app/views/admin/shop/customers/index.html.haml

@@ -1,36 +1,10 @@
-Add Customer
-- form_for [:admin, @shop_customer] do |f|
-  %p
-    = f.label :name, 'Name:'
-    = f.text_field :name
-  %p
-    = f.label :email, 'Email:'
-    = f.text_field :email
-  %p
-    = f.label :login, 'Login:'
-    = f.text_field :login
-  %p
-    = f.label :password, "Password"
-    = f.password_field "password", :value => "", :size => 15, :maxlength => 40
-  %p
-    = f.label :password_confirmation, "Confirm Password"
-    = f.password_field "password_confirmation", :value => "", :size => 15, :maxlength => 40
-  %p
-    = f.label :reference, 'Reference:'
-    = f.text_field :reference
-  %p
-    = f.label :Organization, 'Organization:'
-    = f.text_field :organization
-  %p
-    = f.submit "Save"
-    
+- @page_title = t('customers') + ' - ' + default_page_title
 
-- if @shop_customers.empty?
-  %p There are no customers.
-- else
-  %form
-    - @shop_customers.each do |customer|
-      %p
-        = customer.name
-        = link_to "Add Order", "", :style => "color: blue;"
-        = link_to "Delete Customer", "/admin/shop/customers/#{customer.id}", :confirm => "Are you sure?", :method => :delete, :style => "color: blue;"
+.outset
+
+  #customers_map.map
+    %ul#customers
+      = render :partial => '/admin/shop/customers/index/customer', :collection => @shop_customers
+
+  #actions
+    = render :partial => '/admin/shop/customers/index/bottom'

data/app/views/admin/shop/customers/index/_bottom.html.haml

@@ -0,0 +1,4 @@
+%ul
+  - render_region :bottom do |bottom|
+    - bottom.add do
+      %li= link_to image('plus') + " " + t("add_customer"), new_admin_shop_customer_path

data/app/views/admin/shop/customers/index/_customer.html.haml

@@ -0,0 +1,9 @@
+%li.customer.object{:id => "customer_#{customer.id}", :'data-id' => customer.id}
+  .attributes
+    %span.name.attribute
+    - render_region :customer do |region|
+      - region.name do
+        %span.name.attribute= link_to customer.name, edit_admin_shop_customer_path(customer)
+      - region.modify do
+        .modify
+          %span.remove= link_to t('remove'), remove_admin_shop_customer_path(customer)

data/app/views/admin/shop/customers/new.html.haml

@@ -0,0 +1,11 @@
+- render_region :main do |main|
+  - main.header do
+    %h1
+      = @shop_customer.name
+      = render 'admin/shop/customers/edit/head'
+  - main.form do
+    - form_for :shop_customer, :url => admin_shop_customers_path, :html => {:id => 'new_shop_customer', :multipart => true, 'data-onsubmit_status'=>"Creating Customer…"} do |f|
+      = render :partial => 'admin/shop/customers/edit/fields', :locals => { :f => f }
+  - main.popups do
+    #popups
+      = render 'admin/shop/customers/edit/popups'

data/app/views/admin/shop/customers/remove.html.haml

@@ -0,0 +1,12 @@
+%h1
+  = t('remove_customer')
+
+%p
+  = t('text.remove_customer.warning')
+
+- form_for [:admin, @shop_customer.becomes(ShopCustomer)], :html => {:method => :delete, 'data-onsubmit_status'=>"Removing Customer…"} do
+  
+  %p.buttons
+    %input.button{:type=>"submit", :value => t('delete_customer') }/
+    = t('or')    
+    = link_to t('cancel'), admin_shop_customers_path

data/app/views/admin/shop/products/new.html.haml

@@ -4,7 +4,7 @@
       = t('new_product')
       = render :partial => 'admin/shop/products/edit/head'
   - main.edit_form do
-    - form_for :shop_product, @shop_product, :url => admin_shop_products_path, :html => {:id => 'new_shop_product', :multipart => true, 'data-onsubmit_status'=>"Creating Product…"} do |f|
+    - form_for :shop_product, :url => admin_shop_products_path, :html => {:id => 'new_shop_product', :multipart => true, 'data-onsubmit_status'=>"Creating Product…"} do |f|
       = render :partial => 'admin/shop/products/edit/fields', :object => f
   - main.edit_popups do
     - #empty

data/config/locales/en.yml

@@ -1,6 +1,6 @@
 ---
 en:
-  shop: "shop"
+  shop: "Shop"
   shop_category:          "Category"
   shop_categories:        "Categories"
   shop_product:           "Product"
@@ -15,35 +15,43 @@ en:
     could_not_update:       "Couldn't update"
     could_not_destroy:      "Couldn't delete"
     could_not_sort:         "Couldn't sort"
-  handle: 'Handle'
-  title: 'Title'
-  category: 'Category'
-  categories: 'Categories'
-  no_categories: 'No Categories'
-  add_category: 'Add Category'
-  new_category: 'New Shop Category'
-  edit_category: 'Update Shop Category'
-  remove_category: 'This will delete the category'
-  delete_category: 'Delete Category'
-  custom_layout: 'Layout'
-  custom_product_layout: 'Product Layout'
-  product: 'Product'
-  products: 'Products'
-  no_products: 'No Products'
-  add_product: 'Add Product'
-  new_product: 'New Shop Product'
-  edit_product: 'Update Shop Product'
-  remove_product: 'This will delete the product'
-  delete_product: 'Delete Product'
-  image: 'Image'
-  images: 'Images'
-  no_images: 'No Images'
-  add_image: 'Add Image'
-  browse_images: 'Browse Images'
-  caption: 'Caption'
-  price: 'Price'
-  sku: 'SKU'
+  email: "Email"
+  handle: "Handle"
+  title: "Title"
+  customer: "Customer"
+  customers: "Customers"
+  add_customer: "Add Customer"
+  remove_customer: "This will delete the customer"
+  delete_customer: "Delete Customer"
+  category: "Category"
+  categories: "Categories"
+  no_categories: "No Categories"
+  add_category: "Add Category"
+  new_category: "New Shop Category"
+  edit_category: "Update Shop Category"
+  remove_category: "This will delete the category"
+  delete_category: "Delete Category"
+  custom_layout: "Layout"
+  custom_product_layout: "Product Layout"
+  product: "Product"
+  products: "Products"
+  no_products: "No Products"
+  add_product: "Add Product"
+  new_product: "New Shop Product"
+  edit_product: "Update Shop Product"
+  remove_product: "This will delete the product"
+  delete_product: "Delete Product"
+  image: "Image"
+  images: "Images"
+  no_images: "No Images"
+  add_image: "Add Image"
+  browse_images: "Browse Images"
+  caption: "Caption"
+  price: "Price"
+  sku: "SKU"
   text:
+    remove_customer:
+      warning: "Deleting a customer is irreversible and will also delete their orders and addresses, make sure you're sure."
     remove_product:
       warning: "Deleting a product is irreversible, make sure you're sure."
     remove_category:

data/config/routes.rb

@@ -3,6 +3,8 @@ ActionController::Routing::Routes.draw do |map|
   map.namespace :admin do |admin|
     admin.namespace :shop, :member => { :remove => :get } do |shop|
       
+      shop.resources :customers
+      
       shop.resources :categories, :collection => { :sort => :put }, :member => { :products => :get } do |category|
         category.resources :products, :only => :new
       end

data/db/migrate/20100927041219_remove_payment_methods.rb

@@ -0,0 +1,16 @@
+class RemovePaymentMethods < ActiveRecord::Migration
+  def self.up
+    drop_table    :shop_payment_methods
+    remove_index  :shop_payments, :shop_payment_method_id
+    remove_column :shop_payments, :shop_payment_method_id
+  end
+
+  def self.down
+    add_column  :shop_payments, :shop_pamyent_method_id, :integer
+    add_index   :shop_payments, :shop_payment_method_id
+  
+    create_table :shop_payment_methods do |t|
+      t.string      :name
+    end
+  end
+end