dorsale 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eccb9aaabea69572a6ff7061cce1fc33921b8790
-  data.tar.gz: d67e662c8357314c2e81b0c799e5d3a25dcca139
+  metadata.gz: 7b068a002a89a6afe5adcca02b598e4191a55464
+  data.tar.gz: a21da8e2e1ab0c5d1a4f56f871522637a2844849
 SHA512:
-  metadata.gz: c831223566520957a002d35c520432ef1c13e8c36817666d3682bcd1dcd2fb934ec8dd8f27f8048a8523b2a3ca76b45aea6a4e0e249560946fe5e3e4a29bd221
-  data.tar.gz: bdb645710a8e0c13a7d11eea230a2afd0d5b85382a73f00eba067e1e6799f34c26a2eedca575328ea038b10c383b9173ef2a9c4f79f3d7bbd36e69bf1d8860f7
+  metadata.gz: 4b2a577e6abea4a8ef1b6108dcf15eb26cab912d30f714e8421e744381ac7c4765bfdb17eb05f854cb2abf6c16cf654ebd469fda41735aa19277c8e26ba8868e
+  data.tar.gz: 1fc8e1b92a9a548fb41f000c463c9fba1dc8727ab066bee6c725cb34f5603068801e765a5b9133d557498bf701dcaa327b619097de29a9b0dd90b635f8c56d38

data/app/controllers/dorsale/billing_machine/quotations_controller.rb

@@ -6,6 +6,8 @@ module Dorsale
         :edit,
         :update,
         :destroy,
+        :copy,
+        :create_invoice,
       ]
 
       def index
@@ -21,6 +23,24 @@ module Dorsale
         @quotations_without_pagination = @quotations # All filtered quotations (not paginated)
         @quotations = @quotations.page(params[:page]).per(50)
 
+        @total_duty = @quotations_without_pagination.to_a
+          .select{ |q| q.state != "canceled" }
+          .map(&:total_duty)
+          .delete_if(&:blank?)
+          .sum
+
+        @vat_amount = @quotations_without_pagination.to_a
+          .select{ |q| q.state != "canceled" }
+          .map(&:vat_amount)
+          .delete_if(&:blank?)
+          .sum
+
+        @total_all_taxes = @quotations_without_pagination.to_a
+          .select{ |q| q.state != "canceled" }
+          .map(&:total_all_taxes)
+          .delete_if(&:blank?)
+          .sum
+
         respond_to do |format|
           format.csv {
             send_data generate_encoded_csv(@quotations_without_pagination), type: "text/csv"
@@ -114,6 +134,25 @@ module Dorsale
         redirect_to dorsale.billing_machine_quotations_path
       end
 
+      def copy
+        authorize! :create, @quotation
+
+        new_quotation = @quotation.create_copy!
+        flash[:notice] = t("messages.quotations.copy_ok")
+
+        redirect_to dorsale.edit_billing_machine_quotation_path(new_quotation)
+      end
+
+      def create_invoice
+        authorize! :read, @quotation
+        authorize! :create, ::Dorsale::BillingMachine::Invoice
+
+        new_invoice = @quotation.create_invoice!
+        flash[:notice] = t("messages.quotations.create_invoice_ok")
+
+        redirect_to dorsale.edit_billing_machine_invoice_path(new_invoice)
+      end
+
       private
 
       def set_objects
@@ -123,6 +162,7 @@ module Dorsale
       def permitted_params
         [
           :label,
+          :state,
           :customer_guid,
           :payment_term_id,
           :id_card_id,

data/app/helpers/dorsale/billing_machine/application_helper.rb

@@ -0,0 +1,14 @@
+module Dorsale
+  module BillingMachine
+    module ApplicationHelper
+      def billing_machine_quotation_states_for_select
+        ::Dorsale::BillingMachine::Quotation::STATES.map do |e|
+          [
+            ::Dorsale::BillingMachine::Quotation.t("state.#{e}"),
+            e,
+          ]
+        end
+      end
+    end
+  end
+end

data/app/helpers/dorsale/button_helper.rb

@@ -18,7 +18,7 @@ module Dorsale
 
         options.deep_merge!(
           :data => {
-            :confirm => confirm
+            :confirm => confirm,
           }
         )
       end
@@ -39,7 +39,7 @@ module Dorsale
     def read_button(url, options = {})
       options = {
         :icon   => "info-circle",
-        :action => :read
+        :action => :read,
       }.merge(options)
 
       dorsale_button(url, options)
@@ -47,8 +47,9 @@ module Dorsale
 
     def download_button(url, options = {})
       options = {
-        :icon   => "cloud-download",
-        :action => :download
+        :icon     => "cloud-download",
+        :action   => :download,
+        :download => url,
       }.merge(options)
 
       dorsale_button(url, options)
@@ -57,7 +58,7 @@ module Dorsale
     def update_button(url, options = {})
       options = {
         :icon   => :pencil,
-        :action => :update
+        :action => :update,
       }.merge(options)
 
       dorsale_button(url, options)
@@ -101,7 +102,7 @@ module Dorsale
         :icon    => :"clock-o",
         :action  => :snooze,
         :confirm => true,
-        :method  => :patch
+        :method  => :patch,
       }.merge(options)
 
       dorsale_button(url, options)
@@ -112,7 +113,7 @@ module Dorsale
         :icon    => :lock,
         :action  => :lock,
         :confirm => true,
-        :method  => :patch
+        :method  => :patch,
       }.merge(options)
 
       dorsale_button(url, options)
