tienda 1.0.0

data/app/views/tienda/delivery_service_prices/_form.html.haml

@@ -0,0 +1,44 @@
+= form_for [@delivery_service, @delivery_service_price] do |f|
+  = f.error_messages
+  = field_set_tag t('tienda.delivery_service_prices.identification_weight')  do
+    .splitContainer
+      %dl.third
+        %dt= f.label :code, t('tienda.delivery_service_prices.code')
+        %dd= f.text_field :code, :class => 'focus text'
+
+      %dl.third
+        %dt= f.label :min_weight, t('tienda.delivery_service_prices.min_weight')
+        %dd= f.text_field :min_weight, :class => 'text'
+      %dl.third
+        %dt= f.label :max_weight, t('tienda.delivery_service_prices.max_weight')
+        %dd= f.text_field :max_weight, :class => 'text'
+
+  = field_set_tag t('tienda.delivery_service_prices.pricing') do
+    .splitContainer
+      %dl.third
+        %dt= f.label :price, t('tienda.delivery_service_prices.price')
+        %dd
+          .moneyInput
+            .currency= Tienda.settings.currency_unit.html_safe
+            = f.text_field :price, :class => 'text'
+      %dl.third
+        %dt= f.label :cost_price, t('tienda.delivery_service_prices.cost_price')
+        %dd
+          .moneyInput
+            .currency= Tienda.settings.currency_unit.html_safe
+            = f.text_field :cost_price, :class => 'text'
+      %dl.third
+        %dt= f.label :tax_rate_id, t('tienda.delivery_service_prices.tax_rate')
+        %dd= f.collection_select :tax_rate_id, Tienda::TaxRate.ordered, :id, :description, {:include_blank => true}, {:class => 'chosen-with-deselect', :data => {:placeholder => t('tienda.delivery_service_prices.no_tax')}}
+
+  = field_set_tag t('tienda.delivery_service_prices.countries') do
+    %dl
+      %dd
+        = f.collection_select :country_ids, Tienda::Country.ordered, :id, :name, {}, {:class => 'chosen', :multiple => true, :data => {:placeholder => t('tienda.delivery_service_prices.all_countries')}}
+        %p.help= t('tienda.delivery_service_prices.help.countries')
+
+  %p.submit
+    - unless @delivery_service_price.new_record?
+      %span.right= link_to t('tienda.delete'), [@delivery_service, @delivery_service_price], :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this price?"}
+    = f.submit t('tienda.submit'), :class => 'button green'
+    = link_to t('tienda.cancel'), [@delivery_service, :delivery_service_prices], :class => 'button'

data/app/views/tienda/delivery_service_prices/edit.html.haml

@@ -0,0 +1,6 @@
+- @page_title = t('tienda.delivery_service_prices.delivery_services')
+
+= content_for :header do
+  %p.buttons= link_to t('tienda.delivery_service_prices.back'), [@delivery_service, :delivery_service_prices], :class => 'button'
+  %h2.delivery_services= t('tienda.delivery_service_prices.delivery_services')
+= render 'form'

data/app/views/tienda/delivery_service_prices/index.html.haml

@@ -0,0 +1,23 @@
+- @page_title = t('tienda.delivery_service_prices.delivery_services')
+
+= content_for :header do
+  %p.buttons
+    = link_to t('tienda.delivery_service_prices.new_price'), [:new, @delivery_service, :delivery_service_price], :class => 'button green'
+    = link_to t('tienda.delivery_service_prices.back_to_delivery_services'), :delivery_services, :class => 'button'
+  %h2.delivery_services= t('tienda.delivery_service_prices.pricing_for', delivery_name: @delivery_service.name)
+
+.table
+  %table.data
+    %thead
+      %tr
+        %th= t('tienda.delivery_service_prices.code')
+        %th= t('tienda.delivery_service_prices.weight_allowance')
+        %th= t('tienda.delivery_service_prices.price')
+        %th= t('tienda.delivery_service_prices.cost')
+    %tbody
+      - for price in @delivery_service_prices
+        %tr
+          %td= link_to price.code, [:edit, @delivery_service, price]
+          %td #{number_to_weight price.min_weight} → #{number_to_weight price.max_weight}
+          %td= number_to_currency(price.price)
+          %td= number_to_currency price.cost_price

