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

// shipping block was missplaced on order-detail

Browse Source
This commit is contained in:
Rémi Gaillard committed 2013-08-22 15:41:34 +02:00
1 parent b67827772b
commit a21d3fd22e
3 files changed
+18 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/Validate.php
+2 -2
View File
@@ -399,10 +399,10 @@ class ValidateCore
$events .= '|onoffline|ononline|onpaste|onpropertychange|onreadystatechange|onresizeend|onresizestart|onrowenter|onrowexit|onrowsdelete|onrowsinserted|onscroll|onsearch|onselectionchange'; $events .= '|onoffline|ononline|onpaste|onpropertychange|onreadystatechange|onresizeend|onresizestart|onrowenter|onrowexit|onrowsdelete|onrowsinserted|onscroll|onsearch|onselectionchange';
$events .= '|onselectstart|onstart|onstop'; $events .= '|onselectstart|onstart|onstop';
if (preg_match('/<[ \t\n]*script/ims', $html) || preg_match('/('.$events.')[ \t\n]*=/ims', $html) || preg_match('/.*script\:/ims', $html)) if (preg_match('/<[\s]*script/ims', $html) || preg_match('/('.$events.')[\s]*=/ims', $html) || preg_match('/.*script\:/ims', $html))
return false; return false;
if (!$allow_iframe && preg_match('/<[ \t\n]*(i?frame|form|input|embed|object)/ims', $html)) if (!$allow_iframe && preg_match('/<[\s]*(i?frame|form|input|embed|object)/ims', $html))
return false; return false;
return true; return true;
classes/controller/AdminController.php
+1 -1
View File
@@ -387,7 +387,7 @@ class AdminControllerCore extends Controller
$filter = ''; $filter = '';
foreach ($this->fields_list AS $field => $t) foreach ($this->fields_list AS $field => $t)
{ {
if ($val = Tools::getValue($this->table.'Filter_'.$field)) if ($val = htmlspecialchars(Tools::getValue($this->table.'Filter_'.$field), ENT_QUOTES, 'UTF-8'))
{ {
if(!is_array($val) && !empty($val)) if(!is_array($val) && !empty($val))
$filter .= ($filter ? ', ' : $this->l(' filter by ')).$t['title'].' : '; $filter .= ($filter ? ', ' : $this->l(' filter by ')).$t['title'].' : ';
themes/default/order-detail.tpl
+15 -16
View File
@@ -310,6 +310,21 @@
</tbody> </tbody>
</table> </table>
</div> </div>
{if $return_allowed}
<div id="returnOrderMessage">
<h3>{l s='Merchandise return'}</h3>
<p>{l s='If you wish to return one or more products, please mark the corresponding boxes and provide an explanation for the return. When complete, click the button below.'}</p>
<p class="textarea">
<textarea cols="67" rows="3" name="returnText"></textarea>
</p>
<p class="submit">
<input type="submit" value="{l s='Make an RMA slip'}" name="submitReturnMerchandise" class="button_large" />
<input type="hidden" class="hidden" value="{$order->id|intval}" name="id_order" />
</p>
</div>
<br />
{/if}
</form>
<div class="table_block"> <div class="table_block">
{if $order->getShipping()|count > 0} {if $order->getShipping()|count > 0}
<table class="std"> <table class="std">
@@ -340,22 +355,6 @@
</div> </div>
<br /> <br />
{if !$is_guest} {if !$is_guest}
{if $return_allowed}
<div id="returnOrderMessage">
<h3>{l s='Merchandise return'}</h3>
<p>{l s='If you wish to return one or more products, please mark the corresponding boxes and provide an explanation for the return. When complete, click the button below.'}</p>
<p class="textarea">
<textarea cols="67" rows="3" name="returnText"></textarea>
</p>
<p class="submit">
<input type="submit" value="{l s='Make an RMA slip'}" name="submitReturnMerchandise" class="button_large" />
<input type="hidden" class="hidden" value="{$order->id|intval}" name="id_order" />
</p>
</div>
<br />
{/if}
</form>
{if count($messages)} {if count($messages)}
<h3>{l s='Messages'}</h3> <h3>{l s='Messages'}</h3>
<div class="table_block"> <div class="table_block">