diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 5e34aec39..064d5d2b9 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -50,6 +50,11 @@
Thelia\Controller\Admin\OrderController::indexAction
+
+ Thelia\Controller\Admin\OrderController::viewAction
+ \d+
+
+
diff --git a/core/lib/Thelia/Controller/Admin/OrderController.php b/core/lib/Thelia/Controller/Admin/OrderController.php
index b7e2b00ce..b2047cc31 100644
--- a/core/lib/Thelia/Controller/Admin/OrderController.php
+++ b/core/lib/Thelia/Controller/Admin/OrderController.php
@@ -36,4 +36,12 @@ class OrderController extends BaseAdminController
return $this->render("orders", array("display_order" => 20));
}
+ public function viewAction($order_id)
+ {
+
+ return $this->render("order-edit", array(
+ "order_id" => $order_id
+ ));
+ }
+
}
\ No newline at end of file
diff --git a/templates/admin/default/assets/less/thelia/thelia.less b/templates/admin/default/assets/less/thelia/thelia.less
index 8576272bf..d1619d924 100644
--- a/templates/admin/default/assets/less/thelia/thelia.less
+++ b/templates/admin/default/assets/less/thelia/thelia.less
@@ -201,13 +201,23 @@
border-bottom: 2px solid #A5CED8;
margin-bottom: 0.5em;
}
-
+
// The action bar on the right
.actions {
text-align: right;
}
}
+.tab-pane{
+ caption, .title{
+ margin-top: 0.5em;
+
+ .btn{
+ text-transform: none;
+ }
+ }
+}
+
// The overall form container
.form-container {
diff --git a/templates/admin/default/order-edit.html b/templates/admin/default/order-edit.html
new file mode 100644
index 000000000..603176fe6
--- /dev/null
+++ b/templates/admin/default/order-edit.html
@@ -0,0 +1,451 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Edit an order'}{/block}
+
+{block name="check-permissions"}admin.order.edit{/block}
+
+{block name="main-content"}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {intl l='Information about order 01201303540354'}
+
+
+
+ {intl l="Designation"}
+ {intl l="Price"}
+ {intl l="Quantity"}
+ {intl l="Total"}
+
+
+
+
+
+ T-Shirt F T1 20.00 €
+ 3
+ 60.00 €
+
+
+ T-Shirt F T1 20.00 €
+ 3
+ 60.00 €
+
+
+ T-Shirt F T1 20.00 €
+ 3
+ 60.00 €
+
+
+
+
+ Total 180.00 €
+
+
+
+
+
+
+
+ {intl l='Information about the bill'}
+
+
+
+ {intl l="Bill n°"}
+ {intl l="Compagny"}
+ {intl l="Firstname & Lastname"}
+ {intl l="Date & Hour"}
+
+
+
+
+
+ 0001 Thelia
+ Dupont Jean
+ 11/01/2013 14:11:00
+
+
+
+
+
+
+
+ {intl l='Information about the carriage'}
+
+
+
+
+
+ {intl l="Mode of transportation"}
+ Colissimo
+
+
+ {intl l="Description"}
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ut, error, necessitatibus ipsam dolores ad quisquam provident sed repudiandae ullam quasi quae perferendis numquam voluptates doloribus laborum possimus dicta similique in?
+
+
+
+
+
+
+
+ {intl l='Information about the settlement'}
+
+
+
+ {intl l="Type of payment"}
+ Unknown
+
+
+ {intl l="Transaction reference"}
+ 141100
+
+
+ {intl l="Total order before discount"}
+ 60 €
+
+
+ {intl l="Discount"}
+ 10%
+
+
+ {intl l="Coupon code"}
+
+
+ {intl l="Total with discount"}
+ 50 €
+
+
+ {intl l="Freight"}
+ 6 €
+
+
+ {intl l="Total"}
+ 56 €
+
+
+
+
+
+
+
+
+
+
+
+ {intl l='Billing address'}
+
+
+
+
+
+ {intl l="Title"}
+ Mr
+
+
+ {intl l="Compagny"}
+ Thelia
+
+
+ {intl l="Firstname"}
+ Espeche
+
+
+ {intl l="Lastname"}
+ Michaël
+
+
+ {intl l="Street address"}
+ 5, rue Rochon
+
+
+ {intl l="Additional address"}
+ Lorem ipsum dolor sit amet
+
+
+ {intl l="Additional address"}
+ Lorem ipsum dolor sit
+
+
+ {intl l="Zip code"}
+ 63000
+
+
+ {intl l="City"}
+ Clermont-Fd
+
+
+ {intl l="Country"}
+ France
+
+
+ {intl l="Phone"}
+ 01 02 03 04 05
+
+
+
+
+
+
+
+
+ {intl l='Delivery address'}
+
+
+
+
+
+ {intl l="Title"}
+ Mr
+
+
+ {intl l="Compagny"}
+ Thelia
+
+
+ {intl l="Firstname"}
+ Espeche
+
+
+ {intl l="Lastname"}
+ Michaël
+
+
+ {intl l="Street address"}
+ 5, rue Rochon
+
+
+ {intl l="Additional address"}
+ Lorem ipsum dolor sit amet
+
+
+ {intl l="Additional address"}
+ Lorem ipsum dolor sit
+
+
+ {intl l="Zip code"}
+ 63000
+
+
+ {intl l="City"}
+ Clermont-Fd
+
+
+ {intl l="Country"}
+ France
+
+
+ {intl l="Phone"}
+ 01 02 03 04 05
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {intl l="{$label}"} :
+
+ {/form_field}
+
+ {form_field form=$form field='company'}
+
+ {intl l="{$label}"} :
+
+ {/form_field}
+
+ {form_field form=$form field='title'}
+
+ {intl l="{$label}"} :
+
+
+ {loop type="title" name="title1"}
+ {$LONG}
+ {/loop}
+
+
+ {/form_field}
+
+ {form_field form=$form field='firstname'}
+
+ {intl l="{$label}"} :
+
+ {/form_field}
+
+ {form_field form=$form field='lastname'}
+
+ {intl l="{$label}"} :
+
+ {/form_field}
+
+ {form_field form=$form field='address1'}
+
+ {intl l="{$label}"} :
+
+
+
+ {form_field form=$form field='address2'}
+
+
+
+ {form_field form=$form field='address3'}
+
+ {/form_field}
+
+ {form_field form=$form field='zipcode'}
+
+ {intl l="{$label}"} :
+
+ {/form_field}
+
+ {form_field form=$form field='city'}
+
+ {intl l="{$label}"} :
+
+ {/form_field}
+
+ {form_field form=$form field='country'}
+
+ {intl l="{$label}"} :
+
+ {loop type="country" name="country1"}
+ {$TITLE}
+ {/loop}
+
+
+ {/form_field}
+
+ {/capture}
+
+ {include
+ file = "includes/generic-create-dialog.html"
+
+ dialog_id = "edit_address_dialog"
+ dialog_title = {intl l="Edit an address"}
+ dialog_body = {$smarty.capture.edit_address_dialog nofilter}
+
+ dialog_ok_label = {intl l="Edit this address"}
+ dialog_cancel_label = {intl l="Cancel"}
+
+ form_action = {url path='/admin/address/update'}
+ form_enctype = {form_enctype form=$form}
+ form_error_message = $form_error_message
+ }
+
+ {/form}
+
+{/block}
\ No newline at end of file
diff --git a/templates/admin/default/orders.html b/templates/admin/default/orders.html
index 8693f2a33..8450bcd1d 100644
--- a/templates/admin/default/orders.html
+++ b/templates/admin/default/orders.html
@@ -60,7 +60,7 @@
{loop type="auth" name="can_change" roles="ADMIN" permissions="admin.orders.edit"}
-
+
{/loop}
{loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.orders.delete"}
@@ -84,7 +84,7 @@
{loop type="auth" name="can_change" roles="ADMIN" permissions="admin.orders.edit"}
-
+
{/loop}
{loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.orders.delete"}
@@ -108,7 +108,7 @@
{loop type="auth" name="can_change" roles="ADMIN" permissions="admin.orders.edit"}
-
+
{/loop}
{loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.orders.delete"}