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

fix conflicts

Browse Source
This commit is contained in:
Marion Muszynski 2017-04-13 12:32:44 +02:00
commit 35e33703b7
10 changed files with 209 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
adm/helpers/HelperFormBootstrap.php
View File

@ -51,7 +51,7 @@ class HelperFormBootstrap{
public function renderScript() {
$this->_script .= '<script type="text/javascript" src="'.__PS_BASE_URI__.'adm/helpers/includes/jquery.min.js"></script>';
$this->_script .= '<script type="text/javascript" src="'.__PS_BASE_URI__.'adm/helpers/includes/jquery-ui-1.8.20.custom.min.js"></script>';
$this->_script .= '<script type="text/javascript" src="'.__PS_BASE_URI__.'adm/helpers/includes/jquery-ui.min.js"></script>';
$this->_script .= '<script type="text/javascript" src="'.__PS_BASE_URI__.'adm/helpers/includes/js/bootstrap.min.js"></script>';
if ($this->_select2) {
$this->_script .= '<script type="text/javascript" src="'.__PS_BASE_URI__.'adm/helpers/includes/js/select2.full.min.js"></script>';
@ -629,7 +629,6 @@ class HelperFormBootstrap{
}
$default_value = (isset($p['default']) ? $p['default'] : '');
$disabled = ((isset($p['disabled']) && $p['disabled']) ? 'disabled="disabled"' : '');
$this->_html .= '
<div class="form-group '.(isset($p['class-group'])?$p['class-group']:'').'">
<label class="control-label '.(isset($p['label-class']) ? $p['label-class'] : '').'">'.$p['label']. ((isset($p['required']) && $p['required']) ? '<sup> *</sup>' : '') . '</label>

7
adm/helpers/includes/jquery-ui.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

25
adm/tabs/AdminCustomerThreads.php
View File

@ -1141,11 +1141,13 @@ class AdminCustomerThreads extends AdminTab
}
echo '<div style="margin-top:10px">';
Module::hookExec('rightColumnSav', array(
'customer' => $customer,
'customer_info' => $customer_info,
'order' => $order_thread)
);
if ($thread->id_customer) {
Module::hookExec('rightColumnSav', array(
'customer' => $customer,
'customer_info' => $customer_info,
'order' => $order_thread)
);
}
echo '</div>';
echo '</div>';
@ -1155,12 +1157,13 @@ class AdminCustomerThreads extends AdminTab
echo $this->displayMsgCustom($message);
}
echo '</div>';
$conversations = CustomerThread::getCustomerConversations((int)$customer->id,'ASC',(int)Tools::getValue('id_customer_thread'));
if(!empty($conversations)){
echo '<div>';
$this->displayOldMessages($conversations,$customer);
echo '</div>';
if ($thread->id_customer) {
$conversations = CustomerThread::getCustomerConversations((int)$customer->id,'ASC',(int)Tools::getValue('id_customer_thread'));
if(!empty($conversations)){
echo '<div>';
$this->displayOldMessages($conversations,$customer);
echo '</div>';
}
}
echo '</div>';

200
modules/ant_configurations/AdminAntConfigurations.php
View File

@ -462,111 +462,115 @@ class AdminAntConfigurations extends AdminTab
</div>
</div>';
if($cookie->id_employee == 1) {
$nb_credits = $this->getNbOrderToUpdate();
$helperForm->_forms = array(
array(
'action' => $base_link,
'title' => $this->l('Section Antadis'),
'class' => 'form-horizontal',
'class_div' => 'col-md-12',
'sections' => array(
array(
'class' => 'col-md-6',
'title' => $this->l('Actions diverses'),
'inputs' => array(
array(
'type' => 'submit',
'class' => 'btn-default',
'label-class' => 'col-md-6',
'input-class' => 'col-md-4',
'name' => 'submitUpdateLoyaltyOrders',
'label' => $this->l('Credit fidélité ').($nb_credits>0?'('.$nb_credits.')':'').' : ',
'value' => $this->l('Mettre à jour'),
),
array(
'type' => 'submit',
'class' => 'btn-default',
'label-class' => 'col-md-6',
'input-class' => 'col-md-4',
'name' => 'submitCleanMenuCache',
'label' => $this->l('Clean Menu :'),
'value' => $this->l('Regeneration'),
),
array(
'type' => 'simpleText',
'name' => 'carrier_dropshipping',
'label-class' => 'col-md-6',
'input-class' => 'col-md-4',
'label' => $this->l('Transporteur Dropshipping :'),
'default' => Configuration::get('ANT_CARRIER_DROP')
),
array(
'type' => 'simpleText',
'name' => 'carrier_domicile',
'label-class' => 'col-md-6',
'input-class' => 'col-md-4',
'label' => $this->l('Transporteur domicile :'),
'default' => Configuration::get('ANT_CARRIER_DOM')
),
array(
'type' => 'simpleText',
'name' => 'carriers_socol',
'label-class' => 'col-md-6',
'input-class' => 'col-md-4',
'label' => $this->l('Transporteur socol :'),
'default' => Configuration::get('ANT_CARRIERS_SOCOL')
),
array(
'type' => 'simpleText',
'name' => 'carriers_ooh',
'label-class' => 'col-md-6',
'input-class' => 'col-md-4',
'label' => $this->l('Transporteur OOH :'),
'default' => Configuration::get('ANT_CARRIERS_OOH')
),
$helperForm->_forms[] = array(
'action' => $base_link,
'title' => $this->l('Section Antadis'),
'class' => 'form-horizontal',
'class_div' => 'col-md-12',
'sections' => array(
array(
'class' => 'col-md-6',
'title' => $this->l('Actions diverses'),
'inputs' => array(
array(
'type' => 'submit',
'class' => 'btn-default',
'label-class' => 'col-md-6',
'input-class' => 'col-md-4',
'name' => 'submitUpdateLoyaltyOrders',
'label' => $this->l('Credit fidélité ').($nb_credits>0?'('.$nb_credits.')':'').' : ',
'value' => $this->l('Mettre à jour'),
),
array(
'type' => 'simpleText',
'name' => 'carrier_dropshipping',
'label-class' => 'col-md-6',
'input-class' => 'col-md-4',
'label' => $this->l('Transporteur Dropshipping :'),
'default' => Configuration::get('ANT_CARRIER_DROP')
),
array(
'type' => 'simpleText',
'name' => 'carrier_domicile',
'label-class' => 'col-md-6',
'input-class' => 'col-md-4',
'label' => $this->l('Transporteur domicile :'),
'default' => Configuration::get('ANT_CARRIER_DOM')
),
array(
'type' => 'simpleText',
'name' => 'carriers_socol',
'label-class' => 'col-md-6',
'input-class' => 'col-md-4',
'label' => $this->l('Transporteur socol :'),
'default' => Configuration::get('ANT_CARRIERS_SOCOL')
),
array(
'type' => 'simpleText',
'name' => 'carriers_mr',
'label-class' => 'col-md-6',
'input-class' => 'col-md-4',
'label' => $this->l('Transporteur MR :'),
'default' => Configuration::get('ANT_CARRIERS_MR')
),
array(
'type' => 'simpleText',
'name' => 'carriers_ooh',
'label-class' => 'col-md-6',
'input-class' => 'col-md-4',
'label' => $this->l('Transporteur OOH :'),
'default' => Configuration::get('ANT_CARRIERS_OOH')
),
array(
'type' => 'simpleText',
'name' => 'carriers_special',
'label-class' => 'col-md-6',
'input-class' => 'col-md-4',
'label' => $this->l('Transporteur speciaux :'),
'default' => Configuration::get('ANT_CARRIERS_SPECIAL')
),
),
array(
'class' => 'col-md-6',
'title' => $this->l('Mettre à jour PS Cache'),
'inputs' => array(
array(
'label' => $this->l('PS Cache : '),
'type' => 'select2',
'class-select' => '',
'name' => 'id_category',
'options' => $id_category_options,
),
),
array(
'class' => 'col-md-6',
'title' => $this->l('Mettre à jour PS Cache'),
'inputs' => array(
array(
'label' => $this->l('PS Cache : '),
'type' => 'select2',
'class-select' => '',
'name' => 'id_category',
'options' => $id_category_options,
),
'actions' => array(
array(
'type' => 'submit',
'class' => 'btn-default',
'name' => 'submitShowProductCacheSale',
'value' => $this->l('Voir'),
),
array(
'type' => 'submit',
'class' => 'btn-primary',
'name' => 'submitUpdateCacheSale',
'value' => $this->l('Ré-Associer'),
),
),
'actions-class' => 'text-right',
),
'actions' => array(
array(
'type' => 'submit',
'class' => 'btn-default',
'name' => 'submitShowProductCacheSale',
'value' => $this->l('Voir'),
),
array(
'type' => 'submit',
'class' => 'btn-primary',
'name' => 'submitUpdateCacheSale',
'value' => $this->l('Ré-Associer'),
),
),
'actions-class' => 'text-right',
),
'actions' => array(
array(
'type' => 'submit',
'class' => 'btn-primary',
'name' => 'submitUpdateConfigurations',
'value' => $this->l('Mettre à jour les configurations')
)
),
'actions-class' => 'text-center',
)
),
'actions' => array(
array(
'type' => 'submit',
'class' => 'btn-primary',
'name' => 'submitUpdateConfigurations',
'value' => $this->l('Mettre à jour les configurations')
)
),
'actions-class' => 'text-center',
);
}
$helperForm->_js .= '

34
modules/fluxcatalogue/flux.php
View File

@ -17,17 +17,17 @@ $catalog = new Catalog();
$catalog->displayContent($id_lang);
// $catalog->debug();
class Catalog
class Catalog
{
private $_xml;
private $_debug;
public $id_lang;
public $currentTime;
public function __construct(){
$this->_xml ="";
}
public function setContent($id_lang)
{
global $cookie;
@ -38,13 +38,13 @@ class Catalog
} else if ($id_lang == 3) {
$site_version = 'es';
}
if (Tools::getValue('future') && Tools::getValue('future') == 1)
$sales = Sale::getSales(TRUE, NULL, NULL, TRUE, FALSE, Configuration::get('PRIVATESALES_SHOW_PUBLIC'), '`date_start` DESC', NULL, $filter_type, $site_version);
else
$sales = Sale::getSales(TRUE, NULL, NULL, 'current', FALSE, Configuration::get('PRIVATESALES_SHOW_PUBLIC'), '`date_start` DESC', NULL, $filter_type, $site_version);
foreach ($sales as $sale) {
foreach ($sales as $sale) {
$sql = 'SELECT value FROM '._DB_PREFIX_.'privatesale_extrafield_sale WHERE id_field = 2 AND id_lang = '.(int) $id_lang.' AND id_sale = ' . $sale->id;
if ($value = Db::getInstance()->getValue($sql)){
$sale->reduction = $value;
@ -55,7 +55,7 @@ class Catalog
$this->setXml($sales, false, $id_lang);
}
public function displayContent($id_lang)
{
$this->setContent($id_lang);
@ -65,19 +65,19 @@ class Catalog
public function setXml($items, $rss=false, $id_lang){
$this->_xml = '<?xml version="1.0" encoding="UTF-8" ?>';
// Catalog
$this->_xml .= '<catalogue>';
//Shop details
$this->_xml .= '<infos_boutique>';
$this->_xml .= '<logo>http://www.bebeboutik.com/img/logo.png</logo>';
$this->_xml .= '<logo>https://www.bebeboutik.com/img/logo.png</logo>';
$this->_xml .= '<nom>bebeboutik.com</nom>';
if (Tools::getValue('partenaire')
if (Tools::getValue('partenaire')
&& Tools::getValue('partenaire') == "family_deal") {
$this->_xml .= '<url><![CDATA[http://www.bebeboutik.com/invite/MjAxMy0xMC0y=02bj5yapRXdvJWZiVmYAxWYlRWL5xWatFmZ&lp=mosaique-enfant]]></url>';
$this->_xml .= '<url><![CDATA[https://www.bebeboutik.com/invite/MjAxMy0wNC0z=02bj5yapRXdvJWZiVmYANWasJWdwtCdjFGdu92Y&lp=mosaique-enfant?utm_source=publicidees&utm_medium=CPL]]></url>';
} else {
$this->_xml .= '<url>www.bebeboutik.com</url>';
$this->_xml .= '<url>https://www.bebeboutik.com</url>';
}
$this->_xml .= '</infos_boutique>';
@ -90,13 +90,13 @@ class Catalog
$this->_xml .= '<date_debut>'.$item->date_start.'</date_debut>';
$this->_xml .= '<date_fin>'.$item->date_end.'</date_fin>';
$this->_xml .= '<reduction>'.$item->reduction.'</reduction>';
$this->_xml .= '<image_vente>http://www.bebeboutik.com/modules/privatesales/img/'.$item->id.'/liston_'.(int) $id_lang.'.jpg</image_vente>';
$this->_xml .= '<image_vente>https://www.bebeboutik.com/modules/privatesales/img/'.$item->id.'/liston_'.(int) $id_lang.'.jpg</image_vente>';
$this->_xml.='</vente>';
}
$this->_xml .= '</catalogue>';
}
}

36
modules/fluxcatalogue/rss.php
View File

@ -17,17 +17,17 @@ $catalog = new Catalog();
$catalog->displayContent($id_lang);
// $catalog->debug();
class Catalog
class Catalog
{
private $_xml;
private $_debug;
public $id_lang;
public $currentTime;
public function __construct(){
$this->_xml ="";
}
public function setContent($id_lang)
{
global $cookie;
@ -38,13 +38,13 @@ class Catalog
} else if ($id_lang == 3) {
$site_version = 'es';
}
if (Tools::getValue('future') && Tools::getValue('future') == 1)
$sales = Sale::getSales(TRUE, NULL, NULL, TRUE, FALSE, Configuration::get('PRIVATESALES_SHOW_PUBLIC'), '`date_start` DESC', NULL, $filter_type, $site_version);
else
$sales = Sale::getSales(TRUE, NULL, NULL, 'current', FALSE, Configuration::get('PRIVATESALES_SHOW_PUBLIC'), '`date_start` DESC', NULL, $filter_type, $site_version);
foreach ($sales as $sale) {
foreach ($sales as $sale) {
$sql = 'SELECT value FROM '._DB_PREFIX_.'privatesale_extrafield_sale WHERE id_field = 2 AND id_lang = '.(int) $id_lang.' AND id_sale = ' . $sale->id;
if ($value = Db::getInstance()->getValue($sql)){
$sale->reduction = $value;
@ -55,7 +55,7 @@ class Catalog
$this->setXml($sales, false, $id_lang);
}
public function displayContent($id_lang)
{
$this->setContent($id_lang);
@ -65,19 +65,19 @@ class Catalog
public function setXml($items, $rss=false, $id_lang){
$this->_xml = '<?xml version="1.0" encoding="UTF-8" ?>';
// Catalog
$this->_xml .= '<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><catalogue>';
$this->_xml .= '<rss xmlns:atom="https://www.w3.org/2005/Atom" version="2.0"><catalogue>';
//Shop details
$this->_xml .= '<infos_boutique>';
$this->_xml .= '<logo>http://www.bebeboutik.com/img/logo.png</logo>';
$this->_xml .= '<logo>https://www.bebeboutik.com/img/logo.png</logo>';
$this->_xml .= '<nom>bebeboutik.com</nom>';
if (Tools::getValue('partenaire')
if (Tools::getValue('partenaire')
&& Tools::getValue('partenaire') == "family_deal") {
$this->_xml .= '<url><![CDATA[http://www.bebeboutik.com/invite/MjAxMy0xMC0y=02bj5yapRXdvJWZiVmYAxWYlRWL5xWatFmZ&lp=mosaique-enfant]]></url>';
$this->_xml .= '<url><![CDATA[https://www.bebeboutik.com/invite/MjAxMy0wNC0z=02bj5yapRXdvJWZiVmYANWasJWdwtCdjFGdu92Y&lp=mosaique-enfant]]></url>';
} else {
$this->_xml .= '<url>www.bebeboutik.com</url>';
$this->_xml .= '<url>https://www.bebeboutik.com</url>';
}
$this->_xml .= '</infos_boutique>';
@ -90,13 +90,13 @@ class Catalog
$this->_xml .= '<date_debut>'.$item->date_start.'</date_debut>';
$this->_xml .= '<date_fin>'.$item->date_end.'</date_fin>';
$this->_xml .= '<reduction>'.$item->reduction.'</reduction>';
$this->_xml .= '<image_vente>http://www.bebeboutik.com/modules/privatesales/img/'.$item->id.'/liston_'.(int) $id_lang.'.jpg</image_vente>';
$this->_xml .= '<image_vente>https://www.bebeboutik.com/modules/privatesales/img/'.$item->id.'/liston_'.(int) $id_lang.'.jpg</image_vente>';
$this->_xml.='</vente>';
}
$this->_xml .= '</catalogue></rss>';
}
}

2
modules/logistics/AdminLogistics.php
View File

@ -131,7 +131,7 @@ class AdminLogistics extends AdminTab {
.$this->isoreplace($data)
.'Q0001'."\n" // Number of labels to print
.'E'."\n" // End*/
$data
$data
)))
);

10
modules/privatesales/AdminPrivateSalesSales.php
View File

@ -1,8 +1,8 @@
<?php
include_once(_PS_ROOT_DIR_.'/modules/privatesales/Sale.php');
require_once(_PS_ROOT_DIR_.'/modules/privatesales_delay/saledelay.php');
require_once(PS_ADMIN_DIR . '/helpers/HelperFormBootstrap.php');
require_once('../modules/privatesales_delay/saledelay.php');
class AdminPrivateSalesSales extends AdminTab {
@ -324,8 +324,8 @@ class AdminPrivateSalesSales extends AdminTab {
// 'label_off' => '<span class="anticon anticon-user-minus text-rose"></span>',
'label-class' => 'col-sm-8',
'input-class' => 'col-sm-4',
'default' => ($this->cursale!==NULL?($this->cursale->logout==0?0:1):0),
'checked' => ($this->cursale!==NULL?($this->cursale->logout==0?0:1):0),
'default' => ($this->cursale!==NULL?($this->cursale->logout==0?0:1):1),
'checked' => ($this->cursale!==NULL?($this->cursale->logout==0?0:1):1),
'required' => true,
);
echo $helperForm->generateInput($input);
@ -864,7 +864,7 @@ class AdminPrivateSalesSales extends AdminTab {
</script>
<?php
//echo '<script type="text/javascript" src="../js/jquery/jquery-ui.min.js"></script>
//echo '<script type="text/javascript" src="../js/jquery/jquery-ui.min.js"></script>';
echo '<script language="javascript" type="text/javascript">
<!--
@ -1014,7 +1014,7 @@ class AdminPrivateSalesSales extends AdminTab {
<ul class="dropdown-menu dropdown-menu-right">
'.($export? '
<li>
<a onclick="window.open(this.href); return false;" href="'.__PS_BASE_URI__.'modules/exports/exports/privatesales.php?id_sale='.$sale->id.'&amp;token='.Tools::encrypt('PrivateSalesDirectExtract'.$sale->id).'">
<a onclick="window.open(this.href); return false;" href="'.__PS_BASE_URI__.'modules/exports/exports/privatesales.php?id_sale='.$sale->id.'&amp;adtoken='.Tools::encrypt('PrivateSalesDirectExtract'.$sale->id).'">
<i class="glyphicon glyphicon-new-window"></i> Exporter
</a>
</li>':'').'

4
override/controllers/ParentOrderController.php
View File

@ -160,10 +160,12 @@ class ParentOrderController extends ParentOrderControllerCore {
if($dropshipping && $carrier['id_carrier'] == $carrier_dropshipping) {
$carrier_drop = $carrier;
}
if (in_array((int)$carrier['id_carrier'], $config_carrier_socol)) {
if ($carrier['external_module_name'] == "soflexibilite") {
if($address->id_country == 3) {
$carrier['delay'] = str_replace(array("France",'10 000','8 000'),array("Belgique",'des','des'),$carrier['delay']);
}
}
if (in_array((int)$carrier['id_carrier'], $config_carrier_socol)) {
$carriers_socol[] = $carrier;
}
if(in_array((int)$carrier['id_carrier'], $config_carrier_mr)

79
themes/site/css/style.css
View File

@ -7200,43 +7200,6 @@ table#carrierTable tbody td {
width: 700px;
}
/* Mondial Relay */
#fancybox-content .mr_relay_validation a {
display: inline-block;
color: #ffffff;
background: #42b82f;
font-size: 14px;
padding: 10px 20px;
text-decoration: none;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
font-weight: bold;
}
#relay_point_selected_box{
border: 1px solid #BDC2C9;
padding: 5px;
background-color: #F1F2F4;
}
#relay_point_selected_box .mr_field.name {
margin-top: 10px;
color: #514c8c!important;
font-size: 1.2em;
line-height: 1.3em;
font-weight: bold;
}
#relay_point_selected_box .mr_relay_info{
padding: 20px;
}
#relay_point_selected_box .mr_relay_update_relay {
text-align: center;
}
#relay_point_selected_box .mr_relay_update_relay span a{
font-size: 16px
}
/* random product */
#category .random{
top: 115px;
@ -7306,7 +7269,7 @@ table#carrierTable tbody td {
position: relative;
}
#cart_block_list .remove_link{
display: inline-block;
display: none;
position: absolute;
height: 13px;
width: 13px;
@ -7326,3 +7289,43 @@ table#carrierTable tbody td {
text-decoration: none;
}
#order .cart_quantity_delete{
display:none;
}
/* Mondial Relay */
#fancybox-content .mr_relay_validation a {
display: inline-block;
color: #ffffff;
background: #42b82f;
font-size: 14px;
padding: 10px 20px;
text-decoration: none;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
font-weight: bold;
}
#relay_point_selected_box{
border: 1px solid #BDC2C9;
padding: 5px;
background-color: #F1F2F4;
}
#relay_point_selected_box .mr_field.name {
margin-top: 10px;
color: #514c8c!important;
font-size: 1.2em;
line-height: 1.3em;
font-weight: bold;
}
#relay_point_selected_box .mr_relay_info{
padding: 20px;
}
#relay_point_selected_box .mr_relay_update_relay {
text-align: center;
}
#relay_point_selected_box .mr_relay_update_relay span a{
font-size: 16px
}