antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-12591-MarketingModifications' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-03-03 13:21:23 +01:00
commit a6fe73118a
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adm/helpers/HelperFormBootstrap.php
View File

@ -703,8 +703,8 @@ class HelperFormBootstrap{
<label class="control-label ' . (isset($p['label-class']) && $p['label-class'] ? $p['label-class'] : '') . '">'.$p['label'].' </label>
<div class="' . (isset($p['input-class']) && $p['input-class'] ? $p['input-class'] : '') . '">';
foreach($p['options'] as $key => $option) {
$this->_html .= '<label class="radio-inline" for="'.$p['name'].'_'.$key.'">
<input type="radio" name="'.$p['name'].'" value="'.$option['value'].'" id="'.$p['name'] . '_' . $opt['value'].'"'.($option['checked']? ' checked="checked"' : '').' /> '.(isset($option['label']) && $option['label'] ?$option['label']:'').'
$this->_html .= '<label class="radio-inline" for="'.$p['name'].'_' . $option['value'].'">
<input type="radio" name="'.$p['name'].'" value="'.$option['value'].'" id="'.$p['name'] . '_' . $option['value'].'"'.($option['checked']? ' checked="checked"' : '').' /> '.(isset($option['label']) && $option['label'] ?$option['label']:'').'
</label>';
}
$this->_html .= '<div class="clearfix"></div>

2
modules/bulkupdate/AdminBulkUpdate.php
View File

@ -1248,7 +1248,7 @@ class AdminBulkUpdate extends AdminTab {
$products = array_unique($products);
$privatesale = Sale::getSaleFromCategory((int) $id_category);
$fname = date( "Ymd", strtotime($privatesale->date_start)).'-'.$privatesale->title[(int)$id_lang].'.csv';
$fname = date( "Ymd", strtotime($privatesale->date_start)).'-'.$privatesale->title[(int)$id_lang].'-'.$id_category.'.csv';
foreach(glob(dirname(__FILE__).'/*.csv') as $filename) {
if ($fname == $filename) {
unlink($filename);

2
modules/labelgenerate/models/generatebarcode.php
View File

@ -130,7 +130,7 @@ class GenerateBarcode {
for ($i=1; $i <= $quantity; $i++) {
$this->products[] = array(
'key' => ($id_product.'-'.$id_product_attribute),
'label' => ($name_combination . ' ' . $p['name']),
'label' => substr(($name_combination . ' ' . $p['name']),0,28),
'ref' => $ref,
'decli' => substr($name_combination,0,-1)
);

2
modules/privatesales_logistique/AdminPrivateSalesLogistique.php
View File

@ -970,7 +970,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
}
$products = array_unique($products);
$fname = date( "Ymd", strtotime($sale->date_start)).'-'.$sale->title[(int)$id_lang].'.csv';
$fname = date( "Ymd", strtotime($sale->date_start)).'-'.$sale->title[(int)$id_lang].'-'.$id_category.'.csv';
foreach(glob(dirname(__FILE__).'/*.csv') as $filename) {
if ($fname == $filename) {
unlink($filename);

2
themes/site/order-address.tpl
View File

@ -190,7 +190,7 @@
</ol>
</div>
{/if}
<form action="{$link->getPageLink($back_order_page, true)}" method="post">
<form action="{$link->getPageLink($back_order_page, true)}?step=2" method="post">
{else}
<h2>1. {l s='Addresses'}</h2>
<div id="opc_account" class="opc-main-block">

2
themes/site/order-carrier.tpl
View File

@ -93,7 +93,7 @@
{include file="$tpl_dir./errors.tpl"}
<form id="form" action="{$link->getPageLink('order.php', true)}" method="post" onsubmit="return submitCarrier(); return ((window.ga && ga.create)? !ga.loaded : true);">
<form id="form" action="{$link->getPageLink('order.php', true)}?step=3" method="post" onsubmit="return submitCarrier(); return ((window.ga && ga.create)? !ga.loaded : true);">
{else}
<h2>2. {l s='Delivery methods'}</h2>
<div id="opc_delivery_methods" class="opc-main-block">

2
themes/site_mobile/order-address.tpl
View File

@ -188,7 +188,7 @@
</ol>
</div>
{/if}
<form action="{$link->getPageLink($back_order_page, true)}" method="post" class="form_address">
<form action="{$link->getPageLink($back_order_page, true)}?step=2" method="post" class="form_address">
{else}
<h2>1. {l s='Addresses'}</h2>
<div id="opc_account" class="opc-main-block">

2
themes/site_mobile/order-carrier.tpl
View File

@ -90,7 +90,7 @@
{include file="$tpl_dir./errors.tpl"}
<form id="form" action="{$link->getPageLink('order.php', true)}" method="post" onsubmit="return submitCarrier(); return ((window.ga && ga.create)? !ga.loaded : true);">
<form id="form" action="{$link->getPageLink('order.php', true)}?step=3" method="post" onsubmit="return submitCarrier(); return ((window.ga && ga.create)? !ga.loaded : true);">
{else}
<h2>2. {l s='Delivery methods'}</h2>
<div id="opc_delivery_methods" class="opc-main-block">