From 1ef13a75a235cb9820d6fb387082b6570fef051e Mon Sep 17 00:00:00 2001
From: "arlemp@selectel.ru" <arlemp@selectel.ru>
Date: Tue, 5 Nov 2024 18:22:30 +0300
Subject: [PATCH] delete samo

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

diff --git a/app/views/checkout.phtml b/app/views/checkout.phtml
index ed7fb32..fdd590b 100644
--- a/app/views/checkout.phtml
+++ b/app/views/checkout.phtml
@@ -13,6 +13,10 @@
             
             <?$nn++;?>
 
+            <?if ($ditem['delivery_id'] == 2){
+                continue;
+            }?>
+
             <?if ( $price_id['fullprice'] and $ditem['delivery_id'] == 4 or $ditem['delivery_id'] == 5 ){
                 continue;
             }?>   
@@ -55,13 +59,13 @@
 
         }
         <?if ( $price_id['fullprice'] ):?>
-            else if(document.getElementById('devilery_id6').checked){ 
+           if(document.getElementById('devilery_id6').checked){ 
                 document.getElementById("form_adress").style.display='block';
                 document.getElementById("form_samo").style.display='none';
                 el_adress.placeholder='Индекс (обязательно). Далее область, населенный пункт и Ваш адрес';
             }
         <?else:?>
-            else if(document.getElementById('devilery_id4').checked){ 
+            if(document.getElementById('devilery_id4').checked){ 
                 document.getElementById("form_adress").style.display='block';
                 document.getElementById("form_samo").style.display='none';
                 el_adress.placeholder='Индекс (обязательно). Далее область, населенный пункт и Ваш адрес';
@@ -117,14 +121,21 @@
 
                 <p style="font-weight: bold;font-size: 22px;"><label for="devilery_id">Доставка:</label></p>
 
-                <?foreach($delivery as $ditem):?>
+                <?foreach($delivery as $ditem):
+                    if ($ditem['delivery_id'] == 2){
+                        continue;
+                    }?>
 
                     <?$checked = ($ditem['delivery_id'] == $delivery_id) ? ' checked': '';?>
 
-                    <?if ( $price_id['fullprice'] and $ditem['delivery_id'] == 4 or $ditem['delivery_id'] == 5 ){
+                    <?if ( $price_id['fullprice'] and $ditem['delivery_id'] == 4 ){
                         continue;
-                    }?>   
-            
+                    }
+                    
+                    if ( !$price_id['fullprice'] and $ditem['delivery_id'] == 6 ){
+                        continue;
+                    }?>  
+                    
 
                     <?if ($ditem['delivery_weight_max'] > 0):?> 
                         <?if ($price_id['weight'] > $ditem['delivery_weight'] and $price_id['weight'] < $ditem['delivery_weight_max']):?>
@@ -147,15 +158,7 @@
                         </p>
                     <?endif?>
                     
-                <?endforeach?>    
-
-                <div id="form_samo" class="adress_box" style="display: <?= ($delivery_id == 2) ? 'block' : 'none' ?>;">
-                    <p>Москва, метро "Аэропорт", Авиационный переулок, д. 4А (здание МФЮА), к. 104</p>
-                    <p>Мы работаем пн.-пт. c 10:00 - 18:00</p>
-                    <?if ($preorder == 0):?> 
-                        <p><strong><em>Резерв - 3 рабочих дня<em></strong></p>
-                    <?endif?>    
-                </div>        
+                <?endforeach?>       
                 
                 <div id="form_adress" class="adress_box" style="display: <?= ($delivery_id == 3 or $delivery_id == 4) ? 'block' : 'none' ?>;">
                     <p style="margin:0px;"><label for="buy_adress">Адрес:</label></p>