first commit

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/_basketDeliveryList.php

@@ -0,0 +1,55 @@
+<?php
+st_theme_use_stylesheet('stDelivery.css');
+
+use_javascript('stDelivery.js');
+
+$smarty->assign('deliveries', $delivery->getDeliveries());
+
+$smarty->assign('delivery_countries', $delivery->getDeliveryCountries());
+
+if ($config->get('date_on'))
+{
+   $smarty->assign('date_time', st_get_component('stDeliveryFrontend', 'dateTime'));
+}
+
+if (!$delivery->hasDeliveries())
+{
+   if (DeliveryPeer::retrieveIdsCached())
+   {
+      $smarty->assign('max_order_amount_exceeded', true);
+   }
+}
+
+
+$smarty->assign('has_valid_allow_criteria', $delivery->hasValidAllowCriteria());
+
+
+$smarty->display('basket_delivery_list.html');
+?>
+<?php if ($sf_context->getController()->getTheme()->getVersion() < 7): ?>
+<script type="text/javascript">
+jQuery(function($) {
+   $('input.st_delivery-default').each(function() {
+      if (this.checked)
+      {
+         stDelivery.deliveryChecked = this.id;
+      }
+
+      $(this).click(function() {
+         if (stDelivery.deliveryChecked != this.id)
+         {
+            $(document).trigger('delivery.change.started', this);
+            stDelivery.executeAjaxUpdate($(this), '<?php echo url_for('stDeliveryFrontend/ajaxDeliveryUpdate') ?>');
+
+            stDelivery.deliveryChecked = this.id;
+         }
+      });
+   });
+
+   $('#delivery_country').change(function()
+   {
+      stDelivery.executeAjaxUpdate($(this), '<?php echo url_for('stDeliveryFrontend/ajaxDeliveryCountryUpdate') ?>');
+   });    
+});
+</script>
+<?php endif ?>

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/_basketDialog.php

@@ -0,0 +1,14 @@
+<?php if ($delivery):?>
+    <?php use_helper('Javascript', 'stCurrency');?>
+    <?php st_theme_use_stylesheet('stDelivery.css') ?>
+    <?php $results=array(); ?>
+    <?php foreach ($delivery as $deliver): ?>
+        <?php $row['radiobutton']=radiobutton_tag('deliver', $deliver->getId(), $deliver->getId() == $checked, array("onclick" => remote_function(array('update' => 'st_component-st_basket-sumary', 'url' => 'stDeliveryFrontend/ajaxDeliveryUpdate', 'with' => "'id=' + this.value", 'script' => true, 'complete' => visual_effect('highlight', 'st_component-st_basket-sumary', array('duration' => 3))))));?>
+        <?php $row['name']=$deliver->getName();?>
+        <?php $row['cost']=st_price($deliver->getCost($basket->getItems(), $order_sum), true, true);?>
+        <?php $row['description']=$deliver->getDescription();?>
+        <?php $results[]=$row;?>
+     <?php endforeach; ?>
+     <?php $smarty->assign('results',$results); ?>
+     <?php $smarty->display('delivery_basket_dialog.html'); ?> 
+<?php endif;?>

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/_basketPaymentList.php

@@ -0,0 +1,28 @@
+<?php st_theme_use_stylesheet('stDelivery.css') ?>
+
+<?php $smarty->assign('delivery_payments', $delivery_payments) ?>
+
+<?php $smarty->assign('is_order_only_for_points', stPoints::isOrderOnlyForPoints()) ?>
+
+<?php $smarty->display('basket_payment_list.html') ?>
+
+<?php if ($sf_context->getController()->getTheme()->getVersion() < 7): ?>
+<script type="text/javascript">
+jQuery(function($) {
+    $('input.st_delivery-payment_default').each(function() {
+        if (this.checked) {
+                stDelivery.deliveryPaymentChecked = this.id;
+            }
+
+        $(this).click(function() {
+            if (stDelivery.deliveryPaymentChecked != this.id)
+            {
+                stDelivery.executeAjaxUpdate($(this), '<?php echo url_for('stDeliveryFrontend/ajaxPaymentUpdate') ?>');
+
+                stDelivery.deliveryPaymentChecked = this.id;
+            }
+        });
+    });
+});
+</script>
+<?php endif ?>

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/_basketSummary.php

@@ -0,0 +1,57 @@
+<?php
+use_helper('stCurrency');
+st_theme_use_stylesheet('stDelivery.css');
+
+$paid = stGiftCardPlugin::getTotalAmountPaid();
+
+$discount_amount = $basket->getTotalProductDiscountAmount(true, true);
+
+$basket_amount = $basket->getTotalAmount(true, true);
+
+$delivery_cost = $delivery->getTotalDeliveryCost(true, true);
+
+$total_amount = $basket_amount + $delivery_cost - $paid;
+
+$smarty->assign("basket", $basket);
+
+$smarty->assign("delivery", $delivery);
+
+$smarty->assign("basket_cost", $basket_amount + $discount_amount);
+
+$smarty->assign('basket_discount', $discount_amount);
+
+$smarty->assign('basket_discount_name', $basket->getDiscount() ? $basket->getDiscount()->getName() : null);
+
+if (sfContext::getInstance()->getUser()->isAuthenticated() == 1)
+{
+    $smarty->assign("points_value", stPoints::getBasketPointsValue());
+}
+
+$smarty->assign('points_system_is_active', stPoints::isPointsSystemActive());
+
+$smarty->assign('points_shortcut', $config_points->get('points_shortcut', null, true));
+
+$smarty->assign("basket_weight", $basket->getTotalProductWeight());
+
+$smarty->assign("basket_quantity", $basket->getTotalProductQuantity());
+
+$smarty->assign("delivery_cost", $delivery_cost);
+
+$smarty->assign('max_order_amount', $delivery->getMaxOrderAmount());
+
+$smarty->assign('max_order_weight', $delivery->getMaxOrderWeight());
+
+$smarty->assign('max_order_quantity', $delivery->getMaxOrderQuantity());
+
+$smarty->assign('paid', $paid);
+
+$smarty->assign('total_amount', $total_amount >= 0 ? $total_amount : 0);
+
+$smarty->assign('basket_discount_message', stDiscount::getBasketMessage());
+
+$smarty->assign("discount_coupon_code", $discount_coupon_code);
+     
+$smarty->assign("gift_card", $gift_card);
+
+$smarty->display("basket_summary.html");
+?>

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/_dateTime.php

