office_clerk 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a2b4bc40578de23126465f66caf7875b16d756a
-  data.tar.gz: 0921190739bd31c9e5687fcdf9f2a3a82553d41b
+  metadata.gz: 56d6271f7a086331b09afec3ae09a147a9597258
+  data.tar.gz: 30ebd8fbf11b488f2a05d00d316ee64c8f693e3f
 SHA512:
-  metadata.gz: d2dd8a0e3fd11659919f9bdf9ef5e72428d285448d01ab8628d11af4cfbaa4ba0d0167c6c5dde2030dccb2f3f2426ed7da3b9bdd98a6ad762a0340daa475fc6c
-  data.tar.gz: c6c5bced0d3646e2b9e3810d84fef728c29340bd147c63fb6649b6e162b6208a25daaf2bbb06d29ea2db4b33f4fd7e94f378fbb1325792144b7c82335b0e7af1
+  metadata.gz: aa365643d22ae66f4c82b55d9d6715122dfca353c6cdb6684dcb7d0f57800caef83b910889d769108be317e4bc6c666a96a2d7e20e497aa34c7b4f93b591a3ee
+  data.tar.gz: 15932e74f50c0fca75818e3e2ef099c5d6b33370f72b0796ddfcad556dae7f02dd32cb43c41396fda97f10267277ccf2db224abbc61fe94635f1487e71c7e6aa

data/Gemfile.lock

@@ -19,23 +19,20 @@ GIT
 PATH
   remote: ../
   specs:
-    office_clerk (0.4)
-      barby
+    office_clerk (0.5)
       bcrypt-ruby (~> 3.1)
       bootstrap-sass (~> 3.1)
       bootstrap_form (~> 2.2)
-      chunky_png
+      coffee-rails
+      gon
       haml (~> 4.0)
+      jquery-rails (~> 3.1)
       jquery-ui-rails (~> 5.0)
       kramdown (~> 1.5)
-      opal-jquery (~> 0.2)
-      opal-rails (~> 0.6)
       paperclip (~> 4.1)
-      prawn
       rails (~> 4.0, >= 4.0.1)
       rails-i18n (~> 4.0)
       sass-rails (~> 4.0)
-      simple_form (~> 3.0)
       will_paginate-bootstrap (~> 1.0)
 
 GEM
@@ -67,7 +64,6 @@ GEM
       tzinfo (~> 0.3.37)
     addressable (2.3.6)
     arel (4.0.2)
-    barby (0.6.2)
     bcrypt (3.1.9)
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
@@ -77,7 +73,7 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.1.1.1)
+    bootstrap-sass (3.3.1.0)
       sass (~> 3.2)
     bootstrap_form (2.2.0)
     builder (3.1.4)
@@ -93,7 +89,6 @@ GEM
       launchy
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    chunky_png (1.3.3)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cocaine (0.5.4)
@@ -129,6 +124,11 @@ GEM
       railties (>= 3.0.0)
     ffi (1.9.6)
     formatador (0.2.5)
+    gon (5.2.3)
+      actionpack (>= 2.3.0)
+      json
+      multi_json
+      request_store (>= 1.0.5)
     guard (2.8.2)
       formatador (>= 0.2.4)
       listen (~> 2.7)
@@ -186,33 +186,13 @@ GEM
     multi_json (1.10.1)
     nokogiri (1.6.4.1)
       mini_portile (~> 0.6.0)
-    opal (0.6.2)
-      source_map
-      sprockets
-    opal-activesupport (0.0.5)
-      opal
-    opal-jquery (0.2.0)
-      opal (>= 0.5.0, < 1.0.0)
-    opal-rails (0.6.3)
-      jquery-rails
-      opal (~> 0.6.0)
-      opal-activesupport (>= 0.0.5)
-      opal-jquery (>= 0.1.0)
-      opal-rspec (~> 0.3.0.beta1)
-      rails (>= 3.2.13, < 5.0)
-    opal-rspec (0.3.0.beta3)
-      opal (>= 0.6.0, < 1.0.0)
     paperclip (4.2.0)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
-    pdf-core (0.4.0)
     polyamorous (1.1.0)
       activerecord (>= 3.0)
-    prawn (1.3.0)
-      pdf-core (~> 0.4.0)
-      ttfunk (~> 1.4.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -244,6 +224,7 @@ GEM
       ffi (>= 0.5.0)
     rb-readline (0.5.1)
     ref (1.0.5)
+    request_store (1.1.0)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -270,17 +251,12 @@ GEM
       sass (~> 3.2.2)
       sprockets (~> 2.8, < 2.12)
       sprockets-rails (~> 2.0)
-    simple_form (3.0.2)
-      actionpack (~> 4.0)
-      activemodel (~> 4.0)
     simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.6.0)
