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-02-07 16:35:59 +01:00
commit eeac92d0ef
10 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/ant_support_form/support.php
View File

@ -56,7 +56,7 @@ if (Tools::isSubmit('submitMessage')) {
$errors[] = Tools::displayError('Please select a subject on the list.');
elseif (($id_contact = (int)(Tools::getValue('id_contact'))) && $id_contact == 9 && !Tools::getValue('id_reason'))
$errors[] = Tools::displayError('Please select a reason on the list.');
elseif (($id_contact = (int)(Tools::getValue('id_contact'))) && ($id_contact == 9 || $id_contact == 1) && !Tools::getValue('id_order'))
elseif (($id_contact = (int)(Tools::getValue('id_contact'))) && ($id_contact == 9 || $id_contact == 1 || $id_contact == 2) && !Tools::getValue('id_order'))
$errors[] = Tools::displayError('Please enter/choose an order ID');
elseif (($id_contact = (int)(Tools::getValue('id_contact'))) && $id_contact == 1 && !Tools::getValue('id_products'))
$errors[] = Tools::displayError('Please choose a product');
@ -251,20 +251,29 @@ if (isset($_GET['id_contact']) && is_numeric($_GET['id_contact'])) {
case '1':
$allow_product = true;
$allow_order = true;
$allow_file = false;
break;
case '2':
$allow_order = true;
$allow_product = false;
$allow_file = true;
break;
case '9':
$allow_order = true;
$allow_product = false;
$allow_file = false;
break;
default:
$allow_product = false;
$allow_order = false;
$allow_file = false;
break;
}
$smarty->assign(array(
'id_contact' => $id_contact,
'allow_product' => $allow_product,
'allow_order' => $allow_order,
'allow_file' => $allow_file,
'subject' => $contact->name
));

4
modules/ant_support_form/support.tpl
View File

@ -142,13 +142,13 @@
</select>
</p>
{/if}
{*{if $fileupload == 1}
{if $allow_file == 1}
<p class="text">
<label for="fileUpload">{l s='Attach File' mod='ant_support_form'}</label>
<input type="hidden" name="MAX_FILE_SIZE" value="2000000" />
<input type="file" name="fileUpload" id="fileUpload" />
</p>
{/if}*}
{/if}
{if isset($reasons) && !empty($reasons)}
<p class="select">
<label for="id_reason">{l s='Reason' mod='ant_support_form'}</label>

2
modules/blockordersummary/blockordersummary.php
View File

@ -210,7 +210,7 @@ class BlockOrderSummary extends Module {
<div style="margin:10px auto;" class="styled-select semi-square bg-purple-light">
<select name="summary_id_order" id="summary_id_order" class="">';
foreach ($orders as $key => $order) {
echo '<option value="'.$order['id_order'].'" '.((int)$order['id_order'] == (int)$params['order']->id ? 'selected="selected"' : '').'">Commande #'.$order['id_order'].'</option>';
echo '<option value="'.$order['id_order'].'" '.((int)$order['id_order'] == (int)$params['order']->id ? 'selected="selected"' : '').'">Commande #'.$order['id_order'].' ('.date('d/m/Y',strtotime($order['date_add'])).')</option>';
}
echo '</select>
</div>

2
modules/logistics/AdminLogistics.php
View File

@ -668,7 +668,7 @@ class AdminLogistics extends AdminTab {
|| $.inArray(loaded.order.id_carrier, carriers_exapaq) > 0
|| $.inArray(loaded.order.id_carrier, carriers_mondialrelay) >= 0
)
&& $.inArray(parseInt(loaded.delivery_address.id_country), [1, 2, 3, 6, 8, 10, 12, 13, 17, 26, 40, 148, 245]) != -1) {
&& $.inArray(parseInt(loaded.delivery_address.id_country), [1, 2, 3, 6, 8, 10, 12, 13, 15, 17, 26, 40, 148, 245]) != -1) {
content += \'<label for="parcel_carrier">'.$this->l('Carrier').'</label><select onchange="changeCarrier();" id="parcel_carrier" name="parcel_carrier">\
';

5
modules/logistics/carriers/laposte/webservice_wsu.php
View File

@ -158,6 +158,9 @@ class Parcel {
if(!in_array($so_data['cecountry'], array('ES', 'BE', 'AD', 'MC', 'FR', 'GP', 'RE', 'MQ', 'YT', 'NC', 'PM', 'GF'))) {
$this->product_type = 'DOS';
}
if($so_data['cecountry'] == 'IT'){
$this->product_type = 'COLI';
}
$this->dst_address['email'] = $so_data['ceemail'];
if(empty($this->dst_address['email'])) {
@ -207,6 +210,8 @@ class Parcel {
if(strtolower($so_data['cecountry']) == 'sl') {
$this->dst_address['zipCode'] = (string) str_ireplace(array('SI-', 'SL-'), '', mb_substr($so_data['przipcode'], 0, 5));
} elseif(strtolower($so_data['cecountry']) == 'pt') {
$this->dst_address['zipCode'] = (string) $so_data['przipcode'];
} else {
$this->dst_address['zipCode'] = (string) mb_substr($so_data['przipcode'], 0, 5);
}

14
modules/philea_magistor/ajax.php
View File

@ -67,13 +67,25 @@ function getStepDestock(){
if(Tools::getValue('id_category')) {
$id_category = Tools::getValue('id_category');
$id_sale = Tools::getValue('id_sale');
// Getting 3 level of category
$categories = Category::getChildren($id_category, 2);
$id_categories = array((int)$id_category);
foreach ($categories as $category) {
$id_categories[] = (int)$category['id_category'];
if($subcats = Category::getChildren((int)$category['id_category'], 2)) {
foreach ($subcats as $subcat) {
$id_categories[] = (int)$subcat['id_category'];
}
}
}
$product_ids = array();
$sale_ids = array();
$products = Db::getInstance()->ExecuteS('
SELECT p.`id_product`, ps.`id_sale`
FROM `'._DB_PREFIX_.'product` p
LEFT JOIN `'._DB_PREFIX_.'product_ps_cache` ps ON (p.`id_product` = ps.`id_product`)
WHERE p.`id_category_default` = '.(int)$id_category.'
WHERE p.`id_category_default` IN ('.implode(',', $id_categories).')
');
foreach($products as $row) {
$product_ids[(int)$row['id_product']] = (int)$row['id_product'];

3
modules/trustedshopsbbb/models/TrustedshopBbbAsync.php
View File

@ -40,7 +40,8 @@ class TrustedShopBbbAsync extends ObjectModel
FROM `' . _DB_PREFIX_ . 'trustedshop_bbb_async` tba
JOIN `' . _DB_PREFIX_ . 'orders` o ON o.`id_order` = tba.`id_order`
JOIN `' . _DB_PREFIX_ . 'lang` l ON o.`id_lang` = l.`id_lang`
WHERE tba.`processed` = 0;
WHERE tba.`processed` = 0
LIMIT 0,1000;
');
}

5
modules/trustedshopsbbb/scripts/trustedshopscron.php
View File

@ -1,8 +1,7 @@
<?php
// $_SERVER['SERVER_NAME'] = 'www.bebeboutik.com';
// $_SERVER['HTTP_HOST'] = 'www.bebeboutik.com';
$_SERVER['HTTP_HOST'] = 'bebeboutik.local';
$_SERVER['SERVER_NAME'] = 'www.bebeboutik.com';
$_SERVER['HTTP_HOST'] = 'www.bebeboutik.com';
$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
$_SERVER['HTTP_PORT'] = 80;
global $protocol_content;

4
themes/site/contact-form.tpl
View File

@ -137,13 +137,13 @@
{literal}
<script>
$(function() {
if($("option:selected", $('#id_contact')).val() == 9 || $("option:selected", $('#id_contact')).val() == 1){
if($("option:selected", $('#id_contact')).val() == 9 || $("option:selected", $('#id_contact')).val() == 1 || $("option:selected", $('#id_contact')).val() == 2){
$('.overlay_bbb').fadeIn();
$('.box_waiting').fadeIn();
window.location = "{/literal}{$base_dir_ssl}{literal}modules/ant_support_form/support.php?id_contact="+$("option:selected", $('#id_contact')).val();
}
$('#id_contact').change(function() {
if($("option:selected", $('#id_contact')).val() == 9 || $("option:selected", $('#id_contact')).val() == 1){
if($("option:selected", $('#id_contact')).val() == 9 || $("option:selected", $('#id_contact')).val() == 1 || $("option:selected", $('#id_contact')).val() == 2){
$('.overlay_bbb').fadeIn();
$('.box_waiting').fadeIn();
window.location = "{/literal}{$base_dir_ssl}{literal}modules/ant_support_form/support.php?id_contact="+$("option:selected", $('#id_contact')).val();

4
themes/site_mobile/contact-form.tpl
View File

@ -141,13 +141,13 @@
{literal}
<script>
$(function() {
if($("option:selected", $('#id_contact')).val() == 9 || $("option:selected", $('#id_contact')).val() == 1){
if($("option:selected", $('#id_contact')).val() == 9 || $("option:selected", $('#id_contact')).val() == 1 || $("option:selected", $('#id_contact')).val() == 2){
$('.overlay_bbb').fadeIn();
$('.box_waiting').fadeIn();
window.location = "{/literal}{$base_dir_ssl}{literal}modules/ant_support_form/support.php?id_contact="+$("option:selected", $('#id_contact')).val();
}
$('#id_contact').change(function() {
if($("option:selected", $('#id_contact')).val() == 9 || $("option:selected", $('#id_contact')).val() == 1){
if($("option:selected", $('#id_contact')).val() == 9 || $("option:selected", $('#id_contact')).val() == 1 || $("option:selected", $('#id_contact')).val() == 2){
$('.overlay_bbb').fadeIn();
$('.box_waiting').fadeIn();
window.location = "{/literal}{$base_dir_ssl}{literal}modules/ant_support_form/support.php?id_contact="+$("option:selected", $('#id_contact')).val();