From 3e6f425bd4ed7edd2dbb229fdc94fa27f325eb88 Mon Sep 17 00:00:00 2001 From: Kevin Granger Date: Tue, 8 Oct 2013 12:26:48 +0200 Subject: [PATCH] // Orders WIP --- admin-dev/themes/default/css/admin-theme.css | 8 +- .../default/css/bootstrap/_variables.scss | 2 +- .../controllers/orders/_discount_form.tpl | 4 +- .../controllers/orders/_new_product.tpl | 4 +- .../controllers/orders/helpers/view/view.tpl | 1166 +++++++++-------- .../template/helpers/list/list_header.tpl | 23 +- 6 files changed, 619 insertions(+), 588 deletions(-) diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 8eb2216dc..f8be6e65b 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -1510,7 +1510,7 @@ input[type="number"]::-webkit-outer-spin-button, input[type="number"]::-webkit-i display: block; width: 100%; height: 27px; - padding: 4px 12px; + padding: 4px 8px; font-size: 12px; line-height: 1.42857; color: #555555; @@ -1732,7 +1732,7 @@ textarea.input-lg, .input-group-lg > textarea, .input-group-lg > textarea.input- /* line 10, ../bower_components/sass-bootstrap/lib/_buttons.scss */ .btn { display: inline-block; - padding: 4px 12px; + padding: 4px 8px; margin-bottom: 0; font-size: 12px; font-weight: normal; @@ -3170,7 +3170,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto /* line 59, ../bower_components/sass-bootstrap/lib/_input-groups.scss */ .input-group-addon { - padding: 4px 12px; + padding: 4px 8px; font-size: 12px; font-weight: normal; line-height: 1; @@ -3842,7 +3842,7 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto .pagination > li > a, .pagination > li > span { position: relative; float: left; - padding: 4px 12px; + padding: 4px 8px; line-height: 1.42857; text-decoration: none; background-color: white; diff --git a/admin-dev/themes/default/css/bootstrap/_variables.scss b/admin-dev/themes/default/css/bootstrap/_variables.scss index e1e21ef3f..cef16e82d 100644 --- a/admin-dev/themes/default/css/bootstrap/_variables.scss +++ b/admin-dev/themes/default/css/bootstrap/_variables.scss @@ -64,7 +64,7 @@ $headings-font-weight: 300 ; // Based on 14px font-size and 1.428 line-height (~20px to start) $padding-base-vertical: 4px ; -// $padding-base-horizontal: 12px ; +$padding-base-horizontal: 8px ; // $padding-large-vertical: 14px ; // $padding-large-horizontal: 16px ; diff --git a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl index 119ecefb8..406b1bb19 100644 --- a/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl +++ b/admin-dev/themes/default/template/controllers/orders/_discount_form.tpl @@ -23,7 +23,7 @@ * International Registered Trademark & Property of PrestaShop SA *} -
+
{/if} -
+
+ +
+
+
+
+ + + {l s='Click here'} {l s='to see all messages.'} + + +
+ +
+ + +
+ + +
+
+ +
+

+ + {l s='Payment'} +

+ {if count($order->getOrderPayments()) > 0} +

+ {l s='Warning'} + {displayPrice price=$total_paid currency=$currency->id} + {l s='paid instead of'} + {displayPrice price=$orders_total_paid_tax_incl currency=$currency->id} + + {foreach $order->getBrother() as $brother_order} + {if $brother_order@first} + {if count($order->getBrother()) == 1} +
{l s='This warning also concerns order '} + {else} +
{l s='This warning also concerns the next orders:'} + {/if} + {/if} + + #{'%06d'|sprintf:$brother_order->id} + + {/foreach} +

+ {/if} +
+ + + + + + + + + + + + + {foreach from=$order->getOrderPaymentCollection() item=payment} + + + + + + + + + + + + {foreachelse} + + + + {/foreach} + + + + + + {if count($invoices_collection) > 0} + + {/if} + + + +
{l s='Date'}{l s='Payment method'}{l s='Transaction ID'}{l s='Amount'}{l s='Invoice'}
{dateFormat date=$payment->date_add full=true}{$payment->payment_method}{$payment->transaction_id}{displayPrice price=$payment->amount currency=$payment->id_currency} + {if $invoice = $payment->getOrderInvoice($order->id)} + {$invoice->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)} + {else} + {l s='No invoice'} + {/if} + + +
+ + {l s='No payments are available'} +
+ + + + + + +
+
+ +
+
+ +
+
+ 		+ + + +
+
+ {if (!$order->valid && sizeof($currencies) > 1)} +
+ +
+ +

{l s='Do not forget to update your exchange rate before making this change.'}

+
+
+ +
+
+ {/if} +
+
+
+ +
+
+ + {if !$order->isVirtual()} +
+
+

+ + {l s='Shipping'} +

+
+ +
+

+ {if $order->recyclable} + + + {l s='Yes'} + + {else} + + + {l s='No'} + + {/if} +

+
+
+
+ +
+

+ {if $order->gift} + + + {l s='Yes'} + + {else} + + + {l s='No'} + + {/if} +

+
+
+ {if $order->gift_message} +
+ +
+

{$order->gift_message|nl2br}

+
+
+ {/if} +
+ {include file='controllers/orders/_shipping.tpl'} + {if $carrierModuleCall} + {$carrierModuleCall} + {/if} +
+
+ {/if} + + + {if !$order->isVirtual()} +
+ +
+

+ + {l s='Shipping address'} +

+ {if $can_edit} +
+
+
+ +
+
+ +
+
+
+ {/if} +
+ + + {l s='Edit'} + + {displayAddressDetail address=$addresses.delivery newLine='
'} + {if $addresses.delivery->other} +
{$addresses.delivery->other}
+ {/if} +
+ +
+
+ {/if} + + + +
+
+

+ + {l s='Invoice address'} +

+ + {if $can_edit} +
+
+
+ +
+
+ +
+
+
+ {/if} + +
+ + + {l s='Edit'} + + {displayAddressDetail address=$addresses.invoice newLine='
'} + {if $addresses.invoice->other} +
{$addresses.invoice->other}
+ {/if} +
+
+
+
+
+
+

@@ -240,19 +675,67 @@ {include file='controllers/orders/_documents.tpl'}

-
+
+ {if !$order->isVirtual()} + +
+

+ + {l s='Merchandise returns'} +

-
- - -
-
1
-
2
-
3
+ {if $order->getReturn()|count > 0} + + + + + + + + + + + {foreach from=$order->getReturn() item=line} + + + + + + + {/foreach} + +
DateTypeCarrierTracking number
{$line.date_add}{$line.type}{$line.state_name} + {if isset($line.url) && isset($line.tracking_number)}{$line.tracking_number}{elseif isset($line.tracking_number)}{$line.tracking_number}{/if} + {if $line.can_edit} +
+ + + +
+ {/if} +
+ {else} + {l s='No merchandise returned yet.'} + {/if} + {if $carrierModuleCall} + {$carrierModuleCall} + {/if} +
+ {/if} +