v1.4.2: Bugfix Progressbar, Datenquelle weg von der Packingnote, hin zum Job. EpiRent hat auch den "Total Items" Parameter im Packingnote Endpunkt gelöscht
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
<?php
|
||||
|
||||
error_reporting(E_ALL);
|
||||
require('../config.php');
|
||||
require('../EpiApi.php');
|
||||
|
||||
@@ -96,15 +96,18 @@ foreach ($data_output as $packingjob) {
|
||||
|
||||
|
||||
|
||||
if ($packingjob->is_all_in == 0) {
|
||||
if ($orderdetail_output->amount_open_checkin==0) {
|
||||
echo "<span class='badge badge-success'>";
|
||||
} else {
|
||||
|
||||
echo '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: '.((($packingjob->ps_parameters->result->total_pieces-abs($packingjob->is_all_out))-abs($packingjob->is_all_in)) /($packingjob->ps_parameters->result->total_pieces - abs($packingjob->is_all_out)))*100 .'%" aria-valuenow="' . ($packingjob->ps_parameters->result->total_pieces-abs($packingjob->is_all_out)) . '" aria-valuemin="0" aria-valuemax="' . $packingjob->ps_parameters->result->total_pieces - abs($packingjob->is_all_out) . '"></div></div>';
|
||||
|
||||
echo '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" style="width: '.(($orderdetail_output->amount_checkout - $orderdetail_output->amount_open_checkin)/$orderdetail_output->amount_checkout) *100 .'%" aria-valuenow="' . ($orderdetail_output->amount_checkout - $orderdetail_output->amount_open_checkin) . '" aria-valuemin="0" aria-valuemax="' . $orderdetail_output->amount_checkout . '"></div></div>';
|
||||
|
||||
echo "<span class='badge badge-info'>";
|
||||
}
|
||||
echo (($packingjob->ps_parameters->result->total_pieces-abs($packingjob->is_all_out))-abs($packingjob->is_all_in)) . "/" . $packingjob->ps_parameters->result->total_pieces - abs($packingjob->is_all_out). " (".$packingjob->ps_parameters->result->total_pieces.")" ;
|
||||
|
||||
echo ($orderdetail_output->amount_checkout - $orderdetail_output->amount_open_checkin) . "/" . $orderdetail_output->amount_checkout;
|
||||
echo "</span><td>";
|
||||
|
||||
echo "</tr>";
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user