data/app/views/tienda/delivery_service_prices/new.html.haml

@@ -0,0 +1,6 @@
+- @page_title = t('tienda.delivery_service_prices.delivery_services')
+
+= content_for :header do
+  %p.buttons= link_to t('tienda.delivery_service_prices.back') , [@delivery_service, :delivery_service_prices], :class => 'button'
+  %h2.delivery_services= t('tienda.delivery_service_prices.delivery_services')
+= render 'form'

data/app/views/tienda/delivery_services/_form.html.haml

@@ -0,0 +1,38 @@
+= form_for @delivery_service do |f|
+  = f.error_messages
+  = field_set_tag t('tienda.delivery_services.details') do
+    .splitContainer
+      %dl.half
+        %dt= f.label :name, t('tienda.delivery_services.name')
+        %dd= f.text_field :name, :class => 'focus text'
+      %dl.half
+        %dt= f.label :code, t('tienda.delivery_services.code')
+        %dd= f.text_field :code, :class => 'text'
+    .splitContainer
+      %dl.half
+        %dt= f.label :active, t('tienda.delivery_services.active')
+        %dd.checkbox
+          = f.check_box :active
+          = f.label :active,  t('tienda.delivery_services.active_info')
+      %dl.half
+        %dt= f.label :default, t('tienda.delivery_services.default')
+        %dd.checkbox
+          = f.check_box :default
+          = f.label :default,  t('tienda.delivery_services.default_info')
+
+  = field_set_tag  t('tienda.delivery_services.courier') do
+    .splitContainer
+      %dl.half
+        %dt= f.label :courier,  t('tienda.delivery_services.courier_name')
+        %dd= f.text_field :courier, :class => 'text'
+      %dl.half
+        %dt= f.label :tracking_url,  t('tienda.delivery_services.tracking_url')
+        %dd
+          = f.text_field :tracking_url, :class => 'text'
+          %p.help=  t('tienda.delivery_services.tracking_url_help_html')
+
+  %p.submit
+    - unless @delivery_service.new_record?
+      %span.right= link_to  t('tienda.delete'), [@delivery_service], :class => 'button purple', :method => :delete, :data => {:confirm => t('tienda.delivery_services.delete_confirmation')}
+    = f.submit t('tienda.submit'), :class => 'button green'
+    = link_to t('tienda.cancel'), :delivery_services, :class => 'button'

data/app/views/tienda/delivery_services/edit.html.haml

@@ -0,0 +1,9 @@
+- @page_title = t('tienda.delivery_services.delivery_services')
+
+= content_for :header do
+  %p.buttons
+    = link_to t('tienda.delivery_services.prices'), [@delivery_service, :delivery_service_prices], :class => 'button'
+    = link_to t('tienda.delivery_services.back'), :delivery_services, :class => 'button'
+  %h2.delivery_services= t('tienda.delivery_services.delivery_services')
+
+= render 'form'

data/app/views/tienda/delivery_services/index.html.haml

@@ -0,0 +1,27 @@
+- @page_title = t('tienda.delivery_services.delivery_services')
+
+= content_for :header do
+  %p.buttons= link_to t('tienda.delivery_services.new'), :new_delivery_service, :class => 'button green'
+  %h2.delivery_services= t('tienda.delivery_services.delivery_services')
+
+.table
+  %table.data
+    %thead
+      %tr
+        %th= t('tienda.delivery_services.name')
+        %th= t('tienda.delivery_services.prices')
+        %th= t('tienda.delivery_services.courier')
+        %th= t('tienda.delivery_services.active?')
+        %th= t('tienda.delivery_services.default?')
+    %tbody
+      - if @delivery_services.empty?
+        %tr.empty
+          %td{:colspan => 5}= t('tienda.delivery_services.no_services')
+      - else
+        - for delivery_service in @delivery_services
+          %tr
+            %td= link_to delivery_service.name, [:edit, delivery_service]
+            %td= link_to t('tienda.delivery_services.set_prices'), [delivery_service, :delivery_service_prices]
+            %td= delivery_service.courier
+            %td= boolean_tag delivery_service.active?
+            %td= boolean_tag delivery_service.default?

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