@@ -0,0 +1,184 @@
+<?php
+use_helper('stCurrency');
+st_theme_use_stylesheet('stDelivery.css');
+
+
+
+if( $off_date_picker == 1)
+{
+   $smarty->assign('date_on', 0);
+   $smarty->assign('time_on', 0);
+}
+else
+{
+   $smarty->assign('date_on', $config->get('date_on'));
+   $smarty->assign('time_on', $config->get('time_on'));
+}
+
+if( $off_date_picker == 1 && $config->get('date_on')==0)
+{
+   $smarty->assign('time_on', $config->get('time_on'));
+}
+
+
+$smarty->assign('def_time',$time_h_def.':'.$time_m_def);
+
+$time_limit=$config->get('time_h_limit').$config->get('time_m_limit');
+
+if(date('Hi')>=$time_limit)
+{
+   $add_day = 1;
+}
+else
+{
+   $add_day = 0;
+}
+
+if($language == 'pl_PL')
+{
+   $regional = 'pl';
+}
+else
+{
+   $regional = 'other';
+}
+
+
+$smarty->display("basket_dateTime.html");
+?>
+
+ <script type="text/javascript">
+
+        jQuery(function($){
+
+
+	$.datepicker.regional['pl'] = {
+		closeText: 'Zamknij',
+		prevText: '&#x3c;Poprzedni',
+		nextText: 'Następny&#x3e;',
+		currentText: 'Dziś',
+		monthNames: ['Styczeń','Luty','Marzec','Kwiecień','Maj','Czerwiec',
+		'Lipiec','Sierpień','Wrzesień','Październik','Listopad','Grudzień'],
+		monthNamesShort: ['Sty','Lu','Mar','Kw','Maj','Cze',
+		'Lip','Sie','Wrz','Pa','Lis','Gru'],
+		dayNames: ['Niedziela','Poniedzialek','Wtorek','Środa','Czwartek','Piątek','Sobota'],
+		dayNamesShort: ['Nie','Pn','Wt','Śr','Czw','Pt','So'],
+		dayNamesMin: ['N','Pn','Wt','Śr','Cz','Pt','So'],
+		dateFormat: 'yy-mm-dd', firstDay: 1,
+		isRTL: false
+        };
+
+        $.datepicker.regional['other'] = {
+		dateFormat: 'yy-mm-dd', firstDay: 1,
+		isRTL: false
+        };
+
+	$.datepicker.setDefaults($.datepicker.regional['<?php echo $regional; ?>']);
+
+        <?php if (isset($allowed_dates) && $allowed_dates): ?>
+            var allowed_dates = [<?php echo $allowed_dates; ?>];
+        <?php else: ?>
+            var allowed_dates = [];
+        <?php endif; ?>
+
+
+        $('#datepicker').datepicker({
+
+
+        <?php if($config->get('min')<=0): ?>
+            minDate: <?php echo $add_day; ?>,
+        <?php else: ?>
+            minDate: <?php echo $config->get('min')+$add_day; ?>,
+        <?php endif; ?>
+
+        <?php if ($config->get('max')>0): ?>
+            maxDate: <?php echo $config->get('max') ?>,
+        <?php endif; ?>
+
+        dateFormat: 'dd-mm-yy',
+
+
+        beforeShowDay: function(date) {
+
+            var current = $.datepicker.formatDate('dd-mm-yy', date);
+
+            var weekend = date.getDay()>0 && date.getDay()<6;
+
+            <?php if($config->get('weekends_on')==1): ?>
+               var is_allowed = [weekend];
+            <?php else: ?>
+               var is_allowed = [true];
+            <?php endif; ?>
+
+            $.each(allowed_dates, function() {
+               if (this.allow_date == current)
+               {
+                  is_allowed = [false];
+               }
+             
+            });
+
+         return is_allowed;
+         }
+
+        });
+
+
+
+        $('#datepicker').datepicker('setDate', '<?php echo $default_date; ?>');
+
+
+        $("#show24").timeEntry({
+
+           show24Hours: true,
+           defaultTime: new Date(0, 0, 0, <?php echo $time_h_def; ?>, <?php echo $time_m_def; ?>, 0),
+           minTime: new Date(0, 0, 0, <?php echo $config->get('time_h_from') ?>, <?php echo $config->get('time_m_from') ?>, 0), 
+           maxTime: new Date(0, 0, 0, <?php echo $config->get('time_h_to') ?>, <?php echo $config->get('time_m_to') ?>, 0) 
+
+         });
+
+         $('#st_user-register_form').submit(function() {
+            <?php if($config->get('date_on')): ?>
+            var date = document.getElementById("datepicker").value;
+            post_input_date = $('<input type="hidden" name="delivery[date]" value="'+date+'" />');
+            $('#st_user-register_form').append(post_input_date);
+            <?php endif; ?>
+            
+            <?php if($config->get('time_on')): ?>
+            var time = document.getElementById("show24").value;
+            post_input_time = $('<input type="hidden" name="delivery[time]" value="'+time+'" />');
+            $('#st_user-register_form').append(post_input_time);
+            <?php endif; ?>
+         });
+
+         $('#st_user-login_form').submit(function() {
+            <?php if($config->get('date_on')): ?>
+            var date = document.getElementById("datepicker").value;
+            post_input_date = $('<input type="hidden" name="delivery[date]" value="'+date+'" />');
+            $('#st_user-login_form').append(post_input_date);
+            <?php endif; ?>
+
+            <?php if($config->get('time_on')): ?>
+            var time = document.getElementById("show24").value;
+            post_input_time = $('<input type="hidden" name="delivery[time]" value="'+time+'" />');
+            $('#st_user-login_form').append(post_input_time);
+            <?php endif; ?>
+         });
+         
+          $('#user_delivery_form').submit(function() {
+            <?php if($config->get('date_on')): ?>
+            var date = document.getElementById("datepicker").value;
+            post_input_date = $('<input type="hidden" name="delivery[date]" value="'+date+'" />');
+            $('#user_delivery_form').append(post_input_date);
+            <?php endif; ?>
+
+            <?php if($config->get('time_on')): ?>
+            var time = document.getElementById("show24").value;
+            post_input_time = $('<input type="hidden" name="delivery[time]" value="'+time+'" />');
+            $('#user_delivery_form').append(post_input_time);
+            <?php endif; ?>
+         });
+
+        });
+
+</script>

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/default/basket_dateTime.html

