office_clerk 0.0.1 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88f1e5f9c12249c9ad964adec5940713cfb69419
-  data.tar.gz: 0125c7e1a20918192569fe08db7420e7a2772d38
+  metadata.gz: 80c600db3f486aa78978af20f03c4db991244347
+  data.tar.gz: 44db9c4bae59fc5b10fdc97d13b9256ec78e53f0
 SHA512:
-  metadata.gz: 61ac0c3ec3cd94a38bdf5d9aa4a7b5b604c05a1f25111cc6fb82cfd168d36330c1cce46bd11c4f5f9658228e33269795f2fe40c5de80b57a80584d21ec915736
-  data.tar.gz: 08145c33042db2e00ed140b279659c5127cda4364f69d5ba66a286ec072478024bebbeb39a0e41343e1370e2f2081e65f47ac0ac68cb29a392591a32ce344bbd
+  metadata.gz: 0f10654de1d7f3ab735d07d1f10491ec41f2482aaca8fe92933616f0974c9e9f530c38d0e3fc9074dc8a63a910e10c5187bcbf08666e4e43c3c5f4e47da8d9af
+  data.tar.gz: c8d865084809f8fdb68a70c497945bf0ba7d32faed891b103b48f2c4a88911a55ba3ebf22380af18b5a5d6e3b50022a964d5784e5a26fa4e1c6cd360a25e6b8d

data/Gemfile.lock

@@ -12,9 +12,11 @@ GIT
 
 GIT
   remote: git://github.com/rubyclerks/accountant_clerk.git
-  revision: a9ef40d1a4b56364240416ff17e2c45b24df67b2
+  revision: 180a37904680284caf2fe4d37c739f69fa76f621
   specs:
-    accountant_clerk (0.1)
+    accountant_clerk (0.2)
+      flot-rails (~> 0.0.6)
+      office_clerk (~> 0.1)
 
 GIT
   remote: git://github.com/rubyclerks/db_fixtures_dump.git
@@ -24,21 +26,22 @@ GIT
 
 GIT
   remote: git://github.com/rubyclerks/post_clerk.git
-  revision: ceca98ccf99bd54ad9119fa4f1fffb1a54aa5910
+  revision: e8933edc2ecf62eed79417f7db92e5f5c1ace53e
   specs:
-    post_clerk (0.0.1)
-      office_clerk (~> 0.0.1)
+    post_clerk (0.4)
+      office_clerk (~> 0.1)
 
 GIT
   remote: git://github.com/rubyclerks/print_clerk.git
-  revision: 485dfc1f1e77081575a77afa6972af2b5b492183
+  revision: c73c5f7bcb7f0af73b37bc627fa2d0fa0faee6f0
   specs:
-    print_clerk (0.1)
+    print_clerk (0.2)
+      office_clerk (~> 0.1)
 
 PATH
   remote: .
   specs:
-    office_clerk (0.0.1)
+    office_clerk (0.1)
       barby
       bcrypt-ruby
       bootstrap-sass (~> 3.1.0)
@@ -148,6 +151,8 @@ GEM
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
     ffi (1.9.6)
+    flot-rails (0.0.6)
+      jquery-rails
     formatador (0.2.5)
     guard (2.8.0)
       formatador (>= 0.2.4)
@@ -313,7 +318,7 @@ GEM
       hitimes
     tins (1.3.3)
     ttfunk (1.4.0)
-    turbolinks (2.5.1)
+    turbolinks (2.5.2)
       coffee-rails
     tzinfo (0.3.42)
     uglifier (2.5.3)

data/README.md

