office_clerk 0.8 → 0.9

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

@@ -1,25 +0,0 @@
-%h2
-  = t params["action"]
-  = t(:order)
-= bootstrap_form_for(@order) do |f|
-  .col-md-6
-    = f.date_field :ordered_on
-  .col-md-6
-    = f.text_field :shipment_price
-  .col-md-6
-    = f.text_field :shipment_tax
-  .col-md-6
-    = f.text_field :email
-  .col-md-6
-    = f.date_field :paid_on
-  .col-md-6
-    = f.date_field :shipped_on
-  .col-md-6
-    = f.date_field :paid_on
-  .col-md-6
-    = f.date_field :canceled_on
-  .col-md-6
-    = f.text_field :shipment_type
-  .form-actions
-    = f.submit :class => "btn btn-success"
-    = link_to t(:back), order_path(@order), :class => "btn btn-warning"

data/app/views/orders/ship.haml

@@ -1,91 +0,0 @@
-= bootstrap_form_for @order, :url => ship_order_path do |f|
-  .row
-    = f.alert_message t(:fix_errors) , error_summary: false
-
-  .row
-    .col-md-3
-      %h4.highlight
-        Valitse toimitustapa
-        .row
-          .col-md-10
-            %br
-              - extra = OfficeClerk.config("defaults.free_shipping") - @order.basket.total_price
-              - if extra > 0
-                .frame.bg-high8
-                  %b= t(:notice) + "!"
-                  = t(:order_more_for_free_shipping , :more => extra.round(2))
-
-    .col-md-9
-      .row
-        .col-md-7
-          %h4
-            Valitse toimitustapa
-            = @order.shipment_type              
-          - OfficeClerk::ShippingMethod.all.each_value do |s|
-            .radio
-              = radio_button_tag "order[shipment_type]" , s.type , s.type.to_s == @order.shipment_type , "data-price" => s.price_for(@order.basket).round(2)
-              = s.name
-              = s.price_for(@order.basket).round(2)
-              €
-
-        .col-md-4
-          %h4
-            = t(:order)
-            = @order.number
-
-          %table.table.table-condensed.basket-total
-            %thead
-              %tr
-                %th Tuotteet yhteensä
-                %td.text-right
-                  %span#basket_total= @order.basket.total_price.round(2)
-                  €
-            %tbody
-              %tr 
-                %th Toimituskulut 
-                %td.text-right
-                  %span#shipping_cost= @order.shipment_price
-                  €
-              %tr 
-                %th Tilaus yhteensä
-                %th.text-right
-                  %span#order_total= @order.total_price.round(2)
-                  €
-        .col-md-1
-
-
-  .row
-    %hr 
-    .col-md-3
-      .row
-        .col-md-9
-          %h4.highlight Anna yhteystiedot
-          %br/
-          
-          %b Tallennetut osoitteet
-          
-          .frame#previous_address
-            %span.name Anna Asiakas 
-            %br/ 
-            %span.street Mallikatu 3  
-            %br/
-            %span.city 10300 Karjaa  
-            %br/
-            %span.phone 040 333 4455  
-            %br/
-            %br/
-            %button.btn.btn-primary.btn-xs#fill_address{:type => "button"} Käytä tätä osoitetta
-      
-    .col-md-9
-      .row
-        .col-md-9#address_form
-          %h4 Yhteystiedot 
-          = f.text_field :name , :placeholder => t(:name)
-          = f.text_field :street , :placeholder => t(:street)
-          = f.text_field :city , :placeholder => t(:city)
-          = f.text_field :phone , :placeholder => t(:phone)
-          = f.email_field :email, :placeholder => t(:email)
-          %hr  
-          %button.btn.btn-primary.btn-lg#make_order{:type => "submit"} Tee tilaus
-          
-        .col-md-3

data/app/views/purchases/edit.html.haml

@@ -1,9 +0,0 @@
-%h2
-  = t params["action"]
-  = t(:purchase)
-= bootstrap_form_for(@purchase) do |f|
-  = f.test_field :name
-  = f.date_field :ordered_on
-  = f.date_field :received_on
-  = f.submit :class => "btn btn-success"
-  = link_to t(:back), purchases_path, :class => "btn btn-warning"

data/spec/features/orders_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-
-describe "Orders" do
-  before(:each) do
-    sign_in
-  end
-  it "lists orders" do
-    visit_path orders_path
-  end
-  it "should render" do
-    order = create :order
-    visit_path order_path order
-  end
-  it "creates order from basket" do
-    basket = create(:basket_with_item)
-    visit_path edit_basket_path(basket)
-    find(".make_order").click
-    ensure_path order_path(basket.reload.kori)
-  end
-  it "orders a order" do
-    order = create(:order_ordered)
-    visit_path order_path(order)
-    find(".pay_now").click
-  end
-  it "inventories a order" do
-    order = create(:order_paid)
-    visit_path order_path(order)
-    start = order.basket.items.first.product.inventory
-    find(".ship_now").click
-#    expect(order.basket.items.first.product.inventory).to be order.basket.items.first.quantity
-  end
-  it "filters by email" do
-    order_ab :email =>[ "torsten@villataika.fi", "raisa@villataika.fi"]
-    fill_in("q[email_cont]" , :with => "torsten")
-    expect(order_count).to eq 1
-  end
-end