add bnn_upload plugin that overrides some controller methods to use order_bnn
This commit is contained in:
parent
f8c91b46cd
commit
b1ec0fd2fc
12 changed files with 70 additions and 27 deletions
|
@ -1,8 +0,0 @@
|
||||||
class Mailer
|
|
||||||
# attaches files to mail sent to supplier
|
|
||||||
def add_order_result_attachments(order, options = {})
|
|
||||||
attachments['order.pdf'] = OrderFax.new(order, options).to_pdf if options[:file_formats][:pdf].present?
|
|
||||||
attachments['order.csv'] = OrderCsv.new(order, options).to_csv if options[:file_formats][:csv].present?
|
|
||||||
attachments['order.bnn'] = OrderBnn.new(order, options).to_bnn if options[:file_formats][:bnn].present?
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -1,13 +1,13 @@
|
||||||
class OrdersController < ApplicationController
|
OrdersController.class_eval do
|
||||||
# Send a order to the supplier.
|
|
||||||
def send_result_to_supplier
|
def send_result_to_supplier
|
||||||
order = Order.find(params[:id])
|
order = Order.find(params[:id])
|
||||||
options = { file_formats: params[:file_formats] }
|
options = { file_formats: params[:file_formats] }
|
||||||
order.send_to_supplier!(@current_user, options)
|
order.send_to_supplier!(@current_user, options)
|
||||||
redirect_to order, notice: I18n.t('orders.send_to_supplier.notice')
|
redirect_to order_path(order), notice: I18n.t('orders.send_to_supplier.notice')
|
||||||
rescue => error
|
# rescue => error
|
||||||
redirect_to order, alert: I18n.t('errors.general_msg', :msg => error.message)
|
# redirect_to order, alert: I18n.t('errors.general_msg', :msg => error.message)
|
||||||
end
|
end
|
||||||
|
|
||||||
def send_result_to_supplier_modal
|
def send_result_to_supplier_modal
|
||||||
@order = Order.find(params[:id])
|
@order = Order.find(params[:id])
|
||||||
end
|
end
|
|
@ -0,0 +1,8 @@
|
||||||
|
Mailer.class_eval do
|
||||||
|
require 'foodsoft_bnn_upload/order_bnn'
|
||||||
|
def add_order_result_attachments(order, options = {})
|
||||||
|
# attachments['order.pdf'] = ::OrderFax.new(order, options).to_pdf if options[:file_formats][:pdf].present?
|
||||||
|
# attachments['order.csv'] = ::OrderCsv.new(order, options).to_csv if options[:file_formats][:csv].present?
|
||||||
|
attachments['order.bnn'] = FoodsoftBnnUpload::OrderBnn.new(order, options).to_csv if options[:file_formats][:bnn].present?
|
||||||
|
end
|
||||||
|
end
|
|
@ -1,4 +1,4 @@
|
||||||
class Order
|
Order.class_eval do
|
||||||
def send_to_supplier!(user, options = {})
|
def send_to_supplier!(user, options = {})
|
||||||
Mailer.deliver_now_with_default_locale do
|
Mailer.deliver_now_with_default_locale do
|
||||||
Mailer.order_result_supplier(user, self, options)
|
Mailer.order_result_supplier(user, self, options)
|
|
@ -1,5 +1,3 @@
|
||||||
/ replace '#send_button'
|
/ replace 'erb:contains("send_to_supplier")'
|
||||||
- if FoodsoftBnnUpload.enabled?
|
- if FoodsoftBnnUpload.enabled?
|
||||||
= link_to t('.send_to_supplier'), send_result_to_supplier_modal_order_path(@order), remote: true,
|
= link_to t('.send_to_supplier'), order_send_result_to_supplier_modal_path(@order), class: 'btn btn-primary', remote: true
|
||||||
class: "btn#{' btn-primary',
|
|
||||||
data: {confirm: @order.last_sent_mail && t('.confirm_send_to_supplier', when: format_time(@order.last_sent_mail)) }
|
|
|
@ -5,8 +5,10 @@
|
||||||
.modal-body
|
.modal-body
|
||||||
= f.check_box 'file_formats[pdf]'
|
= f.check_box 'file_formats[pdf]'
|
||||||
= f.label 'file_formats[pdf]', "PDF"
|
= f.label 'file_formats[pdf]', "PDF"
|
||||||
|
= f.check_box 'file_formats[csv]'
|
||||||
|
= f.label 'file_formats[csv]', "CSV"
|
||||||
|
= f.check_box 'file_formats[bnn]'
|
||||||
|
= f.label 'file_formats[bnn]', "BNN"
|
||||||
.modal-footer
|
.modal-footer
|
||||||
= link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
|
= link_to t('ui.close'), '#', class: 'btn', data: {dismiss: 'modal'}
|
||||||
= f.submit class: 'btn btn-primary'
|
= f.submit class: 'btn btn-primary'
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
$('#modalContainer').html('#{j(render("send_to_supplier_modal"))}');
|
$('#modalContainer').html('#{escape_javascript(render("send_result_to_supplier_modal"))}');
|
||||||
$('#modalContainer').modal();
|
$('#modalContainer').modal();
|
||||||
$('#modalContainer').submit(function() {$('#modalContainer').modal('hide');});
|
$('#modalContainer').submit(function() {$('#modalContainer').modal('hide');});
|
|
@ -1,5 +1,6 @@
|
||||||
Rails.application.routes.draw do
|
Rails.application.routes.draw do
|
||||||
scope '/:foodcoop' do
|
scope '/:foodcoop' do
|
||||||
get '/order/send_result_to_supplier_modal' => 'orders#send_result_to_supplier_modal'
|
get '/order/:id/send_result_to_supplier_modal', controller: 'orders', action: :send_result_to_supplier_modal, as: :order_send_result_to_supplier_modal
|
||||||
|
post '/order/:id/send_result_to_supplier', controller: 'orders', action: :send_result_to_supplier, as: :send_result_to_supplier
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
require "deface"
|
require "deface"
|
||||||
require 'foodsoft_bnn_upload/engine'
|
require 'foodsoft_bnn_upload/engine'
|
||||||
|
|
||||||
module FoodsoftBnnUpload
|
module FoodsoftBnnUpload
|
||||||
def self.enabled?
|
def self.enabled?
|
||||||
FoodsoftConfig[:use_bnn_upload]
|
FoodsoftConfig[:use_bnn_upload]
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
module FoodsoftBnnUpload
|
module FoodsoftBnnUpload
|
||||||
class Engine < ::Rails::Engine
|
class Engine < ::Rails::Engine
|
||||||
|
config.to_prepare do
|
||||||
|
Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c|
|
||||||
|
require_dependency(c)
|
||||||
|
end
|
||||||
|
end
|
||||||
def default_foodsoft_config(cfg)
|
def default_foodsoft_config(cfg)
|
||||||
cfg[:use_bnn_upload] = true
|
cfg[:use_bnn_upload] = true
|
||||||
end
|
end
|
||||||
|
|
42
plugins/bnn_upload/lib/foodsoft_bnn_upload/order_bnn.rb
Normal file
42
plugins/bnn_upload/lib/foodsoft_bnn_upload/order_bnn.rb
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
module FoodsoftBnnUpload
|
||||||
|
class OrderBnn < RenderCsv
|
||||||
|
def initialize(object, options = {})
|
||||||
|
super
|
||||||
|
@options[:col_sep] = ""
|
||||||
|
@options[:row_sep] = "\n"
|
||||||
|
@options[:encoding] = 'IBM850'
|
||||||
|
end
|
||||||
|
|
||||||
|
def header
|
||||||
|
customer_id = "000001"
|
||||||
|
delivery_date = Time.zone.now.strftime("%y%m%d")
|
||||||
|
pickup = " "
|
||||||
|
|
||||||
|
["D##{customer_id}#{delivery_date}#{pickup}#{@object.id}"]
|
||||||
|
end
|
||||||
|
|
||||||
|
def data
|
||||||
|
@object.order_articles.ordered.includes([:article, :article_price]).all.map do |oa|
|
||||||
|
yield [
|
||||||
|
pad_to_length(oa.article.order_number, 13),
|
||||||
|
"+",
|
||||||
|
pad_float_values(oa.units_to_order),
|
||||||
|
pad_to_length(oa.article.name, 30),
|
||||||
|
pad_float_values(oa.article.unit_quantity),
|
||||||
|
pad_to_length(oa.article.unit, 14),
|
||||||
|
pad_to_length(oa.article.manufacturer, 3),
|
||||||
|
pad_to_length("", 26)
|
||||||
|
]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def pad_float_values(number, digits_before=4, digits_after=3)
|
||||||
|
format_string = "%0#{digits_before + digits_after}d"
|
||||||
|
formatted_number = sprintf(format_string, (number * 10 ** digits_after).to_i)
|
||||||
|
end
|
||||||
|
|
||||||
|
def pad_to_length(string, length)
|
||||||
|
string.to_s.rjust(length, " ")[0, length]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -1,4 +0,0 @@
|
||||||
/ insert_after 'erb:contains("title t(\'.title\'")'
|
|
||||||
- content_for :actionbar do
|
|
||||||
- if FoodsoftMessages.enabled?
|
|
||||||
= link_to_new_message message_params: {order_id: @order.id}
|
|
Loading…
Reference in a new issue