antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket/r15782-stats'

Browse Source
This commit is contained in:
Michael RICOIS 2018-02-06 16:48:32 +01:00
commit 54781041ee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/stats_logistic/AdminStatsLogistic.php
View File

@ -313,7 +313,7 @@ class AdminStatsLogistic extends AdminTab
}
</style>
<script type="text/javascript" src="'.__PS_BASE_URI__.'modules/privatesales_livestats/jquery-ui-1.8.20.custom.min.js"></script>
<script type="text/javascript" src="'.__PS_BASE_URI__.'adm/helpers/includes/jquery-ui-1.8.20.custom.min.js"></script>
<script type="text/javascript" src="'.__PS_BASE_URI__.'adm/helpers/includes/jquery-ui-timepicker-addon.js"></script>
<script type="text/javascript" src="'.__PS_BASE_URI__.'modules/stats_logistic/views/js/export.js"></script>
';
@ -599,7 +599,7 @@ class AdminStatsLogistic extends AdminTab
echo '<br><br><h2 style="margin-top:15px">Export Remboursements</h2>
<fieldset>
<p>Exporter le détail des ventes dont la date de début est comprise entre : </p>
<form method="POST" action="'.Tools::getShopDomain(true).'/modules/stats_logistic/ajax.php?action=export">'
<form name="export-remb" method="post" action="'.Tools::getShopDomain(true).'/modules/stats_logistic/ajax.php?action=export">'
.'<span class="form-group">'
.'<label style="float: none;" class="control-label" for="date_export_begin">Date de début :</label>'
.'<input type="date" name="date_export_begin" value="'.pSQl($this->date_export_begin).'" id="date_export_begin" class="form-control" />'
@ -617,7 +617,7 @@ class AdminStatsLogistic extends AdminTab
echo '<br><br><h2 style="margin-top:15px">Export Expeditions</h2>
<fieldset>
<p>Exporter le détail des expeditions dont la date est comprise entre : </p>
<form method="POST" action="'.$currentIndex.'" >'
<form method="post" action="'.$currentIndex.'" >'
.'<span class="form-group">'
.'<label style="float: none;" class="control-label" for="date_export_begin">Date de début :</label>'
.'<input type="date" name="date_expe_begin" value="'.pSQl($this->date_expe_begin).'" id="date_expe_begin" class="form-control" />'

2
modules/stats_logistic/views/js/export.js
View File

@ -26,7 +26,7 @@ $(function(){
});
}
$('form').submit(function(e) {
$('form[name=export-remb]').submit(function(e) {
$(this).find('input#submitExport').attr('disabled', 'disabled');
url = $(this).attr('action');
$.post(url, $(this).serialize(), function (data, textStatus) {