office_clerk 0.4 → 0.5

data/app/views/layouts/sales_clerk.haml

@@ -0,0 +1,10 @@
+!!!
+%html
+  %head
+    %meta{charset: "utf-8"}/
+    = csrf_meta_tags
+  %body
+    .container-fluid
+      .row
+        .col-md-12
+          = yield

data/app/views/order_mailer/cancel.html.haml

@@ -0,0 +1,6 @@
+Hi
+
+we cancelled your order of
+=@order.total_price
+
+

data/app/views/order_mailer/confirm.html.haml

@@ -0,0 +1,7 @@
+Hi
+
+please pay the sum of 
+=@order.total_price
+
+NOW
+

data/app/views/order_mailer/paid.html.haml

@@ -0,0 +1,6 @@
+Hi
+
+we received payment for
+=@order.total_price
+
+

data/app/views/order_mailer/shipped.html.haml

@@ -0,0 +1,6 @@
+Hi
+
+we shipped your order
+=@order.total_price
+
+

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

@@ -1,7 +1,7 @@
 %h2
   = t params["action"]
   = t(:order)
-= simple_form_for(@order, :html => { :class => "form-horizontal" }) do |f|
+= bootstrap_form_for(@order) do |f|
   .col-md-6
     = f.date_field :ordered_on
   .col-md-6

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

@@ -1,45 +1,49 @@
-%h2
-  = t(:order) + " : " + @order.number.to_s
-.col-md-4
-  %p
-    %b
-      = t(:ordered_on) + " : " + date(@order.ordered_on)
-  %p
-    %b
-      = t(:total_price) + " : " +  euros(@order.basket.total_price)
-  %p
-    %b
-      = t(:total_tax) + " : " + euros(@order.basket.total_tax)
-  %p
-    %b
-      = t(:shipment_price) + " : " + euros(@order.shipment_price)
-  %p
-    %b
-      = t(:email) + " : " + @order.email.to_s
-.col-md-4
-  %p
-    %b
-    -if @order.paid_on
-      %b= t(:paid_on) + " : " + date(@order.paid_on)
-    -else
-      = link_to t(:paid), pay_order_path(@order), :class => "btn btn-info pay_now"
-
-  %p
-    -if @order.shipped_on
-      %b
-        = t(:shipped_on) + " : " + date(@order.shipped_on)
-    -else
-      = link_to t(:ship), ship_order_path(@order), :class => "btn btn-info ship_now"
-  %p
-    %b
-      = t(:canceled_on) + " : " + date(@order.canceled_on)
-  %p
-    %b
-      = t(:shipment_type) + " : " + @order.shipment_type.to_s
-
-= render "baskets/small" , :basket => @order.basket
+.row
+  %h2
+    = t(:order) + " : " + @order.number.to_s
+.row
+  .col-md-4
+    %p
+      %b
+        = t(:ordered_on) + " : " + date(@order.ordered_on)
+    %p
+      %b
+        = t(:total_price) + " : " +  euros(@order.basket.total_price)
+    %p
+      %b
+        = t(:total_tax) + " : " + euros(@order.basket.total_tax)
+    %p
+      %b
+        = t(:shipment_price) + " : " + euros(@order.shipment_price)
+    %p
+      %b
+        = t(:email) + " : " + @order.email.to_s
+  .col-md-4
+    %p
+      %b
+      -if @order.paid_on
+        %b= t(:paid_on) + " : " + date(@order.paid_on)
+      -else
+        = link_to t(:paid), pay_order_path(@order), :class => "btn btn-info pay_now"
 
-.col-md-12
-  = link_to t(:back), orders_path, :class => "btn btn-warning"
-  - print_styles.each do |style|
-    = link_to t("print_" + style) , print_path(style), :class => "btn btn-primary" ,  :target => "_blank"
+    %p
+      -if @order.shipped_on
+        %b
+          = t(:shipped_on) + " : " + date(@order.shipped_on)
+      -else
+        = link_to t(:ship), ship_order_path(@order), :class => "btn btn-info ship_now"
+    %p
+      %b
+        = t(:canceled_on) + " : " + date(@order.canceled_on)
+    %p
+      %b
+        = t(:shipment_type) + " : " + @order.shipment_type.to_s
+.row
+  = render "baskets/small" , :basket => @order.basket
+.row
+  .col-md-2
+    = link_to t(:back), orders_path, :class => "btn btn-warning"
+  .col-md-10
+    - mail_actions.each do |action|
+      = link_to t("#{action}_order_button") , mail_order_path( @order , :act => action) , :class => "btn btn-info"
+  .col-md-12.order_show_back

data/app/views/products/_head.haml

@@ -2,11 +2,13 @@
   .col-md-2
     = t params["action"]
     %h3= t @product.type
