bulk DID order/inventory improvements, RT11291

3 files changed, 82 insertions, 22 deletions

diff --git a/httemplate/edit/did_order.html b/httemplate/edit/did_order.html
index a9bece9b1..25e38c72e 100644
--- a/httemplate/edit/did_order.html
+++ b/httemplate/edit/did_order.html
@@ -6,39 +6,54 @@
                               table => 'did_vendor',
                               disable_empty => 1,
                             },
-                            'vendor_order_id',
-                            'msa',
-                            { field => 'latanum',
-                              type => 'select-table',
-                              name_col => 'description',
-                              table => 'lata',
-                              disable_empty => 1,
-                              label_showkey => 1,
-                            },
-                            'rate_center',
-                            { field => 'state',
-                              type => 'select-state',
-                              country => 'US',
-                            },
-                            'quantity',
+                            { field => 'vendor_order_id',
+			      type => 'hidden',
+			    },
                             { field => 'confirmed',
-                              type => 'input-date-field',
+                              type => 'hidden',
                             },
+			    'custnum',
+			    { type => 'tablebreak-tr-title',
+			      value => 'Order Items',
+			    },
+			    { 'field' => 'orderitemnum',
+			      'type' => 'did_order_item',
+			      'o2m_table' => 'did_order_item',
+			      'm2_label' => 'Item',
+			      'm2_error_callback' => $m2_error_callback,
+			    },
+                            #'msa',
+                            #{ field => 'latanum',
+                            #  type => 'select-table',
+                            #  name_col => 'description',
+                            #  table => 'lata',
+                            #  disable_empty => 1,
+                            #  label_showkey => 1,
+                            #},
+                            #'rate_center',
+                            #{ field => 'state',
+                            #  type => 'select-state',
+                            #  country => 'US',
+                            #},
+                            #'quantity',
                           ],
               'labels' => { 
                             'ordernum'        => 'Order',
                             'vendornum'       => 'Vendor',
                             'vendor_order_id' => 'Vendor Order #',
-                            'msa'             => 'MSA',
-                            'latanum'         => 'LATA',
-                            'rate_center'     => 'Rate Center',
-                            'state'           => 'State',
-                            'quantity'        => 'Quantity',
+			    'custnum'	      => 'Customer',
+                            #'msa'             => 'MSA',
+                            #'latanum'         => 'LATA',
+                            #'rate_center'     => 'Rate Center',
+                            #'state'           => 'State',
+                            #'quantity'        => 'Quantity',
                             'confirmed'       => 'Confirmation Date',
+			    'orderitemnum'     => 'Item',
                           },
               'viewall_dir' => 'browse',
               'table' => 'did_order',
               'name' => 'Bulk DID Order',
+	      'field_callback' => $field_callback,
            )
           
 %>
@@ -47,4 +62,42 @@
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Import');
 
+
+my $field_callback = sub {
+  my ($cgi, $object, $field_hashref ) = @_;
+  if ($object->ordernum) {
+    $field_hashref->{type} = 'text'
+	if $field_hashref->{field} eq 'vendor_order_id';
+    $field_hashref->{type} = 'input-date-field'
+	if $field_hashref->{field} eq 'confirmed';
+  }
+};
+
+my $m2_error_callback = sub {
+  my($cgi, $object) = @_;
+
+  #process_o2m fields in process/did_order.html
+  my @fields = qw( msa npa latanum rate_center state quantity );
+  my @gfields = ( '', map "_$_", @fields );
+
+  map {
+        if ( /^orderitemnum(\d+)$/ ) {
+          my $num = $1;
+          if ( grep $cgi->param("orderitemnum$num$_"), @gfields ) {
+            my $x = new FS::did_order_item {
+              'orderitemnum' => scalar($cgi->param("orderitemnum$num")),
+              map { $_ => scalar($cgi->param("orderitemnum${num}_$_")) } @fields,
+            };
+            $x;
+          } else {
+            ();
+          }
+        } else {
+          ();
+        }
+      }
+      $cgi->param;
+};
+
+
 </%init>
diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html
index 295ad8567..f5698d98e 100644
--- a/httemplate/edit/elements/edit.html
+++ b/httemplate/edit/elements/edit.html
@@ -272,6 +272,7 @@ Example:
 %     'options'       => $f->{'options'},
 %     'labels'        => $f->{'labels'},
 %     'multiple'      => $f->{'multiple'},
+%     'label_showkey' => $f->{'label_showkey'},
 %     'disable_empty' => $f->{'disable_empty'},
 %     #select-reason
 %     'reason_class'  => $f->{'reason_class'},
@@ -439,7 +440,7 @@ Example:
 %       }
 %       warn "layer values: ". Dumper($layer_values)
 %         if $opt{'debug'};
-%
+%	
 %       my @existing = &{ $include_sub }(
 %         'label'        => $ex_label,
 %         'fieldnum'     => $fieldnum,
diff --git a/httemplate/edit/process/did_order.html b/httemplate/edit/process/did_order.html
index 0c9a3f0e0..e5948ff0b 100644
--- a/httemplate/edit/process/did_order.html
+++ b/httemplate/edit/process/did_order.html
@@ -2,6 +2,10 @@
                'table'       => 'did_order',
                'viewall_dir' => 'browse',
 	       'value_callback' => $value_callback,
+		 'process_o2m' => {
+		   'table'  => 'did_order_item',
+		   'fields' => \@item_fields,
+		 },
            )
 %>
 <%init>
@@ -15,6 +19,8 @@ my $value_callback = sub {
      ($field =~ /ed$/ && $value !~ /^\d+$/) ? parse_datetime($value) : $value;
 };
 
+my @item_fields = qw( msa npa latanum rate_center state quantity );
+
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Import');