Index: /mods/wpsg_mod_ordercondition.class.php
===================================================================
--- /mods/wpsg_mod_ordercondition.class.php	(revision 6242)
+++ /mods/wpsg_mod_ordercondition.class.php	(revision 6244)
@@ -40,4 +40,5 @@
 				errortext TEXT NOT NULL,
 		   		deleted INT(1) NOT NULL,
+		   		shipping TEXT NOT NULL,
 		   		PRIMARY KEY  (id)
 		   	) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;";
@@ -149,4 +150,14 @@
 					
 					$this->shop->addTranslationString('wpsg_mod_ordercondition_'.$_REQUEST['oc_id'], $_REQUEST['value']);
+					
+					die($_REQUEST['value']);
+					
+				}
+				else if ($_REQUEST['field'] == 'shipping')
+				{
+					
+					$this->db->UpdateQuery(WPSG_TBL_ORDERCOND, array(
+						'shipping' => wpsg_q(implode(',', $_REQUEST['value']))
+					), "`id` = '".wpsg_q($_REQUEST['oc_id'])."'");
 					
 					die($_REQUEST['value']);
@@ -338,6 +349,7 @@
 					OC.`deleted` != '1' AND
 					(
-						OC.`typ` = '1' OR 
-						(OC.`typ` = '2' AND FIND_IN_SET(OC.`id`, '".implode(",", $arOC_products)."'))
+						(OC.`typ` = '1') OR 
+						(OC.`typ` = '2' AND FIND_IN_SET(OC.`id`, '".implode(",", $arOC_products)."')) OR
+						(OC.`typ` = '3' AND FIND_IN_SET('".wpsg_q($arBasket['checkout']['shipping'])."', OC.`shipping`))
 					)
 			");
@@ -352,4 +364,12 @@
 			
 			$this->shop->view['wpsg_mod_ordercondition']['data'] = $this->db->fetchAssoc("SELECT * FROM `".WPSG_TBL_ORDERCOND."` WHERE `deleted` != '1'");
+			$this->shop->view['arShipping'] = array();
+			
+			foreach ($this->shop->arShipping as $k => $v)
+			{
+			
+				$this->shop->view['arShipping'][$v['id']] = $v['name'];
+				
+			}
 			
 			$this->shop->render(WPSG_PATH_VIEW.'/mods/mod_ordercondition/list.phtml');
Index: /views/js/editable.js
===================================================================
--- /views/js/editable.js	(revision 6242)
+++ /views/js/editable.js	(revision 6244)
@@ -74,4 +74,19 @@
 
 			}
+			else if (options.type == 'checklist')
+			{
+				
+				opt.type = 'checklist';
+				opt.source = [];
+				opt.value = options.value;
+				
+				for (var i in options.data)
+				{
+				
+					opt.source.push( { value: i, text: options.data[i] } );
+					
+				}
+				
+			}
 			else
 			{
@@ -83,5 +98,5 @@
 				};
 				
-			}
+			}			
 
             if (typeof options.callback == "function") opt.success = options.callback;
Index: /views/mods/mod_ordercondition/list.phtml
===================================================================
--- /views/mods/mod_ordercondition/list.phtml	(revision 6242)
+++ /views/mods/mod_ordercondition/list.phtml	(revision 6244)
@@ -100,4 +100,5 @@
             if ($oc['typ'] == '1') echo __('Jede Bestellung', 'wpsg');
             else if ($oc['typ'] == '2') echo __('Bestimmte Produkte', 'wpsg');
+            else if ($oc['typ'] == '3') echo __('Bestimmte Versandarten', 'wpsg');
             else echo __('Inaktiv', 'wpsg');
 
@@ -108,8 +109,14 @@
             jQuery('#oc_typ_<?php echo $oc['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
                 type: 'select',
-                data: <?php echo wpsg_prepare_for_inlineEdit(array('0' => __('Inaktiv', 'wpsg'), '1' => __('Jede Bestellung', 'wpsg'), '2' => __('Bestimmte Produkte', 'wpsg'))); ?>,
+                data: <?php echo wpsg_prepare_for_inlineEdit(array('0' => __('Inaktiv', 'wpsg'), '1' => __('Jede Bestellung', 'wpsg'), '2' => __('Bestimmte Produkte', 'wpsg'), '3' => __('Bestimmte Versandarten'))); ?>,
                 submitdata: {
                     field: 'typ',
                     oc_id: '<?php echo $oc['id']; ?>'
+                },
+                callback: function(e, params) {
+                    
+                    if (params == 3) jQuery('.wpsg_mod_ordercondition_shipping_<?php echo $oc['id']; ?>').show();
+                    else jQuery('.wpsg_mod_ordercondition_shipping_<?php echo $oc['id']; ?>').hide();
+                    
                 }
             });
@@ -146,5 +153,33 @@
 
         /* ]]> */</script>
-
+        
+        <div class="wpsg_mod_ordercondition_shipping_<?php echo $oc['id']; ?>" style="display:<?php echo (($oc['type'] === '3')?'block':'none'); ?>;">
+            <?php echo wpsg_drawForm_TextStart(); ?>
+            <span class="wpsg_editable" id="oc_shipping_<?php echo $oc['id']; ?>"><?php 
+            
+                foreach (wpsg_trim(explode(',', $oc['shipping'])) as $shipping_id) 
+                {  
+                    
+                    if (array_key_exists($shipping_id, $this->view['arShipping'])) echo $this->view['arShipping'][$shipping_id].'<br />';
+                    
+                } 
+                
+            ?></span>
+            <?php echo wpsg_drawForm_TextEnd(__('Versandartenauswahl', 'wpsg')); ?>
+            <script type="text/javascript">/* <![CDATA[ */
+    
+                jQuery('#oc_shipping_<?php echo $oc['id']; ?>').wpsg_editable('<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=module&modul=wpsg_mod_ordercondition&do=inlinedit&noheader=1', {
+                    submitdata: {
+                        field: 'shipping',
+                        oc_id: '<?php echo $oc['id']; ?>'
+                    },
+                    data: <?php echo json_encode($this->view['arShipping']); ?>,
+                    value: <?php echo json_encode(wpsg_trim(explode(',', $oc['shipping']))); ?>,
+                    type: 'checklist'
+                });
+    
+            /* ]]> */</script>
+        </div>
+            
 		<?php if ($i == sizeof($this->view['wpsg_mod_ordercondition']['data'])) { ?><hr /><?php } ?>