use parent qw(SL::Controller::Base);
use SL::Helper::Flash;
-use SL::ClientJS;
use SL::Presenter;
use SL::Locale::String;
use SL::SessionFile::Random;
use SL::DB::Project;
use SL::DB::Default;
use SL::DB::Unit;
+use SL::DB::Price;
use SL::Helper::DateTime;
use SL::Helper::CreatePDF qw(:all);
use List::Util qw(max first);
use List::MoreUtils qw(none pairwise);
use English qw(-no_match_vars);
+use File::Spec;
use Rose::Object::MakeMethods::Generic
(
- 'scalar --get_set_init' => [ qw(order valid_types type cv js p) ],
+ 'scalar --get_set_init' => [ qw(order valid_types type cv p) ],
);
if (scalar @{ $errors }) {
$self->js->flash('error', $_) foreach @{ $errors };
- return $self->js->render($self);
+ return $self->js->render();
}
flash_later('info', $::locale->text('The order has been saved'));
$sfile->fh->print($pdf);
$sfile->fh->close;
- my $tmp_filename = $sfile->file_name;
- my $pdf_filename = t8('Sales Order') . '_' . $self->order->ordnumber . '.pdf';
+ my $key = join('_', Time::HiRes::gettimeofday(), int rand 1000000000000);
+ $::auth->set_session_value("Order::create_pdf-${key}" => $sfile->file_name);
+
+ my $pdf_filename = t8('Sales Order') . '_' . $self->order->ordnumber . '.pdf';
$self->js
- ->run('download_pdf', $tmp_filename, $pdf_filename)
+ ->run('download_pdf', $pdf_filename, $key)
->flash('info', t8('The PDF has been created'))->render($self);
}
sub action_download_pdf {
my ($self) = @_;
+ my $key = $::form->{key};
+ my $tmp_filename = $::auth->get_session_value("Order::create_pdf-${key}");
return $self->send_file(
- $::form->{tmp_filename},
+ $tmp_filename,
type => 'application/pdf',
name => $::form->{pdf_filename},
);
if (scalar @{ $errors }) {
$self->js->flash('error', $_) foreach @{ $errors };
- return $self->js->render($self);
+ return $self->js->render();
}
my $delivery_order = $self->order->convert_to_delivery_order($self->order);
sub action_customer_vendor_changed {
my ($self) = @_;
- if ($self->cv eq 'customer') {
- $self->order->customer(SL::DB::Manager::Customer->find_by_or_create(id => $::form->{cv_id}));
-
- } elsif ($self->cv eq 'vendor') {
- $self->order->vendor(SL::DB::Manager::Vendor->find_by_or_create(id => $::form->{cv_id}));
- }
+ my $cv_method = $self->cv;
- if ($self->order->{$self->cv}->contacts && scalar @{ $self->order->{$self->cv}->contacts } > 0) {
+ if ($self->order->$cv_method->contacts && scalar @{ $self->order->$cv_method->contacts } > 0) {
$self->js->show('#cp_row');
} else {
$self->js->hide('#cp_row');
}
- if ($self->order->{$self->cv}->shipto && scalar @{ $self->order->{$self->cv}->shipto } > 0) {
+ if ($self->order->$cv_method->shipto && scalar @{ $self->order->$cv_method->shipto } > 0) {
$self->js->show('#shipto_row');
} else {
$self->js->hide('#shipto_row');
}
+ $self->order->taxzone_id($self->order->$cv_method->taxzone_id);
+
+ $self->order->taxincluded(defined($self->order->$cv_method->taxincluded_checked)
+ ? $self->order->$cv_method->taxincluded_checked
+ : $::myconfig{taxincluded_checked});
+
+ $self->_recalc();
+
$self->js
- ->replaceWith('#order_cp_id', $self->build_contact_select)
- ->replaceWith('#order_shipto_id', $self->build_shipto_select)
- ->val('#order_taxzone_id', $self->order->{$self->cv}->taxzone_id)
- ->focus('#order_' . $self->cv . '_id')
- ->render($self);
+ ->replaceWith('#order_cp_id', $self->build_contact_select)
+ ->replaceWith('#order_shipto_id', $self->build_shipto_select)
+ ->val( '#order_taxzone_id', $self->order->taxzone_id)
+ ->val( '#order_taxincluded', $self->order->taxincluded)
+ ->focus( '#order_' . $self->cv . '_id');
+
+ $self->_js_redisplay_amounts_and_taxes;
+ $self->js->render();
}
sub action_add_item {
my $cv_method = $self->cv;
my $cv_discount = $self->order->$cv_method? $self->order->$cv_method->discount : 0.0;
+ my $price = $item->sellprice;
+ $price ||= ($self->order->$cv_method && $self->order->$cv_method->klass)
+ ? (SL::DB::Manager::Price->find_by(parts_id => $part->id, pricegroup_id => $self->order->$cv_method->klass)->price || $part->sellprice)
+ : $part->sellprice;
+
my %new_attr;
$new_attr{part} = $part;
$new_attr{description} = $part->description if ! $item->description;
$new_attr{qty} = 1.0 if ! $item->qty;
$new_attr{unit} = $part->unit;
- $new_attr{sellprice} = $part->sellprice if ! $item->sellprice;
+ $new_attr{sellprice} = $price;
$new_attr{discount} = $cv_discount if ! $item->discount;
# add_custom_variables adds cvars to an orderitem with no cvars for saving, but
->focus('#add_item_parts_id_name');
$self->_js_redisplay_amounts_and_taxes;
- $self->js->render($self);
+ $self->js->render();
}
sub action_recalc_amounts_and_taxes {
$self->_js_redisplay_linetotals;
$self->_js_redisplay_amounts_and_taxes;
- $self->js->render($self);
+ $self->js->render();
}
sub _js_redisplay_linetotals {
return $cv;
}
-sub init_js {
- SL::ClientJS->new;
-}
-
sub init_p {
SL::Presenter->get;
}
#$item->active_price_source('');
#$item->active_discount_source('');
}
+
+ # autovivify all cvars that are not in the form (cvars_by_config can do it).
+ # workaround to pre-parse number-cvars (parse_custom_variable_values does not parse number values).
+ foreach my $var (@{ $item->cvars_by_config }) {
+ $var->unparsed_value($::form->parse_amount(\%::myconfig, $var->{__unparsed_value})) if ($var->config->type eq 'number' && exists($var->{__unparsed_value}));
+ }
+ $item->parse_custom_variable_values;
}
}
sub _save {
my ($self) = @_;
- # autovivify all cvars that are not in the form (cvars_by_config can do it)
- foreach my $item (@{ $self->order->items }) {
- $item->cvars_by_config;
- }
-
my $errors = [];
my $db = $self->order->db;
projects / mfinanz.git / blobdiff