@@ -0,0 +1,6 @@
+- @page_title = t('tienda.delivery_services.delivery_services')
+
+= content_for :header do
+  %p.buttons= link_to t('tienda.delivery_services.back'), :delivery_services, :class => 'button'
+  %h2.delivery_services= t('tienda.delivery_services.delivery_services')
+= render 'form'

data/app/views/tienda/order_mailer/accepted.text.erb

@@ -0,0 +1,12 @@
+Hello <%=@order.first_name%>!
+
+Re: Order #<%=@order.number%>
+
+We're pleased to let you know that we have accepted your order and your payment of <%=number_to_currency @order.total%> has been taken from your card successfully.
+
+We will e-mail you again when we ship your order from our warehouse.
+
+Many thanks,
+
+<%=Tienda.settings.store_name%>
+<%=Tienda.settings.email_address%>

data/app/views/tienda/order_mailer/received.text.erb

@@ -0,0 +1,12 @@
+Hello <%=@order.first_name%>!
+
+Re: Order #<%=@order.number%>
+
+We're pleased to let you know that we have received your order and one of our team will be accepting it shortly.
+
+We will e-mail you again when your order has been accepted.
+
+Many thanks,
+
+<%=Tienda.settings.store_name%>
+<%=Tienda.settings.email_address%>

data/app/views/tienda/order_mailer/rejected.text.erb

@@ -0,0 +1,10 @@
+Hello <%=@order.first_name%>!
+
+Re: Order #<%=@order.number%>
+
+Unfortunately, this attached order was rejected. This is most likely due to our over-zealous fraud system so if you wish to continue with this order, please drop us an email or give us a call.
+
+Many thanks,
+
+<%=Tienda.settings.store_name%>
+<%=Tienda.settings.email_address%>

data/app/views/tienda/order_mailer/shipped.text.erb

@@ -0,0 +1,16 @@
+Hello <%=@order.first_name%>!
+
+Re: Order #<%=@order.number%>
+
+We're pleased to let you know your order has been shipped and
+will be with you shortly!
+
+<% if @order.delivery_service && @order.courier_tracking_url -%>
+You can the delivery online at:
+<%=@order.courier_tracking_url%>
+<% end -%>
+
+Many thanks,
+
+<%=Tienda.settings.store_name%>
+<%=Tienda.settings.email_address%>

data/app/views/tienda/orders/_form.html.haml

@@ -0,0 +1,55 @@
+= field_set_tag t('tienda.orders.billing_address') do
+  .splitContainer
+    %dl.third
+      %dt= f.label :first_name, t('tienda.orders.first_name')
+      %dd= f.text_field :first_name, :class => 'focus text'
+    %dl.third
+      %dt= f.label :last_name, t('tienda.orders.last_name')
+      %dd= f.text_field :last_name, :class => 'text'
+    %dl.third
+      %dt= f.label :company, t('tienda.orders.company')
+      %dd= f.text_field :company, :class => 'text'
+  %dl
+    %dt= f.label :billing_address1, t('tienda.orders.address')
+    %dd.space= f.text_field :billing_address1, :class => 'text'
+    %dd.space= f.text_field :billing_address2, :class => 'text'
+    %dd.space= f.text_field :billing_address3, :class => 'text'
+    %dd.space= f.text_field :billing_address4, :class => 'text'
+  .splitContainer
+    %dl.half
+      %dt= f.label :billing_postcode, t('tienda.orders.post_code')
+      %dd= f.text_field :billing_postcode, :class => 'text'
+    %dl.half
+      %dt= f.label :billing_country_id, t('tienda.orders.country')
+      %dd= f.collection_select :billing_country_id, Tienda::Country.ordered, :id, :name, {:include_blank => true}, {:data => {:placeholder => t('tienda.orders.select_country')}}
+
+  .splitContainer
+    %dl.third
+      %dt= f.label :email_address, t('tienda.orders.email_address')
+      %dd= f.text_field :email_address, :class => 'text'
+    %dl.third
+      %dt= f.label :phone_number, t('tienda.orders.phone_number')
+      %dd= f.text_field :phone_number, :class => 'text'
+    %dl.third
+      %dt= f.label :separate_delivery_address, t('tienda.orders.separate_delivery_address')
+      %dd.checkbox
+        = f.check_box :separate_delivery_address
+        = f.label :separate_delivery_address, t('tienda.orders.use_separate_delivery_address?')
+
+= field_set_tag t('tienda.orders.delivery_address'), :class => 'delivery' do
+  %dl
+    %dt= f.label :delivery_name, t('tienda.orders.delivery_name')
+    %dd= f.text_field :delivery_name, :class => 'text'
+  %dl
+    %dt= f.label :delivery_address1, t('tienda.orders.address')
+    %dd.space= f.text_field :delivery_address1, :class => 'text'
+    %dd.space= f.text_field :delivery_address2, :class => 'text'
+    %dd.space= f.text_field :delivery_address3, :class => 'text'
+    %dd.space= f.text_field :delivery_address4, :class => 'text'
+  .splitContainer
+    %dl.half
+      %dt= f.label :delivery_postcode, t('tienda.orders.post_code')
+      %dd= f.text_field :delivery_postcode, :class => 'text'
+    %dl.half
+      %dt= f.label :delivery_country_id, t('tienda.orders.country')
+      %dd= f.collection_select :delivery_country_id, Tienda::Country.ordered, :id, :name, {:include_blank => true}, {:data => {:placeholder => t('tienda.orders.select_country')}}