-  .col-md-10
+  .col-md-6
     %h3
       - if @product.product_item?
         = link_to @product.product.name , product_url(@product.product)
       = @product.name
     %small
       = @product.online ? t(:online) : t(:not_online)
-
+  .col-md-4
+    %h2= t(:preview)
+  

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

@@ -1,14 +1,18 @@
 = render "head"
 
-.row
-  = simple_form_for(@product, :html => { :multipart => true , :class => "form-horizontal" , :role=>"form"} ) do |f|
-    = f.hidden_field( :product_id) if @product.product_id
+= bootstrap_form_for(@product, :html => { :multipart => true , :role=>"form"} ) do |f|
+  = f.hidden_field( :product_id) if @product.product_id
+  .row
     .col-md-8
       .row
-        = f.input :name
-        - unless @product.product_id
-          = f.input :link
-        = f.input :description, :as => :text , :input_html => {:rows => 10}
+        .col-md-6
+          = f.text_field :name
+        .col-md-6
+          - unless @product.product_id
+            = f.text_field :link
+      .row
+        .col-md-12
+          = f.text_area :description, :rows => 10
       .row
         .col-md-6
           = image_tag @product.main_picture.url(:list)
@@ -17,20 +21,27 @@
           = image_tag @product.extra_picture.url(:list)
           = f.file_field :extra_picture , :label => t(:extra_picture)
     .col-md-4
-      = f.input :online
-      = f.input :price
-      = f.input :cost
-      = f.input :weight
-      = f.input :ean
-      = f.input :tax
-      = f.input :scode
-      = f.input :supplier do 
-        = f.select :supplier_id, Supplier.all.order(:supplier_name).map { |c| [c.supplier_name, c.id ] }, :prompt => t(:select) 
-      = f.input :category do 
-        = f.select :category_id, Category.all.order(:name).map { |c| [c.name, c.id ] }, :prompt => t(:select) 
-      .form-actions
-        = f.submit :class => "btn btn-success"
-        -if @product.product_id
-          = link_to t(:cancel), product_path(@product.product), :class => "btn btn-warning"
-        -else
-          = link_to t(:cancel), products_path, :class => "btn btn-warning"
+      .row
+        .col-md-12
+          = f.text_area :summary, :rows => 4
+        .col-md-6
+          = f.text_field :price
+          = f.text_field :cost
+          = f.text_field :scode
+        .col-md-6
+          = f.text_field :weight
+          = f.text_field :ean
+          = f.text_field :tax
+      .row
+        .col-md-6
+          = f.select :supplier_id,  Supplier.all.order(:supplier_name).map { |c| [c.supplier_name, c.id ] }, :prompt => t(:select)
+        .col-md-6
+          = f.select :category_id , Category.all.order(:name).map { |c| [c.name, c.id ] }, :prompt => t(:select)
+        .col-md-4
+          = f.check_box :online
+        .col-md-8
+          = f.submit :class => "btn btn-success"
+          -if @product.product_id
+            = link_to t(:cancel), product_path(@product.product), :class => "btn btn-warning"
+          -else
+            = link_to t(:cancel), products_path, :class => "btn btn-warning"

data/app/views/products/show.html.haml

@@ -5,69 +5,62 @@
 
 .row
   %br
-  .col-md-6.tausta
-    .row
+  .col-md-4
+    .row.tausta
       .col-md-6
         %p
-          %b
-            = t(:main_picture) + " : "
+          %b= t(:main_picture) + " : "
           %br
           = image_tag @product.main_picture.url
       .col-md-6
         %p
-          %b
-            = t(:extra_picture) + " : "
+          %b= t(:extra_picture) + " : "
           %br
           = image_tag @product.extra_picture.url
     .row
       .col-md-6
         %p
-          %b
-            = t(:price) + " : "
+          %b= t(:price) + " : "
           = euros(@product.price)
         %p
-          %b
-            = t(:cost) + " : "
+          %b= t(:cost) + " : "
           = euros(@product.cost)
         %p
-          %b
-            = t(:category) + " : "
+          %b= t(:category) + " : "
           = link_to @product.category.name ,category_path(@product.category) if @product.category
+        %p
+          %b= t(:link) + " : "
+          = @product.link
+        %p
+          %b= t(:ean) + " : "
+          = @product.ean
       .col-md-6
         %p
-          %b
-            = t(:weight) + " : "
+          %b= t(:weight) + " : "
           = @product.weight
         %p
-          %b
-            = t(:inventory) + " : "
+          %b= t(:inventory) + " : "
           = @product.inventory
         %p