@@ -0,0 +1,28 @@
+{use_javascript src="jquery.timeentry.js" }
+{use_javascript src="calendar.js" }
+
+
+
+{if $date_on == 1 && $time_on == 1}
+<label for="delivery_date">{__ text="Data i czas"}</label>
+{else}
+
+    {if $date_on == 1}
+        <label for="delivery_date">{__ text="Dzień dostawy"}</label>
+    {/if}
+
+    {if $time_on == 1}
+        <label for="delivery_date">{__ text="Czas dostawy"}</label>
+    {/if}
+
+{/if}
+
+
+{if $date_on == 1}
+    <input name="delivery[delivery_date]" id="datepicker" readonly="readonly"/>
+{/if}
+
+{if $time_on == 1}
+    <input id="show24" name="delivery[delivery_time]" value="{$def_time}">
+{/if}
+

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/default/basket_delivery_list.html

@@ -0,0 +1,60 @@
+<div class="st_component-st_delivery-list">
+
+    <h5 class="st_title">{__ text="Dostawa"}</h5>
+    <div class="st_delivery-content">
+        {$date_time}
+        
+        {if $delivery_countries}
+        <div id="st_delivery-country">
+            <label for="delivery_country">{__ text="Kraj dostawy"}</label>
+            <select style="width: 100%;" name="delivery[country]" id="delivery_country">
+                {foreach item=delivery_country from=$delivery_countries}
+                {assign var=country_name value=$delivery_country->getName()}
+                {assign var=country_default value=$delivery_country->getIsDefault()}
+
+                {if $country_default}
+                <option value="{$delivery_country->getId()}" selected="selected">{$country_name}</option>
+                {else}
+                <option value="{$delivery_country->getId()}">{$country_name}</option>
+                {/if}
+                {/foreach}
+            </select>
+        </div>
+        {/if}
+        <ul>
+            {foreach item=delivery from=$deliveries}
+            {assign var=delivery_cost value=$delivery->getTotalCost(true, true)}
+            {assign var=delivery_name value=$delivery->getName()}
+            {assign var=delivery_description value=$delivery->getDescription()}
+            {assign var=delivery_default value=$delivery->getIsDefault()}
+
+            <li>
+                {if $delivery_default}
+                <input class="st_delivery-default" type="radio" name="delivery[default_delivery]" id="delivery_default_delivery-{$delivery->getId()}" value="{$delivery->getId()}" checked="checked" />
+                {else}
+                <input class="st_delivery-default" type="radio" name="delivery[default_delivery]" id="delivery_default_delivery-{$delivery->getId()}" value="{$delivery->getId()}" />
+                {/if}
+                <div class="st_delivery-item-content">
+                    {if $delivery_cost != 0}
+                    <span class="st_delivery-cost">{$delivery_cost|st_currency_format:false}</span>
+                    {/if}
+                    <label class="st_delivery-label" for="delivery_default_delivery-{$delivery->getId()}">{$delivery_name}</label>
+                    {if $delivery_description}
+                    <p class="st_delivery-description">{$delivery_description}</p>
+                    {/if}
+                    <br class="st_clear_all" />
+                </div>
+                <br class="st_clear_all" />
+            </li>
+            {foreachelse}
+            <div style="border: 1px solid #bbb; background-color: #eee; padding: 5px;">
+            {if $max_order_amount_exceeded || $max_order_quantity_exceeded || $max_order_weight_exceeded}
+                {__ text="Produkty w koszyku nie spełniają kryteriów dostawy. Zmniejsz ilość sztuk produktów w koszyku lub skontaktuj się ze sprzedawcą w celu ustalenia alternatywnego sposobu dostawy"}
+            {else}
+                {__ text="Brak zdefiniowanych dostaw lub stref w sklepie"}
+            {/if}
+            </div>
+            {/foreach}
+        </ul>
+    </div>
+</div>

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/default/basket_payment_list.html