data/app/views/tienda/orders/_order_details.html.haml

@@ -0,0 +1,57 @@
+.details
+  .left
+    %dl
+      %dt= t('tienda.orders.name')
+      %dd= @order.full_name
+      %dt= t('tienda.orders.company')
+      %dd= @order.company.blank? ? '-' : @order.company
+      %dt
+        - if @order.separate_delivery_address?
+          = t('tienda.orders.billing_address')
+        - else
+          = t('tienda.orders.billing_delivery_address')
+
+      %dd= @order.billing_address1
+      %dd= @order.billing_address2
+      %dd= @order.billing_address3
+      %dd= @order.billing_address4
+      %dd= @order.billing_postcode
+      %dd= @order.billing_country.try(:name)
+      - if @order.separate_delivery_address?
+        %dt= t('tienda.orders.delivery_address')
+        %dd= @order.delivery_name
+        %dd= @order.delivery_address1
+        %dd= @order.delivery_address2
+        %dd= @order.delivery_address3
+        %dd= @order.delivery_address4
+        %dd= @order.delivery_postcode
+        %dd= @order.delivery_country.try(:name)
+  .right
+    %dl
+      %dt= t('tienda.orders.email_address')
+      %dd= mail_to @order.email_address
+      %dt= t('tienda.orders.telephone')
+      %dd= @order.phone_number
+      %dt= t('tienda.orders.weight')
+      %dd= number_to_weight @order.total_weight
+      - if @order.received?
+        %dt= t('tienda.orders.build_time')
+        %dd= distance_of_time_in_words(@order.created_at, @order.received_at)
+      - if @order.invoiced?
+        %dt= t('tienda.orders.invoice_number')
+        %dd= @order.invoice_number
+      %dt= t('tienda.orders.order_balance')
+      %dd= boolean_tag @order.paid_in_full?, nil, :true_text => number_to_currency(@order.balance), :false_text => number_to_currency(@order.balance)
+    - if @order.accepted? && !@order.shipped?
+      = form_tag [:ship, @order] do
+        %dl.form
+          %dt.padding= label_tag 'consignment_number', t('tienda.orders.consignment_number')
+          %dd= text_field_tag 'consignment_number', '', :class => 'text'
+        %dl.form
+          %dd= submit_tag t('tienda.orders.mark_as_shipped') , :class => 'button green button-mini'
+
+    - unless @order.accepted? || @order.rejected?
+      %dl.form
+        %dd
+          = link_to t('tienda.orders.accept'), [:accept, @order], :method => :post, :class => 'button green'
+          = link_to t('tienda.orders.reject'), [:reject, @order], :method => :post, :class => 'button purple'

data/app/views/tienda/orders/_order_items.html.haml

@@ -0,0 +1,38 @@
+.order_items
+  .table
+    %table.data
+      %thead
+        %tr
+          %th.qty= t('tienda.orders.qty')
+          %th= t('tienda.orders.item')
+          %th= t('tienda.orders.sku')
+          %th.money= t('tienda.orders.cost')
+          %th.money= t('tienda.orders.price')
+          %th.money= Tienda.settings.tax_name
+          %th.money= t('tienda.orders.sub_total')
+      %tbody
+        - for item in @order.order_items
+          %tr
+            %td.qty= item.quantity
+            %td.product= item.ordered_item.full_name
+            %td.sku= item.ordered_item.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.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/tienda/orders/_order_items_form.html.haml