-    source_map (3.0.1)
-      json
     sprockets (2.11.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -304,7 +280,6 @@ GEM
     timers (4.0.1)
       hitimes
     tins (1.3.3)
-    ttfunk (1.4.0)
     tzinfo (0.3.42)
     uglifier (2.5.3)
       execjs (>= 0.3.0)

data/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Rubyclerks
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

data/app/assets/javascripts/office_clerk.js

@@ -1,8 +1,6 @@
 //= require jquery
 //= require jquery-ui
 //= require jquery-ui/datepicker-fi
-//= require opal
-//= require opal_ujs
 //= require bootstrap
 //= require_self
 
@@ -13,11 +11,6 @@ $(function() {
  });
  
 function initPage(){
-  // Barcode
-  $('.barcode').each(function(){
-      $(this).barcode($(this).attr('data-barcode'), $(this).attr('data-type-barcode'));
-  });
-
   // Add Error Form style with bootstrap
   $("div.form-group>div.field_with_errors").parent().addClass("error");
   $("#error_explanation").addClass("text-error");

data/app/controllers/orders_controller.rb

@@ -1,7 +1,7 @@
 # encoding : utf-8
 class OrdersController < AdminController
 
-  before_filter :load_order, :only => [:show, :edit, :update , :pay , :ship]
+  before_filter :load_order, :only => [:show, :edit, :update , :pay , :ship , :mail]
 
   # Uncomment for check abilities with CanCan
   #authorize_resource
@@ -13,6 +13,7 @@ class OrdersController < AdminController
   end
 
   def show
+    gon.order_id = @order.id
   end
 
   def new
@@ -21,6 +22,14 @@ class OrdersController < AdminController
     render :edit
   end
 
+  def mail
+    action = params[:act]
+    puts "MAIL #{action}"
+    mail = eval("OrderMailer.#{action}(@order)")
+    mail.deliver
+    flash.notice = "Sent #{action}"
+    redirect_to :action => :show
+  end
   def pay
     @order.paid_on = Date.today
     @order.save!

data/app/controllers/products_controller.rb

@@ -1,14 +1,8 @@
 # encoding : utf-8
-require 'barby'
-require 'prawn'
-require 'prawn/measurement_extensions'
-require 'barby/barcode/code_128'
-require 'barby/barcode/ean_13'
-require 'barby/outputter/png_outputter'
 
 class ProductsController < AdminController
 
-  before_filter :load_product, :only => [:show, :edit, :update, :delete , :barcode]
+  before_filter :load_product, :only => [:show, :edit, :update, :delete ]
 
   # Uncomment for check abilities with CanCan
   #authorize_resource
@@ -22,6 +16,7 @@ class ProductsController < AdminController
   end
 
   def show
+    gon.product_id = @product.id
   end
 
   def new
@@ -65,31 +60,6 @@ class ProductsController < AdminController
       redirect_to product_url , :notice => "#{t(:error)} : #{t(:inventory)}"
     end
   end
-  
-  # loads of ways to create barcodes nowadays, this is a bit older. 
-  # Used to be html but moved to pdf for better layout control
-  def barcode
-    code = @product.ean
-    code = @product.name if code.blank?
-    if code.length == 12
-      aBarcode =  ::Barby::EAN13.new( code )
-    else
-      aBarcode = ::Barby::Code128B.new( code  )
-    end
-    pdf = create_pdf
-    pdf.image( StringIO.new( aBarcode.to_png(:xdim => 5)) , :width => 50.mm , 
-            :height => 10.mm , :at => [ 0 , 10.mm])
-    send_data pdf.render , :type => "application/pdf" , :filename => "#{@product.full_name}.pdf"
-  end
-  
-  private
-
-  def create_pdf
-    pdf = Prawn::Document.new( :page_size => [ 54.mm , 25.mm ] , :margin => 2.mm )
-    pdf.text( @product.full_name  , :align => :left )
-    pdf.text( "#{@product.price} € "  , :align => :right , :padding => 5.mm)
-    pdf
-  end
 
   def load_product
     @product = Product.find(params[:id])

data/app/controllers/shop_controller.rb

@@ -31,6 +31,7 @@ class ShopController < OfficeController
       order_ps = params.require(:order).permit( :email,:name , :street , :city , :phone , :shipment_type )
       if @order.update_attributes(order_ps)
         new_basket
+        OrderMailer.confirm(@order).deliver
         redirect_to shop_order_path(@order), :notice => t(:thanks)
         return
       end

data/app/helpers/orders_helper.rb

@@ -1,10 +1,11 @@
 # encoding : utf-8
-require "admin_helper"
 module OrdersHelper
-  def print_styles
-    OfficeClerk.config(:print_styles).split
+  def mail_actions
+    conf = OfficeClerk.config(:mail_buttons)
+    return "" if conf.blank?
+    conf.split(" ").collect{|s| s.strip }
   end
-  def print_path style
-    eval("office.#{style}_order_path(@order)")
+  def mail_path action
+    
   end
 end

data/app/helpers/shop_helper.rb

@@ -17,12 +17,13 @@ module ShopHelper
   end
 
   # a short version of a desciption text. now we use markdown and often have a bold "header"
-  # so if we find a bold we use just that, regardless of length given
-  # otherwise we try and find a space close to the given length, to avoid ugly half-words
-  def short text , len = 110
-    ind = text.index( "**" , 10)  || text.index( "**" , 10)
-    return text[0 .. ind + 1] if ind
-    ind = text.index(" " , len - 10)
-    ind ? text[0 .. ind + 1] : text[0 .. len +1]
+  # so one can give a char sequence
+  def short text , chop = "**"
+    ind = text.index( chop , 10)
+    if ind
+      return text[0 .. ind + 1] 
+    else
+      return text[0 .. 100] 
+    end
   end
 end

data/app/mailers/order_mailer.rb

@@ -0,0 +1,19 @@
+class OrderMailer < ActionMailer::Base
+
+  def confirm(order)
+    @order = order
+    mail(to: @order.email, from: "me@here.now" ,  subject: "Order #{@order.number}")
+  end
+  def cancel(order)
+    @order = order
+    mail(to: @order.email, from: "me@here.now" ,  subject: "Order #{@order.number}")
+  end
+  def paid(order)
+    @order = order
+    mail(to: @order.email, from: "me@here.now" ,  subject: "Order #{@order.number}")
+  end
+  def shipped(order)
+    @order = order
+    mail(to: @order.email, from: "me@here.now" ,  subject: "Order #{@order.number}")
+  end
+end

data/app/views/addresses/_form_fields.html.haml

@@ -1,4 +1,4 @@
-= f.input :name
-= f.input :street
-= f.input :city
-= f.input :phone
+= f.text_field :name
+= f.text_field :street
+= f.text_field :city
+= f.text_field :phone

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

@@ -29,7 +29,7 @@
           %tr{:class => "line-#{cycle("1","2")}"}
             %td.picture= image_tag item.product.main_picture.url(:thumb) if item.product
             %td.name= item.name
-            = f.simple_fields_for :items , item do |iform|
+            = f.fields_for :items , item do |iform|
               %td= iform.text_field :quantity , :label => false
               %td= iform.text_field :price , :label => false
             %td

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

@@ -9,28 +9,32 @@
       - else
         = t(:new)
         
-= simple_form_for(@category, :html => { :multipart => true , :class => "form-horizontal" }) do |f|
+= bootstrap_form_for(@category, :html => { :multipart => true }) do |f|
   .row.form-group
-    .col-md-6
-      = f.input :category ,  input_html: { class: 'form-control' } do 
-        = f.select :category_id, Category.all.order(:name).map { |c| [c.name, c.id ] }, :include_blank => true , :prompt => t(:select)
-      = f.input :online
-      = f.input :name
-      = f.input :link
-      = f.input :position
-    .col-md-6
-      = f.input :description , :as => :text , :input_html => {:rows => 12}
+    .col-md-5
+      = f.text_field :name
+      .row
+        .col-md-2
+          = f.check_box :online
+        .col-md-10
+          = f.text_field :link
+      = f.select :category_id , Category.all.order(:name).map { |c| [c.name, c.id ] }, :prompt => t(:select) , :include_blank => true
+      = f.text_field :position
+    .col-md-7
+      = f.text_area :description , :rows => 12
   .row
-    .col-md-6
+    .col-md-4
       = image_tag @category.main_picture.url
+    .col-md-4
+      = image_tag @category.extra_picture.url
+    .col-md-4
+      = f.submit :class => "btn btn-success"
+      %br
+      %br
+      = link_to t(:back), categories_path, :class => "btn btn-warning"
   .row
-    .col-md-6
+    .col-md-4
       = f.file_field :main_picture
-    .col-md-6
+    .col-md-4
       = f.file_field :extra_picture
-  .row
-    .col-md-3
-      = f.submit :class => "btn btn-success"
-    .col-md-3
-      = link_to t(:back), categories_path, :class => "btn btn-warning"
         

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

@@ -3,18 +3,15 @@
   = t(:clerk)
   -if @clerk.admin
     =t(:admin) 
-= simple_form_for(@clerk, :html => { :class => "form-horizontal" }) do |f|
+= bootstrap_form_for(@clerk) do |f|
   .row
-    = f.input :admin
-    = f.input :email
-    = f.input :name
-    = f.input :street
-    = f.input :city
-    = f.input :phone
+    = f.check_box :admin
+    = f.email_field :email
+    = render "addresses/form_fields" ,:f => f
     -unless @clerk.new_record?
       =f.label t(:may_be_blank)
-    = f.input :password
-    = f.input :password_confirmation
+    = f.password_field :password
+    = f.password_field :password_confirmation
   .form-actions
     = f.submit :class => "btn btn-success" , :id => "submit"
     = link_to t(:back), clerks_path, :class => "btn btn-warning"

data/app/views/layouts/office_clerk.haml

@@ -5,6 +5,7 @@
     %title Office Clerk
     %meta{:content => "Office Clerk", :name => "description"}
     = stylesheet_link_tag "office_clerk"
+    = include_gon(:init => true)
     = javascript_include_tag "office_clerk"
     = render "layouts/header_extra"
     = csrf_meta_tags