From d4f73213cbe6d5f3844aaf8c0331e13ef8201382 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Fri, 6 Dec 2013 12:12:21 +0100 Subject: [PATCH 1/5] // checkout - shopping cart W3C valid --- themes/default-bootstrap/shopping-cart.tpl | 172 +++++++++++---------- 1 file changed, 91 insertions(+), 81 deletions(-) diff --git a/themes/default-bootstrap/shopping-cart.tpl b/themes/default-bootstrap/shopping-cart.tpl index 5b2694ac3..59d0741cf 100644 --- a/themes/default-bootstrap/shopping-cart.tpl +++ b/themes/default-bootstrap/shopping-cart.tpl @@ -26,7 +26,11 @@ {capture name=path}{l s='Your shopping cart'}{/capture}

{l s='Shopping-cart summary'} - {if !isset($empty) && !$PS_CATALOG_MODE}{l s='Your shopping cart contains:'} {$productNumber} {if $productNumber == 1}{l s='product'}{else}{l s='products'}{/if}{/if} + {if !isset($empty) && !$PS_CATALOG_MODE} + {l s='Your shopping cart contains:'} + {$productNumber} {if $productNumber == 1}{l s='product'}{else}{l s='products'}{/if} + + {/if}

{if isset($account_created)} @@ -122,7 +126,9 @@

{l s='Take advantage of our exclusive offers:'}

{foreach $displayVouchers as $voucher} - {if $voucher.code != ''}{$voucher.code} - {/if}{$voucher.name}
+ {if $voucher.code != ''}{$voucher.code} - {/if} + {$voucher.name} +
{/foreach}
{/if} @@ -206,96 +212,100 @@ {displayPrice price=$total_products} {/if} - - - {if $use_taxes} - {if $display_tax_label}{l s='Total gift wrapping (tax incl.):'}{else}{l s='Total gift-wrapping cost:'}{/if} - {else} - {l s='Total gift-wrapping cost:'} - {/if} - - - {if $use_taxes} - {if $priceDisplay} - {displayPrice price=$total_wrapping_tax_exc} - {else} - {displayPrice price=$total_wrapping} - {/if} - {else} - {displayPrice price=$total_wrapping_tax_exc} - {/if} - - - {if $total_shipping_tax_exc <= 0 && !isset($virtualCart)} - - {l s='Shipping'} - {l s='Free Shipping!'} - - {else} - {if $use_taxes && $total_shipping_tax_exc != $total_shipping} + + + {if $use_taxes} + {if $display_tax_label}{l s='Total gift wrapping (tax incl.):'}{else}{l s='Total gift-wrapping cost:'}{/if} + {else} + {l s='Total gift-wrapping cost:'} + {/if} + + + {if $use_taxes} {if $priceDisplay} - - {if $display_tax_label}{l s='Total shipping (tax excl.)'}{else}{l s='Total shipping'}{/if} - {displayPrice price=$total_shipping_tax_exc} - + {displayPrice price=$total_wrapping_tax_exc} {else} - - {if $display_tax_label}{l s='Total shipping (tax incl.)'}{else}{l s='Total shipping'}{/if} - {displayPrice price=$total_shipping} - + {displayPrice price=$total_wrapping} {/if} {else} - - {l s='Total shipping'} - {displayPrice price=$total_shipping_tax_exc} + {displayPrice price=$total_wrapping_tax_exc} + {/if} + + + {if $total_shipping_tax_exc <= 0 && !isset($virtualCart)} + + {l s='Shipping'} + {l s='Free Shipping!'} + + {else} + {if $use_taxes && $total_shipping_tax_exc != $total_shipping} + {if $priceDisplay} + + {if $display_tax_label}{l s='Total shipping (tax excl.)'}{else}{l s='Total shipping'}{/if} + {displayPrice price=$total_shipping_tax_exc} + + {else} + + {if $display_tax_label}{l s='Total shipping (tax incl.)'}{else}{l s='Total shipping'}{/if} + {displayPrice price=$total_shipping} {/if} + {else} + + {l s='Total shipping'} + {displayPrice price=$total_shipping_tax_exc} + {/if} - - - {if $display_tax_label} - {if $use_taxes && $priceDisplay == 0} - {l s='Total vouchers (tax incl.):'} - {else} - {l s='Total vouchers (tax excl.)'} - {/if} - {else} - {l s='Total vouchers'} - {/if} - - + {/if} + + + + {if $display_tax_label} {if $use_taxes && $priceDisplay == 0} - {assign var='total_discounts_negative' value=$total_discounts * -1} + {l s='Total vouchers (tax incl.):'} {else} - {assign var='total_discounts_negative' value=$total_discounts_tax_exc * -1} + {l s='Total vouchers (tax excl.)'} {/if} - {displayPrice price=$total_discounts_negative} - - - {if $use_taxes && $show_taxes} - - {l s='Total (tax excl.)'} - {displayPrice price=$total_price_without_tax} - - - {l s='Total tax'} - {displayPrice price=$total_tax} - - {/if} - - - {l s='Total'} - - {if $use_taxes} - - {displayPrice price=$total_price} - {else} - - {displayPrice price=$total_price_without_tax} - + {l s='Total vouchers'} {/if} + + + {if $use_taxes && $priceDisplay == 0} + {assign var='total_discounts_negative' value=$total_discounts * -1} + {else} + {assign var='total_discounts_negative' value=$total_discounts_tax_exc * -1} + {/if} + {displayPrice price=$total_discounts_negative} + + + {if $use_taxes && $show_taxes} + + + {l s='Total (tax excl.)'} + {displayPrice price=$total_price_without_tax} + + + {l s='Total tax'} + {displayPrice price=$total_tax} + + {/if} + + + + {l s='Total'} + + {if $use_taxes} + + {displayPrice price=$total_price} + + {else} + + {displayPrice price=$total_price_without_tax} + + {/if} + {assign var='odd' value=0} @@ -545,14 +555,14 @@