@@ -0,0 +1,61 @@
+%table.data.orderItems
+  %thead
+    %tr
+      %th.product= t('tienda.orders.product')
+      %th.qty= t('tienda.orders.quantity')
+      %th.stock= t('tienda.orders.stock')
+      %th.price= t('tienda.orders.unit_price')
+      %th.tax= t('tienda.orders.tax')
+      %th.total= t('tienda.orders.sub_total')
+      %th.weight= t('tienda.orders.weight')
+  %tbody
+    - products = Tienda::Product.ordered
+    = f.fields_for :order_items do |of|
+      = of.hidden_field :ordered_item_type
+      %tr.item{:class => of.object.ordered_item ? 'existing' : 'new'}
+        %td.product{:colspan => of.object.ordered_item ? nil : 7}= of.collection_select :ordered_item_id, products, :id, :full_name, {:include_blank => true}, {:data => {:placeholder => t('tienda.orders.add_item')}}
+        - if of.object.ordered_item
+          %td.qty= of.text_field :quantity, :class => 'text'
+          %td.stock{:class => @order.new_record? && !of.object.in_stock? ? 'oos' : ''}= of.object.ordered_item.stock
+          %td.money-input
+            .moneyInput
+              = of.text_field :unit_price, :placeholder => number_to_currency(of.object.unit_price, :unit => ''), :class =>'text short'
+          %td.money-input
+            .moneyInput
+              = of.text_field :tax_amount, :placeholder => number_to_currency(of.object.tax_amount, :unit => ''), :class =>'text short'
+          %td
+            .moneyInput
+              = text_field_tag '_', number_to_currency(of.object.total, :unit => ''), :disabled => true, :class => 'text short'
+          %td= of.text_field :weight, :placeholder => of.object.weight, :class =>'text short'
+    - if @order.available_delivery_services.empty?
+      %tr.delivery
+        - if @order.delivery_required?
+          %td.none{:colspan => 7}= t('tienda.orders.missing_delivery_service')
+        - else
+          %td.none-needed{:colspan => 7 }= t('tienda.orders.no_delivery_required')
+    - else
+      %tr.delivery
+        %td.product= f.collection_select :delivery_service_id, @order.available_delivery_services, :id, :name
+        %td
+        %td
+        %td.money-input
+          .moneyInput
+            = f.text_field :delivery_price, :placeholder => number_to_currency(@order.delivery_price, :unit => ''), :class =>'text short'
+        %td.money-input
+          .moneyInput
+            = f.text_field :delivery_tax_amount, :placeholder => number_to_currency(@order.delivery_tax_amount, :unit => ''), :class => 'text short'
+        %td.money.total= text_field_tag '_', number_to_currency(@order.delivery_price + @order.delivery_tax_amount, :unit => ''), :class => 'text short', :disabled => true
+        %td
+  %tfoot
+    %tr
+      %td
+      %td
+      %td
+      %td= text_field_tag '_', number_to_currency(@order.total_before_tax, :unit => ''), :class => 'text short', :disabled => true
+      %td= text_field_tag '_', number_to_currency(@order.tax, :unit => ''), :class => 'text short', :disabled => true
+      %td= text_field_tag '_', number_to_currency(@order.total, :unit => ''), :class => 'text short', :disabled => true
+      %td.weight= text_field_tag '_', number_to_currency(@order.total_weight, :unit => ''), :class => 'text short', :disabled => true
+
+- unless @order.new_record?
+  %p.slaWarning
+    = t('tienda.orders.sla_warning')

data/app/views/tienda/orders/_payments_form.html.haml

