shoppe 0.0.7 → 0.0.8

data/app/views/shoppe/delivery_services/new.html.haml

@@ -1,5 +1,5 @@
 - @page_title = "Delivery Services"
 = content_for :header do
   %p.buttons= link_to "Back to delivery services", :delivery_services, :class => 'button'
-  %h2 New Delivery Service
+  %h2.delivery_services Delivery Services
 = render 'form'

data/app/views/shoppe/orders/index.html.haml

@@ -2,7 +2,7 @@
 
 = content_for :header do
   %p.buttons= link_to "Search Orders", '#', :class => 'button', :rel => 'searchOrders'
-  %h2
+  %h2.orders
     Orders
     %span= page_entries_info @orders
   
@@ -45,16 +45,20 @@
         %th Total
         %th Paid?
     %tbody
-      - for order in @orders
-        %tr
-          %td= link_to order.number, order
-          %td= order.customer_name
-          %td= status_tag order.status
-          %td
-            %ul
-              - for item in order.order_items
-                %li #{item.quantity} x #{item.product.title}
-          %td= number_to_currency order.total
-          %td= boolean_tag order.paid?
+      - if @orders.empty?
+        %tr.empty
+          %td{:colspan => 6} No orders to display.
+      - else
+        - for order in @orders
+          %tr
+            %td= link_to order.number, order
+            %td= order.customer_name
+            %td= status_tag order.status
+            %td
+              %ul
+                - for item in order.order_items
+                  %li #{item.quantity} x #{item.product.title}
+            %td= number_to_currency order.total
+            %td= boolean_tag order.paid?
 
 = paginate @orders

data/app/views/shoppe/orders/show.html.haml

@@ -2,7 +2,7 @@
 
 = content_for :header do
   %p.buttons= link_to "Back to orders", :orders, :class => 'button'
-  %h2 Order ##{@order.number}
+  %h2.orders Order <b>##{@order.number}</b>
 
 #order
   .details
@@ -31,7 +31,6 @@
         %dt Build Time
         %dd= distance_of_time_in_words(@order.created_at, @order.received_at)
       
-      
       - if !@order.paid?
         = form_tag [:pay, @order] do
           %p.ship
@@ -45,7 +44,7 @@
             = submit_tag "Ship", :class => 'button green'
       
       - if @order.paid? && !(@order.accepted? || @order.rejected?)
-        %p.acceptreject
+        %p.ship
           = link_to 'Accept order', [:accept, @order], :method => :post, :class => 'button green'
           = link_to "Reject order", [:reject, @order], :method => :post, :class => 'button purple'
   
@@ -86,32 +85,36 @@
       %table.data
         %thead
           %tr
-            %th Qty
+            %th.qty Qty
             %th Item
             %th SKU
-            %th Price
-            %th= Shoppe.config[:tax_name]
-            %th Sub-Total
+            %th.money Cost
+            %th.money Price
+            %th.money= Shoppe.config[:tax_name]
+            %th.money Sub-Total
         %tbody
           - for item in @order.order_items
             %tr
-              %td= item.quantity
-              %td= link_to item.product.title, [:edit, item.product]
-              %td= item.product.sku
-              %td= number_to_currency item.sub_total
-              %td= number_to_currency item.tax_amount
-              %td= number_to_currency item.total
+              %td.qty= item.quantity
+              %td.product= link_to item.product.title, [:edit, item.product]
+              %td.sku= item.product.sku
+              %td.money= number_to_currency item.total_cost
+              %td.money= number_to_currency item.sub_total
+              %td.money= number_to_currency item.tax_amount
+              %td.money= number_to_currency item.total
+          - if @order.delivery_service
+            %td.qty
+            %td.product= link_to @order.delivery_service.name, [:edit, @order.delivery_service]
+            %td.sku
+            %td.money= number_to_currency @order.delivery_cost_price
+            %td.money= number_to_currency @order.delivery_price
+            %td.money= number_to_currency @order.delivery_tax_amount
+            %td.money= number_to_currency @order.delivery_price + @order.delivery_tax_amount
         %tfoot
           %tr
