delf/anpdf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
arlemp@selectel.ru
2022-10-08 19:57:56 +03:00
parent 14e627ce4f c0d8c0622a
commit 58e89d1f04
2 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/routes/order.php
View File

@@ -51,8 +51,6 @@ function checkout_kuri($priceslug, $delivery_id = 1){
$delivery = delivery_list($price_id['weight']); // список доставок для бумажной версии $delivery = delivery_list($price_id['weight']); // список доставок для бумажной версии
} }
/** если клиент залогинен */ /** если клиент залогинен */
if (defined('CLIENT_ID')){ if (defined('CLIENT_ID')){
@@ -316,15 +314,6 @@ function delivery_list($weight = 250) {
$key = $del['delivery_id']; $key = $del['delivery_id'];
$result[$key] = $del; $result[$key] = $del;
if ($del['delivery_id'] == 4){
if ($weight > 499){
$result[$key]['delivery_price'] = 450;
}
}
} }
return $result; return $result;

27
app/views/checkout.phtml
View File

@@ -35,26 +35,30 @@
var el_adress = document.getElementById("buy_adress"); var el_adress = document.getElementById("buy_adress");
if (document.getElementById('devilery_id1').checked){ if (document.getElementById('devilery_id2').checked){
document.getElementById("form_adress").style.display='none'; document.getElementById("form_adress").style.display='none';
document.getElementById("form_samo").style.display='block'; document.getElementById("form_samo").style.display='block';
} }
else if(document.getElementById('devilery_id2').checked){ else if(document.getElementById('devilery_id3').checked){
document.getElementById("form_adress").style.display='block'; document.getElementById("form_adress").style.display='block';
document.getElementById("form_samo").style.display='none'; document.getElementById("form_samo").style.display='none';
el_adress.placeholder='Адрес в свободной форме'; el_adress.placeholder='Адрес в свободной форме';
} }
else if(document.getElementById('devilery_id3').checked){ else if(document.getElementById('devilery_id4').checked){
document.getElementById("form_adress").style.display='block';
document.getElementById("form_samo").style.display='none';
el_adress.placeholder='Индекс (обязательно). Далее область, населенный пункт и Ваш адрес';
}
else if(document.getElementById('devilery_id5').checked){
document.getElementById("form_adress").style.display='block'; document.getElementById("form_adress").style.display='block';
document.getElementById("form_samo").style.display='none'; document.getElementById("form_samo").style.display='none';
el_adress.placeholder='Индекс (обязательно). Далее область, населенный пункт и Ваш адрес'; el_adress.placeholder='Индекс (обязательно). Далее область, населенный пункт и Ваш адрес';
} }
} }
</script> </script>
<form id="clientform" class="clientform" action="<?=$submit_link?>" method="POST"> <form id="clientform" class="clientform" action="<?=$submit_link?>" method="POST">
@@ -97,22 +101,23 @@
<p style="font-weight: bold;font-size: 22px;"><label for="devilery_id">Доставка:</label></p> <p style="font-weight: bold;font-size: 22px;"><label for="devilery_id">Доставка:</label></p>
<?$weight_start = 0?>
<?foreach($delivery as $ditem):?> <?foreach($delivery as $ditem):?>
<?$checked = ($ditem['delivery_id'] == $delivery_id) ? ' checked': '';?> <?$checked = ($ditem['delivery_id'] == $delivery_id) ? ' checked': '';?>
<?if ($ditem['delivery_weight'] > 0):?> <?if ($ditem['delivery_weight_max'] > 0):?>
<?if ($price['weight'] > $weight_start and $price['weight'] < $ditem['delivery_weight']):?> <?if ($price_id['weight'] > $ditem['delivery_weight'] and $price_id['weight'] < $ditem['delivery_weight_max']):?>
<?$weight_start = $ditem['delivery_weight']?> <div>
<?else:?>
<div style="display: none;">
<?endif?>
<p><input name="delivery_id" type="radio" id="devilery_id<?=$ditem['delivery_id']?>" 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']?> руб.
<?endif?> <?endif?>
</p> </p></div>
<?endif?>
<?else:?> <?else:?>
<p><input name="delivery_id" type="radio" id="devilery_id<?=$ditem['delivery_id']?>" 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']?>