+ {this.props.batch.state == 'resolved' ? "Concluído" : "A processar"} +
+| Lote | +Total de vendas | +Receita Bruta | +Status | +
|---|
| Comprador | +Descrição | +Preço unitário | +Quantidade | +Endereço | +Fornecedor | +Valor total da compra | +
|---|---|---|---|---|---|---|
| <%= @sale.customer %> | +<%= @sale.description %> | +<%= number_to_currency(@sale.unit_price, unit: "R$ ") %> | +<%= @sale.amount %> | +<%= @sale.address %> | +<%= @sale.supplier %> | +<%= number_to_currency(@sale.amount * @sale.unit_price, unit: "BRL ") %> | +
Para criar um novo lote de vendas, selecione um arquivo no formato '.txt'
com dados separados por TAB.
A primeira linha do arquivo deve conter os nome das colunas obrigatóriamente:
+ Comprador descrição Preço Unitário Quantidade Endereço Fornecedor
-
Comprador descrição Preço Unitário Quantidade Endereço Fornecedor- - Você pode baixar um arquivo de <%= link_to "exemplo aqui", "/sales.txt" %>. + <%= link_to "/sales.txt", class: 'btn btn-success' do %> + + Download de modelo de Arquivo de lote + <% end %> +
| # Batch | -Total de vendas | -Receita Bruta | -Status | -
|---|---|---|---|
| <%= link_to "##{batch.id}", sales_batch_path(batch) %> | -<%= batch.sales.count %> | -<%= number_to_currency(batch.revenue, :unit => "R$ ") %> | -
- - <%= (batch.processed) ? "Processado" : "A processar" %> - - |
-
| # | @@ -22,11 +22,21 @@
|---|
<%= @sales_batch.batch_code %>
+
+
+
+ Download do arquivo original
+
+
+ Código do Lote:
+ <%= @sales_batch.batch_code %>
+
A processar
<%end%> -<%= link_to "Voltar para home", root_path %> +<%= link_to root_path, class: "btn btn-info" do %> + + Voltar +<% end %> diff --git a/app/views/shareds/_navbar.html.erb b/app/views/shareds/_navbar.html.erb new file mode 100644 index 00000000..b640aa3a --- /dev/null +++ b/app/views/shareds/_navbar.html.erb @@ -0,0 +1,45 @@ + diff --git a/app/workers/sales_batch_worker.rb b/app/workers/sales_batch_worker.rb new file mode 100644 index 00000000..cb28edc5 --- /dev/null +++ b/app/workers/sales_batch_worker.rb @@ -0,0 +1,50 @@ +require 'csv' + +class SalesBatchWorker + include Sidekiq::Worker + + sidekiq_options queue: :sales + + CSV_HEADERS = %w(customer description unit_price amount address supplier) + + def perform(id) + batch = SalesBatch.find(id) + + batch.process! + + tsv = generate_tsv(batch.attachment.file.path) + + generate_sales_attrs(tsv).each do |sale_attr| + batch.sales.create(sale_attr) + end + + calc_revenue(batch) + batch.resolve! + # rescue => e + # logger.error "Erro de execução de job no sidekiq #{e}" + # batch.reject! + end + + private + + def calc_revenue(batch) + total_revenue = batch.sales.map do |sale| + sale.amount * sale.unit_price + end.reduce(:+) + batch.update_attributes({ revenue: total_revenue }) + end + + def generate_sales_attrs(tsv) + tsv.map do |row| + row.each_with_index.map do |value, index| + Hash[ CSV_HEADERS[index], value ] + end.reduce(&:merge) + end + end + + def generate_tsv(file_path) + data = CSV.read(file_path, col_sep: "\t") + data.delete_at(0) + data + end +end diff --git a/bin/webpack b/bin/webpack new file mode 100755 index 00000000..528233a7 --- /dev/null +++ b/bin/webpack @@ -0,0 +1,27 @@ +#!/usr/bin/env ruby +$stdout.sync = true + +require "shellwords" + +ENV["RAILS_ENV"] ||= "development" +RAILS_ENV = ENV["RAILS_ENV"] + +ENV["NODE_ENV"] ||= RAILS_ENV +NODE_ENV = ENV["NODE_ENV"] + +APP_PATH = File.expand_path("../", __dir__) +NODE_MODULES_PATH = File.join(APP_PATH, "node_modules") +WEBPACK_CONFIG = File.join(APP_PATH, "config/webpack/#{NODE_ENV}.js") + +unless File.exist?(WEBPACK_CONFIG) + puts "Webpack configuration not found." + puts "Please run bundle exec rails webpacker:install to install webpacker" + exit! +end + +env = { "NODE_PATH" => NODE_MODULES_PATH.shellescape } +cmd = [ "#{NODE_MODULES_PATH}/.bin/webpack", "--config", WEBPACK_CONFIG ] + ARGV + +Dir.chdir(APP_PATH) do + exec env, *cmd +end diff --git a/bin/webpack-dev-server b/bin/webpack-dev-server new file mode 100755 index 00000000..c9672f66 --- /dev/null +++ b/bin/webpack-dev-server @@ -0,0 +1,68 @@ +#!/usr/bin/env ruby +$stdout.sync = true + +require "shellwords" +require "yaml" +require "socket" + +ENV["RAILS_ENV"] ||= "development" +RAILS_ENV = ENV["RAILS_ENV"] + +ENV["NODE_ENV"] ||= RAILS_ENV +NODE_ENV = ENV["NODE_ENV"] + +APP_PATH = File.expand_path("../", __dir__) +CONFIG_FILE = File.join(APP_PATH, "config/webpacker.yml") +NODE_MODULES_PATH = File.join(APP_PATH, "node_modules") +WEBPACK_CONFIG = File.join(APP_PATH, "config/webpack/#{NODE_ENV}.js") + +DEFAULT_LISTEN_HOST_ADDR = NODE_ENV == 'development' ? 'localhost' : '0.0.0.0' + +def args(key) + index = ARGV.index(key) + index ? ARGV[index + 1] : nil +end + +begin + dev_server = YAML.load_file(CONFIG_FILE)[RAILS_ENV]["dev_server"] + + HOSTNAME = args('--host') || dev_server["host"] + PORT = args('--port') || dev_server["port"] + HTTPS = ARGV.include?('--https') || dev_server["https"] + DEV_SERVER_ADDR = "http#{"s" if HTTPS}://#{HOSTNAME}:#{PORT}" + LISTEN_HOST_ADDR = args('--listen-host') || DEFAULT_LISTEN_HOST_ADDR + +rescue Errno::ENOENT, NoMethodError + $stdout.puts "Webpack dev_server configuration not found in #{CONFIG_FILE}." + $stdout.puts "Please run bundle exec rails webpacker:install to install webpacker" + exit! +end + +begin + server = TCPServer.new(LISTEN_HOST_ADDR, PORT) + server.close + +rescue Errno::EADDRINUSE + $stdout.puts "Another program is running on port #{PORT}. Set a new port in #{CONFIG_FILE} for dev_server" + exit! +end + +# Delete supplied host, port and listen-host CLI arguments +["--host", "--port", "--listen-host"].each do |arg| + ARGV.delete(args(arg)) + ARGV.delete(arg) +end + +env = { "NODE_PATH" => NODE_MODULES_PATH.shellescape } + +cmd = [ + "#{NODE_MODULES_PATH}/.bin/webpack-dev-server", "--progress", "--color", + "--config", WEBPACK_CONFIG, + "--host", LISTEN_HOST_ADDR, + "--public", "#{HOSTNAME}:#{PORT}", + "--port", PORT.to_s +] + ARGV + +Dir.chdir(APP_PATH) do + exec env, *cmd +end diff --git a/bower.json b/bower.json index 63931ebf..c22c2dd2 100644 --- a/bower.json +++ b/bower.json @@ -1,8 +1,6 @@ { "name": "Splunka", - "authors": [ - "Paulo Patto