{if !$opc} {l s='Proceed to checkout'} {if Configuration::get('PS_ALLOW_MULTISHIPPING')} {l s='Proceed to checkout'} From 33e9c2c13273f90fcd10708eb642d651259a9599 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Fri, 6 Dec 2013 12:12:54 +0100 Subject: [PATCH 2/5] [-] FO : Remove bad links on home tabs --- themes/default-bootstrap/modules/blockbestsellers/tab.tpl | 2 +- themes/default-bootstrap/modules/blocknewproducts/tab.tpl | 2 +- themes/default-bootstrap/modules/homefeatured/tab.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/default-bootstrap/modules/blockbestsellers/tab.tpl b/themes/default-bootstrap/modules/blockbestsellers/tab.tpl index 48e726934..9af78eed8 100644 --- a/themes/default-bootstrap/modules/blockbestsellers/tab.tpl +++ b/themes/default-bootstrap/modules/blockbestsellers/tab.tpl @@ -24,5 +24,5 @@ *} {if is_array($best_sellers) && count($best_sellers)} -

  • {l s='Best Sellers' mod='blockbestsellers'}
    • +
  • {l s='Best Sellers' mod='blockbestsellers'}
    • {/if} \ No newline at end of file diff --git a/themes/default-bootstrap/modules/blocknewproducts/tab.tpl b/themes/default-bootstrap/modules/blocknewproducts/tab.tpl index 916713c12..203ffcc97 100644 --- a/themes/default-bootstrap/modules/blocknewproducts/tab.tpl +++ b/themes/default-bootstrap/modules/blocknewproducts/tab.tpl @@ -22,4 +22,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -
  • {l s='New arrivals' mod='blocknewproducts'}
    • \ No newline at end of file +
  • {l s='New arrivals' mod='blocknewproducts'}
    • \ No newline at end of file diff --git a/themes/default-bootstrap/modules/homefeatured/tab.tpl b/themes/default-bootstrap/modules/homefeatured/tab.tpl index abd7175e1..d845c931f 100644 --- a/themes/default-bootstrap/modules/homefeatured/tab.tpl +++ b/themes/default-bootstrap/modules/homefeatured/tab.tpl @@ -22,4 +22,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -
  • {l s='Popular' mod='homefeatured'}
    • \ No newline at end of file +
  • {l s='Popular' mod='homefeatured'}
    • \ No newline at end of file From 0d374e5501e69e6a7d3f36555ef94119930a0812 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Fri, 6 Dec 2013 14:54:45 +0100 Subject: [PATCH 3/5] // new hook --- controllers/front/ProductController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php index 1da5a589a..0e6e53a9f 100644 --- a/controllers/front/ProductController.php +++ b/controllers/front/ProductController.php @@ -261,6 +261,7 @@ class ProductControllerCore extends FrontController 'HOOK_PRODUCT_ACTIONS' => Hook::exec('displayProductButtons', array('product' => $this->product)), 'HOOK_PRODUCT_TAB' => Hook::exec('displayProductTab', array('product' => $this->product)), 'HOOK_PRODUCT_TAB_CONTENT' => Hook::exec('displayProductTabContent', array('product' => $this->product)), + 'HOOK_PRODUCT_CONTENT' => Hook::exec('displayProductContent', array('product' => $this->product)), 'display_qties' => (int)Configuration::get('PS_DISPLAY_QTIES'), 'display_ht' => !Tax::excludeTaxeOption(), 'currencySign' => $this->context->currency->sign, From 9f106d06ef1a41c58bf65510cf69d3bf953dab24 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Fri, 6 Dec 2013 15:43:12 +0100 Subject: [PATCH 4/5] // valid W3C checkout - WIP --- themes/default-bootstrap/authentication.tpl | 1105 ++++++++++--------- themes/default-bootstrap/shopping-cart.tpl | 10 +- 2 files changed, 557 insertions(+), 558 deletions(-) diff --git a/themes/default-bootstrap/authentication.tpl b/themes/default-bootstrap/authentication.tpl index 24e23c000..b595f47f3 100644 --- a/themes/default-bootstrap/authentication.tpl +++ b/themes/default-bootstrap/authentication.tpl @@ -31,46 +31,45 @@ {/capture}

    {if !isset($email_create)}{l s='Authentication'}{else}{l s='Create an account'}{/if}

    @@ -80,64 +79,59 @@ $(document).ready(function() { {assign var="postCodeExist" value=false} {if !isset($email_create)} -
    -
    -
    - -
    -

    {l s='Create an account'}

    -
    -

    {l s='Please enter your email address to create an account.'}

    - -
    - - -
    -
    - {if isset($back)}{/if} - - -
    -
    -
    -
    -
    -
    -
    -
    -

    {l s='Already registered?'}

    -
    -
    - - -
    -
    - - -
    -

    {l s='Forgot your password?'}

    -

    - {if isset($back)}{/if} - -

    -
    -
    -
    -
    +
    +
    +
    +

    {l s='Create an account'}

    +
    +

    {l s='Please enter your email address to create an account.'}

    + +
    + + +
    +
    + {if isset($back)}{/if} + + +
    +
    +
    +
    +
    +
    +

    {l s='Already registered?'}

    +
    +
    + + +
    +
    + + +
    +

    {l s='Forgot your password?'}

    +

    + {if isset($back)}{/if} + +

    +
    +
    +
    {if isset($inOrderProcess) && $inOrderProcess && $PS_GUEST_CHECKOUT_ENABLED} -
    -
    -
    -
    -

    {l s='Instant checkout'}

    - -
    - - -
    -
    - - {foreach from=$genders key=k item=gender} -
    - -
    - {/foreach} -
    -
    - - - -
    -
    - - - -
    -
    - -
    -
    - - {* - {l s='January'} - {l s='February'} - {l s='March'} - {l s='April'} - {l s='May'} - {l s='June'} - {l s='July'} - {l s='August'} - {l s='September'} - {l s='October'} - {l s='November'} - {l s='December'} - *} -
    -
    - -
    -
    - -
    -
    -
    - {if isset($newsletter) && $newsletter} -
    - -
    -
    - -
    - {/if} -

    {l s='Delivery address'}

    - {foreach from=$dlv_all_fields item=field_name} - {if $field_name eq "company"} -
    - - + +
    +
    +
    +

    {l s='Instant checkout'}

    + +
    + +
    - {elseif $field_name eq "vat_number"} - -
    - - {$HOOK_CREATE_ACCOUNT_FORM} -
    -

    - *{l s='Required field'} - - -

    -
    + {/if} {else} -
    - {$HOOK_CREATE_ACCOUNT_TOP} - - {if $b2b_enable} - - {/if} - {if isset($PS_REGISTRATION_PROCESS_TYPE) && $PS_REGISTRATION_PROCESS_TYPE} - - - {/if} - {$HOOK_CREATE_ACCOUNT_FORM} -
    - - - {if isset($back)}{/if} - -

    *{l s='Required field'}

    -
    -
    - +
    + {$HOOK_CREATE_ACCOUNT_TOP} + + {if $b2b_enable} + + {/if} + {if isset($PS_REGISTRATION_PROCESS_TYPE) && $PS_REGISTRATION_PROCESS_TYPE} + + + {/if} + {$HOOK_CREATE_ACCOUNT_FORM} +
    + + + {if isset($back)}{/if} + +

    *{l s='Required field'}

    +
    +
    + {/if} \ No newline at end of file diff --git a/themes/default-bootstrap/shopping-cart.tpl b/themes/default-bootstrap/shopping-cart.tpl index 59d0741cf..036f23d12 100644 --- a/themes/default-bootstrap/shopping-cart.tpl +++ b/themes/default-bootstrap/shopping-cart.tpl @@ -105,7 +105,7 @@ {if $use_taxes} {if $priceDisplay} - + {if $voucherAllowed} {if isset($errors_discount) && $errors_discount}
      @@ -139,7 +139,7 @@ {else} - + {if $voucherAllowed} {if isset($errors_discount) && $errors_discount}
        @@ -176,7 +176,7 @@ {/if} {else} - + {if $voucherAllowed} {if isset($errors_discount) && $errors_discount}
          @@ -258,7 +258,6 @@ {/if} {/if} - {if $display_tax_label} {if $use_taxes && $priceDisplay == 0} @@ -281,18 +280,15 @@ {if $use_taxes && $show_taxes} - {l s='Total (tax excl.)'} {displayPrice price=$total_price_without_tax} - {l s='Total tax'} {displayPrice price=$total_tax} {/if} - {l s='Total'} From 74b16defa814b26c3169eafafaae7984b7efd016 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Fri, 6 Dec 2013 15:53:33 +0100 Subject: [PATCH 5/5] // themeconfigurator install failed --- modules/themeconfigurator/themeconfigurator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/themeconfigurator/themeconfigurator.php b/modules/themeconfigurator/themeconfigurator.php index 868fea40a..caabfdead 100644 --- a/modules/themeconfigurator/themeconfigurator.php +++ b/modules/themeconfigurator/themeconfigurator.php @@ -130,7 +130,7 @@ class ThemeConfigurator extends Module \'0\', \'home\', \'\', - \'\', + \'0\', \'banner-img'.$i.'.jpg\', \'\', \'\', @@ -152,7 +152,7 @@ class ThemeConfigurator extends Module \'0\', \'top\', \'\', - \'\', + \'0\', \'banner-img'.$i.'.jpg\', \'\', \'\',