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

recette divers

Browse Source
This commit is contained in:
Thibault GUILLAUME 2015-10-20 17:36:20 +02:00
parent 472c3811a2
commit 69ef2a7c37
5 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
migrations/20151020131138_cart_rule_cms_pack_migration.php Normal file
View File

@ -0,0 +1,33 @@
<?php
use Phinx\Migration\AbstractMigration;
class CartRuleCmsPackMigration extends AbstractMigration
{
/**
* Change Method.
*
* Write your reversible migrations using this method.
*
* More information on writing migrations is available here:
* http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
*
* The following commands can be used in this method and Phinx will
* automatically reverse them when rolling back:
*
* createTable
* renameTable
* addColumn
* renameColumn
* addIndex
* addForeignKey
*
* Remember to call "create()" or "update()" and NOT "save()" when working
* with the Table class.
*/
public function change()
{
$table = $this->table('ps_cms_pack');
$table->addColumn('id_cart_rule', 'integer', array('after' => 'title'))->update();
}
}

1
modules/cmsps/views/templates/admin/cms.tpl
View File

@ -12,6 +12,7 @@
<p>
<a href="{$link->getAdminLink('AdminOrders')}" class="btn btn-default">+ Voir les commandes</a>
<a href="{$link->getAdminLink('AdminCustomers')}" class="btn btn-default">+ Voir les clients</a>
<a href="{$link->getAdminLink('AdminCmsPsExport')}" class="btn btn-default">+ Export newsletter</a>
</p>
</div>
<div class="row" style="margin-top:75px">

1
themes/toutpratique/css/global.css
View File

@ -2890,6 +2890,7 @@ body .ac_results {
border: 1px solid #dfdfdf;
border-radius: 3px;
padding: 30px;
overflow: auto;
}
#shopping-cart #calcul .discount_form {
margin-top: 20px;

22
themes/toutpratique/product-list-colors.tpl
View File

@ -23,14 +23,16 @@
* International Registered Trademark & Property of PrestaShop SA
*}
<ul class="color_to_pick_list clearfix">
{foreach from=$colors_list item='color'}
{assign var='img_color_exists' value=file_exists($col_img_dir|cat:$color.id_attribute|cat:'.jpg')}
<li>
<a href="{$link->getProductLink($color.id_product, null, null, null, null, null, $color.id_product_attribute)|escape:'html':'UTF-8'}" id="color_{$color.id_product_attribute|intval}" class="color_pick"{if !$img_color_exists && isset($color.color) && $color.color} style="background:{$color.color};"{/if}>
{if $img_color_exists}
<img src="{$img_col_dir}{$color.id_attribute|intval}.jpg" alt="{$color.name|escape:'html':'UTF-8'}" title="{$color.name|escape:'html':'UTF-8'}" width="20" height="20" />
{/if}
</a>
</li>
{/foreach}
{if $colors_list}
{foreach from=$colors_list item='color'}
{assign var='img_color_exists' value=file_exists($col_img_dir|cat:$color.id_attribute|cat:'.jpg')}
<li>
<a href="{$link->getProductLink($color.id_product, null, null, null, null, null, $color.id_product_attribute)|escape:'html':'UTF-8'}" id="color_{$color.id_product_attribute|intval}" class="color_pick"{if !$img_color_exists && isset($color.color) && $color.color} style="background:{$color.color};"{/if}>
{if $img_color_exists}
<img src="{$img_col_dir}{$color.id_attribute|intval}.jpg" alt="{$color.name|escape:'html':'UTF-8'}" title="{$color.name|escape:'html':'UTF-8'}" width="20" height="20" />
{/if}
</a>
</li>
{/foreach}
{/if}
</ul>

3
themes/toutpratique/shopping-cart.tpl
View File

@ -111,7 +111,7 @@
</div>
</form>
{if $displayVouchers}
<div class="col-lg-12 col-md-12 discount_form" style="display:none;">
<div class="col-lg-12 col-md-12 discount_form">
<p id="title" class="col-lg-12 col-md-12 title-offers"><u>{l s='Take advantage of our exclusive offers:'}</u></p>
<div id="display_cart_vouchers" class="col-lg-12 col-md-12 ">
{foreach $displayVouchers as $voucher}
@ -126,7 +126,6 @@
{/if}
{/if}
<div class="col-md-offset-1 col-md-7 prices">
{if sizeof($discounts)}
<div class="table-row row0 code-promo">
{foreach $discounts as $discount}