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

fix conflict

Browse Source
This commit is contained in:
Marion Muszynski 2016-11-14 14:20:50 +01:00
commit 40497ffb14
4 changed files with 80 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/ant_support_form/support.php
View File

@ -217,6 +217,9 @@ if (Tools::isSubmit('submitMessage')) {
else
$errors[] = Tools::displayError('An error occurred while sending message.');
}
// Module::hookExec('ant_alert', array()); // @ToDo - uncomment it
if (count($errors) > 1)
array_unique($errors);
}

2
modules/ant_support_form/support.tpl
View File

@ -3,7 +3,7 @@
{capture name=path}{l s='Contact' mod='ant_support_form'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"}
<h1>{l s='Customer Service' mod='ant_support_form'} - {if isset($customerThread) && $customerThread}{l s='Your reply' mod='ant_support_form'}{elseif isset($subject)}{$subject}{else}{l s='Contact us' mod='ant_support_form'}{/if}</h1>
<h1>{l s='Customer Service' mod='ant_support_form'} - {if isset($customerThread) && $customerThread}{l s='Your reply' mod='ant_support_form'}{else}{l s='Contact us' mod='ant_support_form'}{/if}</h1>
{if isset($confirmation)}
<p class="success">{l s='Your message has been successfully sent to our team.' mod='ant_support_form'}</p>

2
modules/privatesales/Sale.php
View File

@ -1653,7 +1653,7 @@ class Sale {
public function buildCategoryCache() {
$categories = Sale::flatRecurseCategory($this->id_category);
mail('marion@antadis.com', '[BBB] Creation category - buildCategoryCache', http_build_query($categories,'',', ')); // check for bad behaviour
//mail('marion@antadis.com', '[BBB] Creation category - buildCategoryCache', http_build_query($categories,'',', ')); // check for bad behaviour
Db::getInstance()->Execute('
DELETE FROM `'._DB_PREFIX_.'privatesale_category`
WHERE `id_sale` = '.$this->id

76
themes/site_mobile/css/style.css
View File

@ -1334,7 +1334,7 @@ body#index #columns #privatesales_block .delivery_delay{
text-align: right;
}
body#index #columns #privatesales_block .delivery_delay img{
width: 50%;
width: 100%;
}
body#index #columns #privatesales_block ul li a.img_link img,
body#trailer #columns a.img_link img{
@ -5002,3 +5002,77 @@ body#product #best-sellers_block_product{
#order #center_column #HOOK_PAYMENT div.payment_paybox .account_payment .title {
text-align: center;
}
/** Module Ant_support help.php && ant_support_form support.tpl **/
#module-ant_support-help h1,
#module-ant_support_form-support h1{
background: #fff;
color: #504c89;
font-family: Georgia;
font-style: italic;
margin-bottom: 10px;
font-size: 21px;
font-weight: normal;
padding: 10px;
text-align: center;
position: relative;
-webkit-box-shadow: 0 5px 3px -3px #ccc;
-moz-box-shadow: 0 5px 3px -3px #ccc;
box-shadow: 0 5px 3px -3px #ccc;
}
#module-ant_support_form-support h1{
padding: 14px;
}
#module-ant_support-help h2{
font-size:20px;
color: #504c89;
text-align: center;
}
#module-ant_support-help h4 {
margin-top: 10px;
background: #fff;
padding: 5px;
-webkit-box-shadow: 0 5px 3px -3px #ccc;
-moz-box-shadow: 0 5px 3px -3px #ccc;
box-shadow: 0 5px 3px -3px #ccc;
}
#module-ant_support-help div.ui-accordion-content{
font-size: 14px;
background: #fff;
padding: 10px;
}
#module-ant_support_form-support #center_column textarea{
width: 100%!important;
}
#module-ant_support_form-support #center_column p.text,
#module-ant_support_form-support #center_column p.select{
margin-bottom: 15px;
}
#module-ant_support_form-support #center_column #products p{
margin-bottom: 10px;
}
#module-ant_support_form-support #center_column #products p:after {
content: '';
display: block;
clear: both;
}
#module-ant_support_form-support #center_column label img {
float: left;
}
#module-ant_support_form-support #center_column p input[type="checkbox"]{
float: left;
}
#module-ant_support_form-support #center_column p.submit .button_large {
margin-top:20px;
background: #565485;
width: 100%;
height: 42px;
text-shadow: 0px -1px 0px #6E6E6E;
text-decoration: none;
text-align: center;
color: #ffffff !important;
font-size: 16px;
text-transform: uppercase;
border: none;
border-bottom: 2px solid #5b5194;
}