@@ -123,7 +124,7 @@ module Dorsale
         :icon    => :unlock,
         :action  => :unlock,
         :confirm => true,
-        :method  => :patch
+        :method  => :patch,
       }.merge(options)
 
       dorsale_button(url, options)

data/app/models/dorsale/billing_machine/quotation.rb

@@ -3,6 +3,8 @@ module Dorsale
     class Quotation < ActiveRecord::Base
       self.table_name = "dorsale_billing_machine_quotations"
 
+      STATES = %w(pending accepted refused canceled)
+
       belongs_to :customer, polymorphic: true
       belongs_to :id_card
       belongs_to :payment_term
@@ -22,6 +24,7 @@ module Dorsale
 
       validates :id_card, presence: true
       validates :date,    presence: true
+      validates :state,   presence: true, inclusion: {in: STATES}
 
       # simple_form
       validates :id_card_id, presence: true
@@ -32,6 +35,7 @@ module Dorsale
         self.expires_at          = date + 1.month if expires_at.nil?
         self.vat_rate            = 20             if vat_rate.nil?
         self.commercial_discount = 0              if commercial_discount.nil?
+        self.state               = STATES.first   if state.nil?
       end
 
       before_create :assign_unique_index
@@ -63,6 +67,62 @@ module Dorsale
         pdf
       end
 
+      def create_copy!
+        new_quotation = self.dup
+
+        self.lines.each do |line|
+          new_quotation.lines << line.dup
+        end
+
+        new_quotation.unique_index = nil
+        new_quotation.created_at   = nil
+        new_quotation.updated_at   = nil
+        new_quotation.date         = Date.today
+        new_quotation.state        = Quotation::STATES.first
+
+        new_quotation.save!
+
+        self.attachments.each do |attachment|
+          new_attachment            = attachment.dup
+          new_attachment.attachable = new_quotation
+          new_attachment.file       = File.open(attachment.file.path)
+          new_attachment.save!
+        end
+
+        new_quotation
+      end
+
+      def create_invoice!
+        new_invoice = Dorsale::BillingMachine::Invoice.new
+
+        self.attributes.each do |k, v|
+          next if k.to_s == "id"
+          next if k.to_s.match /index|tracking|_at/
+
+          if new_invoice.respond_to?("#{k}=")
+            new_invoice.public_send("#{k}=", v)
+          end
+        end
+
+        self.lines.each do |line|
+          new_line = new_invoice.lines.new
+          line.attributes.each do |k, v|
+            next if k.to_s == "id"
+            next if k.to_s.match /index|tracking|_at/
+
+          if new_line.respond_to?("#{k}=")
+            new_line.public_send("#{k}=", v)
+          end
+          end
+        end
+
+        new_invoice.date = Date.today
+
+        new_invoice.save!
+
+        new_invoice
+      end
+
     end # Quotation
   end # BillingMachine
 end # Dorsale

