office_clerk 0.8 → 0.9

data/Guardfile

@@ -25,5 +25,8 @@ guard :rspec , :cmd => command do
   # Turnip features and steps
   watch(%r{^spec/acceptance/(.+)\.feature$})
   watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+
+  # locales
+  watch(%r{^config/locales/.*yml})     { |m| "spec/i18n_spec.rb" }
 end
 

data/README.md

@@ -1,8 +1,10 @@
 ## Office Clerk
+
+[![Join the chat at https://gitter.im/rubyclerks/office_clerk](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/rubyclerks/office_clerk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![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)
+[![Test Coverage](https://codeclimate.com/github/rubyclerks/office_clerk/badges/coverage.svg) 300+](https://codeclimate.com/github/rubyclerks/office_clerk)
 
 Office Clerk is the back office helper, your accountant, storage manager, secretary and more. It is the heart of the [RubyClerks team](http://rubyclerks.org) , the manager as it were.
 
@@ -45,7 +47,10 @@ The longer route, adding to existing project
 
 If you got this far and still have question , mail me, or mail the [list](https://groups.google.com/forum/#!forum/rubyclerks)
 
-I will start writing User/Developer guides soon, your question will help. Off course your help will help even more :-)
+Check the [User Guide](http://rubyclerks.org/user_guide/01_index.html), 
+then the [Developer Guide](http://rubyclerks.org/developer_guide/01_index.html).
+
+Fill issues if you find, or discuss with me for ideas.
 
 ### Similar Projects
 

data/Rakefile

@@ -3,4 +3,13 @@
 
 require File.expand_path('../test_app/config/application', __FILE__)
 
+require 'bundler/gem_tasks'
+
 TestApp::Application.load_tasks
+
+desc 'Rebuild test and run specs'
+task :full_test do
+  system("rake db:drop db:migrate RAILS_ENV=test && rspec")
+end
+
+task :default => 'full_test'

data/app/assets/javascripts/office_clerk.js

@@ -1,11 +1,12 @@
-//= require jquery
+//= require jquery.min
+//= require jquery_ujs
 //= require best_in_place
 
-//= require jquery-ui
+//= require jquery-ui/datepicker
 //= require jquery-ui/datepicker-fi
 //= require best_in_place.jquery-ui
 
-//= require bootstrap
+//= require bootstrap.min
 //= require_self
 
 $.datepicker.setDefaults( $.datepicker.regional[ 'fi' ] );
@@ -13,14 +14,13 @@ $.datepicker.setDefaults( $.datepicker.regional[ 'fi' ] );
 $(function() {
    $( ".datepicker" ).datepicker( );
  });
- 
+
 function initPage(){
   // Add Error Form style with bootstrap
   $("div.form-group>div.field_with_errors").parent().addClass("error");
   $("#error_explanation").addClass("text-error");
 
 }
-
 $(window).bind('page:change', function() {
     initPage();
 });
@@ -28,4 +28,6 @@ $(window).bind('page:change', function() {
 $(document).ready(function() {
   /* Activating Best In Place */
   jQuery(".best_in_place").best_in_place();
+  /* and fading alerts */
+  jQuery(".alert").delay(5000).fadeOut("slow");
 });

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

@@ -38,14 +38,17 @@ a.online{
   color: green;
 }
 
-.alert-notice {
-  background-color: #00FFEB;
+.alert {
   padding: 8px;
   radius: $global-radius;
 }
 
-.alert-error {
-  background-color: red;
+.alert-notice {
+  background-color: #00FFEB;
+}
+
+.alert-alert {
+  background-color: #ff8080;
 };
 
 
@@ -55,7 +58,7 @@ body {
 
 .new-button {
   top: 15px;
-  text-align: right;  
+  text-align: right;
 }
 
 .strip {
@@ -80,7 +83,7 @@ ul.pagination li {
 ul.pagination li a{
   background-color: rgba(255, 255, 255, 0.9);
   }
-  
+
 .admin-table  {
 font-size: 0.5rem;
 
@@ -90,38 +93,110 @@ thead, tbody {  vertical-align: top;
 
 }
 
-.tausta { 
+.tausta {
   background: $tausta-bg;
   border-radius: 6px;
   padding-top: 6px;
   margin-bottom: 20px;
 }
 
-.products{ 
+.products{
   background: image-url('office_clerk/products-2.jpg') no-repeat;
 }
 
-.baskets{ 
+.baskets{
   background: image-url('office_clerk/baskets-2.jpg') no-repeat;
 }
 
-.orders{ 
+.orders{
   background: image-url('office_clerk/orders-2.jpg') no-repeat;
 }
 
-.purchases{ 
+.purchases{
   background: image-url('office_clerk/purchases-2.jpg') no-repeat;
   height: 161px;
 }
 
-.categories{ 
+.categories{
   background: image-url('office_clerk/categories-2.jpg') no-repeat;
 }
 
-.suppliers{ 
+.suppliers{
   background: image-url('office_clerk/suppliers-2.jpg') no-repeat;
 }
 
-.clerks{ 
+.clerks{
   background: image-url('office_clerk/clerks-2.jpg') no-repeat;
 }
+
+.admin {
+  .product-container {
+    margin-bottom: 31px;
+    position: relative;
+    border: 1px solid #5BE7E2;
+    box-shadow: 2px 2px 5px #E8EDF0;
+    overflow: hidden;
+    width: 260px;
+    }
+
+  .product-container h4 {
+    position: absolute;
+    left: 0;
+    padding: 10px;
+    color: #000000;
+    font-size: 1.5rem;
+    background: #94cef6;
+    margin: 0px;
+  	width: 100%;
+  	z-index: 1;
+  }
+
+  .square-image {
+    height: 200px;
+  }
+
+  .square-image img {
+  	position: absolute;
+  	bottom: 4px;
+  }
+
+  .bottom {
+  	position: absolute;
+  	bottom: 0;
+  	right: 0;
+  }
+
+  .product-fact {
+    border-top: 1px solid #0078ff;
+    background: rgba(255, 255, 255, 0.7);
+    padding: 5px 10px 0 5px;
+  	position: relative;
+  	top: 75px;
+  }
+
+  .product-fact	p {
+  	font-size: 1.2rem;
+  	font-weight: 500;
+  	color: #000000;
+  	line-height: 110%;
+  	margin-bottom: 3px;
+  }
+
+  .product-list-price {
+    color: #04617A;
+    font-weight: 400;
+    font-size: 2.6rem;
+    text-align: right;
+    position: absolute;
+    bottom: 2px;
+    right: 22px; }
+
+}
+
+.no-bg {
+  background: none;
+}
+
+.no-border td {
+  border: none;
+}

data/app/controllers/baskets_controller.rb

@@ -1,11 +1,12 @@
 # encoding : utf-8
 class BasketsController < AdminController
+  include BasketsHelper
 
-  before_filter :load_basket, :only => [:show, :edit, :change , :update, :destroy , :order , 
-                                        :checkout, :purchase , :discount , :ean]
+  before_filter :load_basket, :only => [:show, :edit, :change , :update, :destroy , :order ,
+                                        :checkout, :purchase , :discount , :ean , :zero]
 
   def index
-    @q = Basket.search( params[:q] )
+    @q = Basket.ransack( params[:q] )
     @basket_scope = @q.result( :distinct => true )
     @baskets = @basket_scope.includes({:items => :product} , :kori).paginate( :page => params[:page], :per_page => 20 )
   end
@@ -18,8 +19,7 @@ class BasketsController < AdminController
     order = @basket.kori || Order.new( :basket => @basket )
     order.pos_checkout( current_clerk.email )
     order.save!
-    styles = OfficeClerk.config(:print_styles)
-    if(styles && styles.split.include?("receipt"))
+    if has_receipt?
       redirect_to receipt_order_path(order)
     else
       redirect_to order_path(order)
@@ -30,14 +30,18 @@ class BasketsController < AdminController
     gon.basket_id = @basket.id
   end
 
+  def zero
+    @basket.zero_prices!
+    render :edit
+  end
+
   #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
+      return render :edit , :notice => t(:basket_empty)
     end
     order = Order.create! :basket => @basket , :email => current_clerk.email , :ordered_on => Date.today
-    redirect_to :action => :show , :controller => :orders , :id => order.id
+    redirect_to order_path(order)
   end
 
   def purchase
@@ -50,7 +54,7 @@ class BasketsController < AdminController
       return
     end
     purchase = Purchase.create! :basket => @basket
-    redirect_to :action => :show , :controller => :purchases , :id => purchase.id
+    redirect_to office.purchase_path(purchase)
   end
 
   def new
@@ -62,23 +66,23 @@ class BasketsController < AdminController
   def discount
     if discount = params[:discount]
       if i_id = params[:item]
-        item = @basket.items.find { |item| item.id.to_s == i_id }
+        item = @basket.items.find { |it| it.id.to_s == i_id }
         item_discount( item , discount )
       else
-        @basket.items.each do |item|
-          item_discount( item , discount )
+        @basket.items.each do |it|
+          item_discount( it , discount )
         end
       end
       @basket.save!
     else
       flash[:error] = "No discount given"
     end
-    redirect_to :action => :edit
+    redirect_to office.edit_basket_path(@basket)
   end
 
   # ean search at the top of basket edit
   def ean
-    return if locked?
+    return if redirect_if_locked
     ean = params[:ean]
     ean.sub!("P+" , "P-") if ean[0,2] == "P+"
     prod = Product.find_by_ean ean
@@ -90,16 +94,15 @@ class BasketsController < AdminController
         @basket.add_product prod
       else
         # stor the basket in the session ( or the url ???)
-        redirect_to :action => :index, :controller => :products, 
-              :q => {"name_or_product_name_cont"=> ean},:basket => @basket.id
+        redirect_to office.products_path(:q => {"name_or_product_name_cont"=> ean},:basket => @basket.id)
         return
       end
     end
-    redirect_to :action => :edit    
+    redirect_to office.basket_path(@basket)
   end
 
   def edit
-    return if locked?
+    return if redirect_if_locked
     if p_id = (params[:add] || params[:delete])
       add = params[:add].blank? ? -1 : 1
       @basket.add_product Product.find(p_id) , add
@@ -118,7 +121,7 @@ class BasketsController < AdminController
   end
 
   def update
-    return if locked?
+    return if redirect_if_locked
     @basket.update_attributes(params_for_basket)
     flash.notice = t(:update_success, :model => "basket")
     redirect_to edit_basket_path(@basket)
@@ -126,18 +129,27 @@ class BasketsController < AdminController
 
   def destroy
     # the idea is that you can't delete a basket once something has been "done" with it (order..)
-    @basket.destroy unless @basket.kori_type
-    redirect_to baskets_url
+    if @basket.locked?
+      flash.notice = t('basket_locked')
+    else
+      flash.notice = t('basket') + " " + t(:deleted)
+      @basket.destroy
+    end
+    redirect_to baskets_path
   end
 
   private
 
   # check if the @basket is locked (no edits allowed)
   # and if so redirect to show
-  def locked?
-    return false unless @basket.locked
-    redirect_to :action => :show , :notice => t('basket_locked')
-    return true
+  # return if redirect happened
+  def redirect_if_locked
+    if @basket.locked?
+      flash.notice = t('basket_locked')
+      redirect_to :action => :show
+      return true
+    end
+    return false
   end
 
   def item_discount item , discount
@@ -155,4 +167,3 @@ class BasketsController < AdminController
     params.require(:basket).permit( :items_attributes => [:quantity , :price , :id] )
   end
 end
-

data/app/controllers/orders_controller.rb

@@ -1,12 +1,13 @@
 # encoding : utf-8
 class OrdersController < AdminController
 
-  before_filter :load_order, :only => [:show, :edit, :update , :pay , :ship , :mail]
+  before_filter :load_order, :only => [ :show, :edit, :destroy, :update , :cancel,
+                                        :ship, :shipment ,  :pay , :mail]
 
   def index
     @q = Order.search(params[:q])
-    @order_scope = @q.result( :distinct => true)
-    @orders = @order_scope.includes(:basket => :items ).paginate(:page => params[:page],:per_page => 20)
+    @order_scope = @q.result( :distinct => true).includes(:basket => :items )
+    @orders = @order_scope.paginate(:page => params[:page],:per_page => 20)
   end
 
   def show
@@ -14,51 +15,56 @@ class OrdersController < AdminController
   end
 
   def new
-    @order = Order.new
-    @order.build_basket
-    render :edit
+    basket = Basket.create!
+    @order = Order.new :email => current_clerk.email , :basket => basket , :ordered_on => Date.today
+    if( copy = params[:address])
+      order = Order.find copy
+      @order.email = order.email
+      @order.address = order.address
+    end
+    @order.save!
+    redirect_to edit_basket_path basket
   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.pay_now!
-    render :show
+    @order.pay_now
+    @order.save
+    return redirect_to orders_path , :notice => t(:update_success) + ":#{@order.number}"
   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
+    @order.ship_now
+    @order.basket.deduct!
+    @order.save!
+    return redirect_to order_path(@order), :notice => t(:update_success)
   end
-  
-  def edit
+
+  # after many user mistakes we now let the user undo those, cancel to go back to edit
+  def cancel
+    @order.cancel!
+    return redirect_to order_path(@order), :notice => t(:update_success)
   end
 
-  def create
-    @order = Order.create(params_for_order)
-    @order.build_basket() unless @order.basket
-    if @order.save
-      redirect_to order_path(@order), :notice => t(:create_success, :model => "order")
-    else
-      render :edit
-    end
+  def shipment
+    return if request.get?
+    return redirect_to order_path(@order), :notice => t(:update_success) if @order.update_attributes(params_for_order)
+  end
+
+  def edit
   end
 
   def update
     @order.build_basket unless @order.basket
     respond_to do |format|
       if @order.update_attributes(params_for_order)
-        format.html { redirect_to(@order, :notice => t(:update_success, :model => "order")) }
+        format.html { redirect_to(@order, :notice => t(:update_success, :model => :order)) }
         format.json { respond_with_bip(@order) }
       else
         format.html { render :action => :edit }
@@ -67,6 +73,16 @@ class OrdersController < AdminController
     end
   end
 
+  def destroy
+    if @order.basket.locked?
+      flash.notice = t(:basket_locked)
+    else
+      @order.destroy
+      flash.notice = t(:order) + " " + t(:deleted)
+    end
+    redirect_to orders_url
+  end
+
   private
 
   def load_order
@@ -74,7 +90,6 @@ class OrdersController < AdminController
   end
 
   def params_for_order
-    params.require(:order).permit(:shipment_price,:shipment_tax,:shipment_type, :note)
+    params.require(:order).permit(:payment_info,:shipment_info,:shipment_price,:shipment_tax,:shipment_type, :note , :name ,:street, :city , :phone , :email)
   end
 end
-