From 46656d7aa9748e8f9e87f2977b0b665cdc4988ce Mon Sep 17 00:00:00 2001
From: Andrey Kuvshinov <ak.delf@gmail.com>
Date: Sat, 8 Oct 2022 16:52:34 +0000
Subject: [PATCH 1/2] correct in checkout.phtml

---
 app/views/checkout.phtml | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/views/checkout.phtml b/app/views/checkout.phtml
index 64ddf21..2e6f9f0 100644
--- a/app/views/checkout.phtml
+++ b/app/views/checkout.phtml
@@ -35,26 +35,30 @@
 
         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_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_samo").style.display='none';
             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_samo").style.display='none';
             el_adress.placeholder='Индекс (обязательно). Далее область, населенный пункт и Ваш адрес';
         }
 
+
     }
 
-
-
 </script>
 
         <form id="clientform" class="clientform" action="<?=$submit_link?>" method="POST">
@@ -83,8 +87,9 @@
             <p><em>*Куда придет информация о заказе</em></p>    
               
             <p><input style="border: solid 1px #ccc;border-radius:3px;" type="email" id="clientemail" name="clientmail"  value="<?=post_value("clientmail")?>"></p>
-
+            
             <?if($delivery_id > 1):?>
+
                
                 <p style="font-weight: bold;font-size: 22px;"><label for="buy_adress">Фамилия, имя, отчество:</label><br></p>
                 <p><input id="buy_name" name="buy_name"  value="<?=post_value("buy_name")?>" type="text"></p>
@@ -96,22 +101,23 @@
 
                 <p style="font-weight: bold;font-size: 22px;"><label for="devilery_id">Доставка:</label></p>
                 
-                <?$weight_start = 0?>
-    
+        
                 <?foreach($delivery as $ditem):?>
-                    
+
                     <?$checked = ($ditem['delivery_id'] == $delivery_id) ? ' checked': '';?>
                      
-                    <?if ($ditem['delivery_weight'] > 0):?> 
-                        <?if ($price['weight'] > $weight_start and $price['weight'] < $ditem['delivery_weight']):?>
-                            <?$weight_start = $ditem['delivery_weight']?>
-                            <p><input name="delivery_id" type="radio" id="devilery_id<?=$ditem['delivery_id']?>" onclick="devilery_check();" value="<?=$ditem['delivery_id']?>"<?=$checked?>>
+                    <?if ($ditem['delivery_weight_max'] > 0):?> 
+                        <?if ($price_id['weight'] > $ditem['delivery_weight'] and $price_id['weight'] < $ditem['delivery_weight_max']):?>
+                            <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?>>
                             <?=$ditem['delivery']?>
                             <?if ($ditem['delivery_price'] !== '0.00'):?>
                                 + <?=$ditem['delivery_price']?> руб.
                             <?endif?>
-                            </p>
-                        <?endif?>    
+                            </p></div>    
                     <?else:?>    
                         <p><input name="delivery_id" type="radio" id="devilery_id<?=$ditem['delivery_id']?>" onclick="devilery_check();" value="<?=$ditem['delivery_id']?>"<?=$checked?>>
                         <?=$ditem['delivery']?>

From c0d8c0622a89b1f0189c5128d7e23ef861fae22c Mon Sep 17 00:00:00 2001
From: Andrey Kuvshinov <ak.delf@gmail.com>
Date: Sat, 8 Oct 2022 16:56:50 +0000
Subject: [PATCH 2/2] correct delist order.php

---
 app/routes/order.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/app/routes/order.php b/app/routes/order.php
index 9d993dd..ae51d9f 100644
--- a/app/routes/order.php
+++ b/app/routes/order.php
@@ -51,8 +51,6 @@ function checkout_kuri($priceslug, $delivery_id = 1){
         $delivery = delivery_list($price_id['weight']); // список доставок для бумажной версии
     }  
         
-    
-
     /** если клиент залогинен */
     if (defined('CLIENT_ID')){ 
 
@@ -314,16 +312,7 @@ function delivery_list($weight = 250) {
     foreach ($delivery as $del){
 
         $key = $del['delivery_id'];
-        $result[$key] = $del;
-
-        if ($del['delivery_id'] == 4){
-            if ($weight > 499){
-                $result[$key]['delivery_price'] = 450;
-            }
-
-        }
-        
-        
+        $result[$key] = $del; 
 
     }