diff --git a/themes/site/css/style.css b/themes/site/css/style.css index fe322b99..81c9457c 100755 --- a/themes/site/css/style.css +++ b/themes/site/css/style.css @@ -1373,6 +1373,17 @@ var, address { padding-left: 25px; border-bottom: 1px solid #CAC7BF; } +.safety-payment { + background: url('../img/picto_cadena.png') no-repeat left center; + height: 30px; + line-height: 30px; + font-size: 13px; + margin: 5px; + padding: 5px 0px; + /* padding-left: 40px; */ + padding-left: 25px; + border-bottom: 1px solid #CAC7BF; +} .economy { background: url('../img/picto_euro.png') no-repeat left center; height: 30px; @@ -1681,7 +1692,8 @@ body#page-404 .footer_links { float: left; background-color: #b5b1b1; } -#category .content #product_list .view_button:hover{ background-color: #E36EA2;} + +#category .content #product_list .view_button:hover{ background-color: #f45bb7;} #header { position: absolute; @@ -3008,7 +3020,6 @@ div.addresses ul.address li.address_title { display: none; z-index: 2; } - #product .info_coeur p{ color: #666666; font-size: 13px; diff --git a/themes/site/img/picto_cadena.png b/themes/site/img/picto_cadena.png new file mode 100644 index 00000000..6ab1b240 Binary files /dev/null and b/themes/site/img/picto_cadena.png differ diff --git a/themes/site/lang/es.php b/themes/site/lang/es.php index ac3f9b66..43deaa31 100755 --- a/themes/site/lang/es.php +++ b/themes/site/lang/es.php @@ -612,6 +612,7 @@ $_LANG['product_7bb63c7de5a5ee79356083a12f21e1e8'] = 'en lugar de'; $_LANG['product_d436eb0fd9de10b54a828ce6435f7e81'] = 'incluir'; $_LANG['product_f85524c253c150e88136df3999ac3fd4'] = 'de ecoparticipación'; $_LANG['product_fe3838c7c11aa406dd956566e17360d5'] = 'por'; +$_LANG['product_ba86db1f0fae110a74a77824e580ad5b'] = 'La talla indicada corresponde a los estándares españoles. En ocasiones, puede ser diferente de la talla que aparezca en el envoltorio del producto (talla europea).'; $_LANG['product_ea23e12cae068315b351f8d36d432d76'] = 'Referencia:'; $_LANG['product_2c59ffd0a6631127450d729861975719'] = 'Cantidad:'; $_LANG['product_07d814a3df5cfd2d637e77b215519034'] = 'Debe añadir al menos'; diff --git a/themes/site/product.tpl b/themes/site/product.tpl index 37b9a601..fbe6204f 100755 --- a/themes/site/product.tpl +++ b/themes/site/product.tpl @@ -401,7 +401,7 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}'; {/if}

quantity > $last_qties OR $product->quantity <= 0) OR $allow_oosp OR !$product->available_for_order OR $PS_CATALOG_MODE} style='display: none;'{/if} >{l s='Warning :'} {$product->quantity} {l s='items in stock'}

- + {if $product->online_only}
{l s='Coup de coeur'} diff --git a/themes/site/shopping-cart.tpl b/themes/site/shopping-cart.tpl index 5832b2ca..d59281ba 100755 --- a/themes/site/shopping-cart.tpl +++ b/themes/site/shopping-cart.tpl @@ -350,6 +350,9 @@

{l s='savings'} {displayPrice price=$economy} ({displayPrice price=$total_products_wt} {l s='instead of'} {displayPrice price=$strike_price})

{/if}

{l s='Shipping calculated its step 3'}

+{if $site_version == 'es'} +

{l s='Pago seguro, datos encriptados'}

+{/if} {* Define the style if it doesn't exist in the PrestaShop version*} {* Will be deleted for 1.5 version and more *} diff --git a/themes/site_mobile/css/style.css b/themes/site_mobile/css/style.css index 781684e5..f31596b8 100755 --- a/themes/site_mobile/css/style.css +++ b/themes/site_mobile/css/style.css @@ -2363,6 +2363,7 @@ body#order table#cart_summary tfoot tr.cart_total_voucher td{ } body#order #center_column #shipping_cost_third_step, +body#order #center_column #safety-payment, body#order #center_column #cart_voucher_toggle_wrapper { padding-left: 0; } @@ -2453,12 +2454,24 @@ body#order #cart_voucher{ padding:15px; font-family:Tahoma; } -body#order #shipping_cost_third_step{ +body#order #safety-payment{ + padding: 10px; +} +body#order #shipping_cost_third_step, +body#order #safety-payment{ border-top: 1px solid #ccc; color:#434D52; font-family:Tahoma; font-size:12px; } +body#order #safety-payment i{ + width: 25px; + height: 25px; + margin-right: 15px; + display: inline-block; + vertical-align: middle; + background: url('../img/picto_cadena.png') no-repeat center center; +} body#order #invite_credit label, body#order #cart_voucher label{ font-size:12px; @@ -4957,3 +4970,20 @@ body#product #best-sellers_block_product{ width: 200px; } */ +#product_list li div.productQuantityAlert{ + text-align: center; + width: 250px; + margin: 0 !important; + padding: 5px 0 !important; + /* background-color: #f49cc3; + box-shadow: 0px 5px 8px -3px #b5b1b1; */ + background-color: #fff; + position: absolute; + bottom: 0px; + left: 0; +} +.productQuantityAlert p{ + color: #e36ea2; + font-size: 12px; + font-weight: 600; +} diff --git a/themes/site_mobile/img/picto_cadena.png b/themes/site_mobile/img/picto_cadena.png new file mode 100644 index 00000000..6ab1b240 Binary files /dev/null and b/themes/site_mobile/img/picto_cadena.png differ diff --git a/themes/site_mobile/shopping-cart.tpl b/themes/site_mobile/shopping-cart.tpl index af506e6c..b911ebf2 100755 --- a/themes/site_mobile/shopping-cart.tpl +++ b/themes/site_mobile/shopping-cart.tpl @@ -275,6 +275,12 @@ {l s='Shipping cost will be calculated on the third step'}
+{if $site_version == 'es'} +
+ + {l s='Pago seguro, datos encriptados'} +
+{/if}
{$HOOK_SHOPPING_CART}
{* Define the style if it doesn't exist in the PrestaShop version*}