@@ -0,0 +1,15 @@
+= form_for [@order, Tienda::Payment.new(:amount => @order.balance)] do |f|
+  %dl.text
+    %dt= f.label :method, t('tienda.orders.method')
+    %dd= f.text_field :method, :class => 'text'
+  %dl.text
+    %dt= f.label :reference, t('tienda.orders.reference')
+    %dd= f.text_field :reference, :class => 'text'
+  %dl.amount
+    %dt= f.label :amount, t('tienda.orders.amount')
+    %dd
+      .moneyInput
+        .currency= Tienda.settings.currency_unit.html_safe
+        = f.text_field :amount, :class => 'text'
+  %dl.submit
+    %dd= f.submit t('tienda.orders.add_payment') , :class => 'button green'

data/app/views/tienda/orders/_payments_table.html.haml

@@ -0,0 +1,37 @@
+- unless @payments.empty?
+  .table
+    %table.data
+      %thead
+        %tr
+          %th= t('tienda.orders.id')
+          %th= t('tienda.orders.type')
+          %th= t('tienda.orders.method')
+          %th= t('tienda.orders.reference')
+          %th= t('tienda.orders.amount')
+          %th= t('tienda.orders.refunded?')
+          %th
+      %tbody
+        - for payment in @payments
+          %tr
+            %td= payment.id
+            %td
+              = payment.refund? ? t('tienda.orders.refund') : t('tienda.orders.payment')
+              %span.float-right= boolean_tag payment.confirmed?
+            %td= payment.method
+            %td= link_to_if payment.transaction_url, payment.reference, payment.transaction_url
+
+            - if payment.refund?
+              %td{:colspan => 2}
+                %b= number_to_currency payment.amount
+                - if payment.parent_payment_id
+                  #{t('tienda.orders.from_payment')} ##{payment.parent_payment_id}
+            - else
+              %td= number_to_currency payment.amount
+              %td= boolean_tag payment.refunded?, nil, :true_text => number_to_currency(payment.amount_refunded)
+            %td.refund
+              - if payment.refundable?
+                = link_to t('tienda.orders.refund'), [:refund, @order, payment], :class => 'button purple button-mini', :rel => 'dialog'
+              - else
+                = link_to t('tienda.delete'), [@order, payment], :class => 'button purple button-mini', :data => {:confirm => t('tienda.orders.payment_remove_confirmation') }, :method => :delete
+- else
+  %p.notice= t('tienda.orders.no_payments')

data/app/views/tienda/orders/_search_form.html.haml

@@ -0,0 +1,24 @@
+.orderSearch{:style => action_name == 'search' ? "display:block" : ''}
+  = search_form_for @query, :url => search_orders_path, :html => { :method => :post } do |f|
+    %dl.left
+      %dt= f.label :id_eq, t('tienda.orders.order_number')
+      %dd= f.text_field :id_eq
+      %dt= f.label :first_name_or_last_name_or_company_cont, t('tienda.orders.customer')
+      %dd= f.text_field :first_name_or_last_name_or_company_cont
+      %dt= f.label :address1_or_address2_or_address3_or_address4_or_postcode_cont, t('tienda.orders.billing_address')
+      %dd= f.text_field :billing_address1_or_billing_address2_or_billing_address3_or_billing_address4_or_billing_postcode_cont
+      %dt= f.label :consignment_number_cont, t('tienda.orders.consignment_number')
+      %dd= f.text_field :consignment_number_cont
+      %dt= f.label :received_at_eq, t('tienda.orders.received_between')
+      %dd
+        = f.text_field :received_at_gteq, :class => 'small'
+        →
+        = f.text_field :received_at_lteq, :class => 'small'
+    %dl.right
+      %dt= f.label :email_address_cont, t('tienda.orders.email_address')
+      %dd= f.text_field :email_address_cont
+      %dt= f.label :phone_number_cont, t('tienda.orders.phone_number')
+      %dd= f.text_field :phone_number_cont
+      %dt= f.label :status_eq, t('tienda.orders.status')
+      %dd= f.select :status_eq, [nil] + Tienda::Order::STATUSES.map { |s| [t("tienda.orders.statuses.#{s}"), s]}
+      %dd= f.submit  t('tienda.orders.search'), :class => 'button green button'

data/app/views/tienda/orders/_status_bar.html.haml