data/app/views/dorsale/billing_machine/quotations/_data_context.html.slim

@@ -1,10 +1,6 @@
 .quotation-context: .context
   = context_title ::Dorsale::BillingMachine::Quotation.t(:data)
 
-  - total_duty = @quotations_without_pagination.map(&:total_duty).delete_if {|e| e.blank?}.inject(:+) || 0
-  - vat_amount = @quotations_without_pagination.map(&:vat_amount).delete_if {|e| e.blank?}.inject(:+) || 0
-  - total_all_taxes = @quotations_without_pagination.map(&:total_all_taxes).delete_if {|e| e.blank?}.inject(:+) || 0
-
-  = context_info ::Dorsale::BillingMachine::Quotation.t(:total_duty), euros(total_duty)
-  = context_info ::Dorsale::BillingMachine::Quotation.t(:vat_amount), euros(vat_amount)
-  = context_info ::Dorsale::BillingMachine::Quotation.t(:total_all_taxes), euros(total_all_taxes)
+  = context_info ::Dorsale::BillingMachine::Quotation.t(:total_duty), euros(@total_duty)
+  = context_info ::Dorsale::BillingMachine::Quotation.t(:vat_amount), euros(@vat_amount)
+  = context_info ::Dorsale::BillingMachine::Quotation.t(:total_all_taxes), euros(@total_all_taxes)

data/app/views/dorsale/billing_machine/quotations/_form.html.slim

@@ -10,6 +10,7 @@
               = @quotation.tracking_id
 
       = f.input :label
+      = f.input :state, collection: billing_machine_quotation_states_for_select
       = f.input :date, html5: true
       = f.input :expires_at, html5: true
       = f.association :payment_term, collection: @payment_terms

data/app/views/dorsale/billing_machine/quotations/_list.html.slim

@@ -16,6 +16,9 @@ table.default.quotations
       th.hidden-xs
         = ::Dorsale::BillingMachine::Quotation.t(:total_all_taxes)
 
+      th.hidden-xs
+        = ::Dorsale::BillingMachine::Quotation.t(:state)
+
       th
         = t("actions.actions")
 
@@ -37,5 +40,8 @@ table.default.quotations
         td.hidden-xs.total_all_taxes
           = euros(quotation.total_all_taxes)
 
+        td
+          = quotation.t("state.#{quotation.state}")
+
         td.actions
           = read_button dorsale.billing_machine_quotation_path(quotation)

data/app/views/dorsale/billing_machine/quotations/show.html.slim

@@ -3,6 +3,8 @@
     .actions
       = update_button dorsale.edit_billing_machine_quotation_path(@quotation)
       = download_button dorsale.billing_machine_quotation_path(@quotation, format: :pdf)
+      = copy_button dorsale.copy_billing_machine_quotation_path(@quotation), method: :post, confirm: true
+      = dorsale_button dorsale.create_invoice_billing_machine_quotation_path(@quotation), method: :post, action: :create_invoice, confirm: true, icon: :magic
 
 
       - if @quotation.customer
@@ -21,6 +23,7 @@
     .well: .row
       .col-xs-12.col-sm-6
         = info @quotation, :tracking_id
+        = info @quotation, :state, @quotation.t("state.#{@quotation.state}")
         = info @quotation, :label
         = info @quotation, :date,                date(@quotation.date)
         = info @quotation, :expires_at,          date(@quotation.expires_at)

data/config/locales/billing_machine.en.yml

@@ -1,4 +1,7 @@
 en:
+  actions:
+    create_invoice: "Create invoice"
+
   activerecord:
     models:
       dorsale/billing_machine/invoice: "invoice"
@@ -7,6 +10,12 @@ en:
       dorsale/billing_machine/payment_term: "payment term"
 
     attributes:
+      dorsale/billing_machine/quotation/state:
+        pending: "Pending"
+        accepted: "Accepted"
+        refused: "Refused"
+        canceled: "Canceled"
+
       dorsale/billing_machine/id_card:
         id_card_name: "id card name"
         entity_name: "entity name"
