Geschlecht fuer Ansprechpartner bei abweichender Lieferadresse als Auswahlfeld in...

diff --git a/SL/Form.pm b/SL/Form.pm
index 56e46f798d12f7aadc6f311bd1cf4626822ba00c..101576becab564d889267a4588a876e766a980d6 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2018,7 +2018,7 @@ sub add_shipto {
   my @values;
 
   foreach my $item (qw(name department_1 department_2 street zipcode city country
   my @values;
 
   foreach my $item (qw(name department_1 department_2 street zipcode city country

-                       contact phone fax email)) {
+                       contact cp_gender phone fax email)) {

     if ($self->{"shipto$item"}) {
       $shipto = 1 if ($self->{$item} ne $self->{"shipto$item"});
     }
     if ($self->{"shipto$item"}) {
       $shipto = 1 if ($self->{$item} ne $self->{"shipto$item"});
     }


@@ -2036,6 +2036,7 @@ sub add_shipto {
                        shiptocity = ?,
                        shiptocountry = ?,
                        shiptocontact = ?,
                        shiptocity = ?,
                        shiptocountry = ?,
                        shiptocontact = ?,

+                       shiptocp_gender = ?,

                        shiptophone = ?,
                        shiptofax = ?,
                        shiptoemail = ?
                        shiptophone = ?,
                        shiptofax = ?,
                        shiptoemail = ?


@@ -2051,6 +2052,7 @@ sub add_shipto {
                        shiptocity = ? AND
                        shiptocountry = ? AND
                        shiptocontact = ? AND
                        shiptocity = ? AND
                        shiptocountry = ? AND
                        shiptocontact = ? AND

+                       shiptocp_gender = ? AND

                        shiptophone = ? AND
                        shiptofax = ? AND
                        shiptoemail = ? AND
                        shiptophone = ? AND
                        shiptofax = ? AND
                        shiptoemail = ? AND


@@ -2061,8 +2063,8 @@ sub add_shipto {
         $query =
           qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2,
                                  shiptostreet, shiptozipcode, shiptocity, shiptocountry,
         $query =
           qq|INSERT INTO shipto (trans_id, shiptoname, shiptodepartment_1, shiptodepartment_2,
                                  shiptostreet, shiptozipcode, shiptocity, shiptocountry,

-                                 shiptocontact, shiptophone, shiptofax, shiptoemail, module)
-             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
+                                 shiptocontact, shiptocp_gender, shiptophone, shiptofax, shiptoemail, module)
+             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;

         do_query($self, $dbh, $query, $id, @values, $module);
       }
     }
         do_query($self, $dbh, $query, $id, @values, $module);
       }
     }

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 83da8b5a9b7961b39abf5a8d95b48405dec9bec5..fed2ff74c108147a93d05fe13cdf2305eca21bff 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1780,7 +1780,7 @@ sub ship_to {
 
   my @shipto_vars =
     qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry
 
   my @shipto_vars =
     qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry

-       shiptocontact shiptophone shiptofax shiptoemail
+       shiptocontact shiptocp_gender shiptophone shiptofax shiptoemail

        shiptodepartment_1 shiptodepartment_2);
 
   my @addr_vars =
        shiptodepartment_1 shiptodepartment_2);
 
   my @addr_vars =


@@ -1795,6 +1795,19 @@ sub ship_to {
     ? $locale->text('Customer Number')
     : $locale->text('Vendor Number');
 
     ? $locale->text('Customer Number')
     : $locale->text('Vendor Number');
 

+  # sieht nicht nett aus, funktioniert aber
+  # das vorausgewählte select-feld wird über shiptocp_gender
+  # entsprechend vorbelegt
+  my $selected_m='';
+  my $selected_f='';
+  if ($form->{shiptocp_gender} eq 'm') {
+    $selected_m='selected';
+    $selected_f='';
+  } elsif ($form->{shiptocp_gender} eq 'f') {
+    $selected_m='';
+    $selected_f='selected';
+  }
+

   # get pricegroups for parts
   IS->get_pricegroups_for_parts(\%myconfig, \%$form);
 
   # get pricegroups for parts
   IS->get_pricegroups_for_parts(\%myconfig, \%$form);
 


@@ -1867,6 +1880,15 @@ sub ship_to {
           <td>$form->{contact}</td>
           <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
         </tr>
           <td>$form->{contact}</td>
           <td><input name="shiptocontact" size="35" value="$form->{shiptocontact}"></td>
         </tr>

+        <tr>
+          <th align="right" nowrap>| . $locale->text('Gender') . qq|</th>
+          <td></td>
+          <td><select id="shiptocp_gender" name="shiptocp_gender">
+              <option value="m"| .  $selected_m . qq|>| . $locale->text('male') . qq|</option>
+              <option value="f"| .  $selected_f . qq|>| . $locale->text('female') . qq|</option>
+              </select>
+          </td>
+        </tr>

         <tr>
           <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
           <td>$form->{phone}</td>
         <tr>
           <th align="right" nowrap>| . $locale->text('Phone') . qq|</th>
           <td>$form->{phone}</td>

diff --git a/templates/webpages/do/form_header.html b/templates/webpages/do/form_header.html
index 2f98575f0f7248ed51ce9866d01cde95cc606f8a..2410439c3afed9210dccbfe32a5413ee696b61ce 100644 (file)
--- a/templates/webpages/do/form_header.html
+++ b/templates/webpages/do/form_header.html
@@ -80,6 +80,7 @@
   <input type="hidden" name="saved_donumber" value="[% HTML.escape(saved_donumber) %]">
   <input type="hidden" name="shiptocity" value="[% HTML.escape(shiptocity) %]">
   <input type="hidden" name="shiptocontact" value="[% HTML.escape(shiptocontact) %]">
   <input type="hidden" name="saved_donumber" value="[% HTML.escape(saved_donumber) %]">
   <input type="hidden" name="shiptocity" value="[% HTML.escape(shiptocity) %]">
   <input type="hidden" name="shiptocontact" value="[% HTML.escape(shiptocontact) %]">

+  <input type="hidden" name="shiptocp_gender" value="[% HTML.escape(shiptocp_gender) %]">

   <input type="hidden" name="shiptocountry" value="[% HTML.escape(shiptocountry) %]">
   <input type="hidden" name="shiptodepartment_1" value="[% HTML.escape(shiptodepartment_1) %]">
   <input type="hidden" name="shiptodepartment_2" value="[% HTML.escape(shiptodepartment_2) %]">
   <input type="hidden" name="shiptocountry" value="[% HTML.escape(shiptocountry) %]">
   <input type="hidden" name="shiptodepartment_1" value="[% HTML.escape(shiptodepartment_1) %]">
   <input type="hidden" name="shiptodepartment_2" value="[% HTML.escape(shiptodepartment_2) %]">