@@ -0,0 +1,41 @@
+<div class="st_component-st_delivery-list" id="st_delivery-payment_list">
+    <h5 class="st_title">{__ text="Płatności"}</h5>
+    <div class="st_delivery-content">
+        <ul>
+            {foreach item=delivery_payment from=$delivery_payments}
+            {assign var=payment_cost value=$delivery_payment->getCost(true, true)}
+            {assign var=payment_name value=$delivery_payment->getName()}
+            {assign var=payment_description value=$delivery_payment->getDescription()}
+            {assign var=payment_default value=$delivery_payment->getIsDefault()}
+            {assign var=payment_id value=$delivery_payment->getId()}
+            {assign var=payment_socket value=$delivery_payment->getSocketName()}
+            {assign var=payment_socket_exists value=$delivery_payment->getSocketNameExists()}
+            <li>
+                {if $payment_default}
+                <input class="st_delivery-payment_default" name="delivery[default_payment]" id="delivery_default_payment-{$payment_id}" type="radio" value="{$payment_id}" checked="checked" />
+                {else}
+                <input class="st_delivery-payment_default" name="delivery[default_payment]" id="delivery_default_payment-{$payment_id}" type="radio" value="{$payment_id}" />
+                {/if}
+                <div class="st_delivery-item-content">
+                    {if $payment_cost != 0}
+                    <span class="st_delivery-cost">+{$payment_cost|st_currency_format:false}</span>
+                    {/if}
+                    <label class="st_delivery-label" for="delivery_default_payment-{$delivery_payment->getId()}">{$payment_name}</label>
+                    {if $payment_description}
+                    <p class="st_delivery-description">{$payment_description}</p>
+                    {/if}
+                    {if $payment_socket_exists}
+                    <p>{st_socket name=$payment_socket type="component"}</p>
+                    {/if}
+                    <br class="st_clear_all" />
+                </div>
+                <br class="st_clear_all" />
+            </li>
+            {foreachelse}
+            <div style="border: 1px solid #bbb; background-color: #eee; padding: 5px">
+                {__ text="Wybrana dostawa nie posiada zdefiniowanych płatności"}
+            </div>
+            {/foreach}
+        </ul>
+    </div>
+</div>

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/default/basket_summary.html

@@ -0,0 +1,18 @@
+<h5 class="st_title">{__ text="Koszty"}</h5>
+<div id="st_delivery-basket_summary">
+    <div class="st_delivery-basket_summaty-amount">{$basket_cost|st_currency_format}</div>
+    <div class="st_delivery-basket_summaty-text">{__ text="Wartość koszyka"}:</div>
+    <br class="st_clear_all"/> 
+
+    <div class="st_delivery-basket_summaty-amount">{$delivery_cost|st_currency_format}</div>
+    <div class="st_delivery-basket_summaty-text">{__ text="Koszt dostawy"}:</div>
+    <br class="st_clear_all"/> 
+{if $paid > 0}    
+    <div class="st_delivery-basket_summaty-amount">{$paid|st_currency_format}</div>
+    <div class="st_delivery-basket_summaty-text">{__ text="Zapłacono"}:</div>
+    <br class="st_clear_all"/>     
+{/if}
+    <div id="st_basket-total_amount">{$total_amount|st_currency_format}</div>
+    <div id="st_basket-total_amount_text">{__ text="Razem do zapłaty"}:</div>
+    <br class="st_clear_all"/> 
+</div>

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/default2/basket_dateTime.html

@@ -0,0 +1,28 @@
+{use_javascript src="jquery.timeentry.js" }
+{use_javascript src="calendar.js" }
+
+
+
+{if $date_on == 1 && $time_on == 1}
+<label for="delivery_date">{__ text="Data i czas"}</label>
+{else}
+
+    {if $date_on == 1}
+        <label for="delivery_date">{__ text="Dzień dostawy"}</label>
+    {/if}
+
+    {if $time_on == 1}
+        <label for="delivery_date">{__ text="Czas dostawy"}</label>
+    {/if}
+
+{/if}
+
+
+{if $date_on == 1}
+    <input name="delivery[delivery_date]" id="datepicker" readonly="readonly"/>
+{/if}
+
+{if $time_on == 1}
+    <input id="show24" name="delivery[delivery_time]" value="{$def_time}">
+{/if}
+

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/default2/basket_delivery_list.html

@@ -0,0 +1,77 @@
+<div class="st_component-st_delivery-list">
+
+    <h3><b>1</b> {__ text="Dostawa"}</h3>
+    <div class="st_delivery-content">
+        {$date_time}
+
+        {if $delivery_countries}
+        <div id="st_delivery-country">
+            <label for="delivery_country">{__ text="Kraj dostawy"}</label>
+            <select style="width: 100%;" name="delivery[country]" id="delivery_country">
+                {foreach item=delivery_country from=$delivery_countries}
+                {assign var=country_name value=$delivery_country->getName()}
+                {assign var=country_default value=$delivery_country->getIsDefault()}
+
+                {if $country_default}
+                <option value="{$delivery_country->getId()}" selected="selected">{$country_name}</option>
+                {else}
+                <option value="{$delivery_country->getId()}">{$country_name}</option>
+                {/if}
+                {/foreach}
+            </select>
+        </div>
+        {/if}
+        <ul>
+            {foreach item=delivery from=$deliveries}
+            {php}$this->assign('delivery_socket', stSocketView::openComponents('stDeliveryElementOnBasketList', array('delivery' => $this->get_template_vars('delivery'))));{/php}
+            {assign var=delivery_cost value=$delivery->getTotalCost(true, true)}
+            {assign var=delivery_name value=$delivery->getName()}
+            {assign var=delivery_description value=$delivery->getDescription()}
+            {assign var=delivery_default value=$delivery->getIsDefault()}
+
+            <li>
+                {if $delivery_default}
+                <input class="st_delivery-default" type="radio" name="delivery[default_delivery]" id="delivery_default_delivery-{$delivery->getId()}" value="{$delivery->getId()}" checked="checked" />
+                {else}
+                <input class="st_delivery-default" type="radio" name="delivery[default_delivery]" id="delivery_default_delivery-{$delivery->getId()}" value="{$delivery->getId()}" />
+                {/if}
+                <div class="st_delivery-item-content">
+                    {if $delivery_cost != 0}
+                    <span class="st_delivery-cost">{$delivery_cost|st_currency_format:false}</span>
+                    {/if}
+                    <label class="st_delivery-label {if $delivery_description} delivery_tooltip {/if}" title="{$delivery_description|escape}" for="delivery_default_delivery-{$delivery->getId()}">{$delivery_name}{if $delivery_description} <img class="delivery_tooltip" src="/images/frontend/theme/default2/information.png" alt="" />{/if}</label>
+                    <br class="st_clear_all" />
+                    {$delivery_socket}
+                </div>
+                <br class="st_clear_all" />
+            </li>
+            {foreachelse}
+            <div style="border: 1px solid #bbb; background-color: #eee; padding: 5px;">
+            {if $max_order_amount_exceeded || $max_order_quantity_exceeded || $max_order_weight_exceeded}
+                {__ text="Produkty w koszyku nie spełniają kryteriów dostawy. Zmniejsz ilość sztuk produktów w koszyku lub skontaktuj się ze sprzedawcą w celu ustalenia alternatywnego sposobu dostawy"}
+            {else}
+                {__ text="Brak zdefiniowanych dostaw lub stref w sklepie"}
+            {/if}
+            </div>
+            {/foreach}
+        </ul>
+    </div>
+</div>
+{literal}
+<script type="text/javascript" language="javascript">
+    jQuery(function ($) {
+         $(document).ready(function () {
+            $(".delivery_tooltip").tooltip({ 
+               effect: 'slide',
+               opacity: 1,
+               delay: 0,
+               position: 'bottom center',
+               offset: [20,0],
+               tipClass: "my_tooltip tooltip roundies"
+
+            });
+        });
+    });
+
+</script>
+{/literal}

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/default2/basket_payment_list.html

