delivery form

This commit is contained in:
Etienne Roudeix
2013-09-17 11:05:29 +02:00
parent afa9a46abf
commit 692badb06b
31 changed files with 3481 additions and 906 deletions

View File

@@ -17,10 +17,10 @@
<h1 id="main-label" class="page-header">Your Cart</h1>
<div class="btn-group checkout-progress">
<a href="cart.php" role="button" class="btn btn-step active"><span class="step-nb">1</span> <span class="step-label">Your Cart</span></a>
<a href="cart-step2.php" role="button" class="btn btn-step disabled"><span class="step-nb">2</span> <span class="step-label">Billing and delivery</span></a>
<a href="cart-step3.php" role="button" class="btn btn-step disabled"><span class="step-nb">3</span> <span class="step-label">Check my order</span></a>
<a href="cart-step4.php" role="button" class="btn btn-step disabled"><span class="step-nb">4</span> <span class="step-label">Secure payment</span></a>
<a href="#" role="button" class="btn btn-step active"><span class="step-nb">1</span> <span class="step-label">Your Cart</span></a>
<a href="#" role="button" class="btn btn-step disabled"><span class="step-nb">2</span> <span class="step-label">Billing and delivery</span></a>
<a href="#" role="button" class="btn btn-step disabled"><span class="step-nb">3</span> <span class="step-label">Check my order</span></a>
<a href="#" role="button" class="btn btn-step disabled"><span class="step-nb">4</span> <span class="step-label">Secure payment</span></a>
</div>
<table class="table table-cart">
@@ -133,7 +133,7 @@
</table>
<a href="{navigate to="index"}" role="button" class="btn btn-continue-shopping"><span>Continue Shopping</span></a>
<a href="{url path="/order/billing"}" class="btn btn-checkout">Proceed checkout</a>
<a href="{url path="/order/delivery"}" class="btn btn-checkout">Proceed checkout</a>
</article>

View File