@@ -1,5 +1,6 @@
 ## Office Clerk
 [![Build Status](https://travis-ci.org/rubyclerks/office_clerk.svg?branch=master)](https://travis-ci.org/rubyclerks/office_clerk)
+[![Gem Version](https://badge.fury.io/rb/office_clerk.svg)](http://badge.fury.io/rb/office_clerk)
 [![Code Climate](https://codeclimate.com/github/rubyclerks/office_clerk/badges/gpa.svg)](https://codeclimate.com/github/rubyclerks/office_clerk)
 [![Test Coverage](https://codeclimate.com/github/rubyclerks/office_clerk/badges/coverage.svg)](https://codeclimate.com/github/rubyclerks/office_clerk)
 

data/app/assets/javascripts/admin.js

@@ -6,7 +6,7 @@
 //= require bootstrap
 //= require_self
 
-$.datepicker.setDefaults( $.datepicker.regional[ "fi" ] );
+$.datepicker.setDefaults( $.datepicker.regional[ 'fi' ] );
 
 $(function() {
    $( ".datepicker" ).datepicker( );
@@ -14,7 +14,7 @@ $(function() {
  
 function initPage(){
   // Barcode
-  $('.barcode').each(function(index){
+  $('.barcode').each(function(){
       $(this).barcode($(this).attr('data-barcode'), $(this).attr('data-type-barcode'));
   });
 

data/app/assets/javascripts/shop.js

@@ -1,9 +1,10 @@
 
-//= require jquery
+//= require jquery.min
 //= require jquery-ui
 //= require jquery_ujs
 //= require turbolinks
 //= require bootstrap
+//= require bootstrap/dropdown
 //= require_self
 
 function shipmentSelected(){

data/app/assets/stylesheets/shop-receipt.css.scss

@@ -27,7 +27,7 @@ div#header {
 .shop { font-weight: bold; font-size: 40px; line-height: 1.2;}
 .info { padding: 6px; font-size: 30px; text-align: center; line-height: 1.3; width: 700px;}
 
-.line_items {
+.product_items {
   width: 700px;
 }
 

data/app/assets/stylesheets/shop.css.scss

@@ -2,6 +2,7 @@
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 /*
+ *= require_self
  *= require rails_bootstrap_forms
  */
 
@@ -91,7 +92,7 @@ ul.cat {
   color: #FFF;
   background: black;
   /* fallback color */
-  background: rgba(3, 142, 235, 0.25);
+  background: rgba(8, 106, 212, 0.54);
 	text-shadow: black 1px 1px 03px;
   margin: 0px;
 	width: 100%;
@@ -157,51 +158,54 @@ text-shadow: rgb(255, 255, 255) 0px 0px 10px;
 	margin-bottom: 12px;
 }
 
+.product-listing {
+  width: 870px;
+  }
+
 .product-container {
   margin-bottom: 31px;
-  padding: 0 0 86px;
-  text-align: center;
   position: relative;
   border: 1px solid #cae3fb;
   box-shadow: 2px 2px 5px #E8EDF0;
-  border-radius: 4px;
-  height: 375px; 
-  width: 185px;
+  overflow: hidden;	
   }
 
+.product-container h4 {
+  position: absolute;
+  left: 0;
+  padding: 10px;
+  color: $highlight;
+  font-size: 1.5rem;
+  background: black;
+  /* fallback color */
+  background: rgba(3, 142, 235, 0.12);
+  margin: 0px;
+	width: 100%;
+	z-index: 1;
+}
 
 .square-image {
-  height: 200px;}
-
+  height: 200px;
+}
 
 .square-image img {
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-  display: block;
-  height: 190px;
-  max-width: 100%;
-  margin: auto;
-	padding-top: 10px;
+	position: absolute;
+	bottom: 4px;
 }
     
-
-
 .product-fact {
-  height: 49px;
-  position: absolute;
-  padding-right: 24px;
-  padding-left: 24px;
-  width: 100%;
-  margin-bottom: 3px;
   border-top: 1px solid #0078ff;
-	margin-right: 0;
-	text-align: left;
-	p {
+  background: rgba(255, 255, 255, 0.70);
+	padding: 5px 10px 0 5px;
+	position: relative;
+	top: 80px;
+}
+
+.product-fact	p {
 	font-size: 1.2rem;
 	color: #000000; 
 	line-height: 110%;
 	margin-bottom: 3px;
-	}
 }
 
 h5.product-name {
@@ -209,6 +213,12 @@ h5.product-name {
 	margin-bottom: 3px;
 }
 
+
+h4.text {
+  font-size: 16px;
+}
+
+
 h1.product-title {
 	font-size: 2.3rem;
 	color: $highlight;
@@ -229,8 +239,8 @@ h1.product-title {
 
 .price.selling {
   color: $highlight;
-	font-weight: 300;
-	font-size: 1.8rem;
+  font-weight: 400;
+  font-size: 2rem;
 	text-align: right;
 }
 
@@ -321,7 +331,7 @@ body {
 }
 
 .taustalogo {
-  background: url(/assets/shop/kansi.jpg) no-repeat scroll;
+  background: image-url("shop/kansi.jpg") no-repeat scroll;
   height: 107px;
 }
 
@@ -390,7 +400,6 @@ background-color: #0A6779; }
   background-color: $highlight-9;  
 }  
 
-
 .welcome {
   max-width: 92%;
   margin: 20px auto 0; }
@@ -401,3 +410,15 @@ background-color: #0A6779; }
   line-height: 1.33;
   border-radius: 6px;
   }
+  
+.dropdown-menu {
+  background-color: $highlight-2;
+  color: #ffffff;
+  } 
+
+.dropdown-menu > li > a {
+  color: #ffffff;
+}
+
+.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus {
+  background-color: $highlight-8; }

data/app/controllers/application_controller.rb

@@ -2,7 +2,7 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
-  helper_method :current_clerk , :current_basket
+  helper_method :current_clerk , :current_basket , :current_basket_or_nil
 
   # users are stored in the session by email
   # if user is not logged i , return nil
@@ -17,15 +17,20 @@ class ApplicationController < ActionController::Base
     redirect_to "/"
   end
 
+  def current_basket_or_nil
+    return @current_basket unless @current_basket.nil?
+    if session[:current_basket]
+      Basket.where( :id => session[:current_basket] ).limit(1).first 
+    else
+      nil
+    end
+  end
   # the current user has a shopping basket which is also stored in the session
   # we *always* return a basket, even if we have to create one (and then store in the session)
   # this is not associated with the user until an order is finalized at which point the order gets the users email (not id)
   # that way people don't have to log in to order, but if they are we can retrieve their orders by email
   def current_basket
-    return @current_basket unless @current_basket.nil?
-    if session[:current_basket]
-      @current_basket = Basket.where( :id => session[:current_basket] ).limit(1).first 
-    end
+    @current_basket = current_basket_or_nil
     if @current_basket.nil?
       @current_basket = Basket.new(:kori_type => "Order")
       @current_basket.save!
@@ -34,6 +39,7 @@ class ApplicationController < ActionController::Base
     @current_basket
   end
 
+  private
   # when the order is made and the basket locked, it's time to make a new one
   def new_basket
     session[:current_basket] = nil

data/app/controllers/baskets_controller.rb

@@ -18,19 +18,19 @@ class BasketsController < AdminController
     order = @basket.kori || Order.new( :basket => @basket )
     order.pos_checkout( current_clerk.email )
     order.save!
-    redirect_to :action => :invoice , :controller => :orders , :id => order.id
+    redirect_to :action => :receipt , :controller => :orders , :id => order.id
   end
 
   def show
   end
 
-  #as an action this order is mean as a verb, ie order this basket
+  #as an action this order is meant as a verb, ie order this basket
   def order
     if @basket.empty?
       render :edit , :notice => t(:basket_empty)
       return
     end
-    order = Order.create! :basket => @basket , :email => current_clerk.email , :orderd_on => Date.today
+    order = Order.create! :basket => @basket , :email => current_clerk.email , :ordered_on => Date.today
     redirect_to :action => :show , :controller => :orders , :id => order.id
   end
 
@@ -124,30 +124,6 @@ class BasketsController < AdminController
     redirect_to baskets_url
   end
 
-  def inventory
-    if @order.state == "complete"
-      flash[:error] = "Order was already completed (printed), please start with a new customer to add inventory"
-      render :edit
-      return
-    end
-    as = params[:as]
-    num = 0
-    prods = @order.basket.items.length
-    @order.basket.items.each do |item |
-      variant = item.variant
-      num += item.quantity
-      if as
-        variant.on_hand = item.quantity
-      else
-        variant.on_hand += item.quantity
-      end
-      variant.save!
-    end
-    @order.basket.items.clear
-    flash.notice = "Total of #{num} items #{as ? 'inventoried': 'added'} for #{prods} products "
-    render :edit
-  end
-
   private
 
   # check if the @basket is locked (no edits allowed)

data/app/controllers/categories_controller.rb

@@ -26,7 +26,8 @@ class CategoriesController < AdminController
   def create
     @category = Category.create(params_for_model)
     if @category.save
-      redirect_to category_path(@category), :notice => t(:create_success, :model => "category") 
+      flash.notice = t(:create_success, :model => "category") 
+      redirect_to category_path(@category)
     else
       render :edit
     end

data/app/controllers/clerks_controller.rb

@@ -9,7 +9,7 @@ class ClerksController < AdminController
   def index
     @q = Clerk.search params[:q]
     @clerk_scope = @q.result(:distinct => true)
-    @clerks = @clerk_scope.paginate( :page => params[:page],:per_page => 20).to_a
+    @clerks = @clerk_scope.paginate( :page => params[:page],:per_page => 20)
   end
 
   def show
@@ -26,7 +26,8 @@ class ClerksController < AdminController
   def create
     @clerk = Clerk.create(params_for_model)
     if @clerk.save
-      redirect_to clerk_path(@clerk),  :notice => t(:create_success, :model => "clerk") 
+      flash.notice = t(:create_success, :model => "clerk") 
+      redirect_to clerk_path(@clerk)
     else
       render :edit
     end
@@ -45,12 +46,6 @@ class ClerksController < AdminController
     end
   end
 
-  def destroy
-    #should the whole method go ? probably
-    #@clerk.destroy
-    redirect_to clerks_url
-  end
-
   private
 
   def load_clerk

data/app/controllers/manage_controller.rb

@@ -0,0 +1,7 @@
+# encoding : utf-8
+class ManageController < AdminController
+
+
+  def all
+  end
+end

data/app/controllers/orders_controller.rb

@@ -1,7 +1,7 @@
 # encoding : utf-8
 class OrdersController < AdminController
 
-  before_filter :load_order, :only => [:show, :edit, :update ]
+  before_filter :load_order, :only => [:show, :edit, :update , :pay , :ship]
 
   # Uncomment for check abilities with CanCan
   #authorize_resource
@@ -21,8 +21,22 @@ class OrdersController < AdminController
     render :edit
   end
 
+  def pay
+    @order.paid_on = Date.today
+    @order.save!
+    render :show
+  end
+  def ship
+    return if request.get?
+    order_ps = params.require(:order).permit( :email,:name , :street , :city , :phone , :shipment_type )
+    order_ps[:shipped_on] = Date.today
+    if @order.update_attributes(order_ps)
+      redirect_to order_path(@order), :notice => t(:OK)
+      return
+    end
+  end
+  
   def edit
-
   end
 
   def create