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

Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop

Browse Source
This commit is contained in:
Michael RICOIS 2017-11-28 10:15:07 +01:00
commit 3ae42bf73e
3 changed files with 102 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/ant_support_form/support.php
View File

@ -99,7 +99,7 @@ if (Tools::isSubmit('submitMessage')) {
if($id_contact == 9){
$id_order_state = Order::getCurrentIdState((int)Tools::getValue('id_order'));
if($id_order_state && in_array($id_order_state, array(4,17,5))) {
$id_contact = 1;
Tools::redirectLink('modules/ant_support_form/support.php?id_contact=1&id_order='.Tools::getValue('id_order'));
}
}

78
override/classes/ObjectModel.php Normal file
View File

@ -0,0 +1,78 @@
<?php
/*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision: 9535 $
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
abstract class ObjectModel extends ObjectModelCore
{
/**
* Override Antadis.
*
* Replacing self::displayFieldName by static::displayFieldName
* to be able to override ObjectModel::displayFieldName
*
* {@inheritdoc}
*/
public function validateController($htmlentities = true)
{
$errors = array();
/* Checking for required fields */
$fieldsRequired = array_merge($this->fieldsRequired, (isset(self::$fieldsRequiredDatabase[get_class($this)]) ? self::$fieldsRequiredDatabase[get_class($this)] : array()));
foreach ($fieldsRequired AS $field)
if (($value = Tools::getValue($field, $this->{$field})) == false AND (string)$value != '0')
if (!$this->id OR $field != 'passwd')
$errors[] = '<b>'.static::displayFieldName($field, get_class($this), $htmlentities).'</b> '.Tools::displayError('is required.');
/* Checking for maximum fields sizes */
foreach ($this->fieldsSize AS $field => $maxLength)
if (($value = Tools::getValue($field, $this->{$field})) AND Tools::strlen($value) > $maxLength)
$errors[] = '<b>'.static::displayFieldName($field, get_class($this), $htmlentities).'</b> '.Tools::displayError('is too long.').' ('.Tools::displayError('Maximum length:').' '.$maxLength.')';
/* Checking for fields validity */
foreach ($this->fieldsValidate AS $field => $function)
{
// Hack for postcode required for country which does not have postcodes
if ($value = Tools::getValue($field, $this->{$field}) OR ($field == 'postcode' AND $value == '0'))
{
if (!Validate::$function($value))
$errors[] = '<b>'.static::displayFieldName($field, get_class($this), $htmlentities).'</b> '.Tools::displayError('is invalid.');
else
{
if ($field == 'passwd')
{
if ($value = Tools::getValue($field))
$this->{$field} = Tools::encrypt($value);
}
else
$this->{$field} = $value;
}
}
}
return $errors;
}
}

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

@ -5124,20 +5124,21 @@ body#product #best-sellers_block_product{
*/
#product_list li div.productQuantityAlert{
text-align: center;
width: 250px;
/*width: 250px;*/
margin: 0 !important;
padding: 5px 0 !important;
/* background-color: #f49cc3;
box-shadow: 0px 5px 8px -3px #b5b1b1; */
background-color: #fff;
position: absolute;
/*position: absolute;*/
bottom: 0px;
left: 0;
}
.productQuantityAlert p{
color: #e36ea2;
color: #F45BB7;
font-family: 'Montserrat-Regular';
font-size: 12px;
font-weight: 600;
font-weight: 400;
}
/** Payment info module */
@ -5228,6 +5229,22 @@ body#product #best-sellers_block_product{
body#product div.sale_img img{
background: none;
}
body#product .product_title span {
font-family: 'Montserrat-Regular';
color: #333;
font-style: normal;
font-size: 14px;
}
body#product #primary_block div.show_price .price{
font-size: 20px;
font-family: 'Montserrat-Regular';
font-style: normal;
color: #7dc668;
}
body#product #primary_block div.show_price #reduction_percent{
color: #F45BB7;
font-size: 16px;
}
#product .product_info {
/* border-bottom: 1px solid #cac7be; */
padding: 0px 0px 15px;
@ -5252,7 +5269,7 @@ body#product div.sale_img img{
#product .product_info .info_3 .picto{ background-position: 0 -82px}
#product .product_info .info .pink{
color: #e36ea2;
color: #F45BB7;
}
h3.gift_title {
font-size: 13px;
@ -5290,7 +5307,7 @@ body#order-detail table#order-product tbody tr.item tr{
border-bottom: 0px;
}
body#order-detail table#order-product tbody tr.item tr.title span.price{
color:#e26ea2;
color:#F45BB7;
font-family: Georgia;
}
body#order-detail table#order-product tbody tr.item tr.title span.quantity{