CHANGES_in ui allignment : GWM

This commit is contained in:
bitbucket 2024-07-26 17:25:07 +05:30
parent 7e95754e6a
commit 2e5e055a30

View File

@ -766,27 +766,33 @@
<?php if(isset($reveuetax)){ ?>
<?php if($reveuetax[0]->AfterPackagingValue != 0){ ?>
<?php foreach ($reveuetax as $key => $value) {
$AfterPackagingValue[] = isset($value->AfterPackagingValue) ? $value->AfterPackagingValue : 0.00;
$AfterFreightValue[] = isset($value->AfterFreightValue) ? $value->AfterFreightValue : 0.00;
$AfterDiscount[] = isset($value->AfterDiscount) ? $value->AfterDiscount : 0.00;
} ?>
<?php if(array_sum($AfterPackagingValue) != 0){ ?>
<tr>
<td class="text-right" style="border:0em;"><?php _trans('Packaging '); ?></td>
<td class="text-right" style="border:0em;"><?php echo $currencyCode; ?></td>
<td class="text-right" style="border:0em;"><?php echo number_alignment($reveuetax[0]->AfterPackagingValue); ?></td>
<td class="text-right" style="border:0em;"><?php echo number_alignment(array_sum($AfterPackagingValue)); ?></td>
</tr>
<?php } ?>
<?php if($reveuetax[0]->AfterFreightValue != 0){ ?>
<?php if(array_sum($AfterFreightValue) != 0){ ?>
<tr>
<td class="text-right" style="border:0em;"><?php _trans('Freight '); ?></td>
<td class="text-right" style="border:0em;"><?php echo $currencyCode; ?></td>
<td class="text-right" style="border:0em;"><?php echo number_alignment($reveuetax[0]->AfterFreightValue); ?></td>
<td class="text-right" style="border:0em;"><?php echo number_alignment(array_sum($AfterFreightValue)); ?></td>
</tr>
<?php } ?>
<?php if($reveuetax[0]->AfterDiscount != 0){ ?>
<?php if(array_sum($AfterDiscount) != 0){ ?>
<tr>
<td class="text-right" style="border:0em;"><?php _trans('Discount '); ?></td>
<td class="text-right" style="border:0em;"><?php echo $currencyCode; ?></td>
<td class="text-right" style="border:0em;"><?php echo '-'.number_alignment($reveuetax[0]->AfterDiscount); ?></td>
<td class="text-right" style="border:0em;"><?php echo '-'.number_alignment(array_sum($AfterDiscount)); ?></td>
</tr>
<?php } ?>
@ -803,10 +809,10 @@
<tr>
<?php $invoiceTotalGST = array_sum($cgst) + array_sum($sgst) + array_sum($igst); ?>
<?php $differences = ($invoiceTotalGST + array_sum($Insurance) + $invoiceTotalBasic); ?>
<?php if(isset($reveuetax)){ $differences = ($differences + $reveuetax[0]->AfterPackagingValue + $reveuetax[0]->AfterFreightValue) - $reveuetax[0]->AfterDiscount; }?>
<?php if(isset($reveuetax)){ $differences = ($differences + array_sum($AfterPackagingValue) + array_sum($AfterFreightValue)) - array_sum($AfterDiscount); }?>
<?php $roundOf = $invoiceTotalAmount - $differences; ?>
<td class="text-right" style="border:0em;"><?php _trans('Round Off'); echo $invoiceTotalAmount; ?></td>
<td class="text-right" style="border:0em;"><?php _trans('Round Off'); ?></td>
<td class="text-right" style="border:0em;"><?php echo $currencyCode; ?></td>
<td class="text-right" style="border:0em;"><?php echo number_format($roundOf, 2); ?></td>
</tr>