Auftrags-Controller: Auftrag löschen können.

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 75933415532b91fc42489a65e7a81605af18eacf..0e89bfea12ab2cc593f5d55bd95e6adf9bee49c7 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -81,6 +81,25 @@ sub action_update {
   );
 }
 
   );
 }
 

+sub action_delete {
+  my ($self) = @_;
+
+  my $errors = $self->_delete();
+
+  if (scalar @{ $errors }) {
+    $self->js->flash('error', $_) foreach @{ $errors };
+    return $self->js->render();
+  }
+
+  flash_later('info', $::locale->text('The order has been deleted'));
+  my @redirect_params = (
+    action => 'edit',
+    type   => $self->type,
+  );
+
+  $self->redirect_to(@redirect_params);
+}
+

 sub action_save {
   my ($self) = @_;
 
 sub action_save {
   my ($self) = @_;
 


@@ -343,6 +362,26 @@ sub _get_unalterable_data {
 }
 
 
 }
 
 

+sub _delete {
+  my ($self) = @_;
+
+  my $errors = [];
+  my $db = $self->order->db;
+
+  $db->do_transaction(
+    sub {
+      my @spoolfiles = grep { $_ } map { $_->spoolfile } @{ SL::DB::Manager::Status->get_all(where => [ trans_id => $self->order->id ]) };
+      $self->order->delete;
+      my $spool = $::lx_office_conf{paths}->{spool};
+      unlink map { "$spool/$_" } @spoolfiles if $spool;
+
+      1;
+  }) || push(@{$errors}, $db->error);
+
+  return $errors;
+}
+
+

 sub _save {
   my ($self) = @_;
 
 sub _save {
   my ($self) = @_;
 

diff --git a/locale/de/all b/locale/de/all
index 219ad76ac83b0900d4f9cd25fff4ea052500467d..5a47fe8c432d2b53a78e755a2d4025d35d451e03 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2839,6 +2839,7 @@ $self->{texts} = {
   'The number of days for full payment' => 'Die Anzahl Tage, bis die Rechnung in voller Höhe bezahlt werden muss',
   'The numbering will start at 1 with each requirement spec.' => 'Die Nummerierung beginnt bei jedem Pflichtenheft bei 1.',
   'The option field is empty.'  => 'Das Optionsfeld ist leer.',
   'The number of days for full payment' => 'Die Anzahl Tage, bis die Rechnung in voller Höhe bezahlt werden muss',
   'The numbering will start at 1 with each requirement spec.' => 'Die Nummerierung beginnt bei jedem Pflichtenheft bei 1.',
   'The option field is empty.'  => 'Das Optionsfeld ist leer.',

+  'The order has been deleted'  => 'Der Auftrag wurde gelöscht.',

   'The order has been saved'    => 'Der Auftrag wurde gespeichert.',
   'The package name is invalid.' => 'Der Paketname ist ungültig.',
   'The parts for this delivery order have already been transferred in.' => 'Die Artikel dieses Lieferscheins wurden bereits eingelagert.',
   'The order has been saved'    => 'Der Auftrag wurde gespeichert.',
   'The package name is invalid.' => 'Der Paketname ist ungültig.',
   'The parts for this delivery order have already been transferred in.' => 'Die Artikel dieses Lieferscheins wurden bereits eingelagert.',

diff --git a/templates/webpages/order/form.html b/templates/webpages/order/form.html
index 62225e2ebb115029d9846a5e0f75bc8ce103bdb5..977d41f590c9e84a88bffd330f8f4a3af78a855b 100644 (file)
--- a/templates/webpages/order/form.html
+++ b/templates/webpages/order/form.html
@@ -31,12 +31,22 @@
   [% L.hidden_tag('action', 'Order/dispatch') %]
 
   [% L.button_tag('save()', LxERP.t8('Save')) %]
   [% L.hidden_tag('action', 'Order/dispatch') %]
 
   [% L.button_tag('save()', LxERP.t8('Save')) %]

+[%- IF SELF.order.id && ( (SELF.cv == 'customer' && INSTANCE_CONF.get_sales_order_show_delete) || (SELF.cv == 'vendor' && INSTANCE_CONF.get_purchase_order_show_delete) ) %]
+  [% L.button_tag('delete_order()', LxERP.t8('Delete'), confirm=LxERP.t8("Are you sure?")) %]
+[%- END %]

 
 </form>
 
 
 <script type='text/javascript'>
 
 
 </form>
 
 
 <script type='text/javascript'>
 

+function delete_order() {
+  var data = $('#order_form').serializeArray();
+  data.push({ name: 'action', value: 'Order/delete' });
+
+  $.post("controller.pl", data, kivi.eval_json_result);
+}
+

 function save() {
   if (!check_cv()) return;
   var data = $('#order_form').serialize();
 function save() {
   if (!check_cv()) return;
   var data = $('#order_form').serialize();