@@ -0,0 +1,92 @@
+<div class="st_component-st_delivery-list" id="st_delivery-payment_list">
+    <h3><b>2</b> {__ text="Płatności"}</h3>
+    <div class="st_delivery-content">
+        <ul>
+            {if $is_order_only_for_points}
+             <li>                                
+                 <input type="radio" checked="checked" value="" id="delivery_default_payment" class="st_delivery-payment_default">
+                 <div class="st_delivery-item-content">
+                     <label for="delivery_default_payment" title="" class="st_delivery-label">{__ text="Płatność punktami"}</label>
+                     <br class="st_clear_all">
+                 </div>
+                 <br class="st_clear_all">
+             </li>
+
+            {else}
+            
+            {foreach item=delivery_payment from=$delivery_payments}
+            {assign var=payment_cost value=$delivery_payment->getCost(true, true)}
+            {assign var=payment_name value=$delivery_payment->getName()}
+            {assign var=payment_description value=$delivery_payment->getDescription()}
+            {assign var=payment_default value=$delivery_payment->getIsDefault()}
+            {assign var=payment_id value=$delivery_payment->getId()}
+            {assign var=payment_socket value=$delivery_payment->getSocketName()}
+            {assign var=payment_socket_exists value=$delivery_payment->getSocketNameExists()}
+            <li>
+                {if $payment_default}
+                <input class="st_delivery-payment_default" name="delivery[default_payment]" id="delivery_default_payment-{$payment_id}" type="radio" value="{$payment_id}" checked="checked" />
+                {else}
+                <input class="st_delivery-payment_default" name="delivery[default_payment]" id="delivery_default_payment-{$payment_id}" type="radio" value="{$payment_id}" />
+                {/if}
+                <div class="st_delivery-item-content">
+                    {if $payment_cost != 0}
+                    <span class="st_delivery-cost">+{$payment_cost|st_currency_format:false}</span>
+                    {/if}
+                    <label class="st_delivery-label {if $payment_description} payment_tooltip {/if}" title="{$payment_description|escape}" for="delivery_default_payment-{$delivery_payment->getId()}">{$payment_name}{if $payment_description} <img class="payment_tooltip" src="/images/frontend/theme/default2/information.png" alt="" />{/if}</label>
+                    {if $payment_socket_exists}
+                    <p>{st_socket name=$payment_socket type="component"}</p>
+                    {/if}
+                    <br class="st_clear_all" />
+                </div>
+                <br class="st_clear_all" />
+            </li>
+            {foreachelse}
+            <div style="border: 1px solid #bbb; background-color: #eee; padding: 5px">
+                {__ text="Wybrana dostawa nie posiada zdefiniowanych płatności"}
+            </div>
+            {/foreach}
+            {/if}
+        </ul>
+    </div>
+</div>
+
+{literal}
+<script type="text/javascript" language="javascript">
+    jQuery(function ($) {
+         $(document).ready(function () {
+            $(".payment_tooltip").tooltip({ 
+               effect: 'slide',
+               opacity: 1,
+               delay: 0,
+               position: 'bottom center',
+               offset: [20,0],
+               tipClass: "my_tooltip roundies tooltip"
+
+            });
+        });
+    });
+
+</script>
+{/literal}
+{literal}
+<script type="text/javascript">
+jQuery(function ($)
+{
+       function equalHeight(group)
+       {
+       tallest = 0;
+       group.each(function() {
+          $(this).css("height","auto");
+          thisHeight = $(this).height();
+          if(thisHeight > tallest) {
+             tallest = thisHeight;
+          }
+        });
+        group.height(tallest);
+        }
+
+       equalHeight($(".frame"));
+               
+});
+</script>
+{/literal}

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/default2/basket_summary.html