@@ -48,3 +57,5 @@ en:
     quotations:
       create_ok : "Quotation successfully created."
       update_ok : "Quotation successfully created."
+      copy_ok : "Quotation successfully duplicated."
+      create_invoice_ok : "Invoice successfully created from quotation."

data/config/locales/billing_machine.fr.yml

@@ -1,4 +1,7 @@
 fr:
+  actions:
+    create_invoice: "Créer facture"
+
   activerecord:
     models:
       dorsale/billing_machine/invoice: "facture"
@@ -6,9 +9,13 @@ fr:
       dorsale/billing_machine/id_card: "carte d'identité"
       dorsale/billing_machine/payment_term: "conditions de paiement"
 
-
-
     attributes:
+      dorsale/billing_machine/quotation/state:
+        pending: "En attente"
+        accepted: "Accepté"
+        refused: "Refusé"
+        canceled: "Annulé"
+
       dorsale/billing_machine/id_card:
         id_card_name: "nom de la carte"
         entity_name: "nom de l'entité"
@@ -50,3 +57,5 @@ fr:
     quotations:
       create_ok : "Le devis a été créé."
       update_ok : "Le devis a été modifié."
+      copy_ok : "Le devis a été dupliqué."
+      create_invoice_ok : "La facture a été créée depuis le devis"

data/config/routes.rb

@@ -36,7 +36,10 @@ Dorsale::Engine.routes.draw do
       end
     end
 
-    resources :quotations
+    resources :quotations do
+      post :copy, on: :member
+      post :create_invoice, on: :member
+    end
   end
 
   namespace :customer_vault do

data/db/migrate/20151023135421_dorsale_billing_machine_quotations_add_state.rb

@@ -0,0 +1,6 @@
+class DorsaleBillingMachineQuotationsAddState < ActiveRecord::Migration
+  def change
+    add_column :dorsale_billing_machine_quotations, :state, :string
+    Dorsale::BillingMachine::Quotation.update_all(state: "pending")
+  end
+end

data/lib/dorsale/engine.rb

@@ -26,6 +26,12 @@ require "prawn"
 require "prawn/table"
 require "combine_pdf"
 
+if %w(development test).include?(Rails.env)
+  require "pry"
+  require "factory_girl_rails"
+  require "factory_girl"
+end
+
 require "dorsale/file_loader"
 require "dorsale/polymorphic_id"
 require "dorsale/simple_form"
@@ -41,10 +47,10 @@ module Dorsale
   class Engine < ::Rails::Engine
     isolate_namespace Dorsale
 
-    config.generators do |g|
-      g.test_framework      :rspec,        :fixture => false
-      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
-      g.template_engine :slim
+    initializer "factory_girl" do
+      if %w(development test).include?(Rails.env)
+        FactoryGirl.definition_file_paths.unshift Dorsale::Engine.root.join("spec/factories/").to_s
+      end
     end
 
     Mime::Type.register "application/vnd.ms-excel", :xls

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "2.1.7"
+  VERSION = "2.1.8"
 end

data/spec/controllers/dorsale/billing_machine/quotations_controller_spec.rb

@@ -0,0 +1,25 @@
+require "rails_helper"
+
+describe Dorsale::BillingMachine::QuotationsController, type: :controller do
+  routes { Dorsale::Engine.routes }
+
+  describe "#index" do
+    it "stats should not include canceled quotations" do
+      q1 = create(:billing_machine_quotation_line, quantity: 1, unit_price: 10)
+      q1.quotation.update_attributes!(state: "pending")
+
+      q2 = create(:billing_machine_quotation_line, quantity: 1, unit_price: 10)
+      q2.quotation.update_attributes!(state: "canceled")
+
+      get :index
+      expect(assigns(:total_duty)).to eq 10
+    end
+
+    it "stats should be 0 if no quotations" do
+      get :index
+      expect(assigns(:total_duty)).to eq 0
+      expect(assigns(:vat_amount)).to eq 0
+      expect(assigns(:total_all_taxes)).to eq 0
+    end
+  end
+end