fix

app/views/main/_order_edit.html.haml

@@ -1,6 +1,34 @@
 .clear
 .block-padded
 = form_for :order, :url => orders_path, :remote => true, :html => {:class => "js"} do |f|
+ .block-padded
+  %h2 Параметры заказа
+  - if @carts.detect{|c| not c.is_a?(CartRequest) }
+   .item
+    .name
+     Добавить примечание к заказу
+    %div
+     %textarea{:name => "order_comment"}
+  .padded
+    = render :partial => "shared/check_button", :locals => {:name => "order_needed", :title => t(:order_needed), :opts => {:need_field => true, :use_system => true}}
+
+  - if @carts.detect{|c| c.pick or c.is_a?(CartWorld) }
+   = render :partial => "main/pick_options"
+  - if @carts.detect{|c| c.is_a?(CartRequest) }
+   .block-padded
+    %h3 Параметры запроса
+    .form-hide
+     .item
+      .name
+       Добавить примечание к запросу
+      .hide
+       %textarea{:name => "comment"}
+    .padded
+ .clear
+ = render :partial => "shared/submit_button", :locals => {:title => t(:make)}
+ -#! %a.ajax#order_cancel{:href => "#", :style => "margin: 5px 21px; float: left;"}= t(:cancel)
+
+-# = form_for :order, :url => orders_path, :remote => true, :html => {:class => "js"} do |f|
  .block-padded
   %h2 Параметры заказа
   - if @carts.detect{|c| not c.is_a?(CartRequest) }
@@ -30,6 +58,5 @@
      .padded
  .clear
  = render :partial => "shared/submit_button", :locals => {:title => t(:make)}
- %a.ajax#order_cancel{:href => "#", :style => "margin: 5px 21px; float: left;"}= t(:cancel)
- -# = render :partial => "shared/button", :locals => {:title => t(:cancel), :opts => {:id => "order_cancel"}}
+ -#! %a.ajax#order_cancel{:href => "#", :style => "margin: 5px 21px; float: left;"}= t(:cancel)