@@ -0,0 +1,35 @@
+.status-bar
+  %ul
+    - if @order.received?
+      %li.received
+        %h4= t('tienda.orders.order_received')
+        %p
+          = t('tienda.orders.status_bar.on_date', on: @order.received_at.to_s(:short))
+          = t('tienda.orders.status_bar.from_ip', ip: @order.ip_address)
+
+    - if @order.accepted?
+      %li.accepted
+        %h4= t('tienda.orders.order_accepted')
+        %p
+          = t('tienda.orders.status_bar.on_date', on: @order.accepted_at.to_s(:short))
+          - if @order.accepter
+            = t('tienda.orders.status_bar.by_user', user: @order.accepter.short_name)
+
+    - elsif @order.rejected?
+      %li.rejected
+        %h4= t('tienda.orders.order_rejected')
+        %p
+          = t('tienda.orders.status_bar.on_date', on: @order.rejected_at.to_s(:short))
+          - if @order.rejecter
+            = t('tienda.orders.status_bar.by_user', user: @order.rejecter.short_name)
+
+    - if @order.shipped?
+      %li.shipped
+        %h4= t('tienda.orders.order_shipped')
+        %p
+          = t('tienda.orders.status_bar.on_date', on: @order.shipped_at.to_s(:short))
+          = t('tienda.orders.status_bar.by_user', user: @order.shipper.try(:short_name) || 'Unknown')
+        - if @order.delivery_service && @order.courier_tracking_url
+          %p= link_to t('tienda.orders.status_bar.tracking_url'), @order.courier_tracking_url
+        - else
+          %p= t('tienda.orders.status_bar.consignment_no_html', consignment_number: @order.consignment_number)

data/app/views/tienda/orders/despatch_note.html.haml

@@ -0,0 +1,45 @@
+- @page_title = "#{t('tienda.orders.despatch_note.order_number')} #{@order.number}"
+
+.despatchNote
+  %header
+    %h1= Tienda.settings.store_name
+    %h2= t("tienda.orders.despatch_note.despatch_note")
+  .address
+    %p.name= @order.delivery_name
+    %p= @order.delivery_address1
+    %p= @order.delivery_address2
+    %p= @order.delivery_address3
+    %p= @order.delivery_address4
+    %p= @order.delivery_postcode
+    %p= @order.delivery_country.try(:name)
+
+  %table.details
+    %tr
+      %th= t("tienda.orders.despatch_note.order_number")
+      %th= t("tienda.orders.despatch_note.order_placed")
+      %th= t("tienda.orders.despatch_note.total_weight")
+      %th= t("tienda.orders.despatch_note.telephone")
+    %tr
+      %td= @order.number
+      %td= @order.received? ? @order.received_at.to_s(:long) : 'n/a'
+      %td= number_to_weight @order.total_weight
+      %td= @order.phone_number
+
+  %table.items
+    %thead
+      %tr
+        %th= t("tienda.orders.despatch_note.quantity")
+        %th= t("tienda.orders.despatch_note.product")
+        %th= t("tienda.orders.despatch_note.sku")
+        %th= t("tienda.orders.despatch_note.weight")
+        %th= t("tienda.orders.despatch_note.packed?")
+    %tbody
+      - for item in @order.order_items
+        %tr
+          %td= item.quantity
+          %td= item.ordered_item.full_name
+          %td= item.ordered_item.sku
+          %td= number_to_weight item.weight
+          %td.check
+
+  %p.footer= t('tienda.orders.despatch_note.footer', :default => "Thank you for your order!")

data/app/views/tienda/orders/edit.html.haml

@@ -0,0 +1,21 @@
+- @page_title = "#{t('tienda.orders.edit_order')} ##{@order.number}"
+
+= content_for :header do
+  %p.buttons
+    = link_to t('tienda.orders.back_to_order'), @order, :class => 'button grey'
+  %h2.orders "#{t('tienda.orders.edit_order')} <b>##{@order.number}</b>"
+
+= form_for @order, :html => {:class => 'orderForm'} do |f|
+  = f.error_messages
+  = render 'form', :f => f
+
+  = field_set_tag  t('tienda.orders.notes') do
+    %dl
+      %dd= f.text_area :notes, :class => 'text'
+
+  = field_set_tag t('tienda.orders.ordered_products'), :class => 'padded' do
+    = render 'order_items_form', :f => f
+
+  %p.submit
+    = f.submit t('tienda.orders.save_order') , :class => 'button green'
+    = link_to t('tienda.cancel'), @order, :class => 'button'