@@ -0,0 +1,33 @@
+<h3><b>3</b> {__ text="Koszty"}</h3>
+<div id="st_delivery-basket_summary">
+    <div class="st_delivery-basket_summaty-amount">{$basket_cost|st_currency_format:false}</div>
+    <div class="st_delivery-basket_summaty-text">{__ text="Wartość koszyka"}:</div>
+    <br class="st_clear_all"/> 
+
+    <div class="st_delivery-basket_summaty-amount">{$delivery_cost|st_currency_format:false}</div>
+    <div class="st_delivery-basket_summaty-text">{__ text="Koszt dostawy"}:</div>
+    <br class="st_clear_all"/>
+{if $basket_discount > 0}
+    <div class="st_delivery-basket_summaty-amount">-{$basket_discount|st_currency_format}</div>
+    <div class="st_delivery-basket_summaty-text">{__ text="Rabat" langCatalogue="stOrder"} ({$basket_discount_name}):</div>
+    <br class="st_clear_all"/>   
+{/if} 
+{if $paid > 0}    
+    <div class="st_delivery-basket_summaty-amount">-{$paid|st_currency_format}</div>
+    <div class="st_delivery-basket_summaty-text">{__ text="Zapłacono"}:</div>
+    <br class="st_clear_all"/>     
+{/if}
+        
+{if $points_value != 0}       
+    <div id="st_basket-total_amount">{$points_value} {$points_shortcut}</div>
+    <div id="st_basket-total_amount_text">{__ text="Koszt"} {$points_shortcut}:</div>
+    <br class="st_clear_all"/>
+{/if}
+
+    <div id="st_basket-total_amount">{$total_amount|st_currency_format}</div>
+    <div id="st_basket-total_amount_text">{__ text="Razem do zapłaty"}:</div>
+    <br class="st_clear_all"/> 
+{if $basket_discount_message}
+    <div id="basket_discount_message">{$basket_discount_message}</div>
+{/if}
+</div>

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/responsive/basket_dateTime.html

@@ -0,0 +1,28 @@
+{use_javascript src="jquery.timeentry.js" }
+{use_javascript src="calendar.js" }
+
+
+
+{if $date_on == 1 && $time_on == 1}
+<label for="delivery_date">{__ text="Data i czas"}</label>
+{else}
+
+    {if $date_on == 1}
+        <label for="delivery_date">{__ text="Dzień dostawy"}</label>
+    {/if}
+
+    {if $time_on == 1}
+        <label for="delivery_date">{__ text="Czas dostawy"}</label>
+    {/if}
+
+{/if}
+
+
+{if $date_on == 1}
+    <input name="delivery[delivery_date]" id="datepicker" readonly="readonly"/>
+{/if}
+
+{if $time_on == 1}
+    <input id="show24" name="delivery[delivery_time]" value="{$def_time}">
+{/if}
+

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/responsive/basket_delivery_list.html.bck

@@ -0,0 +1,92 @@
+{use_javascript src="basket-delivery-list.js"}
+<div class="panel panel-default">
+   <div class="panel-heading"><h3 class="panel-title">{__ text="Dostawa"}</h3></div>
+   <div class="panel-body" data-equalizer-watch>
+      {if $delivery_countries}
+         <form class="delivery-ajax-form" action="{urlfor internal='stDeliveryFrontend/ajaxDeliveryCountryUpdate'}">
+            <fieldset>
+               <div class="form-group">
+                  <label for="delivery-country">{__ text="Kraj dostawy"}</label>
+                  <select name="delivery[country]" id="delivery-country" class="form-control">
+                     {foreach item=delivery_country from=$delivery_countries}
+                        {assign var=country_name value=$delivery_country->getName()}
+                        {assign var=country_default value=$delivery_country->getIsDefault()}
+
+                        {if $country_default}
+                           <option value="{$delivery_country->getId()}" selected="selected">{$country_name}</option>
+                        {else}
+                           <option value="{$delivery_country->getId()}">{$country_name}</option>
+                        {/if}
+                     {/foreach}
+                  </select>
+               </div>
+            </fieldset>
+         </form>
+      {/if}
+      <form class="delivery-ajax-form" action="{urlfor internal='stDeliveryFrontend/ajaxDeliveryUpdate'}">
+         <fieldset>
+            {foreach item=delivery from=$deliveries}
+               {php}$this->assign('delivery_socket', stSocketView::openComponents('stDeliveryElementOnBasketList', array('delivery' => $this->get_template_vars('delivery'))));{/php}
+               {assign var=delivery_cost value=$delivery->getTotalCost(true, true)}
+               {assign var=delivery_name value=$delivery->getName()}
+               {assign var=delivery_description value=$delivery->getDescription()}
+               {assign var=delivery_default value=$delivery->getIsDefault()}
+               {assign var=delivery_service value=$delivery->getService()}
+               <div class="radio">
+                  <label>
+                     <input id="delivery-default-{$delivery->getId()}" class="delivery-radio" type="radio" name="delivery[default_delivery]" value="{$delivery->getId()}" data-delivery-name="{$delivery_name}" data-delivery-type="{$delivery->getType()}"{if $delivery_default} checked{/if}{if $delivery_service && $delivery_service->isPickupPoint()} data-delivery-pickup-point="1"{/if}>
+                     {if $delivery_description}
+                        <span data-toggle="tooltip" data-placement="top" title="{$delivery_description|escape}">
+                           {$delivery_name}
+                           <span class="glyphicon glyphicon-info-sign"></span>
+                        </span>
+                     {else}
+                        {$delivery_name}
+                     {/if}
+                     {if $delivery_cost > 0}
+                        <span class="cost">{$delivery_cost|st_currency_format:false}</span>
+                     {/if}
+
+                     {if $delivery_service && $delivery_service->isPickupPoint()}
+                        <div class="delivery-pickup-point-container">
+                           <a class="btn btn-default" href="#delivery-modal" data-toggle="modal" data-action="choose">{__ text="Wybierz punkt odbioru"}</a>
+                           <div class="selected-pickup-point">
+                              <b class="name"></b>
+                              <div class="address"></div>
+                              <span class="post-code"></span> <span class="city"></span>
+                           </div>
+                        </div>
+                     {/if}
+
+                     {$delivery_socket}
+                  </label>
+               </div>
+            {foreachelse}
+               {if !$has_valid_allow_criteria}
+                  <div class="bg-danger">{__ text="Produkty posiadają różne metody dostawy i nie można ich zamówić w ramach jednego zamówienia"}</div>
+               {elseif $max_order_amount_exceeded || $max_order_quantity_exceeded || $max_order_weight_exceeded}
+                  <div class="bg-danger">{__ text="Produkty w koszyku nie spełniają kryteriów dostawy. Zmniejsz ilość sztuk produktów w koszyku lub skontaktuj się ze sprzedawcą w celu ustalenia alternatywnego sposobu dostawy"}</div>
+               {else}
+                  <div class="bg-danger">{__ text="Brak zdefiniowanych dostaw lub stref w sklepie"}</div>
+               {/if}
+            {/foreach}
+         </fieldset>
+      </form>
+      <form id="weekend-delivery" class="delivery-ajax-form" action="{urlfor internal='stDeliveryFrontend/ajaxWeekendDeliveryUpdate'}">
+         {st_get_component module="stDeliveryFrontend" component="weekendDelivery"}
+      </form>
+      <form id="express-delivery" class="delivery-ajax-form" action="{urlfor internal='stDeliveryFrontend/ajaxExpressDeliveryUpdate'}">
+         {st_get_component module="stDeliveryFrontend" component="expressDelivery"}
+      </form>
+   </div>
+</div>
+
+<script>
+   let isUserAutheticated = {$sf_user->isAuthenticated()|string_format:'%d'};
+{literal}
+   jQuery(function($) {
+      $.initBasketDeliveryList(isUserAutheticated);
+   });
+{/literal}
+
+</script>

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/responsive/basket_payment_list.html

