Merge branch 'master' of ssh://gl.arguments.ru:2224/ak/anpdf

This commit is contained in:
arlemp@selectel.ru
2022-10-08 15:54:02 +03:00

View File

@@ -12,9 +12,9 @@
<?foreach($delivery as $ditem):?> <?foreach($delivery as $ditem):?>
<?$nn++;?> <?$nn++;?>
<? if($nn == 1): ?> <? if($nn == 1): ?>
if (document.getElementById('devilery_id<?=$nn?>').checked) { if (document.getElementById('devilery_id<?=$ditem['delivery_id']?>').checked) {
<?else:?> <?else:?>
else if (document.getElementById('devilery_id<?=$nn?>').checked){ else if (document.getElementById('devilery_id<?=$ditem['delivery_id']?>').checked){
<?endif?> <?endif?>
itog = product_price * count; itog = product_price * count;
<?if ($ditem['delivery_price'] !== '0.00'):?> <?if ($ditem['delivery_price'] !== '0.00'):?>
@@ -101,13 +101,12 @@
<?foreach($delivery as $ditem):?> <?foreach($delivery as $ditem):?>
<?$dd++; <?$checked = ($ditem['delivery_id'] == $delivery_id) ? ' checked': '';?>
$checked = ($ditem['delivery_id'] == $delivery_id) ? ' checked': '';?>
<?if ($ditem['delivery_weight'] > 0):?> <?if ($ditem['delivery_weight'] > 0):?>
<?if ($price['weight'] > $weight_start and $price['weight'] < $ditem['delivery_weight']):?> <?if ($price['weight'] > $weight_start and $price['weight'] < $ditem['delivery_weight']):?>
<?$weight_start = $ditem['delivery_weight']?> <?$weight_start = $ditem['delivery_weight']?>
<p><input name="delivery_id" type="radio" id="devilery_id<?=$dd?>" onclick="devilery_check();" value="<?=$ditem['delivery_id']?>"<?=$checked?>> <p><input name="delivery_id" type="radio" id="devilery_id<?=$ditem['delivery_id']?>" onclick="devilery_check();" value="<?=$ditem['delivery_id']?>"<?=$checked?>>
<?=$ditem['delivery']?> <?=$ditem['delivery']?>
<?if ($ditem['delivery_price'] !== '0.00'):?> <?if ($ditem['delivery_price'] !== '0.00'):?>
+ <?=$ditem['delivery_price']?> руб. + <?=$ditem['delivery_price']?> руб.
@@ -115,7 +114,7 @@
</p> </p>
<?endif?> <?endif?>
<?else:?> <?else:?>
<p><input name="delivery_id" type="radio" id="devilery_id<?=$dd?>" onclick="devilery_check();" value="<?=$ditem['delivery_id']?>"<?=$checked?>> <p><input name="delivery_id" type="radio" id="devilery_id<?=$ditem['delivery_id']?>" onclick="devilery_check();" value="<?=$ditem['delivery_id']?>"<?=$checked?>>
<?=$ditem['delivery']?> <?=$ditem['delivery']?>
<?if ($ditem['delivery_price'] !== '0.00'):?> <?if ($ditem['delivery_price'] !== '0.00'):?>
+ <?=$ditem['delivery_price']?> руб. + <?=$ditem['delivery_price']?> руб.