Index: show_shopping_area.tpl
===================================================================
@@ -306,26 +306,88 @@
                                         </div>
 				</div>
 <!-- END show_bestellmerkmal -->
-													<div class="form-group">
-														<label class="col-sm-4 control-label">Anzahl</label>
-														<div class="col-sm-8">
-															<div class="input-group">
-																<div class="input-group-btn"><button type="button" class="btn btn-default btn-number" disabled="disabled" data-type="minus" data-field="wunschmenge">-</button></div>
-																<input type="text" class="form-control input-number" id="exampleInputAmount" placeholder="{MIN_QUANTITY}" value="{MIN_QUANTITY}" name="wunschmenge" min="{MIN_QUANTITY}" max="{MAX_QUANTITY}" >
-																<div class="input-group-btn"><button type="button" class="btn btn-default btn-number" data-type="plus" data-field="wunschmenge">+</button></div>
-															</div>
-<small><span id="basket_errors" class="error"></span></small>
-														</div>
-													</div>
-													<div class="form-group">
-														<div class="col-sm-8 col-sm-offset-4">
-														<button type="submit" class="btn btn-lg btn-block btn-warning btn-cta">{BASKET_BUTTON_TEXT}</button>
-														</div>
-													</div>
-	
-													
-												
-											</div>
+
+<!-- BEGIN einzelkaufoption -->
+<!-- Auswahl Einzelkaufoption wenn auch Abo aktiv ist -->
+		<div class="form-group" style="margin-bottom:0px;">
+			<div class="col-sm-4">
+				<input type="radio" id="einzelkauf_radio" name="abo_bestelltyp" value="0" {switch_show_basket.einzelkaufoption.CHECKED}  onClick="updateTotalPrice();$('#wk_button_abo').prop('disabled',true);$('#wk_button').prop('disabled',false);"> <label for="einzelkauf_radio">{switch_show_basket.einzelkaufoption.NAME}</label>
+			</div>
+		</div>
+<!-- END einzelkaufoption -->
+
+		<div class="form-group">
+			<label class="col-sm-4 control-label">Anzahl</label>
+			<div class="col-sm-8">
+				<div class="input-group">
+					<div class="input-group-btn">
+						<button type="button" class="btn btn-default btn-number" disabled="disabled" data-type="minus" data-field="wunschmenge">-</button>
+					</div>
+					<input type="text" class="form-control input-number" id="exampleInputAmount" placeholder="{MIN_QUANTITY}" value="{MIN_QUANTITY}" name="wunschmenge" min="{MIN_QUANTITY}" max="{MAX_QUANTITY}" >
+					<div class="input-group-btn">
+						<button type="button" class="btn btn-default btn-number" data-type="plus" data-field="wunschmenge">+</button>
+					</div>
+				</div>
+				<small><span id="basket_errors" class="error"></span></small>
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="col-sm-8 col-sm-offset-4">
+				<button id="wk_button" type="submit" class="btn btn-lg btn-block btn-warning btn-cta">{BASKET_BUTTON_TEXT}</button>
+			</div>
+		</div>
+<!-- BEGIN show_abo -->
+<hr>
+
+		<div class="form-group" style="margin-bottom:0px;">
+			<div class="col-sm-4">
+				<input type="radio" id="abo_radio" name="abo_bestelltyp" value="{switch_show_basket.show_abo.ID}" {switch_show_basket.show_abo.CHECKED} onClick="updateTotalPrice();$('#wk_button_abo').prop('disabled',false);$('#wk_button').prop('disabled',true);"> <label for="abo_radio">{switch_show_basket.show_abo.NAME}</label>	
+<!-- BEGIN discount -->
+ ({switch_show_basket.show_abo.discount.RABATT_WERT}% {switch_show_basket.show_abo.discount.RABATT_NAME})
+<!-- END discount -->			
+			</div>
+			<div class="col-sm-8">
+<!-- Auswahl der Laufzeit oder Textangabe wenn nur eine Laufzeit -->
+<!-- BEGIN show_ein_intervall -->
+				{switch_show_basket.show_abo.show_ein_intervall.TEXT}
+<!-- END show_ein_intervall -->
+			
+			
+<!-- BEGIN show_intervall_auswahl -->
+				<select class="form-control" name="abo_intervall">
+<!-- BEGIN intervall -->
+					<option value="{switch_show_basket.show_abo.show_intervall_auswahl.intervall.ID}">{switch_show_basket.show_abo.show_intervall_auswahl.intervall.NAME}</option>
+<!-- END intervall -->
+				</select>
+<!-- END show_intervall_auswahl -->
+			</div>
+		</div>
+		<div class="form-group">
+		        <div class="col-sm-12">
+			         <small>{switch_show_basket.show_abo.BESCHREIBUNG}</small>		
+		         </div>
+		</div>
+                <div class="form-group">
+			<label class="col-sm-4 control-label">Anzahl</label>
+			<div class="col-sm-8">
+				<div class="input-group">
+					<div class="input-group-btn">
+						<button type="button" class="btn btn-default btn-number" disabled="disabled" data-type="minus" data-field="wunschmenge_abo">-</button>
+					</div>
+					<input type="text" class="form-control input-number" id="exampleInputAmount" placeholder="{MIN_QUANTITY}" value="{MIN_QUANTITY}" name="wunschmenge_abo" min="{MIN_QUANTITY}" max="{MAX_QUANTITY}" >
+					<div class="input-group-btn">
+						<button type="button" class="btn btn-default btn-number" data-type="plus" data-field="wunschmenge_abo">+</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="form-group">
+			<div class="col-sm-8 col-sm-offset-4">
+				<button id="wk_button_abo" type="submit" class="btn btn-lg btn-block btn-warning btn-cta" {switch_show_basket.show_abo.WK_BUTTON_DISABLED}>{BASKET_BUTTON_TEXT_ABO}</button>
+			</div>
+		</div>
+<!-- END show_abo -->
+	</div>
 <!-- END switch_show_basket -->
 
 <!-- BEGIN switch_show_purchase -->