-          %b
-            = t(:supplier) + " : "
+          %b= t(:supplier) + " : "
           = link_to @product.supplier.supplier_name ,supplier_path(@product.supplier) if @product.supplier
-  .col-md-6
-    %p
-      %b
-        = t(:description) + " : "
-      = markdown @product.description
-    %p
-      %b
-        = t(:link) + " : "
-      = @product.link
-    %p
-      %b
-        = t(:ean) + " : "
-      = @product.ean
+        %p
+          %b= t(:scode) + " : "
+          = @product.scode
+        %p
+          %b= t(:tax_percent) + " : "
+          = @product.tax
+  .col-md-4
     %p
-      %b
-        = t(:scode) + " : "
-      = @product.scode
+      %b= t(:summary) + " : "
+      = markdown @product.summary
     %p
-      %b
-        = t(:tax_percent) + " : "
-      = @product.tax
-.row
+      %b= t(:description) + " : "
+      = markdown @product.description
+  .col-md-4
+    =render :partial => "shop/product_box" , :locals => {:product => @product}
+%br
+.row.product_show_row_buttons
   .col-md-2
     = link_to t(:edit), edit_product_path(@product), :class => "btn btn-success"
   .col-md-2
@@ -75,6 +68,4 @@
   -unless @product.product_item?
     .col-md-2
       = link_to t(:new_item) , new_product_path( :parent_id => @product.id), :class => "btn btn-primary" 
-  -unless @product.line?
-    .col-md-2
-      = link_to t(:barcode) , barcode_product_path( @product), :class => "btn btn-primary"
+  .col-md-6.product_show_row_end

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

@@ -1,9 +1,9 @@
 %h2
   = t params["action"]
   = t(:purchase)
-= simple_form_for(@purchase, :html => { :class => "form-horizontal" }) do |f|
-  = f.input :name
-  = f.input :ordered_on
-  = f.input :received_on
+= 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/app/views/sessions/sign_up.haml

@@ -1,5 +1,5 @@
 %h1 Sign Up
-= simple_form_for @clerk , :url => sign_up_path do |f|
+= bootstrap_form_for @clerk , :url => sign_up_path do |f|
   - if @clerk.errors.any?
     .error_messages
       %h2 Form is invalid

data/app/views/shop/_product_box.haml

@@ -0,0 +1,13 @@
+=link_to shop_product_path(:link => product.link ) do
+  %h4.product-name
+    = product.name
+  .row
+    .col-md-4
+      .square-image
+        =image_tag product.main_picture.url
+    .col-md-8.bottom
+      .product-fact
+        = link_to shop_product_path( :link => product.link ) , :class => :info do
+          %p= markdown product.summary
+          .price.selling
+            = euros product.price

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

@@ -1,9 +1,9 @@
 %h2
   = t params["action"]
   = t(:supplier)
-= simple_form_for(@supplier) do |f|
+= bootstrap_form_for(@supplier) do |f|
   .row
-    = f.input :supplier_name
+    = f.text_field :supplier_name
     = render "addresses/form_fields" ,:f => f
   .form-actions
     = f.submit :class => "btn btn-success"

data/bin/rails

@@ -1,16 +1,4 @@
 #!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
-
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/office_clerk/engine', __FILE__)
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-
-require 'rails/all'
-require 'rails/engine/commands'
+APP_PATH = File.expand_path('../test_app/config/application',  __FILE__)
+require_relative '../test_app/config/boot'
+require 'rails/commands'

data/config/environments/production.rb

@@ -1,80 +1,5 @@
-OfficeClerk::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
+Rails.application.config do
 
-  # Code is not reloaded between requests.
-  config.cache_classes = true
+  config.assets.precompile += %w( office_clerk.js office_clerk.css)
 
-  # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both thread web servers
-  # and those relying on copy on write to perform better.
-  # Rake tasks automatically ignore this option for performance.
-  config.eager_load = true
-
-  # Full error reports are disabled and caching is turned on.
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
-  # config.action_dispatch.rack_cache = true
-
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
-
-  # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
-  config.assets.css_compressor = :sass
-
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  # config.assets.compile = true
-
-  # Generate digests for assets URLs.
-  config.assets.digest = true
-
-  # Version of your assets, change this if you want to expire all your assets.
-  config.assets.version = '1.0'
-
-  # Specifies the header that your server uses for sending files.
-  config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
-
-  # Set to :debug to see everything in the log.
-  config.log_level = :info
-
-  # Prepend all log lines with the following tags.
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-
-  # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
-
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets.
-  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-  config.assets.precompile += %w( admin.js admin.css shop.js shop.css)
-
-  # Ignore bad email addresses and do not raise email delivery errors.
-  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found).
-  #config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners.
-  config.active_support.deprecation = :notify
-
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
-
-  # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
 end