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

Merge branch 'ticket-White_2' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-10-31 13:11:14 +01:00
commit ef54c025ad
4 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/labelgenerate/AdminLabelGenerate.php
View File

@ -476,7 +476,7 @@ class AdminLabelGenerate extends AdminTab {
$helperForm->_inputSwitch = true;
$id_sale_options = array();
foreach(Sale::getSales(NULL, NULL, NULL, NULL, FALSE, FALSE, '`date_start` DESC', 500) as $sale) {
foreach(Sale::getSalesBack(NULL, NULL, NULL, NULL, FALSE, FALSE, '`date_start` DESC', 500) as $sale) {
$id_sale_options[(int)$sale->id] = array(

2
modules/privatesales/cron.php
View File

@ -5,7 +5,7 @@ $_SERVER['HTTP_HOST'] = 'www.bebeboutik.com';
include(dirname(__FILE__).'/../../config/config.inc.php');
include(dirname(__FILE__).'/Sale.php');
$sales = Sale::getSales(TRUE, NULL, NULL, FALSE);
$sales = Sale::getSalesBack(TRUE, NULL, NULL, FALSE);
$file = fopen('lastupdate.txt', 'w');
fwrite($file, date('Ymd His'));

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

@ -7548,3 +7548,24 @@ div.addresses ul.address.item {
.ant_support{
padding:0px!important;
}
#privatesales_block #block_sales_home .content > ul li,
#privatesales_block #block_sales_home_future .content > ul li,
#privatesales_block #block_sales_list .content > ul li {
list-style-type: none;
width: 308px;
height: 28px !important;
padding: 296px 0 0 0;
display: inline-block;
margin: 0 0 30px 23px;
cursor: pointer;
vertical-align: top;
border:1px solid #CCCCCC;
}
#privatesales_block #block_sales_home .content > ul li#list_gc,
#privatesales_block #block_sales_home .content > ul li#list_invite{
border: 1px solid transparent;
}
#privatesales_block #block_sales_home .content > ul li#list_gc li{
border: none;
}

4
themes/site/modules/privatesales/home.tpl
View File

@ -242,9 +242,9 @@
</div>
<div class="fb_block">
{if $cookie->id_lang == 2}
<iframe src="https://www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fbebeboutik&amp;width=271&amp;height=62&amp;colorscheme=light&amp;show_faces=false&amp;border_color&amp;stream=false&amp;header=false" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:271px; height:62px;" allowTransparency="true"></iframe>
<iframe src="https://www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fbebeboutik&amp;width=271&amp;height=80&amp;colorscheme=light&amp;show_faces=false&amp;border_color&amp;stream=false&amp;header=false" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:271px; height:80px;" allowTransparency="true"></iframe>
{elseif $cookie->id_lang == 3}
<iframe src="https://www.facebook.com/plugins/likebox.php?href=https://www.facebook.com/Beb%C3%A9-Boutik-ES-703873103075174/&amp;width=271&amp;height=62&amp;colorscheme=light&amp;show_faces=false&amp;border_color&amp;stream=false&amp;header=false" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:271px; height:62px;" allowTransparency="true"></iframe>
<iframe src="https://www.facebook.com/plugins/likebox.php?href=https://www.facebook.com/Beb%C3%A9-Boutik-ES-703873103075174/&amp;width=271&amp;height=80&amp;colorscheme=light&amp;show_faces=false&amp;border_color&amp;stream=false&amp;header=false" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:271px; height:80px;" allowTransparency="true"></iframe>
{/if}
</div>
</li>