-            %td.right.bold{:colspan => 5}= link_to @order.delivery_service.name, [:edit, @order.delivery_service]
-            %td= number_to_currency @order.delivery_price
-          %tr
-            %td.right.bold{:colspan => 5} Total (excluding #{Shoppe.config[:tax_name]})
-            %td= number_to_currency @order.total_before_tax
-          %tr
-            %td.right.bold{:colspan => 5}= Shoppe.config[:tax_name]
-            %td= number_to_currency @order.tax
-          %tr
-            %td.right.bold{:colspan => 5} Total
-            %td= number_to_currency @order.total
-
+            %td.qty= @order.total_items
+            %td{:colspan => 2}
+            %td.money= number_to_currency @order.total_cost
+            %td.money= number_to_currency @order.total_before_tax
+            %td.money= number_to_currency @order.tax
+            %td.money= number_to_currency @order.total

data/app/views/shoppe/product_categories/_form.html.haml

@@ -1,12 +1,13 @@
 = form_for @product_category do |f|
   = f.error_messages
   = field_set_tag 'Category Details' do
-    %dl
-      %dt= f.label :name
-      %dd= f.text_field :name
-    %dl
-      %dt= f.label :permalink
-      %dd= f.text_field :permalink
+    .splitContainer
+      %dl.half
+        %dt= f.label :name
+        %dd= f.text_field :name
+      %dl.half
+        %dt= f.label :permalink
+        %dd= f.text_field :permalink
     %dl
       %dt= f.label :description
       %dd= f.text_area :description

data/app/views/shoppe/product_categories/edit.html.haml

@@ -1,6 +1,6 @@
 - @page_title = "Products"
 = content_for :header do
   %p.buttons= link_to "Back to categories list", :product_categories, :class => 'button'
-  %h2 Edit Product Category ##{@product_category.id}
+  %h2.products Product Categories
 = render 'form'
  

data/app/views/shoppe/product_categories/index.html.haml

@@ -2,7 +2,7 @@
 
 = content_for :header do
   %p.buttons=link_to "New category", :new_product_category, :class => 'button green'
-  %h2 Product Categories
+  %h2.products Product Categories
 
 .table
   %table.data
@@ -10,6 +10,10 @@
       %tr
         %th Name
     %tbody
-      - for cat in @product_categories
-        %tr
-          %td= link_to cat.name, [:edit, cat]
+      - if @product_categories.empty?
+        %tr.empty
+          %td No categories to display.
+      - else
+        - for cat in @product_categories
+          %tr
+            %td= link_to cat.name, [:edit, cat]

data/app/views/shoppe/product_categories/new.html.haml

@@ -1,5 +1,5 @@
 - @page_title = "Products"
 = content_for :header do
   %p.buttons= link_to "Back to categories list", :product_categories, :class => 'button'
-  %h2 New Product Category
+  %h2.products Product Categories
 = render 'form'

data/app/views/shoppe/products/_form.html.haml

@@ -1,19 +1,20 @@
 = form_for @product, :html => {:multipart => true} do |f|
   = f.error_messages
-  = field_set_tag "Category" do
-    %dl
-      %dt= f.label :product_category_id
-      %dd= f.collection_select :product_category_id, Shoppe::ProductCategory.ordered, :id, :name, :include_blank => true
   = field_set_tag "Product Information" do
     %dl
-      %dt= f.label :title
-      %dd= f.text_field :title
-    %dl
-      %dt= f.label :permalink
-      %dd= f.text_field :permalink
-    %dl
-      %dt= f.label :sku, 'SKU'
-      %dd= f.text_field :sku
+      %dt= f.label :product_category_id
+      %dd= f.collection_select :product_category_id, Shoppe::ProductCategory.ordered, :id, :name, {:include_blank => true}, {:class => 'chosen'}
+  
+    .splitContainer
+      %dl.third
+        %dt= f.label :title
+        %dd= f.text_field :title
+      %dl.third
+        %dt= f.label :permalink
+        %dd= f.text_field :permalink
+      %dl.third
+        %dt= f.label :sku, 'SKU'
+        %dd= f.text_field :sku
     %dl
       %dt= f.label :description
       %dd= f.text_area :description
@@ -23,46 +24,88 @@
     %dl
       %dt= f.label :in_the_box, "What's in the box?"
       %dd= f.text_area :in_the_box
-  = field_set_tag "Attachments" do
+  
+  = field_set_tag "Attributes" do
+    .margin
+      %table.productAttributes
+        %thead
+          %tr
+            %td Name
+            %td Value
+            %td.searchable Searchable?
+            %td.searchable Public?
+            %td.remove Remove
+            %td
+        %tbody
+          %tr.template{:style => 'display:none;'}
+            %td= text_field_tag 'product[product_attributes_array][][key]', '', :placeholder => 'Name'
+            %td= text_field_tag 'product[product_attributes_array][][value]', '', :placeholder => 'Value'
+            %td.searchable= check_box_tag 'product[product_attributes_array][][searchable]', '1'
+            %td.searchable= check_box_tag 'product[product_attributes_array][][public]', '1'
+            %td.remove= link_to "Remove", '#', :class => 'button button-mini purple'
+            %td.handle
+          - for attribute in @product.product_attributes
+            %tr
+              %td= text_field_tag 'product[product_attributes_array][][key]', attribute.key, :placeholder => 'Name'
+              %td= text_field_tag 'product[product_attributes_array][][value]', attribute.value, :placeholder => 'Value'
+              %td.searchable= check_box_tag 'product[product_attributes_array][][searchable]', '1', attribute.searchable?
+              %td.searchable= check_box_tag 'product[product_attributes_array][][public]', '1', attribute.public?
+              %td.remove= link_to "Remove", '#', :class => 'button button-mini purple'
+              %td.handle
+      %p.addAttribute= link_to "Add attribute", '#', :data => {:behavior => 'addAttributeToAttributesTable'}, :class => 'button button-mini green'
       
-    %dl
-      %dt= f.label :default_image_file, "Default Image"
-      %dd
-        = attachment_preview @product.default_image
-        %p= f.file_field :default_image_file
-    %dl
-      %dt= f.label :data_sheet_file, "Datasheet"
-      %dd
-        = attachment_preview @product.data_sheet
-        %p= f.file_field :data_sheet_file
+  = field_set_tag "Attachments" do
+    .splitContainer
+      %dl.half
+        %dt= f.label :default_image_file, "Default Image"
+        %dd
+          = attachment_preview @product.default_image
+          %p= f.file_field :default_image_file
+      %dl.half
+        %dt= f.label :data_sheet_file, "Datasheet"
+        %dd
+          = attachment_preview @product.data_sheet
+          %p= f.file_field :data_sheet_file
         
   = field_set_tag "Pricing" do
-    %dl
-      %dt= f.label :price
-      %dd= f.text_field :price
-    %dl
-      %dt= f.label :tax_rate
-      %dd= f.text_field :tax_rate
+    .splitContainer
+      %dl.third
+        %dt= f.label :price
+        %dd= f.text_field :price
+      %dl.third
+        %dt= f.label :cost_price
+        %dd= f.text_field :cost_price
+      %dl.third
+        %dt= f.label :tax_rate
+        %dd= f.text_field :tax_rate
       
   = field_set_tag "Website Properties" do
-    %dl
-      %dt= f.label :active, "On sale?"
-      %dd
-        = f.check_box :active
-        = f.label :active, "If checked, this product will be displayed within the public store"
-    %dl
-      %dt= f.label :featured, "Featured?"
-      %dd
-        = f.check_box :featured
-        = f.label :featured, "If checked, this product will appear on your homepage"
+    .splitContainer
+      
+      %dl.half
+        %dt= f.label :active, "On sale?"
+        %dd.checkbox
+          = f.check_box :active
+          = f.label :active, "If checked, this product will be displayed within the public store"
+      %dl.half
+        %dt= f.label :featured, "Featured?"
+        %dd.checkbox
+          = f.check_box :featured
+          = f.label :featured, "If checked, this product will appear on your homepage"
 
   = field_set_tag "Stock Control" do
-    %dl
-      %dt= f.label :weight
-      %dd= f.text_field :weight
-    %dl
-      %dt= f.label :stock
-      %dd= f.text_field :stock
+    .splitContainer
+      %dl.third
+        %dt= f.label :stock_control
+        %dd.checkbox
+          = f.check_box :stock_control
+          = f.label :stock_control, "Enable stock control for this product?"
+      %dl.third
+        %dt= f.label :stock, "Current stock"
+        %dd= f.text_field :stock
+      %dl.third
+        %dt= f.label :weight
+        %dd= f.text_field :weight
   
   %p.submit
     - unless @product.new_record?

data/app/views/shoppe/products/edit.html.haml

@@ -1,5 +1,5 @@
 - @page_title = "Products"
 = content_for :header do
   %p.buttons= link_to "Back to products list", :products, :class => 'button'
-  %h2 Edit Product ##{@product.id}
+  %h2.products Products
 = render 'form'

data/app/views/shoppe/products/index.html.haml

@@ -1,11 +1,8 @@
 - @page_title = "Products"
 
 = content_for :header do
-  %p.buttons
-    = link_to "New product", :new_product, :class => 'button green'
-    = link_to "New category", :new_product_category, :class => 'button green'
-  
-  %h2 Products
+  %p.buttons= link_to "New product", :new_product, :class => 'button green'  
+  %h2.products Products
 
 .table
   %table.data
@@ -16,12 +13,16 @@
         %th Price
         %th Stock
     %tbody
-      - for category, products in @products
-        %tr
-          %th{:colspan => 4}= category.name
-        - for product in products
+      - if @products.empty?
+        %tr.empty
+          %td{:colspan => 4} No products to display.
+      - else
+        - for category, products in @products
           %tr
-            %td= product.sku
-            %td= link_to product.title, [:edit, product]
-            %td= number_to_currency product.price
-            %td= product.stock
+            %th{:colspan => 4}= category.name
+          - for product in products
+            %tr
+              %td= product.sku
+              %td= link_to product.title, [:edit, product]
+              %td= number_to_currency product.price
+              %td= product.stock

data/app/views/shoppe/products/new.html.haml

@@ -1,5 +1,5 @@
 - @page_title = "Products"
 = content_for :header do
   %p.buttons= link_to "back to products list", :products, :class => 'button'
-  %h2 New Product
+  %h2.products Products
 = render 'form'

data/app/views/shoppe/users/_form.html.haml

@@ -1,22 +1,24 @@
 = form_for @user do |f|
   = f.error_messages
   = field_set_tag "User Details" do
-    %dl
-      %dt= f.label :first_name
-      %dd= f.text_field :first_name
-    %dl
-      %dt= f.label :last_name
-      %dd= f.text_field :last_name
+    .splitContainer
+      %dl.half
+        %dt= f.label :first_name
+        %dd= f.text_field :first_name
+      %dl.half
+        %dt= f.label :last_name
+        %dd= f.text_field :last_name
   = field_set_tag "Login" do
-    %dl
-      %dt= f.label :email_address
-      %dd= f.text_field :email_address
-    %dl
-      %dt= f.label :password
-      %dd= f.password_field :password
-    %dl
-      %dt= f.label :password_confirmation, "...and again"
-      %dd= f.password_field :password_confirmation
+    .splitContainer
+      %dl.third
+        %dt= f.label :email_address
+        %dd= f.text_field :email_address
+      %dl.third
+        %dt= f.label :password
+        %dd= f.password_field :password
+      %dl.third
+        %dt= f.label :password_confirmation, "...and again"
+        %dd= f.password_field :password_confirmation
 
 
   %p.submit

data/app/views/shoppe/users/edit.html.haml

@@ -1,5 +1,5 @@
 - @page_title = "Users"
 = content_for :header do
   %p.buttons= link_to "Back to users", :users, :class => 'button'
-  %h2 Edit User #{@user.id}
+  %h2.users Users
 = render 'form'