@@ -0,0 +1,112 @@
+<div class="panel panel-default">
+   <div class="panel-heading"><h3 class="panel-title">{__ text="Płatności"}</h3></div>
+   <div class="panel-body" data-equalizer-watch>
+      <form class="delivery-ajax-form" action="{urlfor internal='stDeliveryFrontend/ajaxPaymentUpdate'}">
+         <fieldset>
+            {foreach item=delivery_payment from=$delivery_payments}
+               {assign var=payment_type value=$delivery_payment->getPayment()}
+               {assign var=payment_cost value=$delivery_payment->getCost(true, true)}
+               {assign var=payment_name value=$delivery_payment->getName()}
+               {assign var=payment_description value=$delivery_payment->getDescription()}
+               {assign var=payment_default value=$delivery_payment->getIsDefault()}
+               {assign var=payment_id value=$delivery_payment->getId()}
+               {assign var=payment_socket value=$delivery_payment->getSocketName()}
+               {assign var=payment_socket_exists value=$delivery_payment->getSocketNameExists()}
+               <div class="radio payment-method" data-id="{$payment_id}">
+                  <label>
+                     <input type="radio" name="delivery[default_payment]" value="{$payment_id}" class="payment-radio" {if $payment_default}checked{/if} data-payment-type="{$payment_type->getModuleName()}" data-payment-name="{$payment_name}" data-payment-cod="{$payment_type->getIsCod()}">
+                     
+                     {if $payment_description} 
+                        <span data-toggle="tooltip" data-placement="top" title="{$payment_description|escape}">
+                           {$payment_name}
+                           <span class="glyphicon glyphicon-info-sign payment-info-icon"></span>
+                        </span>
+                     {else}
+                        {$payment_name}
+                     {/if}
+                     
+                     <div>
+                        {if $payment_type->showInfoInShoppingCart()}
+                           {assign var='payment_type_info_url' value=$payment_type->getInfoUrl($order_total_amount)}
+                           {if $payment_type_info_url}
+                              <a class="btn btn-default payment-window-open-trigger" href="{$payment_type_info_url}" rel="nofollow" target="_blank" data-width="{$payment_type->getInfoWidth()}" data-height="{$payment_type->getInfoHeight()}">{$payment_type->getInfoTitle()}</a>
+                           {else}
+                              <a class="btn btn-default" href="#payment-info-modal" data-toggle="modal" data-action="select" data-type="{$payment_type->getModuleName()}" data-title="{$payment_name} - {$payment_type->getInfoTitle()}">{$payment_type->getInfoTitle()}</a>
+                           {/if}
+                        {/if}
+                        {if $payment_type->hasChannels()}
+                           <a class="btn btn-default" href="#payment-modal" data-toggle="modal" data-action="select">{__ text="Wybierz"}</a>
+                        {/if}
+                        {if $payment_type->hasLogo()}
+                           <img src="{$payment_type->getLogo()}" alt="{$payment_name}"  class="payment-logo">
+                        {/if}
+                        {if $payment_type->hasChannels()}
+                              {if $sf_request->getParameter('payment_id') == $payment_id && $sf_request->getParameter('payment_channel')}
+                                 {assign var=payment_channel value=$sf_request->getParameter('payment_channel')|json_decode:true}
+                                 <div class="selected-payment-channel">
+                                    <img src="{$payment_channel.logo}" alt="{$payment_channel.name}">
+                                    {if $payment_channel.show_name}
+                                       {$payment_channel.name}
+                                    {/if}
+                                 </div>
+                              {else}
+                                 <div class="selected-payment-channel"></div>
+                              {/if}   
+                        {/if}
+                     </div>
+                     {if $payment_socket_exists}
+                        <div>{st_socket name=$payment_socket type="component" payment=$delivery_payment}</div>
+                     {/if}
+                     {if $payment_cost != 0}
+                        <span class="cost">+{$payment_cost|st_currency_format:false}</span>
+                     {/if}               
+                  </label>
+               </div>         
+            {foreachelse}  
+               <div class="bg-danger">{__ text="Musisz wpierw wybrać dostawę, aby wybrać płatność"}</div>
+            {/foreach} 
+         </fieldset>
+      </form>       
+   </div>
+</div>
+
+<div id="payment-modal" class="modal fade" tabindex="-1" role="dialog" data-action-select="{urlfor internal='@stPayment?action=selectChannel'}">
+   <div class="modal-dialog" role="document">
+      <div class="modal-content">
+         <div class="modal-header">
+               <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+               <h4 class="modal-title"></h4>
+         </div>
+         <div class="modal-body">
+            <div class="preloader"></div>
+         </div>
+      </div>
+   </div>
+</div>
+
+{literal}
+<script type="text/javascript">
+//<![CDATA[
+jQuery(function($) {
+   $('#shopping-cart-payment [data-toggle=tooltip]').tooltip({ html: true, trigger: 'click hover focus', delay:  { show: 100, hide: 0 } });
+   $('#payment-modal')
+      .on('show.bs.modal', function(event) {
+         const modal = $(this);
+         const trigger = $(event.relatedTarget);
+
+         if (trigger.data('action'))
+         {
+            const payment = trigger.closest('.radio').find('.payment-radio');
+            modal.find('.modal-title').html(payment.data('payment-name'));
+            $.get(modal.data('action-'+trigger.data('action')), {'id': payment.val()}, function(response) {
+               modal.find('.modal-body').html(response);
+            });
+         }
+      }).on('hide.bs.modal', function() {
+         const modal = $(this);
+         modal.find('.modal-body').html('<div class="preloader"></div>');
+      });
+});
+//]]> 
+</script>
+{/literal}

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/responsive/basket_summary.html

