use SL::Helper::DateTime;
-use List::Util qw(max);
-use List::MoreUtils qw(none);
+use List::Util qw(max first);
+use List::MoreUtils qw(none pairwise);
use Rose::Object::MakeMethods::Generic
(
- 'scalar' => [ qw(order) ],
- 'scalar --get_set_init' => [ qw(valid_types type cv js p) ],
+ 'scalar --get_set_init' => [ qw(order valid_types type cv js p) ],
);
# safety
__PACKAGE__->run_before('_check_auth');
-__PACKAGE__->run_before('_load_or_new_order',
- only => [ qw(add edit update save customer_vendor_changed set_item_values) ]);
-
-__PACKAGE__->run_before('_setup',
+__PACKAGE__->run_before('_recalc',
only => [ qw(edit update save) ]);
sub action_save {
my ($self) = @_;
- $self->_save();
+ my $errors = $self->_save();
+
+ if (scalar @{ $errors }) {
+ $self->js->flash('error', $_) foreach @{ $errors };
+ return $self->js->render($self);
+ }
+ flash_later('info', $::locale->text('The order has been saved'));
my @redirect_params = (
action => 'edit',
type => $self->type,
sub action_customer_vendor_changed {
my ($self) = @_;
- if ($self->type eq _sales_order_type()) {
+ if ($self->cv eq 'customer') {
$self->order->customer(SL::DB::Manager::Customer->find_by_or_create(id => $::form->{cv_id}));
- } elsif ($self->type eq _purchase_order_type()) {
+ } elsif ($self->cv eq 'vendor') {
$self->order->vendor(SL::DB::Manager::Vendor->find_by_or_create(id => $::form->{cv_id}));
}
->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_cv_id')
+ ->focus('#order_' . $self->cv . '_id')
->render($self);
}
-sub action_add_item_row {
+sub action_add_item {
my ($self) = @_;
- my $random_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
- my $row_as_html = $self->p->render('order/tabs/_row', ITEM => {id => $random_id});
+ my $form_attr = $::form->{add_item};
- $self->js
- ->append('#row_table_id tbody', $row_as_html)
- ->focus('#row_table_id tr:last [id$="parts_id_name"]')
- ->off('[id^="order_orderitems"][id$="parts_id"]', 'change', 'set_item_values')
- ->on('[id^="order_orderitems"][id$="parts_id"]', 'change', 'set_item_values')
- ->render($self);
-}
+ return unless $form_attr->{parts_id};
-sub action_set_item_values {
- my ($self) = @_;
+ my $item = SL::DB::OrderItem->new;
+ $item->assign_attributes(%$form_attr);
- my $part = SL::DB::Part->new(id => $::form->{parts_id})->load;
+ my $part = SL::DB::Part->new(id => $form_attr->{parts_id})->load;
+ my $cv_method = $self->cv;
+ my $cv_discount = $self->order->$cv_method? $self->order->$cv_method->discount : 0.0;
- my $is_new = $::form->{item_id} =~ m{^new_};
- my $item_id = $is_new ? undef : $::form->{item_id};
- my $item = SL::DB::Manager::OrderItem->find_by_or_create(id => $item_id);
+ 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{discount} = $cv_discount if ! $item->discount;
- my $cv_class = "SL::DB::" . ucfirst($self->cv);
- my $cv_discount = $::form->{cv_id}? $cv_class->new(id => $::form->{cv_id})->load->discount :0.0;
+ # add_custom_variables adds cvars to an orderitem with no cvars for saving, but
+ # they cannot be retrieved via custom_variables until the order/orderitem is
+ # saved. Adding empty custom_variables to new orderitem here solves this problem.
+ $new_attr{custom_variables} = [];
- $item->assign_attributes(
- parts_id => $part->id,
- qty => $::form->{qty} ? $::form->parse_amount(\%::myconfig, $::form->{qty}) : 1.0,
- unit => $part->unit,
- discount => $::form->{discount} ? $::form->parse_amount(\%::myconfig, $::form->{discount}) : $cv_discount,
- sellprice => $::form->{sellprice} ? $::form->parse_amount(\%::myconfig, $::form->{sellprice}) : $part->sellprice,
- );
+ $item->assign_attributes(%new_attr);
+
+ $self->order->add_items($item);
- $self->order->add_items([$item]);
- $self->_setup();
- my $linetotal = _linetotal($self->order, $item);
+ $self->_recalc();
+
+ my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
+ my $row_as_html = $self->p->render('order/tabs/_row', ITEM => $item, ID => $item_id);
$self->js
- ->val( '#' . $::form->{qty_dom_id}, $item->qty_as_number)
- ->val( '#' . $::form->{unit_dom_id}, $item->unit)
- ->val( '#' . $::form->{sellprice_dom_id}, $item->sellprice_as_number)
- ->val( '#' . $::form->{discount_dom_id}, $item->discount_as_number)
- ->run('recalc_linetotal', $::form->{item_id}, $::form->format_amount(\%::myconfig, $linetotal, -2))
- ->render($self);
+ ->append('#row_table_id', $row_as_html)
+ ->val('#add_item_parts_id', '')
+ ->val('#add_item_parts_id_name', '')
+ ->val('#add_item_description', '')
+ ->val('#add_item_qty_as_number', '')
+ ->val('#add_item_sellprice_as_number', '')
+ ->val('#add_item_discount_as_percent', '')
+ ->run('row_table_scroll_down')
+ ->run('row_set_keyboard_events_by_id', $item_id)
+ ->focus('#add_item_parts_id_name');
+
+ $self->_js_redisplay_amounts_and_taxes;
+ $self->js->render($self);
+}
+
+sub action_recalc_amounts_and_taxes {
+ my ($self) = @_;
+
+ $self->_recalc();
+
+ $self->_js_redisplay_amounts_and_taxes;
+ $self->js->render($self);
}
+sub _js_redisplay_amounts_and_taxes {
+ my ($self) = @_;
+
+ $self->js
+ ->html('#netamount_id', $::form->format_amount(\%::myconfig, $self->order->netamount, -2))
+ ->html('#amount_id', $::form->format_amount(\%::myconfig, $self->order->amount, -2))
+ ->remove('.tax_row')
+ ->insertBefore($self->build_tax_rows, '#amount_row_id');
+}
#
# helpers
SL::Presenter->get;
}
+sub init_order {
+ _make_order();
+}
+
sub _check_auth {
my ($self) = @_;
);
}
-sub _load_or_new_order {
+sub build_tax_rows {
my ($self) = @_;
- return $self->order(SL::DB::Manager::Order->find_by_or_create(id => $::form->{id}));
+ my $rows_as_html;
+ foreach my $tax (@{ $self->{taxes} }) {
+ $rows_as_html .= $self->p->render('order/tabs/_tax_row', TAX => $tax);
+ }
+ return $rows_as_html;
}
-sub _setup {
+
+sub _make_order {
my ($self) = @_;
- $::form->{order}->{ $self->cv . '_id' } = delete $::form->{order}->{cv_id} if $::form->{order}->{cv_id};
- $self->order->assign_attributes(%{$::form->{order}});
+ # add_items adds items to an order with no items for saving, but they cannot
+ # be retrieved via items until the order is saved. Adding empty items to new
+ # order here solves this problem.
+ my $order;
+ $order = SL::DB::Manager::Order->find_by(id => $::form->{id}) if $::form->{id};
+ $order ||= SL::DB::Order->new(orderitems => []);
+
+ $order->assign_attributes(%{$::form->{order}});
+
+ return $order;
+}
+
+
+sub _recalc {
+ my ($self) = @_;
# bb: todo: currency later
$self->order->currency_id($::instance_conf->get_currency_id());
tax => $tax });
}
- $self->{totalweight} = 0;
- foreach my $item ($self->order->items) {
- $item->{linetotal} = _linetotal($self->order, $item);
- my $item_unit = SL::DB::Manager::Unit->find_by(name => $item->unit);
- my $part_unit = SL::DB::Manager::Unit->find_by(name => $item->part->unit);
- my $base_qty = $item_unit->convert_to($item->qty, $part_unit);
- $item->{weight} = $base_qty * $item->part->weight;
-
- # Calculate total weight/tare weight
- $self->{totalweight} += $item->{weight};
- }
+ pairwise { $a->{linetotal} = $b->{linetotal} } @{$self->order->items}, @{$pat{items}};
}
sub _save {
my ($self) = @_;
+ my $errors = [];
my $db = $self->order->db;
$db->do_transaction(
sub {
$self->order->save();
- }) || die($db->error);
+ }) || push(@{$errors}, $db->error);
+
+ return $errors;
}
sort_by => 'projectnumber');
$self->{current_employee_id} = SL::DB::Manager::Employee->current->id;
- $self->{show_weight} = SL::DB::Default->get()->show_weight;
-}
-
-# The following subs are more or less copied/pasted from SL::DB::Helper::PriceTaxCalculator.
-sub _linetotal {
- my ($order, $item) = @_;
-
- # bb: todo: currencies are not handled by now
- my $exchangerate = _get_exchangerate($order);
-
- my $num_dec = max 2, _num_decimal_places($item->sellprice);
- my $discount = _round($item->sellprice * ($item->discount || 0), $num_dec);
- my $sellprice = _round($item->sellprice - $discount, $num_dec);
- my $linetotal = _round($sellprice * $item->qty / $item->price_factor, 2 ) * $exchangerate;
- $linetotal = _round($linetotal, 2 );
-
- return $linetotal;
-}
-
-sub _get_exchangerate {
- my ($order) = @_;
- require SL::DB::Default;
-
- my $exchangerate = 1;
- my $currency = $order->currency_id ? $order->currency->name || '' : '';
- if ($currency ne SL::DB::Default->get_default_currency) {
- $exchangerate = $::form->check_exchangerate(\%::myconfig, $currency, $order->transdate, $order->is_sales ? 'buy' : 'sell');
- }
-
- return $exchangerate;
-}
-
-sub _num_decimal_places {
- return length( (split(/\./, '' . ($_[0] * 1), 2))[1] || '' );
-}
-
-sub _round {
- return $::form->round_amount(@_);
}
sub _sales_order_type {
projects / kivitendo-erp.git / blobdiff