scores/extranet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

issue #0001775: add ability to search with siren, raisonSociale, numero, voie, cpVille, telFax, naf.

Browse Source
This commit is contained in:
Arman KYOKCHAN 2013-11-12 12:36:13 +00:00
parent 0c97c46568
commit 9534e84400
4 changed files with 8 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
application/views/default/scripts/giant/identite.phtml
View File

@ -1,16 +1,5 @@
<div id="center">
<span style="float:right;margin-right:16px;">
<a style="color:#9C093A;cursor:pointer;" class="totCom">Total commande : <?php echo $this->total; ?> euros</a>
</span>
<div class="dialog-form" title="Total commande">
<strong>Start Date: </strong>
<input type="text" class='datepicker' name="StartDate" value=""/>
<strong>End Date: </strong>
<input type="text" class='datepicker' name="EndDate" value="" /><br /><br />
<?php echo $this->listeCommandes;?></div>
<!-- <span style="color:#9C093A;margin-right:5px;float: right;">
<a style="cursor:help;" class="tooltip" title="<?php// echo htmlentities($this->modification);?>">Dernières modifications au <?php// echo date('d/m/Y'); ?></a>
</span> -->
<h1>Identite</h1>
<div class="paragraph">
<div id="identite">
@ -128,33 +117,5 @@
</div>
<?php endif;?>
<?php //if(!empty($this->modification)): ?>
<!--<h1>Liste des monitoring<img style="margin-top:4px;float:right" src="/themes/default/images/giant/expanded.gif" ></h1>
<div class='monitor_but'>
<a class="dial" title="Start Monitoring" href='/giant/startmonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/lang/<?=serialize($this->listeRapport->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Start monitoring</a>
<a class="dial" title="Stop Monitoring" href='/giant/stopmonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Stop monitoring</a>
<a class="dial" title="Update Monitoring" href='/giant/updatemonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/lang/<?=serialize($this->listeRapport->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Update monitoring</a>
<a class="retr" title="Retrive Monitoring" href='/giant/retrivemonitoring/CompanyId/<?=$this->CompanyId?>/Pays/<?=$this->Pays?>/CompanyName/<?=str_replace(' ', '+', $this->raisonSociale)?>'>Retrive monitoring</a>
</div>
<br><br><br><br>
<div class="dialog-form" title="Create new user">
<form>
<fieldset>
<strong>Monitoring Type For: </strong><br />
<select name="EventType" class="mon_type">
<option value='Customer'>Customer</option>
<option value='Consumer'>Consumer</option>
<option value='Order'>Order</option>
</select><br /><br />
<strong>StartFrom: </strong><br />
<input type="text" name="StartFrom" value="" /><br /><br />
<div class='int_order'><strong>InternalOrderId: </strong><br />
<input type="text" name="InternalOrderId" value="32768032781"/> <br /><br /></div>
</fieldset>
</form>
</div> -->
<?php// echo'<pre>';print_r($this->modification); ?>
<?php //endif;?>
</div>

2
application/views/default/scripts/giant/search.phtml
View File

@ -7,7 +7,7 @@
<?php echo number_format($this->resultats->NumberOfHits, 0, ',', ' ')?>
réponses avec les critères <a href="<?php echo $this->lienReferer;?>">"<?php echo $this->referer; ?>"</a>.
<?php echo ($this->resultats->NumberOfHits>$this->userMaxResult)?$this->userMaxResult:$this->resultats->NumberOfHits?> résultats affichés.
Page <?php echo $this->page + 1 .'/'. $this->resultats->NumberOfHits?>.</b>
Page <?php echo $this->page + 1 .'/'.round($this->resultats->NumberOfHits/$this->userMaxResult)?></b>
</p>
<ol start="<?php echo ($this->userMaxResult * $this->page) + 1; ?>">
<?php foreach ($this->resultats->Results->Company as $resultat) :?>

12
library/Giant/Functions.lib.php
View File

@ -107,17 +107,7 @@ Class GiantFunction
public function selectTypeSearch($form)
{
$type = array('siret','raisonSociale', 'numero', 'voie', 'cpVille', 'telFax', 'naf');
$i = 0;
foreach ($type as $key => $element) {
if($key == 'siret')
return (false);
if(!empty($form[$element]))
$i++;
}
return (($i == 1)?true:false);
return(!empty($form['siret']))?true:false;
}
public function getQueryLink($parametres)

8
public/themes/default/scripts/giant.js
View File

@ -36,10 +36,10 @@ $(document).ready( function()
$('select[name=LanguageCode]').fadeIn(500);
}
getPays();
$(function() {
/*$(function() {
$.datepicker.setDefaults( $.datepicker.regional[ "fr" ] );
$( ".datepicker" ).datepicker({ dateFormat: "yy-mm-dd" });
});
});*/
$('.idpr,.id_cr').on('click', function(){
//e.preventDefault();
var n = $(this).attr('id');
@ -88,7 +88,7 @@ $(document).ready( function()
.button();
});
$.mon_type = $('.mon_type').val();
$('.retr,.totCom').on('click', function(e){
/*$('.retr,.totCom').on('click', function(e){
e.preventDefault();
var title = $(this).attr('title');
var href = $(this).attr('href');
@ -104,7 +104,7 @@ $(document).ready( function()
close: function() { $(this).dialog('close'); }};
$('.dialog-form').dialog(dlgOpts);
return false;
});
});*/
if($('.mon_type').val()!='Order')
{
$('.int_order').fadeOut(500);