has_accounts_engine 3.0.0.beta13 → 3.0.0.beta14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39620cccb368cedd53cf0961b8ec92d6c94ff63
-  data.tar.gz: 28d8a584464240cb74b413e6cb2e279a69b2fe94
+  metadata.gz: 8958dca0de9ab8dd201d2e509d52be51c3607f99
+  data.tar.gz: 6801c3a019deb8f2ea8a4892eea92699db889088
 SHA512:
-  metadata.gz: 32eb1d7cf85729d5467a294505d0abaabeaff46a34968e251c15c495651200495faa585ff07659ea73202cb30bbf0ad40d39943441ee3f634d945f4bbfde02ba
-  data.tar.gz: 0f66cfe81f47c1fc34269884405cb68d1422ef68d63145143b0b1a34b80a676753334b976bd247deb298ea5cf9b3cc69720544e5d88f6ce0260d4942e42ad830
+  metadata.gz: a34f89e7c8db90206aa61c64305eae12251dbc140bc0964b6b36488632f327f42a49a8a0057ef22eba1ae8086bdfaa330290ef1a85ac18fae41b1359a682bda6
+  data.tar.gz: e0fd4ae0846c665d4928cd6551206c34248f42127a096bd960a4e9f891e01566f6cffcf81dfe945e8c06c21acb32a03a3d22098c03edb36e5e8316898f6c0cc2

data/app/controllers/bookings_controller.rb

@@ -5,27 +5,6 @@ class BookingsController < HasAccountsController
   has_scope :by_amount, :using => [:from, :to]
   has_scope :by_date, :using => [:from, :to]
 
-  # Actions
-  def select_booking
-    @booking = Booking.find(params[:id]).dup
-
-    # Clear reference
-    @booking.reference  = nil
-
-    increment_booking_code
-    # Take value date from form
-    @booking.value_date = params[:booking][:value_date]
-
-    render :action => 'edit'
-  end
-
-  def select
-    @booking = Booking.new(params[:booking])
-    increment_booking_code
-    @booking_templates = BookingTemplate.where(:type => [nil, 'BookingTemplate']).where("NOT(code LIKE '%:%')").paginate(:page => params[:page])
-    @bookings = Booking.where("title LIKE ?", '%' + @booking.title + '%').order('value_date DESC').paginate(:page => params[:page])
-  end
-
   def create
     create! { new_booking_path }
   end
@@ -34,6 +13,7 @@ class BookingsController < HasAccountsController
     original_booking = Booking.find(params[:id])
 
     @booking = original_booking.dup
+    increment_booking_code
 
     render 'edit'
   end

data/app/views/accounts/_account.html.haml

@@ -1,8 +1,11 @@
 %tr[account]
   %td= account.code
   %td
-    = link_to account.title, url_for(account), {'data-href-container' => 'tr'}
-    .pull-right= account.tags.map{|tag| boot_label(tag.name)}.join(' ').html_safe
+    = link_to account.title, account, 'data-href-container' => 'tr'
+    .pull-right
+      - account.tags.each do |tag|
+        = boot_label(tag)
   %td.action-links
     = list_link_for(:edit, account)
     = list_link_for(:delete, account)
+    = list_link_to :print, account_path(account, :format => :pdf, :per_page => 5000)

data/app/views/accounts/_booking_list_saldo.html.haml

@@ -1,8 +1,9 @@
 %tr#booking_list_saldo{:style => "border-top: double 2px black"}
   %td{:colspan => "3"}