@@ -18,84 +18,28 @@
<h1 id="main-label" class="page-header">Your Cart</h1>
<div class="btn-group checkout-progress">
<a href="cart.php" role="button" class="btn btn-step"><span class="step-nb">1</span> <span class="step-label">Your Cart</span></a>
<a href="cart-step2.php" role="button" class="btn btn-step active"><span class="step-nb">2</span> <span class="step-label">Billing and delivery</span></a>
<a href="cart-step3.php" role="button" class="btn btn-step disabled"><span class="step-nb">3</span> <span class="step-label">Check my order</span></a>
<a href="cart-step4.php" role="button" class="btn btn-step disabled"><span class="step-nb">4</span> <span class="step-label">Secure payment</span></a>
<a href="{url path="/cart"}" role="button" class="btn btn-step"><span class="step-nb">1</span> <span class="step-label">Your Cart</span></a>
<a href="#" role="button" class="btn btn-step active"><span class="step-nb">2</span> <span class="step-label">Billing and delivery</span></a>
<a href="#" role="button" class="btn btn-step disabled"><span class="step-nb">3</span> <span class="step-label">Check my order</span></a>
<a href="#" role="button" class="btn btn-step disabled"><span class="step-nb">4</span> <span class="step-label">Secure payment</span></a>
</div>
<form id="form-cart-delivery" action="{url path="/order/deliver"}" method="post" role="form">
{form name="thelia.order.delivery"}
<form id="form-cart-delivery" action="{url path="/order/delivery"}" method="post" role="form" {form_enctype form=$form}>
<div id="billing-address" class="panel">
<div class="panel-heading clearfix">
<a href="{url path="/address/create"}" class="btn btn-add-address">Add a new address</a>
Chose your billing address
</div>
<div class="panel-body">
<table class="table table-address" role="presentation" summary="Address Books">
<tbody>
{form_hidden_fields form=$form}
{loop type="address" name="customer.addresses" customer="current"}
{if $form_error}<div class="alert alert-danger">{$form_error_message}</div>{/if}
<tr>
<th>
<div class="radio">
<label for="billing-address_<?php echo $count; ?>">
<input type="radio" name="billing-address" value"{$ID}">
{$LABEL}
</label>
</div>
</th>
<td>
<ul class="list-address">
<li>
<span class="fn">{loop type="title" name="customer.title.info" id=$TITLE}{$SHORT}{/loop} {$LASTNAME|upper} {$FIRSTNAME|ucwords}</span>
<span class="org">{$COMPANY}</span>
</li>
<li>
<address class="adr">
<span class="street-address">{$ADDRESS1}</span>
{if $ADDRESS2 != ""}
<br><span class="street-address">{$ADDRESS2}</span>
{/if}
{if $ADDRESS3 != ""}
<br><span class="street-address">{$ADDRESS3}</span>
{/if}
<br><span class="postal-code">{$ZIPCODE}</span>
<span class="locality">{$CITY}, <span class="country-name">{loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}</span></span>
</address>
</li>
<li>
{if $CELLPHONE != ""}
<span class="tel">{$CELLPHONE}</span>
{/if}
{if $PHONE != ""}
<br><span class="tel">{$PHONE}</span>
{/if}
</li>
</ul>
</td>
<td>
<div class="group-btn">
<a href="{url path="/address/update/{$ID}"}" class="btn btn-edit-address" data-toggle="tooltip" title="Edit this address"><i class="icon-pencil"></i> <span>{intl l="Edit"}</span></a>
{if $DEFAULT != 1}
<a href="{url path="/address/delete/{$ID}"}" class="btn btn-remove-address js-remove-address" title="{intl l="Remove this address"}" data-toggle="tooltip"><i class="icon-remove"></i> <span>{intl l="Cancel"}</span></a>
{/if}
</div>
</td>
</tr>
{/loop}
</tbody>
</table>
</div>
</div>
{form_field form=$form field='delivery-address'}
<div id="delivery-address" class="panel">
<div class="panel-heading clearfix">
<a href="{url path="/address/create"}" class="btn btn-add-address">Add a new address</a>
Chose your delivery address
{if $error}
<span class="help-block"><span class="icon-remove"></span> {$message}</span>
{/if}
</div>
<div class="panel-body">
<table class="table table-address" role="presentation" summary="Address Books">
@@ -103,11 +47,14 @@
{loop type="address" name="customer.addresses" customer="current"}
<tr>
<th>
<div class="radio">
<label for="delivery-address_<?php echo $count; ?>">
<input type="radio" name="delivery-address" value"{$ID}">
<label for="delivery-address_{$ID}">
<input type="radio" name="{$name}" value="{$ID}" {if $value == $ID}checked="checked"{/if} id="delivery-address_{$ID}">
{$LABEL}
</label>
</div>
@@ -158,13 +105,24 @@
</div>
</div>
{/form_field}
{form_field form=$form field='delivery-module'}
<div id="delivery-method" class="panel">
<div class="panel-heading">Choose your delivery method</div>
<div class="panel-heading">
Choose your delivery method
{if $error}
<span class="help-block"><span class="icon-remove"></span> {$message}</span>
{/if}
</div>
<div class="panel-body">
{loop type="delivery" name="deliveries" force_return="true"}
<div class="radio">
<label for="delivery-method_1">
<input type="radio" name="delivery-module" value="{$ID}">
{form_field form=$form field='delivery-module'}
<input type="radio" name="{$name}" {if $value == $ID}checked="checked"{/if} value="{$ID}">
{/form_field}
<strong>{$TITLE}</strong> / {currency attr="symbol"} {$PRICE}
</label>
</div>
@@ -172,10 +130,14 @@
</div>
</div>
<a href="cart.php" role="button" class="btn btn-back"><span>Back</span></a>
{/form_field}
<a href="{url path="/cart"}" role="button" class="btn btn-back"><span>Back</span></a>
<button type="submit" class="btn btn-checkout-next"><span>Next Step</span></button>
</form>
{/form}
</article>
</div>