@@ -0,0 +1,65 @@
+<div class="panel panel-default">
+   <div class="panel-heading"><h3 class="panel-title">{__ text="Koszty"}</h3></div>
+   <div class="panel-body form-horizontal" data-equalizer-watch>
+      <div class="form-group">
+         <label class="col-xs-6 control-label">{__ text="Wartość koszyka"}:</label>
+         <div class="col-xs-6">
+            <p class="form-control-static">{$basket_cost|st_currency_format:false}</p>
+         </div>   
+      </div>   
+      <div class="form-group">
+         <label class="col-xs-6 control-label">{__ text="Koszt dostawy"}:</label>
+         <div class="col-xs-6">
+            <p class="form-control-static">{$delivery_cost|st_currency_format:false}</p>
+         </div>   
+      </div>  
+      {if $basket_discount > 0} 
+         <div class="form-group">
+            <label class="col-xs-6 control-label">{__ text="Rabat" langCatalogue="stOrder"} ({$basket_discount_name}):</label>
+            <div class="col-xs-6">
+               <p class="form-control-static">-{$basket_discount|st_currency_format}</p>
+            </div>   
+         </div>  
+      {/if}       
+      {if $paid > 0} 
+         <div class="form-group">
+            <label class="col-xs-6 control-label">{__ text="Zapłacono"}:</label>
+            <div class="col-xs-6">
+               <p class="form-control-static">-{$paid|st_currency_format}</p>
+            </div>   
+         </div>  
+      {/if} 
+      {if $points_value != 0} 
+         <div class="form-group">
+            <label class="col-xs-6 control-label">{__ text="Koszt"} {$points_shortcut}:</label>
+            <div class="col-xs-6">
+               <p class="form-control-static">{$points_value} {$points_shortcut}</p>
+            </div>   
+         </div>  
+      {/if}       
+      <div class="form-group">
+         <label class="col-xs-6 control-label">{__ text="Razem do zapłaty"}:</label>
+         <div class="col-xs-6">
+            <p class="form-control-static">{$total_amount|st_currency_format}</p>
+         </div>   
+      </div>       
+      
+      {if $basket_discount_message}
+         <div class="alert alert-info" role="alert">
+            {$basket_discount_message}
+         </div>
+      {/if} 
+      
+      <div style="margin-top: 5px;padding: 0 5px;">             
+           {if $discount_coupon_code}             
+               {$discount_coupon_code}                                                                          
+            {/if}
+                
+            {if $gift_card}                
+                {$gift_card}                                           
+            {/if}                                                                   
+      </div>         
+   </div>
+</div>
+
+{st_get_partial partial="stPayment/payment_info_modal" amount=$total_amount}

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/responsive/choose_delivery_point.html

@@ -0,0 +1 @@
+{$content}

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/responsive/express_delivery.html

@@ -0,0 +1,11 @@
+<div class="checkbox">
+    <label>
+
+        <input type="checkbox" name="express_delivery"{if $selected} checked{/if}>
+        <span data-toggle="tooltip" data-placement="top" title="{$help|escape}">
+            {__ text="Dostawa ekspresowa"}
+            <span class="glyphicon glyphicon-info-sign"></span>
+            <span class="cost">+{$delivery->getExpressDeliveryCost(true, true)|st_currency_format}</span>
+        </span>
+    </label>
+</div>

plugins/stDeliveryPlugin/modules/stDeliveryFrontend/templates/theme/responsive/weekend_delivery.html

@@ -0,0 +1,7 @@
+<div class="checkbox">
+    <label>
+        <input type="checkbox" name="weekend_delivery"{if $selected} checked{/if}>
+        {__ text="Dostawa w weekend"}
+        <span class="cost">+{$delivery->getWeekendDeliveryCost(true, true)|st_currency_format}</span>
+    </label>
+</div>