-    Kontostand (per #{@bookings.last.value_date})
+    - if @bookings.any?
+      Kontostand (per #{@bookings.last.value_date})
   %td
   %td
   %td
-  %td{:style => "text-align: right"}= currency_fmt(@account.saldo(@bookings.last))
+  %td.currency= currency_fmt(@account.saldo(@bookings.last))
   %td.action-links

data/app/views/accounts/_booking_list_turnover.html.haml

@@ -1,8 +1,9 @@
 - credit_turnover, debit_turnover = @account.turnover(@bookings)
 %tr#booking_list_turnover{:style => "border-top: double 2px black"}
   %td{:colspan => "4"}
-    Umsatz (#{h @bookings.first.value_date} bis #{h @bookings.last.value_date})
-  %td{:style => "text-align: right"}= currency_fmt(debit_turnover)
-  %td{:style => "text-align: right"}= currency_fmt(credit_turnover)
+    - if @bookings.any?
+      Umsatz (#{h @bookings.first.value_date} bis #{h @bookings.last.value_date})
+  %td.currency= currency_fmt(debit_turnover)
+  %td.currency= currency_fmt(credit_turnover)
   %td
   %td.action-links

data/app/views/accounts/_carry_booking.html.haml

@@ -1,10 +1,9 @@
-%tr{:id => "carry_booking"}
+%tr#carry_booking
   %td= @carry_booking.value_date
   %td
+  %td= t('bookyt.carry_booking')
   %td
-    = t('bookyt.carry_booking')
   %td
   %td
-  %td
-  %td{:style => "text-align: right"}= currency_fmt(@saldo)
+  %td.currency= currency_fmt(@saldo)
   %td.action-links

data/app/views/accounts/_show_bookings.html.haml

@@ -14,6 +14,6 @@
       - @saldo += @booking.accounted_amount(@account)
       = render 'accounts/booking_item'
   %tfoot
-    = render 'accounts/booking_list_footer'
+    = render 'accounts/booking_list_footer' unless @bookings.empty?
 
 = paginate @bookings

data/app/views/booking_templates/_booking_template.html.haml

@@ -1,8 +1,6 @@
-- item_action ||= lambda{|object| url_for(object)}
-
 %tr[booking_template]
   %td
-    = link_to "%s" % [booking_template.title, booking_template.code], item_action.call(booking_template), 'data-href-container' => 'tr'
+    = link_to booking_template.title, [:new_booking, booking_template], 'data-href-container' => 'tr'
     - if booking_template.comments.present?
       %hr{:style => "height: 1px; margin: 0"}/
       %i= booking_template.comments
@@ -13,3 +11,6 @@
   %td= link_to booking_template.credit_account.code, account_path(booking_template.credit_account), :title => booking_template.credit_account.title unless booking_template.credit_account.nil?
   %td.currency= amount_to_s(booking_template)
   %td= t(booking_template.amount_relates_to, :scope => 'booking_template.relation') if booking_template.amount_relates_to.present?
+  %td.action-links
+    = list_link_for(:edit, booking_template)
+    = list_link_for(:delete, booking_template)

data/app/views/booking_templates/_list.html.haml

@@ -9,4 +9,4 @@
       %th= t_attr :amount_relates_to, BookingTemplate
       %th.action-links
     %tbody
-      = render @booking_templates, :item_action => (item_action ||= nil)
+      = render @booking_templates

data/app/views/bookings/_booking.html.haml

@@ -1,10 +1,8 @@
-- item_action ||= lambda{|object| url_for(object)}
-
 %tr[booking]
   %td= booking.value_date
   %td= booking.code
   %td.subject
-    = link_to booking.title, item_action.call(booking), 'data-table-key' => '13'
+    = link_to booking.title, booking, 'data-table-key' => '13'
     - if booking.comments.present?
       %div
         %i= booking.comments

data/app/views/bookings/_list.html.haml

@@ -9,9 +9,9 @@
         %th.debit_account= t_attr :debit_account
         %th.credit_account= t_attr :credit_account
         %th.amount.currency= t_attr 'amount'
-        %th.action-links(style='width: 66px')
+        %th.action-links
     %tbody
-      = render collection, :item_action => (item_action ||= nil)
+      = render collection
 
 = paginate collection if defined?(paginate)
 = render 'bookings/sidebar'

data/config/routes.rb

@@ -4,11 +4,7 @@
 Rails.application.routes.draw do
   # Bookings
   resources :bookings do
-    collection do
-      post :select
-    end
     member do
-      get :select_booking
       get :copy
     end
   end
@@ -23,24 +19,6 @@ Rails.application.routes.draw do
     resources :attachments
   end
 
-  resources :banks do
-    resources :phone_numbers
-    member do
-      get :new_phone_number
-    end
-    collection do
-      get :new_phone_number
-    end
-  end
-
-  resources :bank_accounts do
-    member do
-      get :csv_bookings
-    end
-    resources :bookings
-    resources :attachments
-  end
-
   resources :booking_templates do
     member do
       get :new_booking

data/lib/has_accounts_engine/version.rb

@@ -1,3 +1,3 @@
 module HasAccountsEngine
-  VERSION = "3.0.0.beta13"
+  VERSION = "3.0.0.beta14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts_engine
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta13
+  version: 3.0.0.beta14
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-06 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -299,7 +299,6 @@ files:
 - app/views/bookings/_sidebar.html.haml
 - app/views/bookings/index.html.haml
 - app/views/bookings/index.js.erb
-- app/views/bookings/select.html.haml
 - app/views/bookings/show.html.haml
 - app/views/bookings/show.js.erb
 - app/views/bookings/update.js.erb

data/app/views/bookings/select.html.haml

@@ -1,11 +0,0 @@
-= contextual_links
-
-= boot_page_title :new
-
-= render 'form'
-
-%h3= t_model(BookingTemplate)
-= render 'booking_templates/list', :item_action => lambda{|object| new_booking_booking_template_path(object)}
-
-%h3= t_model(Booking)
-= render 'bookings/list', :item_action => lambda{|object| select_booking_booking_path(object, :booking => params[:booking])}