diff --git a/app/pub/css/an.css b/app/pub/css/an.css index 99fbcec..31a49e7 100644 --- a/app/pub/css/an.css +++ b/app/pub/css/an.css @@ -229,7 +229,14 @@ h1 { #downarrow{ padding: 8px 0px 8px 8px; } - +.adress_box { + background: white; + width: calc(100% - 50px); + padding: 10px; + box-sizing: border-box; + border: 1px solid #ccc; + border-radius: 3px; +} #stuff-bar { display: flex; align-items: center; @@ -309,7 +316,7 @@ h1 { font-weight: bold; color: #181716; } -input[type="email"],input[type="password"]{ +input[type="email"],input[type="password"], input[type="text"], input[type="tel"]{ background: #fff; transition: all 800ms; width: calc(100% - 50px); diff --git a/app/routes/order.php b/app/routes/order.php index 432a83e..ed848b8 100644 --- a/app/routes/order.php +++ b/app/routes/order.php @@ -224,8 +224,8 @@ function checkout_kuri($priceslug, $delivery_id = 1){ $submit_link = SITE."checkout/$priceslug/$delivery_id"; - include VIEWPATH.'checkout.phtml'; - + $tempcontent = VIEWPATH.'checkout.phtml'; + include VIEWPATH.'layout_pay.phtml'; } @@ -249,8 +249,10 @@ function status_kuri($order_id){ $buy_id = db_get($buy_find); - include(VIEWPATH.'order_status.phtml'); - + //$tempcontent = VIEWPATH.'order_status.phtml'; + //include VIEWPATH.'order_status.phtml'; + $tempcontent = VIEWPATH.'order_status.phtml'; + include VIEWPATH.'layout_pay.phtml'; } diff --git a/app/views/checkout.phtml b/app/views/checkout.phtml index 2dc468d..02e9e58 100644 --- a/app/views/checkout.phtml +++ b/app/views/checkout.phtml @@ -11,13 +11,13 @@ if (myRadio.value == 2){ itog = product_price; - document.getElementById("form_adress").style.visibility='hidden'; - document.getElementById("form_samo").style.visibility='visible'; + document.getElementById("form_adress").style.display='none'; + document.getElementById("form_samo").style.display='block'; } else if(myRadio.value == 3){ itog = product_price + 300; - document.getElementById("form_adress").style.visibility='visible'; - document.getElementById("form_samo").style.visibility='hidden'; + document.getElementById("form_adress").style.display='block'; + document.getElementById("form_samo").style.display='none'; } itog_el.innerHTML = itog + ' руб.'; @@ -41,23 +41,22 @@ -


- Куда придет информация о заказе -

+

+

*Куда придет информация о заказе

-

">

+

">

1):?> -


-

">

+


+

" type="text">

-


- Для подтверждения заказа -

-

">

+

+

*Для подтверждения заказа

+ +

" type="text">

-

+

-
-

Адрес:

+
+

Адрес:

Москва, Авиационный переулок, д. 4А

-
-

-

+
+

+

-

+

$pitem):?> @@ -97,7 +96,7 @@

-

+

diff --git a/app/views/layout.phtml b/app/views/layout.phtml index 55233f1..d8b1a6d 100644 --- a/app/views/layout.phtml +++ b/app/views/layout.phtml @@ -115,13 +115,7 @@ else { - +