diff options
Diffstat (limited to 'pages/shop')
| -rw-r--r-- | pages/shop/_product/index.fnl | 2 | ||||
| -rw-r--r-- | pages/shop/index.fnl | 2 | ||||
| -rw-r--r-- | pages/shop/order/_id.fnl | 2 | ||||
| -rw-r--r-- | pages/shop/order/index.fnl | 15 |
4 files changed, 14 insertions, 7 deletions
diff --git a/pages/shop/_product/index.fnl b/pages/shop/_product/index.fnl index 23a057f..30cbc33 100644 --- a/pages/shop/_product/index.fnl +++ b/pages/shop/_product/index.fnl @@ -51,8 +51,8 @@ [:aside {} (templates.header "/shop" authenticated?) (if (< 0 (# basket)) (templates.basket basket redirect-url) "") - (templates.address-block) (templates.conditions-block) + (templates.address-block) (templates.contact-block)]) (HTML [:div {:class "content"} diff --git a/pages/shop/index.fnl b/pages/shop/index.fnl index cfddbe7..854803f 100644 --- a/pages/shop/index.fnl +++ b/pages/shop/index.fnl @@ -144,8 +144,8 @@ [:aside {} (templates.header "/shop" authenticated?) (if (< 0 (# basket)) (templates.basket basket redirect-url) "") - (templates.address-block) (templates.conditions-block) + (templates.address-block) (templates.contact-block)]) (HTML [:div {:class "content"} diff --git a/pages/shop/order/_id.fnl b/pages/shop/order/_id.fnl index 03ec0a9..19c8a9c 100644 --- a/pages/shop/order/_id.fnl +++ b/pages/shop/order/_id.fnl @@ -16,8 +16,8 @@ [(HTML [:aside {} (templates.header "/shop/order" authenticated?) - (templates.address-block) (templates.conditions-block) + (templates.address-block) (templates.contact-block)]) (HTML [:div {:class "content"} diff --git a/pages/shop/order/index.fnl b/pages/shop/order/index.fnl index c49f71b..4cafd62 100644 --- a/pages/shop/order/index.fnl +++ b/pages/shop/order/index.fnl @@ -13,8 +13,8 @@ (forms.checkbox-input "correct-order" "Данные заказа верны" true) (forms.checkbox-input "consent" (.. - "Я согласен с <a target=\"_blank\" href=\"/information/privacy-policy\">условиями обработки персональных данных</a>." - ;;"а также с <a target=\"_blank\" href=\"/information/offer\">нашей публичной офертой</a>." + "Я согласен с <a target=\"_blank\" href=\"/about/privacy-policy\">условиями обработки персональных данных</a> + и условиями заказа." ) true)]}]) @@ -23,8 +23,8 @@ [:aside {} (templates.header "/shop/order") (if (< 0 (# basket)) (templates.basket basket "/shop/order") "") - (templates.address-block) (templates.conditions-block) + (templates.address-block) (templates.contact-block)]) (HTML [:div {:class "content"} @@ -32,6 +32,13 @@ [:div {:class "back"} [:a {:href "/shop"} "⟵ Обратно к списку"]] [:section {} [:h2 {:id "content"} "Оформление заказа"] + [:section {:class "narrow"} + [:p {:class "mb-0-5"} + "После подтверждения заказа мы с вами свяжемся для уточнения + подробностей и оплаты. Оплата по QR-коду."] + [:p {} + "Самовывоз из чайной. Доставка по Омску и России обговаривается + после оформления заказа."]] (forms.render-form %order-form data errors)]])]) (fn check-stocks [db basket] @@ -71,7 +78,7 @@ (.. "Новый заказ " "<a href=\"https://whitetoad.ru/shop/order/" order-id "\">" order-id - "</a> от <b>" data.name "</b>.\n\n" + "</a>. " "<a href=\"https://whitetoad.ru/shop/order/list\">Список заказов</a>")) ;; redirect and clear order cookie (values 302 {:Location (.. "/shop/order/" order-id) |