dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// change view carts

Browse Source
This commit is contained in:
vKham
2012-01-03 17:18:29 +00:00
parent 063197b806
commit 5f0b95bcf8
12 changed files with 70 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/carts/view.tpl
+23 -22
View File
@@ -28,16 +28,17 @@
{block name="override_tpl"}
<h2>{if $customer->id}{$customer->firstname} {$customer->lastname}{else}{l s='Guest'}{/if} - {l s='Cart #'}{$cart->id|string_format:"%06d"} {l s='from'} {$cart->date_upd}</h2>
<div id="container-customer">
<h2><img src="../img/admin/basket.png" /><span>{if $customer->id}{$customer->firstname} {$customer->lastname}{else}{l s='Guest'}{/if} - {l s='Cart #'}{$cart->id|string_format:"%06d"}</span><span style="color:#585A69;padding-left:10px;">{l s='from'} {$cart->date_upd}</span></h2>
<div class="separation"></div>
<br />
<div style="float: left;">
<fieldset style="width: 400px">
<legend><img src="../img/admin/tab-customers.gif" />{l s='Customer information'}</legend>
<span style="font-weight: bold; font-size: 14px;">
<div class="info-customer-left">
<h2><img src="../img/admin/vcard.png" />{l s='Customer information'}</h2>
<span style="font-size: 14px;">
{if $customer->id}
<a href={$link->getAdminLink('AdminCustomers')}&id_customer={$customer->id}&viewcustomer">{$customer->firstname} {$customer->lastname}</a></span> {l s='#'}{$customer->id}<br />
<a href="mailto:{$customer->email}">{$customer->email}</a> <br /><br />
<a href="{$link->getAdminLink('AdminCustomers')}&id_customer={$customer->id}&viewcustomer">{$customer->firstname} {$customer->lastname}</a></span>
{l s='#'}{$customer->id}<br />
<a style="text-decoration: underline; color:#268CCD;" href="mailto:{$customer->email}">{$customer->email}</a> <br /><br />
{l s='Account registered:'} {dateFormat date=$customer->date_add}<br />
{l s='Valid orders placed:'} <b>{$customer_stats.nb_orders}</b><br />
{l s='Total paid since registration:'} <b>{displayWtPriceWithCurrency price=$customer_stats.total_orders currency=$currency}</b><br />
@@ -45,30 +46,29 @@
{l s='Guest not registered'}
{/if}
</span>
</fieldset>
</div>
<div style="float: left; margin-left: 40px">
<fieldset style="width: 400px">
<legend><img src="../img/admin/cart.gif" /> {l s='Order information'}</legend>
<span style="font-weight: bold; font-size: 14px;">
<div class="info-customer-right">
<h2><img src="../img/admin/cart.gif" /> {l s='Order information'}</h2>
<span>
{if $order->id}
<a href="{$link->getAdminLink('AdminOrders')}&id_order={$order->id}&vieworder"> {l s='Order #'}{$order->id|string_format:"%06d"}</a></span>
<br /><br />
{l s='Made on:'} {dateFormat date=$order->date_add}<br /><br /><br /><br />
{else}
{l s='No order created from this cart'}</span>
<p><a href="{$link->getAdminLink('AdminOrders')}&id_cart={$cart->id}&addorder">{l s='Create an order with this cart'}</a></p>
<p><a class="button" href="{$link->getAdminLink('AdminOrders')}&id_cart={$cart->id}&addorder">{l s='Create an order with this cart'}</a></p>
{/if}
</fieldset>
</div>
<br style="clear:both;" />
<fieldset style="margin-top:25px; width: 715px; ">
<legend><img src="../img/admin/cart.gif" alt="{l s='Products'}" />{l s='Cart summary'}</legend>
<div style="float:left;">
<table style="width: 700px;" cellspacing="0" cellpadding="0" class="table" id="orderProducts">
<div class="separation"></div>
<h2><img src="../img/admin/cart.gif" alt="{l s='Products'}" />{l s='Cart summary'}</h2>
<br/>
<table style="width:100%;" cellspacing="0" cellpadding="0" class="table" id="orderProducts">
<thead>
<tr>
<th align="center" style="width: 60px">&nbsp;</th>
<th height="39" align="center" style="width: 60px">&nbsp;</th>
<th>{l s='Product'}</th>
<th style="width: 80px; text-align: center">{l s='UP'}</th>
<th style="width: 20px; text-align: center">{l s='Qty'}</th>
@@ -183,8 +183,9 @@
{/if}
<div style="float:left; margin-top:15px;">
{l s='According to the group of this customer, prices are printed:'} <b>{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC}{l s='tax excluded'}{else}{l s='tax included'}{/if}</b>
</div></div>
</div>
</fieldset>
<div class="clear" style="height:20px;">&nbsp;</div>
{/block}
</div>
admin-dev/themes/default/template/customer_threads/message.tpl
+6 -4
View File
@@ -28,8 +28,8 @@
{if !$email}
<fieldset style="margin-top:10px;{if !empty($message.employee_name)}background: rgb(255,236,242){/if}">
<legend {if !empty($message.employee_name)}style="background:rgb(255,210,225)"{/if}>
<fieldset style="margin-top:10px;{if !empty($message.employee_name)}background-color:#F0F8E6;border:1px solid #88D254{/if}">
<legend {if !empty($message.employee_name)}style="background-color:#F0F8E6;color:#000;border:1px solid #88D254;"{/if}>
{if !empty($message.employee_name)}
<img src="../img/t/AdminCustomers.gif" alt="{$PS_SHOP_NAME}" />
{$PS_SHOP_NAME} - {$message.employee_name}
@@ -192,10 +192,12 @@
{/if}
</div>
</fieldset>
</fieldset>
admin-dev/themes/default/template/customer_threads/view.tpl
+1 -1
View File
@@ -142,7 +142,7 @@
{$message}
{/foreach}
</div>
<div class="clear">&nbsp;</div>
admin-dev/themes/default/template/customers/view.tpl
+1 -1
View File
@@ -63,7 +63,7 @@
<img src="../img/admin/edit.gif" />
</a>
</div>
<span style="font-weight: bold; font-size: 14px;">
<span style="font-size: 14px;">
{$customer->firstname} {$customer->lastname}
</span>
<img src="{$gender_image}" style="margin-bottom: 5px" /><br />
admin-dev/themes/default/template/groups/view.tpl
+12 -11
View File
@@ -28,12 +28,11 @@
{block name="override_tpl"}
<fieldset style="width: 400px">
<span style="font-weight: bold; font-size: 14px;">{l s='Name:'}</span> {$group->name[$language->id]}
<div class="clear">&nbsp;</div>
<span style="font-weight: bold; font-size: 14px;">{l s='Discount:'}</span> {$group->reduction} {l s='%'}
<div class="clear">&nbsp;</div>
<span style="font-weight: bold; font-size: 14px;">{l s='Current category discount:'}</span>
<fieldset>
<ul>
<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Name:'}</span> {$group->name[$language->id]}</li>
<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Discount:'}</span> {$group->reduction} {l s='%'}</li>
<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Current category discount:'}</span>
{if !$categorieReductions}
{l s='None'}
{else}
@@ -46,16 +45,18 @@
{/foreach}
</table>
{/if}
<div class="clear">&nbsp;</div>
<span style="font-weight: bold; font-size: 14px;">{l s='Price display method:'}</span>
</li>
<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Price display method:'}</span>
{if $group->price_display_method}
{l s='Tax excluded'}
{else}
{l s='Tax included'}
{/if}
<div class="clear">&nbsp;</div>
<span style="font-weight: bold; font-size: 14px;">{l s='Show prices:'}</span> {if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}
<div class="clear">&nbsp;</div>
</li>
<li><span style="font-weight: bold; font-size: 13px; color:#000;">{l s='Show prices:'}</span> {if $group->show_prices}{l s='Yes'}{else}{l s='No'}{/if}
</li>
</ul>
</fieldset>
<h2>{l s='Customer members of this group'}</h2>
{$customerList}
admin-dev/themes/default/template/products/informations.tpl
+3 -3
View File
@@ -66,15 +66,15 @@
<div>
<label>{l s='Type:'}</label>
<label style="width:100px;text-align:center;">
<label style="font-weight:normal;width:100px;text-align:center;">
<input type="radio" name="type_product" id="simple_product" value="0" />
{l s='Product'}
</label>
<label style="width:100px;text-align:center;">
<label style="font-weight:normal;width:100px;text-align:center;">
<input type="radio" name="type_product" id="pack_product" value="1" />
{l s='Pack'}
</label>
<label style="width:500px;text-align:center;">
<label style="font-weight:normal;width:500px;text-align:center;">
<input type="radio" name="type_product" id="virtual_product" value="2" />
{l s='Virtual Product (services, booking and downloadable products)'}
</label>
admin-dev/themes/default/template/referrers/form_settings.tpl
+4 -5
View File
@@ -41,19 +41,18 @@
<input type="radio" name="tracking_dt" id="tracking_dt_off" value="0" {if !$tracking_dt}checked="checked"{/if}/>
<label class="t" for="tracking_dt_off"> {l s='No'}</label>
</div>
<br class="clear" />
<p>{l s='Direct traffic can be quite consuming. You should consider enabling it only if you have a strong database server and a strong need for it.'}</p>
<input type="submit" class="button" value="{l s=' Save '}" name="submitSettings" id="submitSettings" />
</form>
<hr />
<div class="separation"></div>
<form action="{$current}&token={$token}" method="post" id="refresh_index_form" name="refresh_index_form">
<p class="bold">{l s='Indexation'}</p>
<h3>{l s='Indexation'}</h3>
<p>{l s='There is a huge quantity of data, so each connection corresponding to a referrer is indexed. You can refresh this index by clicking on the button above. Be aware that it may take a long time and it is only needed if you modified or added a referrer and if you want your changes to be retroactive.'}</p>
<input type="submit" class="button" value="{l s='Refresh index'}" name="submitRefreshIndex" id="submitRefreshIndex" />
</form>
<hr />
<div class="separation"></div>
<form action="{$current}&token={$token}" method="post" id="refresh_cache_form" name="refresh_cache_form">
<p class="bold">{l s='Cache'}</p>
<h3>{l s='Cache'}</h3>
<p>{l s='For you to sort and filter your data, it is cached. You can refresh the cache by clicking on the button above.'}</p>
<input type="submit" class="button" value="{l s='Refresh cache'}" name="submitRefreshCache" id="submitRefreshCache" />
</form>
classes/Hook.php
+3 -1
View File
@@ -379,7 +379,9 @@ class HookCore extends ObjectModel
$output .= '<script type="text/javascript"> modules_list.push(\''.$moduleInstance->name.'\');</script>
<div id="hook_'.$array['id_hook'].'_module_'.$moduleInstance->id.'_moduleName_'.$moduleInstance->name.'"
class="dndModule" style="border: 1px dotted red;'.(!strlen($display) ? 'height:50px;' : '').'">
<span><img src="'._MODULE_DIR_.$moduleInstance->name.'/logo.gif">'
<span style="font-family: Georgia;
font-size:13px;
font-style:italic;"><img style="padding-right:5px;" src="'._MODULE_DIR_.$moduleInstance->name.'/logo.gif">'
.$moduleInstance->displayName.'<span style="float:right">
<a href="#" id="'.$array['id_hook'].'_'.$moduleInstance->id.'" class="moveModule">
<img src="'._PS_ADMIN_IMG_.'arrow_out.png"></a>
controllers/admin/AdminAddressesController.php
+1 -1
View File
@@ -53,7 +53,7 @@ class AdminAddressesControllerCore extends AdminController
'firstname' => array('title' => $this->l('First name'), 'width' => 120, 'filter_key' => 'a!firstname'),
'lastname' => array('title' => $this->l('Last name'), 'width' => 140, 'filter_key' => 'a!lastname'),
'address1' => array('title' => $this->l('Address')),
'postcode' => array('title' => $this->l('Postcode/ Zip Code'), 'align' => 'right', 'width' => 50),
'postcode' => array('title' => $this->l('Postcode/ Zip Code'), 'align' => 'right', 'width' => 80),
'city' => array('title' => $this->l('City'), 'width' => 150),
'country' => array('title' => $this->l('Country'), 'width' => 100, 'type' => 'select', 'list' => $this->countriesArray, 'filter_key' => 'cl!id_country'));
css/admin.css
+16 -18
View File
@@ -269,6 +269,7 @@ input, textarea, option {
input[type="text"], input[type="password"], input[type="file"], textarea {
padding: 2px 4px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) inset;
}
input[type="text"], input[type="password"], input[type="file"], textarea, select, option {
@@ -2170,6 +2171,11 @@ div#scrollTop a:hover{
#container-customer h2 {
color:#000;
font-weight:normal;
margin:0;
}
#container-customer h2 img {
margin-right:5px;
}
#container-customer .info-customer-left {
@@ -2189,6 +2195,14 @@ font-weight:normal;
}
#container-customer .info-customer-left h2,
#container-customer .info-customer-right h2 {
margin-bottom:7px;
}
#container-customer a {
}
/*infoCustomer*/
.infoCustomer {}
@@ -2196,21 +2210,5 @@ font-weight:normal;
.infoCustomer dl dt {font-weight:bold; float:left; padding-right:5px;}
.infoCustomer dl dd { margin:0; padding:0;}
#ajax_running {
display: none;
position: fixed;
top: 0;
left: 40%;
z-index: 10000;
background-color: #FFF1A8;
border: 1px solid #FFD96F;
color: #000;
font-weight: bold;
font-size: 14px;
padding: 5px 20px;
border-radius: 0 0 3px 3px;
-webkit-border-bottom-left-radius: 3px;
-webkit-border-bottom-right-radius: 3px;
width: 300px;
}
/*container-carts*/
#container-carts { background-color:#EBEDF4; border:1px solid #CCCED7; padding:10px;}
img/admin/basket.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

img/admin/vcard.png
Executable
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 642 B